langfuse-haystack 0.3.0__tar.gz → 0.4.0__tar.gz

langfuse_haystack-0.4.0/CHANGELOG.md

@@ -0,0 +1,39 @@
+# Changelog
+
+## [unreleased]
+
+### 🚜 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 -->

{langfuse_haystack-0.3.0 → langfuse_haystack-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: langfuse-haystack
-Version: 0.3.0
+Version: 0.4.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.4.0/example/chat.py

@@ -0,0 +1,54 @@
+import os
+
+# See README.md for more information on how to set up the environment variables
+# before running this script
+
+# In addition to setting the environment variables, you need to install the following packages:
+# pip install cohere-haystack anthropic-haystack
+os.environ["HAYSTACK_CONTENT_TRACING_ENABLED"] = "true"
+
+from haystack import Pipeline
+from haystack.components.builders import ChatPromptBuilder
+from haystack.components.generators.chat import HuggingFaceAPIChatGenerator, OpenAIChatGenerator
+from haystack.dataclasses import ChatMessage
+from haystack.utils.auth import Secret
+from haystack.utils.hf import HFGenerationAPIType
+
+from haystack_integrations.components.connectors.langfuse import LangfuseConnector
+from haystack_integrations.components.generators.anthropic import AnthropicChatGenerator
+from haystack_integrations.components.generators.cohere import CohereChatGenerator
+
+os.environ["HAYSTACK_CONTENT_TRACING_ENABLED"] = "true"
+
+selected_chat_generator = "openai"
+
+generators = {
+    "openai": OpenAIChatGenerator,
+    "anthropic": AnthropicChatGenerator,
+    "hf_api": lambda: HuggingFaceAPIChatGenerator(
+        api_type=HFGenerationAPIType.SERVERLESS_INFERENCE_API,
+        api_params={"model": "mistralai/Mixtral-8x7B-Instruct-v0.1"},
+        token=Secret.from_token(os.environ["HF_API_KEY"]),
+    ),
+    "cohere": CohereChatGenerator,
+}
+
+selected_chat_generator = generators[selected_chat_generator]()
+
+if __name__ == "__main__":
+
+    pipe = Pipeline()
+    pipe.add_component("tracer", LangfuseConnector("Chat example"))
+    pipe.add_component("prompt_builder", ChatPromptBuilder())
+    pipe.add_component("llm", selected_chat_generator)
+
+    pipe.connect("prompt_builder.prompt", "llm.messages")
+
+    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])
+    print(response["tracer"]["trace_url"])

{langfuse_haystack-0.3.0 → langfuse_haystack-0.4.0}/pyproject.toml

@@ -47,6 +47,8 @@ dependencies = [
   "pytest",
   "pytest-rerunfailures",
   "haystack-pydoc-tools",
+  "anthropic-haystack",
+  "cohere-haystack"
 ]
 [tool.hatch.envs.default.scripts]
 test = "pytest {args:tests}"

{langfuse_haystack-0.3.0 → langfuse_haystack-0.4.0}/src/haystack_integrations/tracing/langfuse/tracer.py

@@ -10,8 +10,22 @@ from haystack.tracing import utils as tracing_utils
 import langfuse
 
 HAYSTACK_LANGFUSE_ENFORCE_FLUSH_ENV_VAR = "HAYSTACK_LANGFUSE_ENFORCE_FLUSH"
-_SUPPORTED_GENERATORS = ["AzureOpenAIGenerator", "OpenAIGenerator"]
-_SUPPORTED_CHAT_GENERATORS = ["AzureOpenAIChatGenerator", "OpenAIChatGenerator"]
+_SUPPORTED_GENERATORS = [
+    "AzureOpenAIGenerator",
+    "OpenAIGenerator",
+    "AnthropicGenerator",
+    "HuggingFaceAPIGenerator",
+    "HuggingFaceLocalGenerator",
+    "CohereGenerator",
+]
+_SUPPORTED_CHAT_GENERATORS = [
+    "AzureOpenAIChatGenerator",
+    "OpenAIChatGenerator",
+    "AnthropicChatGenerator",
+    "HuggingFaceAPIChatGenerator",
+    "HuggingFaceLocalChatGenerator",
+    "CohereChatGenerator",
+]
 _ALL_SUPPORTED_GENERATORS = _SUPPORTED_GENERATORS + _SUPPORTED_CHAT_GENERATORS
 
 

{langfuse_haystack-0.3.0 → langfuse_haystack-0.4.0}/tests/test_tracing.py

@@ -1,34 +1,38 @@
 import os
-
-# don't remove (or move) this env var setting from here, it's needed to turn tracing on
-os.environ["HAYSTACK_CONTENT_TRACING_ENABLED"] = "true"
-
-from urllib.parse import urlparse
-
 import pytest
