openinference-instrumentation-beeai 0.1.7__tar.gz → 0.1.9__tar.gz

{openinference_instrumentation_beeai-0.1.7 → openinference_instrumentation_beeai-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openinference-instrumentation-beeai
-Version: 0.1.7
+Version: 0.1.9
 Summary: OpenInference BeeAI Instrumentation
 Project-URL: Homepage, https://github.com/Arize-ai/openinference/tree/main/python/instrumentation/openinference-instrumentation-beeai
 Author: IBM Corp.
@@ -15,17 +15,17 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <3.14,>=3.11
-Requires-Dist: beeai-framework<0.2.0,>=0.1.32
-Requires-Dist: openinference-instrumentation>=0.1.36
+Requires-Dist: beeai-framework<0.2.0,>=0.1.36
+Requires-Dist: openinference-instrumentation>=0.1.37
 Requires-Dist: openinference-semantic-conventions>=0.1.21
 Requires-Dist: opentelemetry-api>=1.36.0
 Requires-Dist: opentelemetry-instrumentation>=0.57b0
 Requires-Dist: opentelemetry-semantic-conventions>=0.57b0
 Requires-Dist: wrapt>=1.17.2
 Provides-Extra: instruments
-Requires-Dist: beeai-framework>=0.1.32; extra == 'instruments'
+Requires-Dist: beeai-framework>=0.1.36; extra == 'instruments'
 Provides-Extra: test
-Requires-Dist: beeai-framework>=0.1.32; extra == 'test'
+Requires-Dist: beeai-framework>=0.1.36; extra == 'test'
 Requires-Dist: opentelemetry-exporter-otlp; extra == 'test'
 Requires-Dist: opentelemetry-sdk; extra == 'test'
 Description-Content-Type: text/markdown

{openinference_instrumentation_beeai-0.1.7 → openinference_instrumentation_beeai-0.1.9}/pyproject.toml

@@ -22,8 +22,8 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "beeai-framework (>=0.1.32,<0.2.0)",
-    "openinference-instrumentation>=0.1.36",
+    "beeai-framework (>=0.1.36,<0.2.0)",
+    "openinference-instrumentation>=0.1.37",
     "openinference-semantic-conventions>=0.1.21",
     "opentelemetry-api>=1.36.0",
     "opentelemetry-instrumentation>=0.57b0",
@@ -33,10 +33,10 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "beeai-framework >= 0.1.32",
+  "beeai-framework >= 0.1.36",
 ]
 test = [
-  "beeai-framework >= 0.1.32",
+  "beeai-framework >= 0.1.36",
   "opentelemetry-sdk",
   "opentelemetry-exporter-otlp"
 ]

{openinference_instrumentation_beeai-0.1.7 → openinference_instrumentation_beeai-0.1.9}/src/openinference/instrumentation/beeai/__init__.py

@@ -2,6 +2,8 @@ import logging
 from importlib.metadata import PackageNotFoundError, version
 from typing import TYPE_CHECKING, Any, Callable, Collection
 
+from opentelemetry.trace import StatusCode
+
 if TYPE_CHECKING:
     from beeai_framework.emitter import EventMeta
 
@@ -82,7 +84,7 @@ class BeeAIInstrumentor(BaseInstrumentor):  # type: ignore
                 self._build_tree(children)
 
             current_span.set_status(node.status)
-            if node.error is not None:
+            if node.error is not None and node.status == StatusCode.ERROR:
                 current_span.record_exception(node.error)
 
             current_span.end(_datetime_to_span_time(node.ended_at) if node.ended_at else None)

{openinference_instrumentation_beeai-0.1.7 → openinference_instrumentation_beeai-0.1.9}/src/openinference/instrumentation/beeai/_span.py

@@ -77,5 +77,20 @@ class SpanWrapper:
     def set_status(self, status: StatusCode) -> None:
         self.status = status
 
+    def reset_exception(self) -> None:
+        self.error = None
+        self.set_status(StatusCode.OK)
+
     def record_exception(self, error: Exception) -> None:
