Merge branch 'main' into feat-bedrock-converse

deepset-ai · Sep 13, 2024 · e446ad3 · e446ad3
2 parents f11fd3b + b72d857
commit e446ad3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 450 deletions.
diff --git a/integrations/google_vertex/pyproject.toml b/integrations/google_vertex/pyproject.toml
@@ -22,12 +22,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = [
-  "haystack-ai",
-  "google-cloud-aiplatform>=1.38",
-  "pyarrow>3",
-  "protobuf<5.28",
-]
+dependencies = ["haystack-ai", "google-cloud-aiplatform>=1.38", "pyarrow>3"]
 
 [project.urls]
 Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/google_vertex#readme"

diff --git a/integrations/qdrant/CHANGELOG.md b/integrations/qdrant/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [integrations/qdrant-v6.0.0] - 2024-09-13
+
 ## [integrations/qdrant-v5.1.0] - 2024-09-12
 
 ### 🚀 Features

diff --git a/integrations/qdrant/src/haystack_integrations/document_stores/qdrant/document_store.py b/integrations/qdrant/src/haystack_integrations/document_stores/qdrant/document_store.py
@@ -11,7 +11,6 @@
 from haystack.document_stores.errors import DocumentStoreError, DuplicateDocumentError
 from haystack.document_stores.types import DuplicatePolicy
 from haystack.utils import Secret, deserialize_secrets_inplace
-from haystack.utils.filters import convert as convert_legacy_filters
 from qdrant_client import grpc
 from qdrant_client.http import models as rest
 from qdrant_client.http.exceptions import UnexpectedResponse
@@ -323,7 +322,8 @@ def filter_documents(
             raise ValueError(msg)
 
         if filters and not isinstance(filters, rest.Filter) and "operator" not in filters:
-            filters = convert_legacy_filters(filters)
+            msg = "Invalid filter syntax. See https://docs.haystack.deepset.ai/docs/metadata-filtering for details."
+            raise ValueError(msg)
         return list(
             self.get_documents_generator(
                 filters,