weaviate-haystack 2.2.1__tar.gz → 4.0.0__tar.gz

{weaviate_haystack-2.2.1 → weaviate_haystack-4.0.0}/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## [unreleased]
+## [integrations/weaviate-v3.0.0] - 2024-09-12
+
+### ⚙️ Miscellaneous Tasks
+
+- Weaviate - remove legacy filter support (#1070)
+
+## [integrations/weaviate-v2.2.1] - 2024-09-07
 
 ### 🚀 Features
 
@@ -10,6 +16,12 @@
 
 - Weaviate filter error (#811)
 - Fix connection to Weaviate Cloud Service (#624)
+- Pin weaviate-client (#1046)
+- Weaviate - fix connection issues with some WCS URLs (#1058)
+
+### 🧪 Testing
+
+- Do not retry tests in `hatch run test` command (#954)
 
 ### ⚙️ Miscellaneous Tasks
 

{weaviate_haystack-2.2.1 → weaviate_haystack-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: weaviate-haystack
-Version: 2.2.1
+Version: 4.0.0
 Summary: An integration of Weaviate vector database with Haystack
 Project-URL: Source, https://github.com/deepset-ai/haystack-core-integrations
 Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/blob/main/integrations/weaviate/README.md
@@ -18,11 +18,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: haystack-ai
 Requires-Dist: haystack-pydoc-tools
 Requires-Dist: python-dateutil
-Requires-Dist: weaviate-client>=4.0
+Requires-Dist: weaviate-client>=4.9
 Description-Content-Type: text/markdown
 
 # weaviate-haystack

{weaviate_haystack-2.2.1 → weaviate_haystack-4.0.0}/pyproject.toml

@@ -7,7 +7,7 @@ name = "weaviate-haystack"
 dynamic = ["version"]
 description = "An integration of Weaviate vector database with Haystack"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = "Apache-2.0"
 keywords = []
 authors = [{ name = "deepset GmbH", email = "info@deepset.ai" }]
@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
   "haystack-ai",
-  "weaviate-client>=4.0",
+  "weaviate-client>=4.9",
   "haystack-pydoc-tools",
   "python-dateutil",
 ]
@@ -47,6 +47,7 @@ root = "../.."
 git_describe_command = 'git describe --tags --match="integrations/weaviate-v[0-9]*"'
 
 [tool.hatch.envs.default]
+installer = "uv"
 dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "ipython"]
 [tool.hatch.envs.default.scripts]
 test = "pytest {args:tests}"
@@ -61,12 +62,13 @@ docs = ["pydoc-markdown pydoc/config.yml"]
 python = ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
 [tool.hatch.envs.lint]
+installer = "uv"
 detached = true
-dependencies = ["black>=23.1.0", "mypy>=1.0.0", "ruff>=0.0.243"]
+dependencies = ["pip", "black>=23.1.0", "mypy>=1.0.0", "ruff>=0.0.243"]
 [tool.hatch.envs.lint.scripts]
 typing = "mypy --install-types --non-interactive --explicit-package-bases {args:src/ tests}"
-style = ["ruff check {args:. --exclude tests/}", "black --check --diff {args:.}"]
-fmt = ["black {args:.}", "ruff --fix {args:. --exclude tests/}", "style"]
+style = ["ruff check {args:}", "black --check --diff {args:.}"]
+fmt = ["black {args:.}", "ruff check --fix {args:}", "style"]
 all = ["style", "typing"]
 
 [tool.black]
@@ -77,7 +79,9 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
-lint.select = [
+
+[tool.ruff.lint]
+select = [
   "A",
   "ARG",
   "B",
@@ -104,7 +108,7 @@ lint.select = [
   "W",
   "YTT",
 ]
-lint.ignore = [
+ignore = [
   # Allow non-abstract empty methods in abstract base classes
   "B027",
   # Allow boolean positional values in function calls, like `dict.get(... True)`
@@ -120,13 +124,13 @@ lint.ignore = [
   "PLR0913",
   "PLR0915",
 ]
-lint.unfixable = [
+unfixable = [
   # Don't touch unused imports
   "F401",
 ]
 
 [tool.ruff.lint.isort]
-known-first-party = ["src"]
+known-first-party = ["haystack_integrations"]
 
 [tool.ruff.lint.flake8-tidy-imports]
 ban-relative-imports = "parents"

{weaviate_haystack-2.2.1 → weaviate_haystack-4.0.0}/src/haystack_integrations/document_stores/weaviate/document_store.py

@@ -12,7 +12,6 @@ from haystack.core.serialization import default_from_dict, default_to_dict
 from haystack.dataclasses.document import Document
 from haystack.document_stores.errors import DocumentStoreError, DuplicateDocumentError
 from haystack.document_stores.types.policy import DuplicatePolicy
-from haystack.utils.filters import convert
 
 import weaviate
 from weaviate.collections.classes.data import DataObject
@@ -388,7 +387,8 @@ class WeaviateDocumentStore:
         :returns: A list of Documents that match the given filters.
         """
         if filters and "operator" not in filters and "conditions" not in filters:
-            filters = convert(filters)
+            msg = "Invalid filter syntax. See https://docs.haystack.deepset.ai/docs/metadata-filtering for details."
+            raise ValueError(msg)
 
         result = []
         if filters:

{weaviate_haystack-2.2.1 → weaviate_haystack-4.0.0}/tests/test_document_store.py

@@ -265,6 +265,7 @@ class TestWeaviateDocumentStore(CountDocumentsTest, WriteDocumentsTest, DeleteDo
                         "session_pool_connections": 20,
                         "session_pool_maxsize": 100,
                         "session_pool_max_retries": 3,
+                        "session_pool_timeout": 5,
                     },
                     "proxies": {"http": "http://proxy:1234", "https": None, "grpc": None},
                     "timeout": [30, 90],
@@ -302,6 +303,7 @@ class TestWeaviateDocumentStore(CountDocumentsTest, WriteDocumentsTest, DeleteDo
                         "connection": {
                             "session_pool_connections": 20,
                             "session_pool_maxsize": 20,
+                            "session_pool_timeout": 5,
                         },
                         "proxies": {"http": "http://proxy:1234"},
                         "timeout": [10, 60],
@@ -338,6 +340,7 @@ class TestWeaviateDocumentStore(CountDocumentsTest, WriteDocumentsTest, DeleteDo
         assert document_store._embedded_options.grpc_port == DEFAULT_GRPC_PORT
         assert document_store._additional_config.connection.session_pool_connections == 20
         assert document_store._additional_config.connection.session_pool_maxsize == 20
+        assert document_store._additional_config.connection.session_pool_timeout == 5
 
     def test_to_data_object(self, document_store, test_files_path):
         doc = Document(content="test doc")
@@ -660,15 +663,6 @@ class TestWeaviateDocumentStore(CountDocumentsTest, WriteDocumentsTest, DeleteDo
         with pytest.raises(ValueError):
             document_store._embedding_retrieval(query_embedding=[], distance=0.1, certainty=0.1)
 
-    def test_filter_documents_with_legacy_filters(self, document_store):
-        docs = []
-        for index in range(10):
-            docs.append(Document(content="This is some content", meta={"index": index}))
-        document_store.write_documents(docs)
-        result = document_store.filter_documents({"content": {"$eq": "This is some content"}})
-
-        assert len(result) == 10
-
     def test_filter_documents_below_default_limit(self, document_store):
         docs = []
         for index in range(9998):