code cleanup v1

Author: shyam-cb

pyproject.toml

@@ -160,6 +160,8 @@ lint.ignore = [
   "B027",
   # Allow boolean positional values in function calls, like `dict.get(... True)`
   "FBT003",
+  # Allow boolean positional values in function calls like cluster options
+  "FBT001",
   # Ignore checks for possible passwords
   "S105", "S106", "S107",
   # Ignore complexity

src/couchbase_haystack/telemetry.py

@@ -8,39 +8,38 @@
 
 import platform
 import threading
+from contextlib import suppress
+from importlib.metadata import version
 
 SCARF_ENDPOINT_URL = "https://couchbase.gateway.scarf.sh/couchbase-haystack"
 
-_telemetry_sent = False
+_telemetry_sent = threading.Event()
 _telemetry_lock = threading.Lock()
 
+
 def _get_package_version() -> str:
     """Return the installed package version, or 'unknown' if unavailable."""
-    try:
-        from importlib.metadata import version
-
+    with suppress(Exception):
         return version("couchbase-haystack")
-    except Exception:
-        return "unknown"
+    return "unknown"
+
 
 def _send_telemetry() -> None:
     """Send a single telemetry event to Scarf."""
-    global _telemetry_sent 
-
     with _telemetry_lock:
-        if _telemetry_sent:
+        if _telemetry_sent.is_set():
             return
-        _telemetry_sent = True
+        _telemetry_sent.set()
 
-    try:
-        from scarf import ScarfEventLogger
+    with suppress(Exception):
+        from scarf import ScarfEventLogger  # noqa: PLC0415
 
-        logger = ScarfEventLogger(
+        event_logger = ScarfEventLogger(
             endpoint_url=SCARF_ENDPOINT_URL,
             timeout=2.0,
         )
 
-        logger.log_event(
+        event_logger.log_event(
             {
                 "package": "couchbase-haystack",
                 "version": _get_package_version(),
@@ -49,17 +48,13 @@ def _send_telemetry() -> None:
                 "arch": platform.machine(),
             }
         )
-    except Exception:
-        # Telemetry must never raise — silently ignore all errors.
-        pass
+
 
 def send_telemetry() -> None:
     """Fire-and-forget telemetry in a background daemon thread.
 
     Safe to call multiple times; only the first invocation actually sends.
     """
-    try:
+    with suppress(Exception):
         t = threading.Thread(target=_send_telemetry, daemon=True)
-        t.start()
-    except Exception:
-        pass
+        t.start()

tests/search_document_store/test_retriever.py

@@ -131,13 +131,13 @@ def test_run(self, doc_store: MagicMock):
             "retriever": {"top_k": 3, "search_query": sq, "filters": {"field": "meta.color", "operator": "==", "value": "red"}},
         }
         result = rag_pipeline.run(data, include_outputs_from={"query_embedder"})
-        doc_store._embedding_retrieval.assert_called_once_with(
-            query_embedding=result["query_embedder"]["embedding"],
-            top_k=3,
-            search_query=data["retriever"]["search_query"],  # type: ignore
-            filters=data["retriever"]["filters"],  # type: ignore
-            limit=None,
-        )
+        doc_store._embedding_retrieval.assert_called_once()
+        called_kwargs = doc_store._embedding_retrieval.call_args.kwargs
+        assert called_kwargs["query_embedding"] == result["query_embedder"]["embedding"]
+        assert called_kwargs["top_k"] == 3
+        assert called_kwargs["search_query"].encodable == data["retriever"]["search_query"].encodable
+        assert called_kwargs["filters"] == data["retriever"]["filters"]
+        assert called_kwargs["limit"] is None
         assert result["retriever"]["documents"] == doc_store._embedding_retrieval.return_value
 
     def test_run_with_limit(self, doc_store: MagicMock):