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

langfuse_haystack-0.6.2/CHANGELOG.md

@@ -0,0 +1,100 @@
+# Changelog
+
+## [unreleased]
+
+### 🚀 Features
+
+- Warn if LangfuseTracer initialized without tracing enabled (#1231)
+
+### 🧹 Chores
+
+- Use text instead of content for ChatMessage in Llama.cpp, Langfuse and Mistral (#1238)
+
+### 🌀 Miscellaneous
+
+- Chore: Fix tracing_context_var lint errors (#1220)
+
+## [integrations/langfuse-v0.6.0] - 2024-11-18
+
+### 🚀 Features
+
+- Add support for ttft (#1161)
+
+### ⚙️ CI
+
+- Adopt uv as installer (#1142)
+
+### 🌀 Miscellaneous
+
+- Fixed TypeError in LangfuseTrace (#1184)
+
+## [integrations/langfuse-v0.5.0] - 2024-10-01
+
+### 🧹 Chores
+
+- Update ruff linting scripts and settings (#1105)
+
+### 🌀 Miscellaneous
+
+- Fix: Add delay to flush the Langfuse traces (#1091)
+- Add invocation_context to identify traces (#1089)
+
+## [integrations/langfuse-v0.4.0] - 2024-09-17
+
+### 🚀 Features
+
+- Langfuse - support generation span for more LLMs (#1087)
+
+### 🚜 Refactor
+
+- Remove usage of deprecated `ChatMessage.to_openai_format` (#1001)
+
+### 📚 Documentation
+
+- Add link to langfuse in LangfuseConnector (#981)
+
+### 🧪 Testing
+
+- Do not retry tests in `hatch run test` command (#954)
+
+### ⚙️ CI
+
+- Retry tests to reduce flakyness (#836)
+
+### 🧹 Chores
+
+- `Langfuse` - replace DynamicChatPromptBuilder with ChatPromptBuilder (#925)
+- Remove all `DynamicChatPromptBuilder` references in Langfuse integration (#931)
+
+### 🌀 Miscellaneous
+
+- Ci: install `pytest-rerunfailures` where needed; add retry config to `test-cov` script (#845)
+- Chore: Update Langfuse README to avoid common initialization issues (#952)
+- Chore: langfuse - ruff update, don't ruff tests (#992)
+
+## [integrations/langfuse-v0.2.0] - 2024-06-18
+
+### 🌀 Miscellaneous
+
+- Feat: add support for Azure generators (#815)
+
+## [integrations/langfuse-v0.1.0] - 2024-06-13
+
+### 🚀 Features
+
+- Langfuse integration (#686)
+
+### 🐛 Bug Fixes
+
+- Performance optimizations and value error when streaming in langfuse (#798)
+
+### 🧹 Chores
+
+- Use ChatMessage to_openai_format, update unit tests, pydocs (#725)
+
+### 🌀 Miscellaneous
+
+- Chore: change the pydoc renderer class (#718)
+- Docs: add missing api references (#728)
+
+<!-- generated by git-cliff -->

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

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: langfuse-haystack
-Version: 0.6.0
+Version: 0.6.2
 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
 Author-email: deepset GmbH <info@deepset.ai>
-License: Apache-2.0
+License-Expression: Apache-2.0
+License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8

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

@@ -5,13 +5,17 @@ from datetime import datetime
 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.lazy_imports import LazyImport
+from haystack.tracing import Span, Tracer
+from haystack.tracing import tracer as proxy_tracer
 from haystack.tracing import utils as tracing_utils
 
 import langfuse
 
+with LazyImport("") as openai_utils_import:
+    from haystack.components.generators.openai_utils import _convert_message_to_openai_format
+
 logger = logging.getLogger(__name__)
 
 HAYSTACK_LANGFUSE_ENFORCE_FLUSH_ENV_VAR = "HAYSTACK_LANGFUSE_ENFORCE_FLUSH"
@@ -42,7 +46,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,18 +82,28 @@ 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:
-                messages = [_convert_message_to_openai_format(m) for m in value["messages"]]
+                if openai_utils_import.is_successful():
+                    # Haystack < 2.9.0
+                    messages = [_convert_message_to_openai_format(m) for m in value["messages"]]
+                else:
+                    # Haystack >= 2.9.0
+                    messages = [m.to_openai_dict_format() for m in value["messages"]]
                 self._span.update(input=messages)
             else:
                 self._span.update(input=value)
         elif key.endswith(".output"):
             if "replies" in value:
                 if all(isinstance(r, ChatMessage) for r in value["replies"]):
-                    replies = [_convert_message_to_openai_format(m) for m in value["replies"]]
+                    if openai_utils_import.is_successful():
+                        # Haystack < 2.9.0
+                        replies = [_convert_message_to_openai_format(m) for m in value["replies"]]
+                    else:
+                        # Haystack >= 2.9.0
+                        replies = [m.to_openai_dict_format() for m in value["replies"]]
                 else:
                     replies = value["replies"]
                 self._span.update(output=replies)
@@ -126,6 +140,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 +167,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.2}/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.2}/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"]

langfuse_haystack-0.6.0/CHANGELOG.md

@@ -1,53 +0,0 @@
-# Changelog
-
-## [integrations/langfuse-v0.5.0] - 2024-10-01
-
-### ⚙️ Miscellaneous Tasks
-
-- Update ruff linting scripts and settings (#1105)
-
-### Langfuse
-
-- Add invocation_context to identify traces (#1089)
-
-## [integrations/langfuse-v0.4.0] - 2024-09-17
-
-### 🚀 Features
-
-- Langfuse - support generation span for more LLMs (#1087)
-
-### 🚜 Refactor
-
-- Remove usage of deprecated `ChatMessage.to_openai_format` (#1001)
-
-### 📚 Documentation
-
-- Add link to langfuse in LangfuseConnector (#981)
-
-### 🧪 Testing
-
-- Do not retry tests in `hatch run test` command (#954)
-
-### ⚙️ Miscellaneous Tasks
-
-- Retry tests to reduce flakyness (#836)
-- `Langfuse` - replace DynamicChatPromptBuilder with ChatPromptBuilder (#925)
-- Remove all `DynamicChatPromptBuilder` references in Langfuse integration (#931)
-
-## [integrations/langfuse-v0.2.0] - 2024-06-18
-
-## [integrations/langfuse-v0.1.0] - 2024-06-13
-
-### 🚀 Features
-
-- Langfuse integration (#686)
-
-### 🐛 Bug Fixes
-
-- Performance optimizations and value error when streaming in langfuse (#798)
-
-### ⚙️ Miscellaneous Tasks
-
-- Use ChatMessage to_openai_format, update unit tests, pydocs (#725)
-
-<!-- generated by git-cliff -->