mount llama_cpp in haystack_integrations (#217)

deepset-ai · Jan 17, 2024 · e98a754 · e98a754
1 parent 78f9c7f
commit e98a754
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/integrations/llama_cpp/examples/llama_cpp_generator_example.py b/integrations/llama_cpp/examples/llama_cpp_generator_example.py
@@ -1,4 +1,4 @@
-from llama_cpp_haystack import LlamaCppGenerator
+from haystack_integrations.components.generators.llama_cpp import LlamaCppGenerator
 
 generator = LlamaCppGenerator(model_path="openchat-3.5-1210.Q3_K_S.gguf", n_ctx=512, n_batch=128)
 generator.warm_up()

diff --git a/integrations/llama_cpp/examples/rag_pipeline_example.py b/integrations/llama_cpp/examples/rag_pipeline_example.py
@@ -6,8 +6,7 @@
 from haystack.components.retrievers import InMemoryEmbeddingRetriever
 from haystack.components.writers import DocumentWriter
 from haystack.document_stores import InMemoryDocumentStore
-
-from llama_cpp_haystack import LlamaCppGenerator
+from haystack_integrations.components.generators.llama_cpp import LlamaCppGenerator
 
 # Load first 100 rows of the Simple Wikipedia Dataset from HuggingFace
 dataset = load_dataset("pszemraj/simple_wikipedia", split="validation[:100]")

diff --git a/integrations/llama_cpp/pyproject.toml b/integrations/llama_cpp/pyproject.toml
@@ -35,6 +35,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/llama_cpp"
 
+[tool.hatch.build.targets.wheel]
+packages = ["src/haystack_integrations"]
+
 [tool.hatch.version]
 source = "vcs"
 tag-pattern = 'integrations\/llama_cpp-v(?P<version>.*)'
@@ -73,7 +76,7 @@ dependencies = [
 ]
 
 [tool.hatch.envs.lint.scripts]
-typing = "mypy --install-types --non-interactive {args:src/llama_cpp_haystack tests}"
+typing = "mypy --install-types --non-interactive --explicit-package-bases {args:src/ tests}"
 style = [
     "ruff {args:.}",
     "black --check --diff {args:.}",
@@ -92,7 +95,7 @@ all = [
 allow-direct-references = true
 
 [tool.ruff.isort]
-known-first-party = ["llama_cpp_haystack"]
+known-first-party = ["src"]
 
 [tool.black]
 target-version = ["py37"]
@@ -142,7 +145,7 @@ unfixable = [
 ]
 
 [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
@@ -158,7 +161,7 @@ parallel = true
 
 
 [tool.coverage.paths]
-ollama_haystack = ["src/llama_cpp_haystack", "*/llama-cpp-haystack/src/llama_cpp_haystack"]
+llama_cpp_haystack = ["src/haystack_integrations", "*/llama-cpp-haystack/src"]
 tests = ["tests", "*/llama-cpp-haystack/tests"]
 
 [tool.coverage.report]
@@ -179,6 +182,7 @@ addopts = [
 [[tool.mypy.overrides]]
 module = [
     "haystack.*",
+    "haystack_integrations.*",
     "pytest.*",
     "llama_cpp.*"
 ]

diff --git a/...ma_cpp/src/llama_cpp_haystack/__init__.py → ...mponents/generators/llama_cpp/__init__.py b/...ma_cpp/src/llama_cpp_haystack/__init__.py → ...mponents/generators/llama_cpp/__init__.py
@@ -2,6 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from llama_cpp_haystack.generator import LlamaCppGenerator
+from .generator import LlamaCppGenerator
 
 __all__ = ["LlamaCppGenerator"]
diff --git a/...a_cpp/src/llama_cpp_haystack/generator.py → ...ponents/generators/llama_cpp/generator.py b/...a_cpp/src/llama_cpp_haystack/generator.py → ...ponents/generators/llama_cpp/generator.py
@@ -2,6 +2,7 @@
 from typing import Any, Dict, List, Optional
 
 from haystack import component
+
 from llama_cpp import Llama
 
 logger = logging.getLogger(__name__)

diff --git a/integrations/llama_cpp/tests/test_generator.py b/integrations/llama_cpp/tests/test_generator.py
@@ -9,8 +9,7 @@
 from haystack.components.builders.prompt_builder import PromptBuilder
 from haystack.components.retrievers import InMemoryBM25Retriever
 from haystack.document_stores import InMemoryDocumentStore
-
-from llama_cpp_haystack import LlamaCppGenerator
+from haystack_integrations.components.generators.llama_cpp import LlamaCppGenerator
 
 
 @pytest.fixture