+        from beeai_framework.errors import FrameworkError
+
         self.error = error
+        self.set_status(StatusCode.ERROR)
+        self.set_attributes(
+            {
+                SpanAttributes.OUTPUT_VALUE: error.explain()
+                if isinstance(error, FrameworkError)
+                else str(error),
+                SpanAttributes.OUTPUT_MIME_TYPE: OpenInferenceMimeTypeValues.TEXT.value,
+            }
+        )

{openinference_instrumentation_beeai-0.1.7 → openinference_instrumentation_beeai-0.1.9}/src/openinference/instrumentation/beeai/_utils.py

@@ -19,9 +19,11 @@ def _datetime_to_span_time(dt: datetime.datetime) -> int:
 
 def _unpack_object(obj: dict[str, Any] | list[Any] | BaseModel, prefix: str = "") -> dict[str, Any]:
     if not isinstance(obj, dict) and not isinstance(obj, list):
+        obj_ref = obj
         obj = json.loads(stringify(obj))
         if not isinstance(obj, dict) and not isinstance(obj, list):
-            raise ValueError(f"Cannot unpack object of type {type(obj)}")
+            logger.debug(f"Cannot unpack object of type {type(obj_ref)} (prefix={prefix})")
+            return {"value": str(obj)}
 
     if prefix and prefix.startswith("."):
         prefix = prefix[1:]
