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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openinference-instrumentation-beeai
-Version: 0.1.8
+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.

{openinference_instrumentation_beeai-0.1.8 → 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.8 → 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.8 → openinference_instrumentation_beeai-0.1.9}/src/openinference/instrumentation/beeai/_utils.py

@@ -22,7 +22,7 @@ def _unpack_object(obj: dict[str, Any] | list[Any] | BaseModel, prefix: str = ""
         obj_ref = obj
         obj = json.loads(stringify(obj))
         if not isinstance(obj, dict) and not isinstance(obj, list):
-            logger.warning(f"Cannot unpack object of type {type(obj_ref)} (prefix={prefix})")
+            logger.debug(f"Cannot unpack object of type {type(obj_ref)} (prefix={prefix})")
             return {"value": str(obj)}
 
     if prefix and prefix.startswith("."):
@@ -34,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}"))
@@ -45,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.8 → 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.8 → openinference_instrumentation_beeai-0.1.9}/src/openinference/instrumentation/beeai/processors/tool.py

@@ -51,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(),
@@ -62,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.8/src/openinference/instrumentation/beeai/version.py

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