+from urllib.parse import urlparse
 import requests
-
+from requests.auth import HTTPBasicAuth
 from haystack import Pipeline
 from haystack.components.builders import ChatPromptBuilder
-from haystack.components.generators.chat import OpenAIChatGenerator
 from haystack.dataclasses import ChatMessage
-from requests.auth import HTTPBasicAuth
-
 from haystack_integrations.components.connectors.langfuse import LangfuseConnector
+from haystack.components.generators.chat import OpenAIChatGenerator
+
+from haystack_integrations.components.generators.anthropic import AnthropicChatGenerator
+from haystack_integrations.components.generators.cohere import CohereChatGenerator
+
+# don't remove (or move) this env var setting from here, it's needed to turn tracing on
+os.environ["HAYSTACK_CONTENT_TRACING_ENABLED"] = "true"
 
 
 @pytest.mark.integration
-@pytest.mark.skipif(
-    not os.environ.get("LANGFUSE_SECRET_KEY", None) and not os.environ.get("LANGFUSE_PUBLIC_KEY", None),
-    reason="Export an env var called LANGFUSE_SECRET_KEY and LANGFUSE_PUBLIC_KEY containing Langfuse credentials.",
+@pytest.mark.parametrize(
+    "llm_class, env_var, expected_trace",
+    [
+        (OpenAIChatGenerator, "OPENAI_API_KEY", "OpenAI"),
+        (AnthropicChatGenerator, "ANTHROPIC_API_KEY", "Anthropic"),
+        (CohereChatGenerator, "COHERE_API_KEY", "Cohere"),
+    ],
 )
-def test_tracing_integration():
+def test_tracing_integration(llm_class, env_var, expected_trace):
+    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}")
 
     pipe = Pipeline()
-    pipe.add_component("tracer", LangfuseConnector(name="Chat example", public=True))  # public so anyone can verify run
+    pipe.add_component("tracer", LangfuseConnector(name=f"Chat example - {expected_trace}", public=True))
     pipe.add_component("prompt_builder", ChatPromptBuilder())
-    pipe.add_component("llm", OpenAIChatGenerator(model="gpt-3.5-turbo"))
-
+    pipe.add_component("llm", llm_class())
     pipe.connect("prompt_builder.prompt", "llm.messages")
 
     messages = [
@@ -39,17 +43,20 @@ def test_tracing_integration():
     response = pipe.run(data={"prompt_builder": {"template_variables": {"location": "Berlin"}, "template": messages}})
     assert "Berlin" in response["llm"]["replies"][0].content
     assert response["tracer"]["trace_url"]
+
     url = "https://cloud.langfuse.com/api/public/traces/"
     trace_url = response["tracer"]["trace_url"]
-    parsed_url = urlparse(trace_url)
-    # trace id is the last part of the path (after the last '/')
-    uuid = os.path.basename(parsed_url.path)
+    uuid = os.path.basename(urlparse(trace_url).path)
+
     try:
-        # GET request with Basic Authentication on the Langfuse API
         response = requests.get(
-            url + uuid, auth=HTTPBasicAuth(os.environ.get("LANGFUSE_PUBLIC_KEY"), os.environ.get("LANGFUSE_SECRET_KEY"))
+            url + uuid, auth=HTTPBasicAuth(os.environ["LANGFUSE_PUBLIC_KEY"], os.environ["LANGFUSE_SECRET_KEY"])
         )
-
         assert response.status_code == 200, f"Failed to retrieve data from Langfuse API: {response.status_code}"
+
+        # check if the trace contains the expected LLM name
+        assert expected_trace in str(response.content)
+        # check if the trace contains the expected generation span
+        assert "GENERATION" in str(response.content)
     except requests.exceptions.RequestException as e:
-        assert False, f"Failed to retrieve data from Langfuse API: {e}"
+        pytest.fail(f"Failed to retrieve data from Langfuse API: {e}")

langfuse_haystack-0.3.0/CHANGELOG.md

@@ -1,19 +0,0 @@
-# Changelog
-
-## [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 -->

langfuse_haystack-0.3.0/example/chat.py

@@ -1,27 +0,0 @@
-import os
-
-os.environ["HAYSTACK_CONTENT_TRACING_ENABLED"] = "true"
-
-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.langfuse import LangfuseConnector
-
-if __name__ == "__main__":
-
-    pipe = Pipeline()
-    pipe.add_component("tracer", LangfuseConnector("Chat example"))
-    pipe.add_component("prompt_builder", ChatPromptBuilder())
-    pipe.add_component("llm", OpenAIChatGenerator(model="gpt-3.5-turbo"))
-
-    pipe.connect("prompt_builder.prompt", "llm.messages")
-
-    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])
-    print(response["tracer"]["trace_url"])