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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openinference-instrumentation-beeai
-Version: 0.1.9
+Version: 0.1.10
 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.9 → openinference_instrumentation_beeai-0.1.10}/src/openinference/instrumentation/beeai/__init__.py

@@ -1,9 +1,12 @@
+import contextlib
 import logging
 from importlib.metadata import PackageNotFoundError, version
-from typing import TYPE_CHECKING, Any, Callable, Collection
+from typing import TYPE_CHECKING, Any, Callable, Collection, Generator
 
 from opentelemetry.trace import StatusCode
 
+from openinference.instrumentation._spans import OpenInferenceSpan
+
 if TYPE_CHECKING:
     from beeai_framework.emitter import EventMeta
 
@@ -29,12 +32,13 @@ except PackageNotFoundError:
 
 
 class BeeAIInstrumentor(BaseInstrumentor):  # type: ignore
-    __slots__ = ("_tracer", "_cleanup", "_processes")
+    __slots__ = ("_tracer", "_cleanup", "_processes", "_processes_deps")
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
         self._cleanup: Callable[[], None] = lambda: None
         self._processes: dict[str, Processor] = {}
+        self._processes_deps: dict[str, list[Processor]] = {}
 
     def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
@@ -66,8 +70,16 @@ class BeeAIInstrumentor(BaseInstrumentor):  # type: ignore
     def _uninstrument(self, **kwargs: Any) -> None:
         self._cleanup()
         self._processes.clear()
+        self._processes_deps.clear()
+
+    def _build_tree(self, processor: Processor) -> None:
+        with self._build_tree_for_span(processor.span):
+            for child in self._processes_deps.pop(processor.run_id):
+                self._build_tree(child)
+        self._processes.pop(processor.run_id)
 
-    def _build_tree(self, node: SpanWrapper) -> None:
+    @contextlib.contextmanager
+    def _build_tree_for_span(self, node: SpanWrapper) -> Generator[OpenInferenceSpan, None, None]:
         with self._tracer.start_as_current_span(
             name=node.name,
             openinference_span_kind=node.kind,
@@ -75,13 +87,16 @@ class BeeAIInstrumentor(BaseInstrumentor):  # type: ignore
             start_time=_datetime_to_span_time(node.started_at) if node.started_at else None,
             end_on_exit=False,  # we do it manually
         ) as current_span:
+            yield current_span
+
             for event in node.events:
                 current_span.add_event(
                     name=event.name, attributes=event.attributes, timestamp=event.timestamp
                 )
 
             for children in node.children:
-                self._build_tree(children)
+                with self._build_tree_for_span(children):
+                    pass
 
             current_span.set_status(node.status)
             if node.error is not None and node.status == StatusCode.ERROR:
@@ -91,7 +106,8 @@ class BeeAIInstrumentor(BaseInstrumentor):  # type: ignore
 
     @exception_handler
     async def _handler(self, data: Any, event: "EventMeta") -> None:
-        assert event.trace is not None, "Event must have a trace"
+        if event.trace is None:
+            return
 
         if event.trace.run_id not in self._processes:
             parent = (
@@ -102,9 +118,10 @@ class BeeAIInstrumentor(BaseInstrumentor):  # type: ignore
             if event.trace.parent_run_id and not parent:
                 raise ValueError(f"Parent run with ID {event.trace.parent_run_id} was not found!")
 
+            self._processes_deps[event.trace.run_id] = []
             node = self._processes[event.trace.run_id] = ProcessorLocator.locate(data, event)
             if parent is not None:
-                parent.span.children.append(node.span)
+                self._processes_deps[parent.run_id].append(node)
         else:
             node = self._processes[event.trace.run_id]
 
@@ -112,8 +129,8 @@ class BeeAIInstrumentor(BaseInstrumentor):  # type: ignore
 
         if isinstance(data, RunContextFinishEvent):
             await node.end(data, event)
-            self._build_tree(node.span)
-            self._processes.pop(event.trace.run_id)
+            if event.trace.parent_run_id is None:
+                self._build_tree(node)
         else:
             if event.context.get("internal"):
                 return

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

@@ -24,6 +24,9 @@ class Processor:
         assert isinstance(meta.creator, RunContext)
         target_cls = type(meta.creator.instance)
 
+        assert meta.trace is not None
+        self.run_id = meta.trace.run_id
+
         self.span = SpanWrapper(name=target_cls.__name__, kind=type(self).kind)
         self.span.started_at = meta.created_at
         self.span.attributes.update(

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

@@ -2,7 +2,7 @@ from typing import Any, ClassVar
 
 from beeai_framework.context import RunContext, RunContextStartEvent
 from beeai_framework.emitter import EventMeta
-from beeai_framework.tools import ToolErrorEvent, ToolRetryEvent, ToolSuccessEvent
+from beeai_framework.tools import ToolErrorEvent, ToolRetryEvent, ToolStartEvent, ToolSuccessEvent
 from beeai_framework.tools.tool import Tool
 from typing_extensions import override
 
@@ -48,6 +48,10 @@ class ToolProcessor(Processor):
         self.span.add_event(f"{meta.name} ({meta.path})", timestamp=meta.created_at)
 
         match event:
+            case ToolStartEvent():
+                pass
+            case None:  # finish event
+                pass
             case ToolSuccessEvent():
                 output_cls = type(event.output)
 

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

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

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

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