langfuse-haystack 3.3.1__tar.gz → 4.0.1__tar.gz

{langfuse_haystack-3.3.1 → langfuse_haystack-4.0.1}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [integrations/langfuse-v4.0.0] - 2026-01-12
+
+### 🧹 Chores
+
+- Make fmt command more forgiving (#2671)
+- [**breaking**] Langfuse - drop Python 3.9 and use X|Y typing (#2709)
+
+
+## [integrations/langfuse-v3.3.1] - 2025-12-10
+
+### 🚀 Features
+
+- *(langfuse)* Add embedder usage metrics for langfuse (#2542)
+
+### 🐛 Bug Fixes
+
+- Correct token usage accounting, fix trace polling in tests (#2594)
+
+### 🧹 Chores
+
+- Remove Readme API CI workflow and configs (#2573)
+
+
 ## [integrations/langfuse-v3.3.0] - 2025-11-21
 
 ### 🚀 Features

{langfuse_haystack-3.3.1 → langfuse_haystack-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langfuse-haystack
-Version: 3.3.1
+Version: 4.0.1
 Summary: Langfuse integration for Haystack
 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
@@ -10,15 +10,14 @@ License-Expression: Apache-2.0
 License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 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>=2.17.1
+Requires-Python: >=3.10
+Requires-Dist: haystack-ai>=2.22.0
 Requires-Dist: langfuse<4.0.0,>=3.3.1
 Description-Content-Type: text/markdown
 

{langfuse_haystack-3.3.1 → langfuse_haystack-4.0.1}/pyproject.toml

@@ -7,14 +7,13 @@ name = "langfuse-haystack"
 dynamic = ["version"]
 description = "Langfuse integration for Haystack"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = "Apache-2.0"
 keywords = []
 authors = [{ name = "deepset GmbH", email = "info@deepset.ai" }]
 classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
@@ -22,7 +21,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
-dependencies = ["haystack-ai>=2.17.1", "langfuse>=3.3.1, <4.0.0"]
+dependencies = ["haystack-ai>=2.22.0", "langfuse>=3.3.1, <4.0.0"]
 
 [project.urls]
 Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/langfuse#readme"
@@ -47,7 +46,7 @@ dependencies = ["haystack-pydoc-tools", "ruff"]
 
 [tool.hatch.envs.default.scripts]
 docs = ["pydoc-markdown pydoc/config_docusaurus.yml"]
-fmt = "ruff check --fix {args} && ruff format {args}"
+fmt = "ruff check --fix {args}; ruff format {args}"
 fmt-check = "ruff check {args} && ruff format --check {args}"
 
 [tool.hatch.envs.test]
@@ -82,7 +81,6 @@ allow-direct-references = true
 
 
 [tool.ruff]
-target-version = "py39"
 line-length = 120
 
 [tool.ruff.lint]
@@ -128,10 +126,6 @@ ignore = [
   # Asserts
   "S101",
 ]
-unfixable = [
-  # Don't touch unused imports
-  "F401",
-]
 
 [tool.ruff.lint.isort]
 known-first-party = ["haystack_integrations"]

{langfuse_haystack-3.3.1 → langfuse_haystack-4.0.1}/src/haystack_integrations/components/connectors/langfuse/langfuse_connector.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from typing import Any, Optional
+from typing import Any
 
 import httpx
 from haystack import component, default_from_dict, default_to_dict, logging, tracing
@@ -118,13 +118,13 @@ class LangfuseConnector:
         self,
         name: str,
         public: bool = False,
-        public_key: Optional[Secret] = Secret.from_env_var("LANGFUSE_PUBLIC_KEY"),  # noqa: B008
-        secret_key: Optional[Secret] = Secret.from_env_var("LANGFUSE_SECRET_KEY"),  # noqa: B008
-        httpx_client: Optional[httpx.Client] = None,
-        span_handler: Optional[SpanHandler] = None,
+        public_key: Secret | None = Secret.from_env_var("LANGFUSE_PUBLIC_KEY"),  # noqa: B008
+        secret_key: Secret | None = Secret.from_env_var("LANGFUSE_SECRET_KEY"),  # noqa: B008
+        httpx_client: httpx.Client | None = None,
+        span_handler: SpanHandler | None = None,
         *,
-        host: Optional[str] = None,
-        langfuse_client_kwargs: Optional[dict[str, Any]] = None,
+        host: str | None = None,
+        langfuse_client_kwargs: dict[str, Any] | None = None,
     ) -> None:
         """
         Initialize the LangfuseConnector component.
@@ -172,7 +172,7 @@ class LangfuseConnector:
         tracing.enable_tracing(self.tracer)
 
     @component.output_types(name=str, trace_url=str, trace_id=str)
-    def run(self, invocation_context: Optional[dict[str, Any]] = None) -> dict[str, str]:
+    def run(self, invocation_context: dict[str, Any] | None = None) -> dict[str, str]:
         """
         Runs the LangfuseConnector component.
 

{langfuse_haystack-3.3.1 → langfuse_haystack-4.0.1}/src/haystack_integrations/tracing/langfuse/tracer.py

@@ -12,7 +12,7 @@ from contextlib import AbstractContextManager
 from contextvars import ContextVar
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Literal, Optional, cast
+from typing import Any, Literal, cast
 
 from haystack import default_from_dict, default_to_dict, logging
 from haystack.dataclasses import ChatMessage
@@ -22,7 +22,7 @@ from haystack.tracing import utils as tracing_utils
 
 import langfuse
 from langfuse import LangfuseSpan as LangfuseClientSpan
-from langfuse.types import TraceMetadata
+from langfuse.types import TraceContext, TraceMetadata
 
 logger = logging.getLogger(__name__)
 
@@ -48,7 +48,7 @@ tracing_context_var: ContextVar[dict[Any, Any]] = ContextVar("tracing_context")
 
 # Internal span execution hierarchy for our tracer
 # Manages parent-child relationships and prevents cross-request span interleaving
-span_stack_var: ContextVar[Optional[list["LangfuseSpan"]]] = ContextVar("span_stack", default=None)
+span_stack_var: ContextVar[list["LangfuseSpan"] | None] = ContextVar("span_stack", default=None)
 
 
 class LangfuseSpan(Span):
@@ -150,9 +150,9 @@ class SpanContext:
 
     name: str
     operation_name: str
-    component_type: Optional[str]
+    component_type: str | None
     tags: dict[str, Any]
-    parent_span: Optional[Span]
+    parent_span: Span | None
     trace_name: str = "Haystack"
     public: bool = False
 
@@ -189,7 +189,7 @@ class SpanHandler(ABC):
     """
 
     def __init__(self) -> None:
-        self.tracer: Optional[langfuse.Langfuse] = None
+        self.tracer: langfuse.Langfuse | None = None
 
     def init_tracer(self, tracer: langfuse.Langfuse) -> None:
         """
@@ -215,7 +215,7 @@ class SpanHandler(ABC):
         pass
 
     @abstractmethod
-    def handle(self, span: LangfuseSpan, component_type: Optional[str]) -> None:
+    def handle(self, span: LangfuseSpan, component_type: str | None) -> None:
         """
         Process a span after component execution by attaching metadata and metrics.
 
@@ -287,8 +287,12 @@ class DefaultSpanHandler(SpanHandler):
             root_span_type: Literal["agent", "span"] = (
                 "agent" if context.operation_name == "haystack.agent.run" else "span"
             )
+            trace_context: TraceContext | None = cast(
+                TraceContext, {"trace_id": tracing_ctx.get("trace_id")} if tracing_ctx.get("trace_id") else None
+            )
             # Create a new trace when there's no parent span
             span_context_manager = self.tracer.start_as_current_observation(
+                trace_context=trace_context,
                 name=context.trace_name,
                 version=tracing_ctx.get("version"),
                 as_type=root_span_type,
@@ -338,7 +342,7 @@ class DefaultSpanHandler(SpanHandler):
         else:
             return LangfuseSpan(self.tracer.start_as_current_span(name=context.name))
 
-    def handle(self, span: LangfuseSpan, component_type: Optional[str]) -> None:
+    def handle(self, span: LangfuseSpan, component_type: str | None) -> None:
         # If the span is at the pipeline level, we add input and output keys to the span
         at_pipeline_level = span.get_data().get(_PIPELINE_INPUT_KEY) is not None
         if at_pipeline_level:
@@ -420,7 +424,7 @@ class LangfuseTracer(Tracer):
         tracer: langfuse.Langfuse,
         name: str = "Haystack",
         public: bool = False,
-        span_handler: Optional[SpanHandler] = None,
+        span_handler: SpanHandler | None = None,
     ) -> None:
         """
         Initialize a LangfuseTracer instance.
@@ -450,7 +454,7 @@ class LangfuseTracer(Tracer):
 
     @contextlib.contextmanager
     def trace(
-        self, operation_name: str, tags: Optional[dict[str, Any]] = None, parent_span: Optional[Span] = None
+        self, operation_name: str, tags: dict[str, Any] | None = None, parent_span: Span | None = None
     ) -> Iterator[Span]:
         tags = tags or {}
         span_name = tags.get(_COMPONENT_NAME_KEY, operation_name)
@@ -541,7 +545,7 @@ class LangfuseTracer(Tracer):
     def flush(self) -> None:
         self._tracer.flush()
 
-    def current_span(self) -> Optional[Span]:
+    def current_span(self) -> Span | None:
         """
         Return the current active span.
 

{langfuse_haystack-3.3.1 → langfuse_haystack-4.0.1}/tests/test_tracer.py

@@ -6,7 +6,6 @@ import asyncio
 import datetime
 import logging
 import sys
-from typing import Optional
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
@@ -19,6 +18,7 @@ from haystack_integrations.tracing.langfuse.tracer import (
     LangfuseTracer,
     SpanContext,
     _sanitize_usage_data,
+    tracing_context_var,
 )
 
 
@@ -107,7 +107,7 @@ class MockLangfuseClient:
 
 
 class CustomSpanHandler(DefaultSpanHandler):
-    def handle(self, span: LangfuseSpan, component_type: Optional[str]) -> None:
+    def handle(self, span: LangfuseSpan, component_type: str | None) -> None:
         if component_type == "OpenAIChatGenerator":
             output = span.get_data().get(_COMPONENT_OUTPUT_KEY, {})
             replies = output.get("replies", [])
@@ -223,6 +223,44 @@ class TestSanitizeUsageData:
 
 
 class TestDefaultSpanHandler:
+    def test_create_span_root_trace(self):
+        """Test creating a root span (no parent)."""
+        mock_client = Mock()
+        mock_client.start_as_current_span = Mock(return_value=MockContextManager())
+        mock_client.start_as_current_observation = Mock(return_value=MockContextManager())
+
+        handler = DefaultSpanHandler()
+        handler.init_tracer(mock_client)
+
+        context = MagicMock(spec=SpanContext)
+        context.parent_span = None
+        context.trace_name = "test_trace"
+        context.operation_name = "haystack.pipeline.run"
+        context.public = False
+
+        # Set up tracing context
+        token = tracing_context_var.set(
+            {"user_id": "test_user", "session_id": "test_session", "trace_id": "test_trace_id"}
+        )
+        try:
+            result = handler.create_span(context)
+
+            # Assert tracer was called with correct parameters
+            handler.tracer.start_as_current_observation.assert_called_once_with(
+                trace_context={"trace_id": "test_trace_id"},
+                name="test_trace",
+                version=None,
+                as_type="span",
+            )
+            call_kwargs = handler.tracer.start_as_current_observation.call_args[1]
+            assert "test_trace" == call_kwargs["name"]
+            assert "span" == call_kwargs["as_type"]
+
+            # Assert result is a LangfuseSpan
+            assert isinstance(result, LangfuseSpan)
+        finally:
+            tracing_context_var.reset(token)
+
     def test_handle_generator(self):
         mock_span = Mock()
         mock_span.raw_span.return_value = mock_span