change import paths (#273)

deepset-ai · Jan 26, 2024 · 4118b62 · 4118b62
1 parent 4ddcd5e
commit 4118b62
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 70 deletions.
diff --git a/integrations/google_vertex/pyproject.toml b/integrations/google_vertex/pyproject.toml
@@ -33,6 +33,9 @@ Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/m
 Issues = "https://github.com/deepset-ai/haystack-core-integrations/issues"
 Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/google_vertex"
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/haystack_integrations"]
+
 [tool.hatch.version]
 source = "vcs"
 tag-pattern = 'integrations\/google_vertex-v(?P<version>.*)'
@@ -69,7 +72,7 @@ dependencies = [
   "ruff>=0.0.243",
 ]
 [tool.hatch.envs.lint.scripts]
-typing = "mypy --install-types --non-interactive {args:src/google_vertex_haystack tests}"
+typing = "mypy --install-types --non-interactive --explicit-package-bases {args:src/ tests}"
 style = [
   "ruff {args:.}",
   "black --check --diff {args:.}",
@@ -132,26 +135,23 @@ unfixable = [
 ]
 
 [tool.ruff.isort]
-known-first-party = ["google_vertex_haystack"]
+known-first-party = ["haystack_integrations"]
 
 [tool.ruff.flake8-tidy-imports]
-ban-relative-imports = "all"
+ban-relative-imports = "parents"
 
 [tool.ruff.per-file-ignores]
 # Tests can use magic values, assertions, and relative imports
 "tests/**/*" = ["PLR2004", "S101", "TID252"]
 
 [tool.coverage.run]
-source_pkgs = ["google_vertex_haystack", "tests"]
+source_pkgs = ["haystack_integrations", "tests"]
 branch = true
 parallel = true
-omit = [
-  "src/google_vertex_haystack/__about__.py",
-]
 
 [tool.coverage.paths]
-google_vertex_haystack = ["src/google_vertex_haystack", "*/google_vertex/src/google_vertex_haystack"]
-tests = ["tests", "*/google_vertex_haystack/tests"]
+google_vertex_haystack = ["src/"]
+tests = ["tests"]
 
 [tool.coverage.report]
 exclude_lines = [
@@ -164,6 +164,7 @@ exclude_lines = [
 module = [
   "vertexai.*",
   "haystack.*",
+  "haystack_integrations.*",
   "pytest.*",
   "numpy.*",
 ]

diff --git a/integrations/google_vertex/src/google_vertex_haystack/__init__.py b/integrations/google_vertex/src/google_vertex_haystack/__init__.py
diff --git a/integrations/google_vertex/src/google_vertex_haystack/generators/__init__.py b/integrations/google_vertex/src/google_vertex_haystack/generators/__init__.py
diff --git a/...s/google_vertex/src/haystack_integrations/components/generators/google_vertex/__init__.py b/...s/google_vertex/src/haystack_integrations/components/generators/google_vertex/__init__.py
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2023-present deepset GmbH <[email protected]>
+#
+# SPDX-License-Identifier: Apache-2.0
+from .captioner import VertexAIImageCaptioner
+from .chat.gemini import VertexAIGeminiChatGenerator
+from .code_generator import VertexAICodeGenerator
+from .gemini import VertexAIGeminiGenerator
+from .image_generator import VertexAIImageGenerator
+from .question_answering import VertexAIImageQA
+from .text_generator import VertexAITextGenerator
+
+__all__ = [
+    "VertexAICodeGenerator",
+    "VertexAIGeminiGenerator",
+    "VertexAIGeminiChatGenerator",
+    "VertexAIImageCaptioner",
+    "VertexAIImageGenerator",
+    "VertexAIImageQA",
+    "VertexAITextGenerator",
+]
diff --git a/...e_vertex_haystack/generators/captioner.py → ...nts/generators/google_vertex/captioner.py b/...e_vertex_haystack/generators/captioner.py → ...nts/generators/google_vertex/captioner.py
diff --git a/...gle_vertex/src/haystack_integrations/components/generators/google_vertex/chat/__init__.py b/...gle_vertex/src/haystack_integrations/components/generators/google_vertex/chat/__init__.py
diff --git a/...vertex_haystack/generators/chat/gemini.py → ...s/generators/google_vertex/chat/gemini.py b/...vertex_haystack/generators/chat/gemini.py → ...s/generators/google_vertex/chat/gemini.py
diff --git a/...tex_haystack/generators/code_generator.py → ...enerators/google_vertex/code_generator.py b/...tex_haystack/generators/code_generator.py → ...enerators/google_vertex/code_generator.py
diff --git a/...ogle_vertex_haystack/generators/gemini.py → ...onents/generators/google_vertex/gemini.py b/...ogle_vertex_haystack/generators/gemini.py → ...onents/generators/google_vertex/gemini.py
diff --git a/...ex_haystack/generators/image_generator.py → ...nerators/google_vertex/image_generator.py b/...ex_haystack/generators/image_generator.py → ...nerators/google_vertex/image_generator.py
diff --git a/...haystack/generators/question_answering.py → ...ators/google_vertex/question_answering.py b/...haystack/generators/question_answering.py → ...ators/google_vertex/question_answering.py
diff --git a/...tex_haystack/generators/text_generator.py → ...enerators/google_vertex/text_generator.py b/...tex_haystack/generators/text_generator.py → ...enerators/google_vertex/text_generator.py
diff --git a/integrations/google_vertex/tests/test_captioner.py b/integrations/google_vertex/tests/test_captioner.py
@@ -2,11 +2,11 @@
 
 from haystack.dataclasses.byte_stream import ByteStream
 
-from google_vertex_haystack.generators.captioner import VertexAIImageCaptioner
+from haystack_integrations.components.generators.google_vertex import VertexAIImageCaptioner
 
 
-@patch("google_vertex_haystack.generators.captioner.vertexai")
-@patch("google_vertex_haystack.generators.captioner.ImageTextModel")
+@patch("haystack_integrations.components.generators.google_vertex.captioner.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.captioner.ImageTextModel")
 def test_init(mock_model_class, mock_vertexai):
     captioner = VertexAIImageCaptioner(
         model="imagetext", project_id="myproject-123456", number_of_results=1, language="it"
@@ -19,14 +19,14 @@ def test_init(mock_model_class, mock_vertexai):
     assert captioner._kwargs == {"number_of_results": 1, "language": "it"}
 
 
-@patch("google_vertex_haystack.generators.captioner.vertexai")
-@patch("google_vertex_haystack.generators.captioner.ImageTextModel")
+@patch("haystack_integrations.components.generators.google_vertex.captioner.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.captioner.ImageTextModel")
 def test_to_dict(_mock_model_class, _mock_vertexai):
     captioner = VertexAIImageCaptioner(
         model="imagetext", project_id="myproject-123456", number_of_results=1, language="it"
     )
     assert captioner.to_dict() == {
-        "type": "google_vertex_haystack.generators.captioner.VertexAIImageCaptioner",
+        "type": "haystack_integrations.components.generators.google_vertex.captioner.VertexAIImageCaptioner",
         "init_parameters": {
             "model": "imagetext",
             "project_id": "myproject-123456",
@@ -37,12 +37,12 @@ def test_to_dict(_mock_model_class, _mock_vertexai):
     }
 
 
-@patch("google_vertex_haystack.generators.captioner.vertexai")
-@patch("google_vertex_haystack.generators.captioner.ImageTextModel")
+@patch("haystack_integrations.components.generators.google_vertex.captioner.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.captioner.ImageTextModel")
 def test_from_dict(_mock_model_class, _mock_vertexai):
     captioner = VertexAIImageCaptioner.from_dict(
         {
-            "type": "google_vertex_haystack.generators.captioner.VertexAIImageCaptioner",
+            "type": "haystack_integrations.components.generators.google_vertex.captioner.VertexAIImageCaptioner",
             "init_parameters": {
                 "model": "imagetext",
                 "project_id": "myproject-123456",
@@ -58,8 +58,8 @@ def test_from_dict(_mock_model_class, _mock_vertexai):
     assert captioner._model is not None
 
 
-@patch("google_vertex_haystack.generators.captioner.vertexai")
-@patch("google_vertex_haystack.generators.captioner.ImageTextModel")
+@patch("haystack_integrations.components.generators.google_vertex.captioner.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.captioner.ImageTextModel")
 def test_run_calls_get_captions(mock_model_class, _mock_vertexai):
     mock_model = Mock()
     mock_model_class.from_pretrained.return_value = mock_model

diff --git a/integrations/google_vertex/tests/test_code_generator.py b/integrations/google_vertex/tests/test_code_generator.py
@@ -2,11 +2,11 @@
 
 from vertexai.language_models import TextGenerationResponse
 
-from google_vertex_haystack.generators.code_generator import VertexAICodeGenerator
+from haystack_integrations.components.generators.google_vertex import VertexAICodeGenerator
 
 
-@patch("google_vertex_haystack.generators.code_generator.vertexai")
-@patch("google_vertex_haystack.generators.code_generator.CodeGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.code_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.code_generator.CodeGenerationModel")
 def test_init(mock_model_class, mock_vertexai):
     generator = VertexAICodeGenerator(
         model="code-bison", project_id="myproject-123456", candidate_count=3, temperature=0.5
@@ -19,14 +19,14 @@ def test_init(mock_model_class, mock_vertexai):
     assert generator._kwargs == {"candidate_count": 3, "temperature": 0.5}
 
 
-@patch("google_vertex_haystack.generators.code_generator.vertexai")
-@patch("google_vertex_haystack.generators.code_generator.CodeGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.code_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.code_generator.CodeGenerationModel")
 def test_to_dict(_mock_model_class, _mock_vertexai):
     generator = VertexAICodeGenerator(
         model="code-bison", project_id="myproject-123456", candidate_count=3, temperature=0.5
     )
     assert generator.to_dict() == {
-        "type": "google_vertex_haystack.generators.code_generator.VertexAICodeGenerator",
+        "type": "haystack_integrations.components.generators.google_vertex.code_generator.VertexAICodeGenerator",
         "init_parameters": {
             "model": "code-bison",
             "project_id": "myproject-123456",
@@ -37,12 +37,12 @@ def test_to_dict(_mock_model_class, _mock_vertexai):
     }
 
 
-@patch("google_vertex_haystack.generators.code_generator.vertexai")
-@patch("google_vertex_haystack.generators.code_generator.CodeGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.code_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.code_generator.CodeGenerationModel")
 def test_from_dict(_mock_model_class, _mock_vertexai):
     generator = VertexAICodeGenerator.from_dict(
         {
-            "type": "google_vertex_haystack.generators.code_generator.VertexAICodeGenerator",
+            "type": "haystack_integrations.components.generators.google_vertex.code_generator.VertexAICodeGenerator",
             "init_parameters": {
                 "model": "code-bison",
                 "project_id": "myproject-123456",
@@ -58,8 +58,8 @@ def test_from_dict(_mock_model_class, _mock_vertexai):
     assert generator._model is not None
 
 
-@patch("google_vertex_haystack.generators.code_generator.vertexai")
-@patch("google_vertex_haystack.generators.code_generator.CodeGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.code_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.code_generator.CodeGenerationModel")
 def test_run_calls_predict(mock_model_class, _mock_vertexai):
     mock_model = Mock()
     mock_model.predict.return_value = TextGenerationResponse("answer", None)

diff --git a/integrations/google_vertex/tests/test_image_generator.py b/integrations/google_vertex/tests/test_image_generator.py
@@ -2,11 +2,11 @@
 
 from vertexai.preview.vision_models import ImageGenerationResponse
 
-from google_vertex_haystack.generators.image_generator import VertexAIImageGenerator
+from haystack_integrations.components.generators.google_vertex import VertexAIImageGenerator
 
 
-@patch("google_vertex_haystack.generators.image_generator.vertexai")
-@patch("google_vertex_haystack.generators.image_generator.ImageGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.image_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.image_generator.ImageGenerationModel")
 def test_init(mock_model_class, mock_vertexai):
     generator = VertexAIImageGenerator(
         model="imagetext",
@@ -25,8 +25,8 @@ def test_init(mock_model_class, mock_vertexai):
     }
 
 
-@patch("google_vertex_haystack.generators.image_generator.vertexai")
-@patch("google_vertex_haystack.generators.image_generator.ImageGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.image_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.image_generator.ImageGenerationModel")
 def test_to_dict(_mock_model_class, _mock_vertexai):
     generator = VertexAIImageGenerator(
         model="imagetext",
@@ -35,7 +35,7 @@ def test_to_dict(_mock_model_class, _mock_vertexai):
         number_of_images=3,
     )
     assert generator.to_dict() == {
-        "type": "google_vertex_haystack.generators.image_generator.VertexAIImageGenerator",
+        "type": "haystack_integrations.components.generators.google_vertex.image_generator.VertexAIImageGenerator",
         "init_parameters": {
             "model": "imagetext",
             "project_id": "myproject-123456",
@@ -46,12 +46,12 @@ def test_to_dict(_mock_model_class, _mock_vertexai):
     }
 
 
-@patch("google_vertex_haystack.generators.image_generator.vertexai")
-@patch("google_vertex_haystack.generators.image_generator.ImageGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.image_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.image_generator.ImageGenerationModel")
 def test_from_dict(_mock_model_class, _mock_vertexai):
     generator = VertexAIImageGenerator.from_dict(
         {
-            "type": "google_vertex_haystack.generators.image_generator.VertexAIImageGenerator",
+            "type": "haystack_integrations.components.generators.google_vertex.image_generator.VertexAIImageGenerator",
             "init_parameters": {
                 "model": "imagetext",
                 "project_id": "myproject-123456",
@@ -70,8 +70,8 @@ def test_from_dict(_mock_model_class, _mock_vertexai):
     }
 
 
-@patch("google_vertex_haystack.generators.image_generator.vertexai")
-@patch("google_vertex_haystack.generators.image_generator.ImageGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.image_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.image_generator.ImageGenerationModel")
 def test_run_calls_generate_images(mock_model_class, _mock_vertexai):
     mock_model = Mock()
     mock_model.generate_images.return_value = ImageGenerationResponse(images=[])

diff --git a/integrations/google_vertex/tests/test_question_answering.py b/integrations/google_vertex/tests/test_question_answering.py
@@ -2,11 +2,11 @@
 
 from haystack.dataclasses.byte_stream import ByteStream
 
-from google_vertex_haystack.generators.question_answering import VertexAIImageQA
+from haystack_integrations.components.generators.google_vertex import VertexAIImageQA
 
 
-@patch("google_vertex_haystack.generators.question_answering.vertexai")
-@patch("google_vertex_haystack.generators.question_answering.ImageTextModel")
+@patch("haystack_integrations.components.generators.google_vertex.question_answering.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.question_answering.ImageTextModel")
 def test_init(mock_model_class, mock_vertexai):
     generator = VertexAIImageQA(
         model="imagetext",
@@ -21,16 +21,16 @@ def test_init(mock_model_class, mock_vertexai):
     assert generator._kwargs == {"number_of_results": 3}
 
 
-@patch("google_vertex_haystack.generators.question_answering.vertexai")
-@patch("google_vertex_haystack.generators.question_answering.ImageTextModel")
+@patch("haystack_integrations.components.generators.google_vertex.question_answering.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.question_answering.ImageTextModel")
 def test_to_dict(_mock_model_class, _mock_vertexai):
     generator = VertexAIImageQA(
         model="imagetext",
         project_id="myproject-123456",
         number_of_results=3,
     )
     assert generator.to_dict() == {
-        "type": "google_vertex_haystack.generators.question_answering.VertexAIImageQA",
+        "type": "haystack_integrations.components.generators.google_vertex.question_answering.VertexAIImageQA",
         "init_parameters": {
             "model": "imagetext",
             "project_id": "myproject-123456",
@@ -40,12 +40,12 @@ def test_to_dict(_mock_model_class, _mock_vertexai):
     }
 
 
-@patch("google_vertex_haystack.generators.question_answering.vertexai")
-@patch("google_vertex_haystack.generators.question_answering.ImageTextModel")
+@patch("haystack_integrations.components.generators.google_vertex.question_answering.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.question_answering.ImageTextModel")
 def test_from_dict(_mock_model_class, _mock_vertexai):
     generator = VertexAIImageQA.from_dict(
         {
-            "type": "google_vertex_haystack.generators.question_answering.VertexAIImageQA",
+            "type": "haystack_integrations.components.generators.google_vertex.question_answering.VertexAIImageQA",
             "init_parameters": {
                 "model": "imagetext",
                 "project_id": "myproject-123456",
@@ -60,8 +60,8 @@ def test_from_dict(_mock_model_class, _mock_vertexai):
     assert generator._kwargs == {"number_of_results": 3}
 
 
-@patch("google_vertex_haystack.generators.question_answering.vertexai")
-@patch("google_vertex_haystack.generators.question_answering.ImageTextModel")
+@patch("haystack_integrations.components.generators.google_vertex.question_answering.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.question_answering.ImageTextModel")
 def test_run_calls_ask_question(mock_model_class, _mock_vertexai):
     mock_model = Mock()
     mock_model.ask_question.return_value = []

diff --git a/integrations/google_vertex/tests/test_text_generator.py b/integrations/google_vertex/tests/test_text_generator.py
@@ -2,11 +2,11 @@
 
 from vertexai.language_models import GroundingSource
 
-from google_vertex_haystack.generators.text_generator import VertexAITextGenerator
+from haystack_integrations.components.generators.google_vertex import VertexAITextGenerator
 
 
-@patch("google_vertex_haystack.generators.text_generator.vertexai")
-@patch("google_vertex_haystack.generators.text_generator.TextGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.text_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.text_generator.TextGenerationModel")
 def test_init(mock_model_class, mock_vertexai):
     grounding_source = GroundingSource.VertexAISearch("1234", "us-central-1")
     generator = VertexAITextGenerator(
@@ -20,15 +20,15 @@ def test_init(mock_model_class, mock_vertexai):
     assert generator._kwargs == {"temperature": 0.2, "grounding_source": grounding_source}
 
 
-@patch("google_vertex_haystack.generators.text_generator.vertexai")
-@patch("google_vertex_haystack.generators.text_generator.TextGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.text_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.text_generator.TextGenerationModel")
 def test_to_dict(_mock_model_class, _mock_vertexai):
     grounding_source = GroundingSource.VertexAISearch("1234", "us-central-1")
     generator = VertexAITextGenerator(
         model="text-bison", project_id="myproject-123456", temperature=0.2, grounding_source=grounding_source
     )
     assert generator.to_dict() == {
-        "type": "google_vertex_haystack.generators.text_generator.VertexAITextGenerator",
+        "type": "haystack_integrations.components.generators.google_vertex.text_generator.VertexAITextGenerator",
         "init_parameters": {
             "model": "text-bison",
             "project_id": "myproject-123456",
@@ -47,12 +47,12 @@ def test_to_dict(_mock_model_class, _mock_vertexai):
     }
 
 
-@patch("google_vertex_haystack.generators.text_generator.vertexai")
-@patch("google_vertex_haystack.generators.text_generator.TextGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.text_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.text_generator.TextGenerationModel")
 def test_from_dict(_mock_model_class, _mock_vertexai):
     generator = VertexAITextGenerator.from_dict(
         {
-            "type": "google_vertex_haystack.generators.text_generator.VertexAITextGenerator",
+            "type": "haystack_integrations.components.generators.google_vertex.text_generator.VertexAITextGenerator",
             "init_parameters": {
                 "model": "text-bison",
                 "project_id": "myproject-123456",
@@ -79,8 +79,8 @@ def test_from_dict(_mock_model_class, _mock_vertexai):
     }
 
 
-@patch("google_vertex_haystack.generators.text_generator.vertexai")
-@patch("google_vertex_haystack.generators.text_generator.TextGenerationModel")
+@patch("haystack_integrations.components.generators.google_vertex.text_generator.vertexai")
+@patch("haystack_integrations.components.generators.google_vertex.text_generator.TextGenerationModel")
 def test_run_calls_get_captions(mock_model_class, _mock_vertexai):
     mock_model = Mock()
     mock_model.predict.return_value = MagicMock()