fix!: Weave - move Connector, fix types, add py.typed (#2038)

* draft

* more fixes

* fix example

* workflow

* fix pydoc config

* fix labeler

Author: anakin87

.github/labeler.yml

@@ -174,10 +174,10 @@ integration:weaviate:
       - any-glob-to-any-file: "integrations/weaviate/**/*"
       - any-glob-to-any-file: ".github/workflows/weaviate.yml"
 
-integration:weight_bias:
+integration:weights_and_biases_weave:
   - changed-files:
-      - any-glob-to-any-file: "integrations/weight_bias/**/*"
-      - any-glob-to-any-file: ".github/workflows/weight_bias.yml"
+      - any-glob-to-any-file: "integrations/weights_and_biases_weave/**/*"
+      - any-glob-to-any-file: ".github/workflows/weights_and_biases_weave.yml"
 
 # Topics
 topic:CI:

.github/workflows/weights_and_biases_weave.yml

@@ -46,11 +46,9 @@ jobs:
       - name: Install Hatch
         run: pip install --upgrade hatch
 
-    # TODO: Once this integration is properly typed, use hatch run test:types
-    # https://github.com/deepset-ai/haystack-core-integrations/issues/1771
       - name: Lint
         if: matrix.python-version == '3.9' && runner.os == 'Linux'
-        run: hatch run fmt-check && hatch run lint:typing
+        run: hatch run fmt-check && hatch run test:types
 
       - name: Generate docs
         if: matrix.python-version == '3.9' && runner.os == 'Linux'

integrations/weights_and_biases_weave/example/hybrid_retrieval.py

@@ -5,7 +5,7 @@
 from haystack.components.retrievers.in_memory import InMemoryBM25Retriever, InMemoryEmbeddingRetriever
 from haystack.document_stores.in_memory import InMemoryDocumentStore
 
-from haystack_integrations.components.connectors import WeaveConnector
+from haystack_integrations.components.connectors.weave import WeaveConnector
 
 
 def index():

integrations/weights_and_biases_weave/pydoc/config.yml

@@ -2,7 +2,7 @@ loaders:
   - type: haystack_pydoc_tools.loaders.CustomPythonLoader
     search_path: [../src]
     modules: [
-      "haystack_integrations.components.connectors.weave_connector",
+      "haystack_integrations.components.connectors.weave.weave_connector",
       "haystack_integrations.tracing.weave.tracer",
     ]
     ignore_when_discovered: ["__init__"]

integrations/weights_and_biases_weave/pyproject.toml

@@ -64,18 +64,14 @@ unit = 'pytest -m "not integration" {args:tests}'
 integration = 'pytest -m "integration" {args:tests}'
 all = 'pytest {args:tests}'
 cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
-types = "mypy --install-types --non-interactive --explicit-package-bases {args:src/ tests}"
-
-# TODO: remove lint environment once this integration is properly typed
-# test environment should be used instead
-# https://github.com/deepset-ai/haystack-core-integrations/issues/1771
-[tool.hatch.envs.lint]
-installer = "uv"
-detached = true
-dependencies = ["pip", "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}"
+types = """mypy -p haystack_integrations.components.connectors.weave \
+-p haystack_integrations.tracing.weave {args}"""
 
+[tool.mypy]
+install_types = true
+non_interactive = true
+check_untyped_defs = true
+disallow_incomplete_defs = true
 
 [tool.ruff]
 target-version = "py39"
@@ -155,14 +151,3 @@ exclude_lines = ["no cov", "if __name__ == .__main__.:", "if TYPE_CHECKING:"]
 markers = [
   "integration: integration tests"
 ]
-
-[[tool.mypy.overrides]]
-module = [
-  "grpc",
-  "haystack.*",
-  "haystack_integrations.*",
-  "numpy",
-  "pytest.*",
-  "weave.*"
-]
-ignore_missing_imports = true

integrations/weights_and_biases_weave/src/haystack_integrations/components/connectors/py.typed

@@ -1,9 +1,9 @@
 from typing import Any, Optional
 
 from haystack import component, default_from_dict, default_to_dict, logging, tracing
-from weave.trace.autopatch import AutopatchSettings
 
 from haystack_integrations.tracing.weave import WeaveTracer
+from weave.trace.autopatch import AutopatchSettings
 
 logger = logging.getLogger(__name__)
 

…ations/components/connectors/__init__.py …/components/connectors/weave/__init__.pyintegrations/weights_and_biases_weave/src/haystack_integrations/components/connectors/__init__.py renamed to integrations/weights_and_biases_weave/src/haystack_integrations/components/connectors/weave/__init__.py integrations/weights_and_biases_weave/src/haystack_integrations/components/connectors/__init__.py renamed to integrations/weights_and_biases_weave/src/haystack_integrations/components/connectors/weave/__init__.py

@@ -53,7 +53,7 @@ def get_correlation_data_for_logs(self) -> dict[str, Any]:
             return {}
         return {"weave.call_id": self._call.id, "weave.run_id": getattr(self._call, "run_id", "")}
 
-    def set_call(self, call: "weave.Call") -> None:
+    def set_call(self, call: Call) -> None:
         self._call = call
 
     def get_attributes(self) -> dict[str, Any]:
@@ -151,7 +151,12 @@ def _finish_regular_call(self, span: WeaveSpan) -> None:
 
     @contextlib.contextmanager
     def trace(
-        self, operation_name: str, tags: Optional[dict[str, Any]] = None, parent_span: Optional[WeaveSpan] = None
+        self,
+        operation_name: str,
+        tags: Optional[dict[str, Any]] = None,
+        # the current implementation violates the Liskov Substitution Principle by using WeaveSpan instead of Span
+        # unfortunately, it seems hard to fix without rewriting the Tracer
+        parent_span: Optional[WeaveSpan] = None,  # type: ignore[override]
     ) -> Iterator[WeaveSpan]:
         """
         A context manager that creates and manages spans for tracking operations in Weights & Biases Weave.