weave-haystack 0.0.1__tar.gz → 2.0.0__tar.gz

weave_haystack-2.0.0/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+## [integrations/weights_and_biases_weave-v1.0.0] - 2025-07-01
+
+### 🐛 Bug Fixes
+
+- [**breaking**] Weave - move Connector, fix types, add py.typed (#2038)
+
+### 🧹 Chores
+
+- Align core-integrations Hatch scripts (#1898)
+- Remove black (#1985)
+
+
+## [integrations/weights_and_biases_weave-v0.0.1] - 2025-03-28
+
+### 🚜 Refactor
+
+- Renaming the project/package to weights_biases_weave (#1565)
+
+<!-- generated by git-cliff -->

weave_haystack-2.0.0/PKG-INFO

@@ -0,0 +1,40 @@
+Metadata-Version: 2.4
+Name: weave-haystack
+Version: 2.0.0
+Summary: An integration of Weights & Biases Weave tracer 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/weights_and_biases_weave/README.md
+Project-URL: Issues, https://github.com/deepset-ai/haystack-core-integrations/issues
+Author-email: deepset GmbH <info@deepset.ai>
+License-Expression: Apache-2.0
+License-File: LICENSE.txt
+Classifier: Development Status :: 4 - Beta
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.9
+Requires-Dist: haystack-ai
+Requires-Dist: weave>=0.52.7
+Description-Content-Type: text/markdown
+
+# weave-haystack
+
+[![PyPI - Version](https://img.shields.io/pypi/v/weave-haystack.svg)](https://pypi.org/project/weave-haystack)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/weave-haystack)](https://pypi.org/project/weave-haystack)
+
+- [Integration page](https://haystack.deepset.ai/integrations/weights-and-bias-tracer)
+- [Changelog](https://github.com/deepset-ai/haystack-core-integrations/blob/main/integrations/weights_and_biases_weave/CHANGELOG.md)
+
+---
+
+## Contributing
+
+Refer to the general [Contribution Guidelines](https://github.com/deepset-ai/haystack-core-integrations/blob/main/CONTRIBUTING.md).
+
+To run integration tests locally, you need to export the `WANDB_API_KEY` environment variable.

weave_haystack-2.0.0/README.md

@@ -0,0 +1,15 @@
+# weave-haystack
+
+[![PyPI - Version](https://img.shields.io/pypi/v/weave-haystack.svg)](https://pypi.org/project/weave-haystack)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/weave-haystack)](https://pypi.org/project/weave-haystack)
+
+- [Integration page](https://haystack.deepset.ai/integrations/weights-and-bias-tracer)
+- [Changelog](https://github.com/deepset-ai/haystack-core-integrations/blob/main/integrations/weights_and_biases_weave/CHANGELOG.md)
+
+---
+
+## Contributing
+
+Refer to the general [Contribution Guidelines](https://github.com/deepset-ai/haystack-core-integrations/blob/main/CONTRIBUTING.md).
+
+To run integration tests locally, you need to export the `WANDB_API_KEY` environment variable.

{weave_haystack-0.0.1 → weave_haystack-2.0.0}/example/hybrid_retrieval.py

@@ -5,11 +5,10 @@ from haystack.components.rankers import TransformersSimilarityRanker
 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():
-
     document_store = InMemoryDocumentStore()
     documents = [
         Document(content="The Eiffel Tower is located in Paris, France."),
@@ -30,7 +29,6 @@ def index():
 
 
 def hybrid_pipeline(document_store):
-
     text_embedder = SentenceTransformersTextEmbedder()
     embedding_retriever = InMemoryEmbeddingRetriever(document_store)
     bm25_retriever = InMemoryBM25Retriever(document_store)

{weave_haystack-0.0.1 → weave_haystack-2.0.0}/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__"]

{weave_haystack-0.0.1 → weave_haystack-2.0.0}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = ["haystack-ai", "weave>=0.51.33"]
+dependencies = ["haystack-ai", "weave>=0.52.7"]
 
 [project.urls]
 Source = "https://github.com/deepset-ai/haystack-core-integrations"
@@ -43,30 +43,35 @@ git_describe_command = 'git describe --tags --match="integrations/weights_and_bi
 
 [tool.hatch.envs.default]
 installer = "uv"
-dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"]
+dependencies = ["haystack-pydoc-tools", "ruff"]
 [tool.hatch.envs.default.scripts]
-test = "pytest {args:tests}"
-test-cov = "coverage run -m pytest {args:tests}"
-test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x"
-cov-report = ["- coverage combine", "coverage report"]
-cov = ["test-cov", "cov-report"]
-cov-retry = ["test-cov-retry", "cov-report"]
 docs = ["pydoc-markdown pydoc/config.yml"]
+fmt = "ruff check --fix {args} && ruff format {args}"
+fmt-check = "ruff check {args} && ruff format --check {args}"
+
+[tool.hatch.envs.test]
+dependencies = [
+    "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+    "pytest-rerunfailures",
+    "mypy",
+    "pip"
+]
 
-[tool.hatch.envs.lint]
-installer = "uv"
-detached = true
-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:}", "black --check --diff {args:.}"]
-fmt = ["black {args:.}", "ruff check --fix {args:}", "style"]
-all = ["style", "typing"]
-
-[tool.black]
-target-version = ["py39"]
-line-length = 120
-skip-string-normalization = true
+[tool.hatch.envs.test.scripts]
+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 -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"
@@ -146,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

{weave_haystack-0.0.1/src/haystack_integrations/components/connectors → weave_haystack-2.0.0/src/haystack_integrations/components/connectors/weave}/weave_connector.py

@@ -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.settings import UserSettings
 
 logger = logging.getLogger(__name__)
 
@@ -101,9 +101,9 @@ class WeaveConnector:
             Dictionary with all the necessary information to recreate this component.
         """
         weave_init_kwargs = self.weave_init_kwargs.copy()
-        autopatch_settings = weave_init_kwargs.get("autopatch_settings", None)
-        if isinstance(autopatch_settings, AutopatchSettings):
-            weave_init_kwargs["autopatch_settings"] = autopatch_settings.model_dump(exclude_defaults=True)
+        settings = weave_init_kwargs.get("settings", None)
+        if isinstance(settings, UserSettings):
+            weave_init_kwargs["settings"] = settings.model_dump(mode="json", exclude_defaults=True)
 
         return default_to_dict(self, pipeline_name=self.pipeline_name, weave_init_kwargs=weave_init_kwargs)
 
@@ -116,12 +116,7 @@ class WeaveConnector:
         :returns:
             Deserialized component.
         """
-        if (
-            autopatch_settings := data.get("init_parameters", {})
-            .get("weave_init_kwargs", {})
-            .get("autopatch_settings", None)
-        ):
-            parsed_settings = AutopatchSettings.model_validate(autopatch_settings)
-            data["init_parameters"]["weave_init_kwargs"]["autopatch_settings"] = parsed_settings
+        # Weave's API accepts both dict and UserSettings objects for `settings`,
+        # so we can pass the raw settings dict directly without deserializing it
 
         return default_from_dict(cls, data)

{weave_haystack-0.0.1 → weave_haystack-2.0.0}/src/haystack_integrations/tracing/weave/tracer.py

@@ -53,7 +53,7 @@ class WeaveSpan(Span):
             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 @@ class WeaveTracer(Tracer):
 
     @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.

{weave_haystack-0.0.1 → weave_haystack-2.0.0}/tests/test_tracer.py

@@ -1,8 +1,6 @@
 import logging
 from unittest.mock import patch
 
-from weave.trace.autopatch import AutopatchSettings
-
 from haystack_integrations.tracing.weave.tracer import WeaveSpan, WeaveTracer
 
 
@@ -27,7 +25,6 @@ class MockWeaveClient:
 
 
 class TestWeaveTracer:
-
     def test_initialization(self):
         with patch("weave.init") as mock_init:
             mock_init.return_value = MockWeaveClient()
@@ -41,13 +38,11 @@ class TestWeaveTracer:
             mock_init.return_value = MockWeaveClient()
             tracer = WeaveTracer(
                 project_name="test_project",
-                autopatch_settings=AutopatchSettings(disable_autopatch=True),
+                settings={"implicitly_patch_integrations": False},
             )
             assert tracer._client is not None
             assert tracer._current_span is None
-            mock_init.assert_called_once_with(
-                "test_project", autopatch_settings=AutopatchSettings(disable_autopatch=True)
-            )
+            mock_init.assert_called_once_with("test_project", settings={"implicitly_patch_integrations": False})
 
     def test_create_new_span(self):
         with patch("weave.init") as mock_init:

{weave_haystack-0.0.1 → weave_haystack-2.0.0}/tests/test_weave_connector.py

@@ -8,9 +8,9 @@ from haystack import Pipeline, component
 from haystack.components.builders import PromptBuilder
 from haystack.core.errors import PipelineRuntimeError
 from haystack.tracing import tracer as haystack_configured_tracer
-from weave.trace.autopatch import AutopatchSettings
+from weave.trace.settings import UserSettings
 
-from haystack_integrations.components.connectors import WeaveConnector
+from haystack_integrations.components.connectors.weave import WeaveConnector
 from haystack_integrations.tracing.weave import WeaveTracer
 
 
@@ -53,7 +53,7 @@ class TestWeaveConnector:
 
         assert serialized["init_parameters"]["pipeline_name"] == "test_pipeline"
         assert "type" in serialized
-        assert serialized["type"] == "haystack_integrations.components.connectors.weave_connector.WeaveConnector"
+        assert serialized["type"] == "haystack_integrations.components.connectors.weave.weave_connector.WeaveConnector"
 
         deserialized = WeaveConnector.from_dict(serialized)
 
@@ -66,21 +66,45 @@ class TestWeaveConnector:
         """Test that WeaveConnector can be serialized and deserialized correctly"""
         connector = WeaveConnector(
             pipeline_name="test_pipeline",
-            weave_init_kwargs={"autopatch_settings": AutopatchSettings(disable_autopatch=True)},
+            weave_init_kwargs={"settings": {"implicitly_patch_integrations": False}},
         )
         serialized: dict[str, Any] = connector.to_dict()
 
         assert serialized["init_parameters"]["pipeline_name"] == "test_pipeline"
-        assert serialized["init_parameters"]["weave_init_kwargs"] == {"autopatch_settings": {"disable_autopatch": True}}
+        assert serialized["init_parameters"]["weave_init_kwargs"] == {
+            "settings": {"implicitly_patch_integrations": False}
+        }
         assert "type" in serialized
-        assert serialized["type"] == "haystack_integrations.components.connectors.weave_connector.WeaveConnector"
+        assert serialized["type"] == "haystack_integrations.components.connectors.weave.weave_connector.WeaveConnector"
 
         deserialized = WeaveConnector.from_dict(serialized)
 
         assert isinstance(deserialized, WeaveConnector)
         assert deserialized.pipeline_name == "test_pipeline"
         assert deserialized.tracer is None  # tracer is only initialized with warm_up
-        assert deserialized.weave_init_kwargs == {"autopatch_settings": AutopatchSettings(disable_autopatch=True)}
+        assert deserialized.weave_init_kwargs == {"settings": {"implicitly_patch_integrations": False}}
+
+    def test_serialization_of_weave_init_kwargs_with_user_settings(self) -> None:
+        """Test that WeaveConnector can be serialized and deserialized correctly with UserSettings"""
+        connector = WeaveConnector(
+            pipeline_name="test_pipeline",
+            weave_init_kwargs={"settings": UserSettings(implicitly_patch_integrations=False)},
+        )
+        serialized: dict[str, Any] = connector.to_dict()
+
+        assert serialized["init_parameters"]["pipeline_name"] == "test_pipeline"
+        assert serialized["init_parameters"]["weave_init_kwargs"] == {
+            "settings": {"implicitly_patch_integrations": False}
+        }
+        assert "type" in serialized
+        assert serialized["type"] == "haystack_integrations.components.connectors.weave.weave_connector.WeaveConnector"
+
+        deserialized = WeaveConnector.from_dict(serialized)
+
+        assert isinstance(deserialized, WeaveConnector)
+        assert deserialized.pipeline_name == "test_pipeline"
+        assert deserialized.tracer is None  # tracer is only initialized with warm_up
+        assert deserialized.weave_init_kwargs == {"settings": {"implicitly_patch_integrations": False}}
 
     def test_pipeline_tracing(self, mock_weave_client: Mock, sample_pipeline: Pipeline) -> None:
         """Test that pipeline operations are correctly traced"""
@@ -155,7 +179,7 @@ class TestWeaveConnector:
         monkeypatch.setenv("HAYSTACK_CONTENT_TRACING_ENABLED", "true")
         connector = WeaveConnector(
             pipeline_name="test_pipeline",
-            weave_init_kwargs={"autopatch_settings": AutopatchSettings(disable_autopatch=True)},
+            weave_init_kwargs={"settings": {"implicitly_patch_integrations": False}},
         )
         assert connector.tracer is None
 

weave_haystack-0.0.1/CHANGELOG.md

@@ -1,20 +0,0 @@
-# Changelog
-
-## [integrations/weights_bias-v0.0.2] - 2025-03-13
-
-### 🚀 Features
-
-- Add weave_init_kwargs to WeaveConnector (#1537)
-
-### 📚 Documentation
-
-- Update changelog for integrations/weights_bias (#1426)
-- Fixing WandB README (#1427)
-
-## [integrations/weights_bias-v0.0.1] - 2025-02-21
-
-### 🚀 Features
-
-- Integration with Weave the tracer from Weight and Bias  (#1412)
-
-<!-- generated by git-cliff -->

weave_haystack-0.0.1/PKG-INFO

@@ -1,99 +0,0 @@
-Metadata-Version: 2.4
-Name: weave-haystack
-Version: 0.0.1
-Summary: An integration of Weights & Biases Weave tracer 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/weights_and_biases_weave/README.md
-Project-URL: Issues, https://github.com/deepset-ai/haystack-core-integrations/issues
-Author-email: deepset GmbH <info@deepset.ai>
-License-Expression: Apache-2.0
-License-File: LICENSE.txt
-Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.9
-Requires-Dist: haystack-ai
-Requires-Dist: weave>=0.51.33
-Description-Content-Type: text/markdown
-
-# weave-haystack
-
-[![PyPI - Version](https://img.shields.io/pypi/v/weave-haystack.svg)](https://pypi.org/project/weave-haystack)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/weave-haystack)](https://pypi.org/project/weave-haystack)
-
-- [Installation](#installation)
-- [Example](#example)
-- [License](#license)
-
-
-## Installation
-
-```console
-pip install weave-haystack
-```
-
-## Weave by Weights & Biases
-
-### Example 
-
-You need to have a Weave account to use this feature. You can sign up for free at https://wandb.ai/site.
-
-You then need to set the `WANDB_API_KEY:` environment variable with your Weights & Biases API key. You should find 
-your API key in https://wandb.ai/home when you are logged in. 
-
-You should then head to `https://wandb.ai/<user_name>/projects` and see the complete trace for your pipeline under
-the pipeline name you specified, when creating the `WeaveConnector`.
-
-You also need to have the `HAYSTACK_CONTENT_TRACING_ENABLED` environment variable set to `true`.
-
-To use this connector simply add it to your pipeline without any connections, and it will automatically start 
-sending traces to Weights & Biases.
-
-```python
-import os
-
-from haystack import Pipeline
-from haystack.components.builders import ChatPromptBuilder
-from haystack.components.generators.chat import OpenAIChatGenerator
-from haystack.dataclasses import ChatMessage
-
-from haystack_integrations.components.connectors import WeaveConnector
-
-os.environ["HAYSTACK_CONTENT_TRACING_ENABLED"] = "true"
-
-pipe = Pipeline()
-pipe.add_component("prompt_builder", ChatPromptBuilder())
-pipe.add_component("llm", OpenAIChatGenerator(model="gpt-3.5-turbo"))
-pipe.connect("prompt_builder.prompt", "llm.messages")
-
-connector = WeaveConnector(pipeline_name="test_pipeline")
-pipe.add_component("weave", connector)
-
-messages = [
-    ChatMessage.from_system(
-        "Always respond in German even if some input data is in other languages."
-    ),
-    ChatMessage.from_user("Tell me about {{location}}"),
-]
-
-response = pipe.run(
-    data={
-        "prompt_builder": {
-            "template_variables": {"location": "Berlin"},
-            "template": messages,
-        }
-    }
-)
-print(response["llm"]["replies"][0])
-```
-
-## License
-
-`weave-haystack` is distributed under the terms of the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) license.

weave_haystack-0.0.1/README.md

@@ -1,74 +0,0 @@
-# weave-haystack
-
-[![PyPI - Version](https://img.shields.io/pypi/v/weave-haystack.svg)](https://pypi.org/project/weave-haystack)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/weave-haystack)](https://pypi.org/project/weave-haystack)
-
-- [Installation](#installation)
-- [Example](#example)
-- [License](#license)
-
-
-## Installation
-
-```console
-pip install weave-haystack
-```
-
-## Weave by Weights & Biases
-
-### Example 
-
-You need to have a Weave account to use this feature. You can sign up for free at https://wandb.ai/site.
-
-You then need to set the `WANDB_API_KEY:` environment variable with your Weights & Biases API key. You should find 
-your API key in https://wandb.ai/home when you are logged in. 
-
-You should then head to `https://wandb.ai/<user_name>/projects` and see the complete trace for your pipeline under
-the pipeline name you specified, when creating the `WeaveConnector`.
-
-You also need to have the `HAYSTACK_CONTENT_TRACING_ENABLED` environment variable set to `true`.
-
-To use this connector simply add it to your pipeline without any connections, and it will automatically start 
-sending traces to Weights & Biases.
-
-```python
-import os
-
-from haystack import Pipeline
-from haystack.components.builders import ChatPromptBuilder
-from haystack.components.generators.chat import OpenAIChatGenerator
-from haystack.dataclasses import ChatMessage
-
-from haystack_integrations.components.connectors import WeaveConnector
-
-os.environ["HAYSTACK_CONTENT_TRACING_ENABLED"] = "true"
-
-pipe = Pipeline()
-pipe.add_component("prompt_builder", ChatPromptBuilder())
-pipe.add_component("llm", OpenAIChatGenerator(model="gpt-3.5-turbo"))
-pipe.connect("prompt_builder.prompt", "llm.messages")
-
-connector = WeaveConnector(pipeline_name="test_pipeline")
-pipe.add_component("weave", connector)
-
-messages = [
-    ChatMessage.from_system(
-        "Always respond in German even if some input data is in other languages."
-    ),
-    ChatMessage.from_user("Tell me about {{location}}"),
-]
-
-response = pipe.run(
-    data={
-        "prompt_builder": {
-            "template_variables": {"location": "Berlin"},
-            "template": messages,
-        }
-    }
-)
-print(response["llm"]["replies"][0])
-```
-
-## License
-
-`weave-haystack` is distributed under the terms of the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) license.