Remove client-side default alpha value

.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.15
+  WEAVIATE_136: 1.36.6-21aaadc
+  WEAVIATE_137: 1.37.0-dev-8fb696b
 
 jobs:
   lint-and-format:
@@ -310,7 +309,7 @@ jobs:
           $WEAVIATE_133,
           $WEAVIATE_134,
           $WEAVIATE_135,
-          $WEAVIATE_136
+          $WEAVIATE_136,
           $WEAVIATE_137
         ]
     steps:

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(

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-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

weaviate/backup/executor.py

@@ -88,6 +88,16 @@ def create(
             wait_for_completion=wait_for_completion,
         )
 
+        if (
+            incremental_base_backup_id is not None
+            and self._connection._weaviate_version.is_lower_than(1, 37, 0)
+        ):
+            raise WeaviateUnsupportedFeatureError(
+                "Incremental backups",
+                str(self._connection._weaviate_version),
+                "1.37.0",
+            )
+
         payload: dict = {
             "id": backup_id,
             "include": include_collections,

weaviate/collections/aggregations/hybrid/async_.pyi

@@ -19,7 +19,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]):
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,
@@ -36,7 +36,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]):
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,
@@ -53,7 +53,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]):
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,

weaviate/collections/aggregations/hybrid/executor.py

@@ -22,7 +22,7 @@ def hybrid(
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,
@@ -40,7 +40,7 @@ def hybrid(
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,
@@ -58,7 +58,7 @@ def hybrid(
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,
@@ -75,7 +75,7 @@ def hybrid(
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,

weaviate/collections/aggregations/hybrid/sync.pyi

@@ -19,7 +19,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]):
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,
@@ -36,7 +36,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]):
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,
@@ -53,7 +53,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]):
         self,
         query: Optional[str],
         *,
-        alpha: NUMBER = 0.7,
+        alpha: Optional[NUMBER] = None,
         vector: Optional[List[float]] = None,
         query_properties: Optional[List[str]] = None,
         object_limit: Optional[int] = None,

weaviate/collections/batch/async_.py

@@ -254,7 +254,14 @@ async def __loop(self) -> None:
                 and not self.__is_shutting_down.is_set()
                 and not self.__is_oom.is_set()
             ):
-                await self.__reqs.put(None)
+                try:
+                    await asyncio.wait_for(self.__reqs.put(None), timeout=60)
+                except asyncio.TimeoutError as e:
+                    logger.warning(
+                        "Batch queue is blocked for more than 60 seconds while trying to send shutdown signal. Exiting the loop"
+                    )
+                    self.__bg_exception = e
+                    return
                 self.__sent_sentinel.set()
             await asyncio.sleep(refresh_time)
 

weaviate/collections/batch/sync.py

@@ -206,7 +206,14 @@ def __loop(self) -> None:
                 and not self.__is_shutting_down.is_set()
                 and not self.__is_oom.is_set()
             ):
-                self.__reqs.put(None)
+                try:
+                    self.__reqs.put(None, timeout=60)
+                except Full as e:
+                    logger.warning(
+                        "Batch queue is blocked for more than 60 seconds while trying to send shutdown signal. Exiting the loop"
+                    )
+                    self.__bg_exception = e
+                    return
                 self.__sent_sentinel.set()
             time.sleep(refresh_time)
 

weaviate/collections/grpc/shared.py

@@ -686,11 +686,16 @@ def _parse_hybrid(
             else:
                 vector_bytes = vector_bytes_tmp
 
+        use_alpha_param = self._weaviate_version.is_at_least(
+            1, 36, 6
+        )  # TODO: change to 1.36.7 once it's released
         return (
             base_search_pb2.Hybrid(
                 properties=properties,
                 query=query,
-                alpha=float(alpha) if alpha is not None else None,
+                alpha=None if use_alpha_param else (alpha if alpha is not None else 0.7),
+                alpha_param=alpha if use_alpha_param else None,
+                use_alpha_param=use_alpha_param,
                 fusion_type=(
                     cast(
                         base_search_pb2.Hybrid.FusionType,