langfuse-haystack 0.6.0__tar.gz → 0.6.1__tar.gz

{langfuse_haystack-0.6.0 → langfuse_haystack-0.6.1}/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [integrations/langfuse-v0.6.0] - 2024-11-18
+
+### 🚀 Features
+
+- Add support for ttft (#1161)
+
+### ⚙️ Miscellaneous Tasks
+
+- Adopt uv as installer (#1142)
+
 ## [integrations/langfuse-v0.5.0] - 2024-10-01
 
 ### ⚙️ Miscellaneous Tasks

{langfuse_haystack-0.6.0 → langfuse_haystack-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: langfuse-haystack
-Version: 0.6.0
+Version: 0.6.1
 Project-URL: Documentation, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/langfuse#readme
 Project-URL: Issues, https://github.com/deepset-ai/haystack-core-integrations/issues
 Project-URL: Source, https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/langfuse

{langfuse_haystack-0.6.0 → langfuse_haystack-0.6.1}/src/haystack_integrations/tracing/langfuse/tracer.py

@@ -7,7 +7,8 @@ from typing import Any, Dict, Iterator, List, Optional, Union
 from haystack import logging
 from haystack.components.generators.openai_utils import _convert_message_to_openai_format
 from haystack.dataclasses import ChatMessage
-from haystack.tracing import Span, Tracer, tracer
+from haystack.tracing import Span, Tracer
+from haystack.tracing import tracer as proxy_tracer
 from haystack.tracing import utils as tracing_utils
 
 import langfuse
@@ -42,7 +43,7 @@ _COMPONENT_OUTPUT_KEY = "haystack.component.output"
 
 # Context var used to keep track of tracing related info.
 # This mainly useful for parents spans.
-tracing_context_var: ContextVar[Dict[Any, Any]] = ContextVar("tracing_context", default={})
+tracing_context_var: ContextVar[Dict[Any, Any]] = ContextVar("tracing_context")
 
 
 class LangfuseSpan(Span):
@@ -78,7 +79,7 @@ class LangfuseSpan(Span):
         :param key: The content tag key.
         :param value: The content tag value.
         """
-        if not tracer.is_content_tracing_enabled:
+        if not proxy_tracer.is_content_tracing_enabled:
             return
         if key.endswith(".input"):
             if "messages" in value:
@@ -126,6 +127,12 @@ class LangfuseTracer(Tracer):
         be publicly accessible to anyone with the tracing URL. If set to `False`, the tracing data will be private
         and only accessible to the Langfuse account owner.
         """
+        if not proxy_tracer.is_content_tracing_enabled:
+            logger.warning(
+                "Traces will not be logged to Langfuse because Haystack tracing is disabled. "
+                "To enable, set the HAYSTACK_CONTENT_TRACING_ENABLED environment variable to true "
+                "before importing Haystack."
+            )
         self._tracer = tracer
         self._context: List[LangfuseSpan] = []
         self._name = name
@@ -147,15 +154,16 @@ class LangfuseTracer(Tracer):
                     operation_name=operation_name,
                 )
             # Create a new trace if no parent span is provided
+            context = tracing_context_var.get({})
             span = LangfuseSpan(
                 self._tracer.trace(
                     name=self._name,
                     public=self._public,
-                    id=tracing_context_var.get().get("trace_id"),
-                    user_id=tracing_context_var.get().get("user_id"),
-                    session_id=tracing_context_var.get().get("session_id"),
-                    tags=tracing_context_var.get().get("tags"),
-                    version=tracing_context_var.get().get("version"),
+                    id=context.get("trace_id"),
+                    user_id=context.get("user_id"),
+                    session_id=context.get("session_id"),
+                    tags=context.get("tags"),
+                    version=context.get("version"),
                 )
             )
         elif tags.get(_COMPONENT_TYPE_KEY) in _ALL_SUPPORTED_GENERATORS:

{langfuse_haystack-0.6.0 → langfuse_haystack-0.6.1}/tests/test_tracer.py

@@ -1,4 +1,6 @@
 import datetime
+import logging
+import sys
 from unittest.mock import MagicMock, Mock, patch
 
 from haystack.dataclasses import ChatMessage
@@ -149,3 +151,17 @@ class TestLangfuseTracer:
             pass
 
         assert tracer._context == []
+
+    def test_init_with_tracing_disabled(self, monkeypatch, caplog):
+        # Clear haystack modules because ProxyTracer is initialized whenever haystack is imported
+        modules_to_clear = [name for name in sys.modules if name.startswith('haystack')]
+        for name in modules_to_clear:
+            sys.modules.pop(name, None)
+
+        # Re-import LangfuseTracer and instantiate it with tracing disabled
+        with caplog.at_level(logging.WARNING):
+            monkeypatch.setenv("HAYSTACK_CONTENT_TRACING_ENABLED", "false")
+            from haystack_integrations.tracing.langfuse import LangfuseTracer
+
+            LangfuseTracer(tracer=MockTracer(), name="Haystack", public=False)
+            assert "tracing is disabled" in caplog.text

{langfuse_haystack-0.6.0 → langfuse_haystack-0.6.1}/tests/test_tracing.py

@@ -49,7 +49,7 @@ def test_tracing_integration(llm_class, env_var, expected_trace):
             "tracer": {"invocation_context": {"user_id": "user_42"}},
         }
     )
-    assert "Berlin" in response["llm"]["replies"][0].content
+    assert "Berlin" in response["llm"]["replies"][0].text
     assert response["tracer"]["trace_url"]
 
     trace_url = response["tracer"]["trace_url"]