Merge branch 'main' into pypdf-rm-deprecated-params

deepset-ai · Jun 21, 2024 · f36729a · f36729a
2 parents 37389cf + f5a34d4
commit f36729a
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 1,366 deletions.
diff --git a/docs/pydoc/config/generators_api.yml b/docs/pydoc/config/generators_api.yml
@@ -5,12 +5,10 @@ loaders:
       [
         "azure",
         "hugging_face_local",
-        "hugging_face_tgi",
         "hugging_face_api",
         "openai",
         "chat/azure",
         "chat/hugging_face_local",
-        "chat/hugging_face_tgi",
         "chat/hugging_face_api",
         "chat/openai",
       ]

diff --git a/haystack/components/caching/cache_checker.py b/haystack/components/caching/cache_checker.py
@@ -108,7 +108,7 @@ def run(self, items: List[Any]):
         misses = []
 
         for item in items:
-            filters = {self.cache_field: item}
+            filters = {"field": self.cache_field, "operator": "==", "value": item}
             found = self.document_store.filter_documents(filters=filters)
             if found:
                 found_documents.extend(found)

diff --git a/haystack/components/generators/__init__.py b/haystack/components/generators/__init__.py
@@ -7,13 +7,6 @@
 )
 from haystack.components.generators.azure import AzureOpenAIGenerator
 from haystack.components.generators.hugging_face_local import HuggingFaceLocalGenerator
-from haystack.components.generators.hugging_face_tgi import HuggingFaceTGIGenerator
 from haystack.components.generators.hugging_face_api import HuggingFaceAPIGenerator
 
-__all__ = [
-    "HuggingFaceLocalGenerator",
-    "HuggingFaceTGIGenerator",
-    "HuggingFaceAPIGenerator",
-    "OpenAIGenerator",
-    "AzureOpenAIGenerator",
-]
+__all__ = ["HuggingFaceLocalGenerator", "HuggingFaceAPIGenerator", "OpenAIGenerator", "AzureOpenAIGenerator"]
diff --git a/haystack/components/generators/chat/__init__.py b/haystack/components/generators/chat/__init__.py
@@ -7,12 +7,10 @@
 )
 from haystack.components.generators.chat.azure import AzureOpenAIChatGenerator
 from haystack.components.generators.chat.hugging_face_local import HuggingFaceLocalChatGenerator
-from haystack.components.generators.chat.hugging_face_tgi import HuggingFaceTGIChatGenerator
 from haystack.components.generators.chat.hugging_face_api import HuggingFaceAPIChatGenerator
 
 __all__ = [
     "HuggingFaceLocalChatGenerator",
-    "HuggingFaceTGIChatGenerator",
     "HuggingFaceAPIChatGenerator",
     "OpenAIChatGenerator",
     "AzureOpenAIChatGenerator",

diff --git a/haystack/components/generators/chat/hugging_face_tgi.py b/haystack/components/generators/chat/hugging_face_tgi.py
diff --git a/haystack/components/generators/hugging_face_tgi.py b/haystack/components/generators/hugging_face_tgi.py