Merge branch 'dev/1.37' into feat/ascii-fold

Author: amourao

.github/workflows/main.yaml

@@ -22,14 +22,13 @@ env:
   WEAVIATE_128: 1.28.16
   WEAVIATE_129: 1.29.11
   WEAVIATE_130: 1.30.22
-  WEAVIATE_131: 1.31.20
-  WEAVIATE_132: 1.32.23
-  WEAVIATE_133: 1.33.10
-  WEAVIATE_134: 1.34.5
-  WEAVIATE_135: 1.35.0
-  WEAVIATE_136: 1.36.0
-  WEAVIATE_137: 1.37.0-dev-29d5c87.amd64
-
+  WEAVIATE_131: 1.31.22
+  WEAVIATE_132: 1.32.27
+  WEAVIATE_133: 1.33.18
+  WEAVIATE_134: 1.34.19
+  WEAVIATE_135: 1.35.16-efdedfa
+  WEAVIATE_136: 1.36.9-d905e6c
+  WEAVIATE_137: 1.37.0-rc.0-b313954.amd64
 
 jobs:
   lint-and-format:
@@ -310,7 +309,7 @@ jobs:
           $WEAVIATE_133,
           $WEAVIATE_134,
           $WEAVIATE_135,
-          $WEAVIATE_136
+          $WEAVIATE_136,
           $WEAVIATE_137
         ]
     steps:

README.rst

@@ -29,7 +29,6 @@ We currently support the following versions client versions:
 
 - 4.X: actively supported
 - 3.X: deprecated, receives only critical bug fixes and dependency updates
-- copy of the 3.X branch in v4 releases: Will be removed on 2024-11-30
 
 
 Articles

docs/changelog.rst

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+Version 4.20.5
+--------------
+This patch version includes:
+    - Fix objectTTL config export
+    - Add support for audio modality in multi2vec-google
+    - Export FilterReturn from weaviate.classes.query
+    - Fix updating async replication config
+    - Remove unmaintained ``deprecated`` dependency
+    - Throw exception on empty time filters
+
 Version 4.20.4
 --------------
 This patch version includes:

integration/conftest.py

@@ -1,5 +1,9 @@
 import os
 import time
+import sys
+import threading
+import traceback
+import pytest
 from typing import (
     Any,
     AsyncGenerator,
@@ -14,7 +18,6 @@
 )
 from typing import Callable, TypeVar
 
-import pytest
 import pytest_asyncio
 from _pytest.fixtures import SubRequest
 
