langfuse-haystack 0.0.1__tar.gz → 0.0.2__tar.gz

{langfuse_haystack-0.0.1 → langfuse_haystack-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: langfuse-haystack
-Version: 0.0.1
+Version: 0.0.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
@@ -23,20 +23,21 @@ Description-Content-Type: text/markdown
 
 # langfuse
 
-[![PyPI - Version](https://img.shields.io/pypi/v/langfuse.svg)](https://pypi.org/project/langfuse)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/langfuse.svg)](https://pypi.org/project/langfuse)
+[![PyPI - Version](https://img.shields.io/pypi/v/langfuse-haystack.svg)](https://pypi.org/project/langfuse-haystack)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/langfuse-haystack.svg)](https://pypi.org/project/langfuse-haystack)
 
 -----
 
 **Table of Contents**
 
-- [Installation](#installation)
-- [License](#license)
+- [langfuse](#langfuse)
+  - [Installation](#installation)
+  - [License](#license)
 
 ## Installation
 
 ```console
-pip install langfuse
+pip install langfuse-haystack
 ```
 
 ## License

langfuse_haystack-0.0.2/README.md

@@ -0,0 +1,22 @@
+# langfuse
+
+[![PyPI - Version](https://img.shields.io/pypi/v/langfuse-haystack.svg)](https://pypi.org/project/langfuse-haystack)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/langfuse-haystack.svg)](https://pypi.org/project/langfuse-haystack)
+
+-----
+
+**Table of Contents**
+
+- [langfuse](#langfuse)
+  - [Installation](#installation)
+  - [License](#license)
+
+## Installation
+
+```console
+pip install langfuse-haystack
+```
+
+## License
+
+`langfuse` is distributed under the terms of the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) license.

{langfuse_haystack-0.0.1 → langfuse_haystack-0.0.2}/example/basic_rag.py

@@ -41,7 +41,7 @@ def get_pipeline(document_store: InMemoryDocumentStore):
     )
     basic_rag_pipeline.add_component("retriever", retriever)
     basic_rag_pipeline.add_component("prompt_builder", prompt_builder)
-    basic_rag_pipeline.add_component("llm", OpenAIGenerator(model="gpt-3.5-turbo"))
+    basic_rag_pipeline.add_component("llm", OpenAIGenerator(model="gpt-3.5-turbo", generation_kwargs={"n": 2}))
 
     # Now, connect the components to each other
     # NOTE: the tracer component doesn't need to be connected to anything in order to work

langfuse_haystack-0.0.2/example/requirements.txt

@@ -0,0 +1,3 @@
+langfuse-haystack
+datasets
+sentence-transformers

langfuse_haystack-0.0.2/src/haystack_integrations/components/others/langfuse/__about__.py

@@ -0,0 +1 @@
+__version__ = "0.0.2"

{langfuse_haystack-0.0.1 → langfuse_haystack-0.0.2}/src/haystack_integrations/components/others/langfuse/langfuse.py

@@ -3,7 +3,8 @@ from haystack import tracing, component
 from haystack_integrations.tracing.langfuse import LangfuseTracer
 
 from langfuse import Langfuse
-from langfuse.openai import openai  # noqa
+
+# from langfuse.openai import openai  # noqa
 
 
 @component

{langfuse_haystack-0.0.1 → langfuse_haystack-0.0.2}/src/haystack_integrations/tracing/langfuse/tracer.py

@@ -1,7 +1,6 @@
 import contextlib
 from typing import Any, Dict, Iterator, Optional, Union
 
-from haystack.lazy_imports import LazyImport
 from haystack.tracing import Span, Tracer, tracer
 from haystack.tracing import utils as tracing_utils
 
@@ -11,10 +10,13 @@ import langfuse
 class LangfuseSpan(Span):
     def __init__(self, span: "Union[langfuse.client.StatefulSpanClient, langfuse.client.StatefulTraceClient]") -> None:
         self._span = span
+        # locally cache tags
+        self._data = {}
 
     def set_tag(self, key: str, value: Any) -> None:
         coerced_value = tracing_utils.coerce_tag_value(value)
         self._span.update(metadata={key: coerced_value})
+        self._data[key] = value
 
     def set_content_tag(self, key: str, value: Any) -> None:
         if not tracer.is_content_tracing_enabled:
@@ -25,6 +27,8 @@ class LangfuseSpan(Span):
         elif key.endswith(".output"):
             self._span.update(output=value)
 
+        self._data[key] = value
+
     def raw_span(self) -> Any:
         return self._span
 
@@ -42,9 +46,11 @@ class LangfuseTracer(Tracer):
     def trace(self, operation_name: str, tags: Optional[Dict[str, Any]] = None) -> Iterator[Span]:
         tags = tags or {}
         span_name = tags.get("haystack.component.name", operation_name)
+        is_generation = False
 
         if tags.get("haystack.component.type") in ["OpenAIGenerator"]:
             span = LangfuseSpan(self.current_span().raw_span().generation(name=span_name))
+            is_generation = True
         else:
             span = LangfuseSpan(self.current_span().raw_span().span(name=span_name))
 
@@ -53,6 +59,14 @@ class LangfuseTracer(Tracer):
 
         yield span
 
+        if is_generation:
+            meta = span._data.get("haystack.component.output", {}).get("meta")
+            if meta:
+                # Haystack returns one meta dict for each message, but the 'usage' value
+                # is always the same, let's just pick the first item
+                m = meta[0]
+                span._span.update(usage=m.get("usage"), model=m.get("model"))
+
         span.raw_span().end()
         self._context.pop()
         self._tracer.flush()

langfuse_haystack-0.0.1/README.md

@@ -1,21 +0,0 @@
-# langfuse
-
-[![PyPI - Version](https://img.shields.io/pypi/v/langfuse.svg)](https://pypi.org/project/langfuse)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/langfuse.svg)](https://pypi.org/project/langfuse)
-
------
-
-**Table of Contents**
-
-- [Installation](#installation)
-- [License](#license)
-
-## Installation
-
-```console
-pip install langfuse
-```
-
-## License
-
-`langfuse` is distributed under the terms of the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) license.

langfuse_haystack-0.0.1/example/requirements.txt

@@ -1,2 +0,0 @@
-datasets
-sentence-transformers

langfuse_haystack-0.0.1/src/haystack_integrations/components/others/langfuse/__about__.py

@@ -1 +0,0 @@
-__version__ = "0.0.1"