langfuse-haystack 0.6.4__tar.gz → 0.7.0__tar.gz

{langfuse_haystack-0.6.4 → langfuse_haystack-0.7.0}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [integrations/langfuse-v0.6.4] - 2025-01-17
+
+### 🚀 Features
+
+- Add LangfuseConnector secure key management and serialization  (#1287)
+
+
 ## [integrations/langfuse-v0.6.3] - 2025-01-15
 
 ### 🌀 Miscellaneous

{langfuse_haystack-0.6.4 → langfuse_haystack-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langfuse-haystack
-Version: 0.6.4
+Version: 0.7.0
 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.4 → langfuse_haystack-0.7.0}/pyproject.toml

@@ -67,7 +67,12 @@ python = ["3.8", "3.9", "3.10", "3.11", "3.12"]
 [tool.hatch.envs.lint]
 installer = "uv"
 detached = true
-dependencies = ["pip", "black>=23.1.0", "mypy>=1.0.0", "ruff>=0.0.243"]
+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}"
@@ -167,6 +172,7 @@ module = [
   "haystack_integrations.*",
   "pytest.*",
   "numpy.*",
+  "httpx.*",
 ]
 ignore_missing_imports = true
 

{langfuse_haystack-0.6.4 → langfuse_haystack-0.7.0}/src/haystack_integrations/components/connectors/langfuse/langfuse_connector.py

@@ -1,5 +1,6 @@
 from typing import Any, Dict, Optional
 
+import httpx
 from haystack import component, default_from_dict, default_to_dict, logging, tracing
 from haystack.utils import Secret, deserialize_secrets_inplace
 
@@ -101,6 +102,7 @@ class LangfuseConnector:
         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,
     ):
         """
         Initialize the LangfuseConnector component.
@@ -112,6 +114,9 @@ class LangfuseConnector:
             only accessible to the Langfuse account owner. The default is `False`.
         :param public_key: The Langfuse public key. Defaults to reading from LANGFUSE_PUBLIC_KEY environment variable.
         :param secret_key: The Langfuse secret key. Defaults to reading from LANGFUSE_SECRET_KEY environment variable.
+        :param httpx_client: Optional custom httpx.Client instance to use for Langfuse API calls. Note that when
+            deserializing a pipeline from YAML, any custom client is discarded and Langfuse will create its own default
+            client, since HTTPX clients cannot be serialized.
         """
         self.name = name
         self.public = public
@@ -121,6 +126,7 @@ class LangfuseConnector:
             tracer=Langfuse(
                 secret_key=secret_key.resolve_value() if secret_key else None,
                 public_key=public_key.resolve_value() if public_key else None,
+                httpx_client=httpx_client,
             ),
             name=name,
             public=public,
@@ -158,6 +164,7 @@ class LangfuseConnector:
             public=self.public,
             secret_key=self.secret_key.to_dict() if self.secret_key else None,
             public_key=self.public_key.to_dict() if self.public_key else None,
+            # Note: httpx_client is not serialized as it's not serializable
         )
 
     @classmethod

{langfuse_haystack-0.6.4 → langfuse_haystack-0.7.0}/src/haystack_integrations/tracing/langfuse/tracer.py

@@ -201,7 +201,11 @@ class LangfuseTracer(Tracer):
                 )
 
         raw_span = span.raw_span()
-        if isinstance(raw_span, langfuse.client.StatefulSpanClient):
+
+        # In this section, we finalize both regular spans and generation spans created using the LangfuseSpan class.
+        # It's important to end() these spans to ensure they are properly closed and all relevant data is recorded.
+        # Note that we do not call end() on the main trace span itself, as its lifecycle is managed differently.
+        if isinstance(raw_span, (langfuse.client.StatefulSpanClient, langfuse.client.StatefulGenerationClient)):
             raw_span.end()
         self._context.pop()
 

{langfuse_haystack-0.6.4 → langfuse_haystack-0.7.0}/tests/test_tracing.py

@@ -10,6 +10,7 @@ from haystack.components.generators.chat import OpenAIChatGenerator
 from haystack.dataclasses import ChatMessage
 from haystack.utils import Secret
 from requests.auth import HTTPBasicAuth
+import httpx
 
 from haystack_integrations.components.connectors.langfuse import LangfuseConnector
 from haystack_integrations.components.generators.anthropic import AnthropicChatGenerator
@@ -49,6 +50,27 @@ def pipeline_with_secrets(llm_class, expected_trace):
     return pipe
 
 
+@pytest.fixture
+def pipeline_with_custom_client(llm_class, expected_trace):
+    """Pipeline factory using custom httpx client for Langfuse"""
+    pipe = Pipeline()
+    custom_client = httpx.Client(timeout=30.0)  # Custom timeout of 30 seconds
+    pipe.add_component(
+        "tracer",
+        LangfuseConnector(
+            name=f"Chat example - {expected_trace}",
+            public=True,
+            secret_key=Secret.from_env_var("LANGFUSE_SECRET_KEY"),
+            public_key=Secret.from_env_var("LANGFUSE_PUBLIC_KEY"),
+            httpx_client=custom_client,
+        ),
+    )
+    pipe.add_component("prompt_builder", ChatPromptBuilder())
+    pipe.add_component("llm", llm_class())
+    pipe.connect("prompt_builder.prompt", "llm.messages")
+    return pipe
+
+
 @pytest.mark.integration
 @pytest.mark.parametrize(
     "llm_class, env_var, expected_trace",
@@ -58,7 +80,9 @@ def pipeline_with_secrets(llm_class, expected_trace):
         (CohereChatGenerator, "COHERE_API_KEY", "Cohere"),
     ],
 )
-@pytest.mark.parametrize("pipeline_fixture", ["pipeline_with_env_vars", "pipeline_with_secrets"])
+@pytest.mark.parametrize(
+    "pipeline_fixture", ["pipeline_with_env_vars", "pipeline_with_secrets", "pipeline_with_custom_client"]
+)
 def test_tracing_integration(llm_class, env_var, expected_trace, pipeline_fixture, request):
     if not all([os.environ.get("LANGFUSE_SECRET_KEY"), os.environ.get("LANGFUSE_PUBLIC_KEY"), os.environ.get(env_var)]):
         pytest.skip(f"Missing required environment variables: LANGFUSE_SECRET_KEY, LANGFUSE_PUBLIC_KEY, or {env_var}")