From 9fb74f427d7f481a6df96c843a30c2998664e0fb Mon Sep 17 00:00:00 2001 From: anakin87 Date: Mon, 20 Jan 2025 09:44:15 +0100 Subject: [PATCH 1/3] pin transformers!=4.48.0 --- integrations/optimum/pyproject.toml | 2 +- integrations/optimum/tests/test_optimum_document_embedder.py | 4 +++- integrations/optimum/tests/test_optimum_text_embedder.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/integrations/optimum/pyproject.toml b/integrations/optimum/pyproject.toml index 6149997ed..ecf1d80ce 100644 --- a/integrations/optimum/pyproject.toml +++ b/integrations/optimum/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] dependencies = [ "haystack-ai", - "transformers[sentencepiece]", + "transformers[sentencepiece]!=4.48.0", # The main export function of Optimum into ONNX has hidden dependencies. # It depends on either "sentence-transformers", "diffusers" or "timm", based # on which model is loaded from HF Hub. diff --git a/integrations/optimum/tests/test_optimum_document_embedder.py b/integrations/optimum/tests/test_optimum_document_embedder.py index 7c8ca02e0..60382a878 100644 --- a/integrations/optimum/tests/test_optimum_document_embedder.py +++ b/integrations/optimum/tests/test_optimum_document_embedder.py @@ -99,7 +99,9 @@ def test_init_with_parameters(self, mock_check_valid_model): # noqa: ARG002 assert embedder._backend.parameters.optimizer_settings is None assert embedder._backend.parameters.quantizer_settings is None - def test_to_and_from_dict(self, mock_check_valid_model, mock_get_pooling_mode): # noqa: ARG002 + def test_to_and_from_dict(self, mock_check_valid_model, mock_get_pooling_mode, monkeypatch): # noqa: ARG002 + monkeypatch.delenv("HF_API_TOKEN", raising=False) + monkeypatch.delenv("HF_TOKEN", raising=False) component = OptimumDocumentEmbedder() data = component.to_dict() diff --git a/integrations/optimum/tests/test_optimum_text_embedder.py b/integrations/optimum/tests/test_optimum_text_embedder.py index db42ec26d..cea5d6317 100644 --- a/integrations/optimum/tests/test_optimum_text_embedder.py +++ b/integrations/optimum/tests/test_optimum_text_embedder.py @@ -84,7 +84,9 @@ def test_init_with_parameters(self, mock_check_valid_model): # noqa: ARG002 assert embedder._backend.parameters.optimizer_settings is None assert embedder._backend.parameters.quantizer_settings is None - def test_to_and_from_dict(self, mock_check_valid_model, mock_get_pooling_mode): # noqa: ARG002 + def test_to_and_from_dict(self, mock_check_valid_model, mock_get_pooling_mode, monkeypatch): # noqa: ARG002 + monkeypatch.delenv("HF_API_TOKEN", raising=False) + monkeypatch.delenv("HF_TOKEN", raising=False) component = OptimumTextEmbedder() data = component.to_dict() From 42215aba2a11b56af932e0c3be473b3133c73fd6 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Mon, 20 Jan 2025 09:44:49 +0100 Subject: [PATCH 2/3] lint --- integrations/optimum/tests/test_optimum_document_embedder.py | 2 +- integrations/optimum/tests/test_optimum_text_embedder.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integrations/optimum/tests/test_optimum_document_embedder.py b/integrations/optimum/tests/test_optimum_document_embedder.py index 60382a878..32db9258f 100644 --- a/integrations/optimum/tests/test_optimum_document_embedder.py +++ b/integrations/optimum/tests/test_optimum_document_embedder.py @@ -101,7 +101,7 @@ def test_init_with_parameters(self, mock_check_valid_model): # noqa: ARG002 def test_to_and_from_dict(self, mock_check_valid_model, mock_get_pooling_mode, monkeypatch): # noqa: ARG002 monkeypatch.delenv("HF_API_TOKEN", raising=False) - monkeypatch.delenv("HF_TOKEN", raising=False) + monkeypatch.delenv("HF_TOKEN", raising=False) component = OptimumDocumentEmbedder() data = component.to_dict() diff --git a/integrations/optimum/tests/test_optimum_text_embedder.py b/integrations/optimum/tests/test_optimum_text_embedder.py index cea5d6317..4343d1a0f 100644 --- a/integrations/optimum/tests/test_optimum_text_embedder.py +++ b/integrations/optimum/tests/test_optimum_text_embedder.py @@ -86,7 +86,7 @@ def test_init_with_parameters(self, mock_check_valid_model): # noqa: ARG002 def test_to_and_from_dict(self, mock_check_valid_model, mock_get_pooling_mode, monkeypatch): # noqa: ARG002 monkeypatch.delenv("HF_API_TOKEN", raising=False) - monkeypatch.delenv("HF_TOKEN", raising=False) + monkeypatch.delenv("HF_TOKEN", raising=False) component = OptimumTextEmbedder() data = component.to_dict() From 3a1861cc3c222e280d110e38b4887aa827ffc0e3 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Mon, 20 Jan 2025 10:57:14 +0100 Subject: [PATCH 3/3] try removing explicit transformers dep --- integrations/optimum/pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/integrations/optimum/pyproject.toml b/integrations/optimum/pyproject.toml index ecf1d80ce..d7446f859 100644 --- a/integrations/optimum/pyproject.toml +++ b/integrations/optimum/pyproject.toml @@ -27,7 +27,6 @@ classifiers = [ ] dependencies = [ "haystack-ai", - "transformers[sentencepiece]!=4.48.0", # The main export function of Optimum into ONNX has hidden dependencies. # It depends on either "sentence-transformers", "diffusers" or "timm", based # on which model is loaded from HF Hub.