@@ -500,3 +503,66 @@ def retry_on_http_error(
             raise
     # This should never be reached, but satisfies the type checker
     raise last_exception  # type: ignore
+
+
+TIMEOUT_SECONDS = 300
+
+
+def dump_all_stacks():
+    frames = sys._current_frames()
+    lines = ["\n===== DEADLOCK DETECTED — THREAD DUMP =====\n"]
+    for thread in threading.enumerate():
+        frame = frames.get(thread.ident)  # pyright: ignore
+        lines.append(f"\n--- Thread: {thread.name} (id={thread.ident}) ---")
+        if frame:
+            lines.append("".join(traceback.format_stack(frame)))
+        else:
+            lines.append("  (no frame)\n")
+    lines.append("===========================================\n")
+    return "\n".join(lines)
+
+
+class DeadlockWatchdog:
+    def __init__(self, timeout):
+        self.timeout = timeout
+        self._timer = None
+
+    def start(self, label):
+        self._label = label
+        self._timer = threading.Timer(self.timeout, self._on_timeout)
+        self._timer.daemon = True
+        self._timer.start()
+
+    def stop(self):
+        if self._timer:
+            self._timer.cancel()
+            self._timer = None
+
+    def _on_timeout(self):
+        sys.stderr.write(f"\n[WATCHDOG] Hung at: '{self._label}' after {self.timeout}s\n")
+        sys.stderr.write(dump_all_stacks())
+        sys.stderr.flush()
+        os._exit(1)  # Hard kill — works reliably in xdist workers
+
+
+_watchdog = DeadlockWatchdog(TIMEOUT_SECONDS)
+
+
+# Covers setup + call + teardown
+@pytest.hookimpl(hookwrapper=True)
+def pytest_runtest_protocol(item, nextitem):
+    _watchdog.start(item.nodeid)
+    try:
+        yield
+    finally:
+        _watchdog.stop()
+
+
+# Separately watch session-scoped fixture setup
+@pytest.hookimpl(hookwrapper=True)
+def pytest_sessionstart(session):
+    _watchdog.start("session startup / session-scoped fixtures")
+    try:
+        yield
+    finally:
+        _watchdog.stop()

integration/test_backup_v4.py

@@ -764,7 +764,7 @@ def test_incremental_backup(client: weaviate.WeaviateClient, request: SubRequest
         backend=BACKEND,
         include_collections=["Article"],
         wait_for_completion=True,
-        incremental_backup_base_id=base_backup_id,
+        incremental_base_backup_id=base_backup_id,
     )
 
     # remove existing class

integration/test_client.py

@@ -334,7 +334,7 @@ def test_collection_name_capitalization(
         client.collections.delete(name_big)
 
 
-def test_client_cluster_with_lazy_shard_loading(
+def test_client_cluster_without_lazy_shard_loading(
     client: weaviate.WeaviateClient, request: SubRequest
 ) -> None:
     try:
@@ -360,37 +360,6 @@ def test_client_cluster_with_lazy_shard_loading(
         client.collections.delete(request.node.name)
 
 
-def test_client_cluster_without_lazy_shard_loading(
-    client_factory: ClientFactory, request: SubRequest
-) -> None:
-    client = client_factory(8090, 50061)
-
-    try:
-        collection = client.collections.create(
-            name=request.node.name, vectorizer_config=Configure.Vectorizer.none()
-        )
-
-        nodes = client.cluster.nodes(collection.name, output="verbose")
-        assert len(nodes) == 1
-        assert len(nodes[0].shards) == 1
-        assert nodes[0].shards[0].collection == collection.name
-        assert nodes[0].shards[0].object_count == 0
-        assert nodes[0].shards[0].vector_indexing_status in [
-            "READONLY",
-            "INDEXING",
-            "READY",
-            "LAZY_LOADING",
-        ]
-        assert nodes[0].shards[0].vector_queue_length == 0
-        assert nodes[0].shards[0].compressed is False
-        if collection._connection._weaviate_version.is_lower_than(1, 25, 0):
-            assert nodes[0].shards[0].loaded is True
-        else:
-            assert nodes[0].shards[0].loaded is False
-    finally:
-        client.collections.delete(request.node.name)
-
-
 def test_client_cluster_multitenant(client: weaviate.WeaviateClient, request: SubRequest) -> None:
     try:
         collection = client.collections.create(

integration/test_collection_config.py

@@ -1589,6 +1589,10 @@ def test_replication_config_without_async_config(collection_factory: CollectionF
 
 
 def test_replication_config_with_async_config(collection_factory: CollectionFactory) -> None:
+    collection_dummy = collection_factory("dummy")
+    if collection_dummy._connection._weaviate_version.is_lower_than(1, 34, 18):
+        pytest.skip("async replication config requires Weaviate >= 1.34.18")
+
     collection = collection_factory(
         replication_config=Configure.replication(
             factor=1,
@@ -1730,15 +1734,15 @@ def test_replication_config_add_async_config_to_existing_collection(
     collection.config.update(
         replication_config=Reconfigure.replication(
             async_config=Reconfigure.Replication.async_config(
-                max_workers=12,
+                max_workers=8,
                 propagation_concurrency=4,
             ),
         ),
     )
     config = collection.config.get()
     assert config.replication_config.async_config is not None
     ac = config.replication_config.async_config
-    assert ac.max_workers == 12
+    assert ac.max_workers == 8
     assert ac.propagation_concurrency == 4
 
 

pytest.ini

@@ -2,4 +2,6 @@
 addopts = -m 'not profiling' --benchmark-skip -l
 markers =
     profiling: marks tests that can be profiled
-asyncio_default_fixture_loop_scope = function
+asyncio_default_fixture_loop_scope = function
+timeout = 300
+timeout_method = thread

requirements-devel.txt

@@ -5,7 +5,6 @@ grpcio==1.75.1
 grpcio-tools==1.75.1
 grpcio-health-checking==1.75.1
 pydantic==2.12.0
-deprecation==2.1.0
 
 build
 twine

requirements-test.txt

@@ -3,6 +3,7 @@ pytest-cov==6.2.1
 pytest-asyncio==1.3.0
 pytest-benchmark==5.1.0
 pytest-profiling==1.8.1
+pytest-timeout==2.4.0
 coverage==7.10.7
 pytest-xdist==3.7.0
 werkzeug==3.1.6