@@ -32,7 +34,7 @@ def _unpack_object(obj: dict[str, Any] | list[Any] | BaseModel, prefix: str = ""
     for key, value in obj.items() if isinstance(obj, dict) else enumerate(obj):
         if value is None:
             continue
-        if is_primitive(value):
+        if is_primitive(value) or has_custom_str(value):
             output[f"{prefix}{key}"] = str(value)
         else:
             output.update(_unpack_object(value, prefix=f"{prefix}{key}"))
@@ -43,6 +45,13 @@ def is_primitive(value: Any) -> bool:
     return isinstance(value, str | bool | int | float | type(None))
 
 
+def has_custom_str(value: Any) -> bool:
+    if value.__class__.__module__ == "builtins":
+        return False
+
+    return value.__class__.__str__ is not object.__str__
+
+
 def stringify(value: Any, pretty: bool = False) -> str:
     if is_primitive(value):
         return str(value)

{openinference_instrumentation_beeai-0.1.7 → openinference_instrumentation_beeai-0.1.9}/src/openinference/instrumentation/beeai/processors/base.py

@@ -43,6 +43,9 @@ class Processor:
         pass
 
     async def end(self, event: "RunContextFinishEvent", meta: "EventMeta") -> None:
+        if event.error is not None:
+            self.span.record_exception(event.error)
+
         if event.output is not None:
             if SpanAttributes.OUTPUT_VALUE not in self.span.attributes:
                 self.span.attributes.update(
@@ -53,8 +56,4 @@ class Processor:
                 )
             self.span.set_status(StatusCode.OK)
 
-        if event.error is not None:
-            self.span.set_status(StatusCode.ERROR)
-            self.span.record_exception(event.error)
-
         self.span.ended_at = meta.created_at

{openinference_instrumentation_beeai-0.1.7 → openinference_instrumentation_beeai-0.1.9}/src/openinference/instrumentation/beeai/processors/chat.py

@@ -1,4 +1,3 @@
-import json
 from datetime import datetime
 from typing import Any, ClassVar
 
@@ -81,7 +80,7 @@ class ChatModelProcessor(Processor):
                 )
                 self.span.set_attributes(
                     {
-                        SpanAttributes.LLM_TOOLS: json.loads(stringify(event.input.tools or [])),
+                        SpanAttributes.LLM_TOOLS: [t.name for t in (event.input.tools or [])],
                         SpanAttributes.LLM_INVOCATION_PARAMETERS: stringify(
                             meta.creator.parameters.model_dump(
                                 exclude_none=True, exclude_unset=True
@@ -103,18 +102,27 @@ class ChatModelProcessor(Processor):
                     self._add_new_messages(event.value.messages)
 
                 usage = event.value.usage
+                if usage:
+                    self.span.set_attributes(
+                        {
+                            SpanAttributes.LLM_TOKEN_COUNT_TOTAL: usage.total_tokens,
+                            SpanAttributes.LLM_TOKEN_COUNT_PROMPT: usage.prompt_tokens,
+                            SpanAttributes.LLM_TOKEN_COUNT_COMPLETION: usage.completion_tokens,
+                        }
+                    )
+
+                cost = event.value.cost
+                if cost:
+                    self.span.set_attributes(
+                        {
+                            SpanAttributes.LLM_COST_COMPLETION: cost.completion_tokens_cost_usd,
+                            SpanAttributes.LLM_COST_PROMPT: cost.prompt_tokens_usd,
+                            SpanAttributes.LLM_COST_TOTAL: cost.total_cost_usd,
+                        }
+                    )
 
                 self.span.set_attributes(
                     {
-                        **(
-                            {
-                                SpanAttributes.LLM_TOKEN_COUNT_TOTAL: usage.total_tokens,
-                                SpanAttributes.LLM_TOKEN_COUNT_PROMPT: usage.prompt_tokens,
-                                SpanAttributes.LLM_TOKEN_COUNT_COMPLETION: usage.completion_tokens,
-                            }
-                            if usage
-                            else {}
-                        ),
                         SpanAttributes.OPENINFERENCE_SPAN_KIND: type(self).kind,
                         SpanAttributes.OUTPUT_VALUE: event.value.get_text_content(),
                         SpanAttributes.OUTPUT_MIME_TYPE: OpenInferenceMimeTypeValues.TEXT.value,
@@ -149,8 +157,6 @@ def _process_tools(tools: list[AnyTool]) -> list[dict[str, str | Any]]:
         {
             SpanAttributes.TOOL_NAME: t.name,
             SpanAttributes.TOOL_DESCRIPTION: t.description,
-            # TODO: difference between TOOL_PARAMETERS and TOOL_JSON_SCHEMA is not obvious
-            SpanAttributes.TOOL_PARAMETERS: safe_dump_model_schema(t.input_schema),
             ToolAttributes.TOOL_JSON_SCHEMA: safe_dump_model_schema(t.input_schema),
         }
         for t in tools

{openinference_instrumentation_beeai-0.1.7 → openinference_instrumentation_beeai-0.1.9}/src/openinference/instrumentation/beeai/processors/tool.py

@@ -31,10 +31,6 @@ class ToolProcessor(Processor):
             {
                 SpanAttributes.TOOL_NAME: tool.name,
                 SpanAttributes.TOOL_DESCRIPTION: tool.description,
-                # TODO: what's the difference?
-                SpanAttributes.TOOL_PARAMETERS: stringify(
-                    safe_dump_model_schema(tool.input_schema)
-                ),
                 ToolAttributes.TOOL_JSON_SCHEMA: stringify(
                     safe_dump_model_schema(tool.input_schema)
                 ),
@@ -55,6 +51,7 @@ class ToolProcessor(Processor):
             case ToolSuccessEvent():
                 output_cls = type(event.output)
 
+                self.span.reset_exception()
                 self.span.set_attributes(
                     {
                         SpanAttributes.OUTPUT_VALUE: event.output.get_text_content(),
@@ -66,6 +63,7 @@ class ToolProcessor(Processor):
             case ToolErrorEvent():
                 span = self.span.child(meta.name, event=(event, meta))
                 span.record_exception(event.error)
+                self.span.record_exception(event.error)
             case ToolRetryEvent():
                 self.span.child(meta.name, event=(event, meta))
             case _:

openinference_instrumentation_beeai-0.1.9/src/openinference/instrumentation/beeai/version.py

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

openinference_instrumentation_beeai-0.1.7/src/openinference/instrumentation/beeai/version.py

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