openinference-instrumentation-beeai 0.1.14__py3-none-any.whl → 0.1.15__py3-none-any.whl

openinference/instrumentation/beeai/processors/chat.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, ClassVar
+from typing import Any, ClassVar, Dict, Generator, Tuple
 
 from beeai_framework.backend import (
     AnyMessage,
@@ -19,6 +19,7 @@ from beeai_framework.tools import AnyTool
 from beeai_framework.utils.lists import remove_falsy
 from typing_extensions import override
 
+from openinference.instrumentation import safe_json_dumps
 from openinference.instrumentation.beeai._utils import (
     _unpack_object,
     safe_dump_model_schema,
@@ -36,6 +37,24 @@ from openinference.semconv.trace import (
 )
 
 
+def get_tool_parameters(tool: AnyTool) -> Dict[str, Any]:
+    tool_dict = tool.to_json_safe()
+    if "input_schema" in tool_dict:
+        input_schema = tool_dict.pop("input_schema")
+        tool_dict["parameters"] = input_schema or {}
+        tool_dict["parameters"]["type"] = "object"
+    return tool_dict
+
+
+def get_tools(tools: list[AnyTool]) -> Generator[Tuple[str, str], None, None]:
+    for index, tool in enumerate(tools):
+        function = {"type": "function", "function": get_tool_parameters(tool)}
+        yield (
+            f"{SpanAttributes.LLM_TOOLS}.{index}.{ToolAttributes.TOOL_JSON_SCHEMA}",
+            safe_json_dumps(function),
+        )
+
+
 class ChatModelProcessor(Processor):
     kind: ClassVar[OpenInferenceSpanKindValues] = OpenInferenceSpanKindValues.LLM
 
@@ -80,7 +99,7 @@ class ChatModelProcessor(Processor):
                 )
                 self.span.set_attributes(
                     {
-                        SpanAttributes.LLM_TOOLS: [t.name for t in (event.input.tools or [])],
+                        **dict(get_tools(event.input.tools or [])),
                         SpanAttributes.LLM_INVOCATION_PARAMETERS: stringify(
                             meta.creator.parameters.model_dump(
                                 exclude_none=True, exclude_unset=True

openinference/instrumentation/beeai/version.py

@@ -1 +1 @@
-__version__ = "0.1.14"
+__version__ = "0.1.15"

{openinference_instrumentation_beeai-0.1.14.dist-info → openinference_instrumentation_beeai-0.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openinference-instrumentation-beeai
-Version: 0.1.14
+Version: 0.1.15
 Summary: OpenInference BeeAI Instrumentation
 Project-URL: Homepage, https://github.com/Arize-ai/openinference/tree/main/python/instrumentation/openinference-instrumentation-beeai
 Author: IBM Corp.
@@ -27,8 +27,13 @@ Provides-Extra: instruments
 Requires-Dist: beeai-framework>=0.1.51; extra == 'instruments'
 Provides-Extra: test
 Requires-Dist: beeai-framework>=0.1.51; extra == 'test'
+Requires-Dist: beeai-framework[duckduckgo]; extra == 'test'
 Requires-Dist: opentelemetry-exporter-otlp; extra == 'test'
 Requires-Dist: opentelemetry-sdk; extra == 'test'
+Requires-Dist: pytest; extra == 'test'
+Requires-Dist: pytest-asyncio; extra == 'test'
+Requires-Dist: pytest-recording; extra == 'test'
+Requires-Dist: vcrpy<8.0.0,>=5.0.0; extra == 'test'
 Description-Content-Type: text/markdown
 
 # OpenInference Instrumentation for BeeAI

{openinference_instrumentation_beeai-0.1.14.dist-info → openinference_instrumentation_beeai-0.1.15.dist-info}/RECORD

@@ -1,10 +1,10 @@
 openinference/instrumentation/beeai/__init__.py,sha256=OVys0Yf0LCB76P_YvnJp9Ph7J746ZPC8r8qYe3REeYE,5229
 openinference/instrumentation/beeai/_span.py,sha256=iVlYou4vnNKtDxpypMdZuD2AKeaDiG1Cu5PXVzgQ8w4,3259
 openinference/instrumentation/beeai/_utils.py,sha256=tfQsQEcevyLJno8WmLTOe936GVTIS2etnAFVbAPyztc,2521
-openinference/instrumentation/beeai/version.py,sha256=PIBqEOI-nqKFL9oJAWQQwlHuujG9Cd7EmdxDrThNQto,23
+openinference/instrumentation/beeai/version.py,sha256=qb0TalpSt1CbprnFyeLUKqgrqNtmnk9IoQQ7umAoXVY,23
 openinference/instrumentation/beeai/processors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openinference/instrumentation/beeai/processors/base.py,sha256=KyS524sQ5NMXH7HxHGdGiqEofLPHulMG6EURz3ab134,2305
-openinference/instrumentation/beeai/processors/chat.py,sha256=Nl0JWThA7f7Oeet6136fARdpNmakMH0SYym3T9kCGFg,9281
+openinference/instrumentation/beeai/processors/chat.py,sha256=KPJjMDUVVINPZEEwKyPJgwkTIejBnULkOCf2Tq26aj0,9997
 openinference/instrumentation/beeai/processors/embedding.py,sha256=Vzk-XhQ7cwVwkhjfa92iQ8_qs54rtlkVgFNwgQzPs_M,3350
 openinference/instrumentation/beeai/processors/locator.py,sha256=oleg8Jxg8sJBIzK4cZ7BbfkHuLH9Hu4XRYqDaOGnNBU,3627
 openinference/instrumentation/beeai/processors/requirement.py,sha256=S5OPN6F5V39puumxEo3fKQRoAOZ_8OC5ml0dr_Z9v0U,2662
@@ -15,7 +15,7 @@ openinference/instrumentation/beeai/processors/agents/base.py,sha256=3fidrUoU9pV
 openinference/instrumentation/beeai/processors/agents/react.py,sha256=rS3xlvgyZ5G6MyDMeSh4xFLT_66h7GVAYEYlwZCpIdY,3022
 openinference/instrumentation/beeai/processors/agents/requirement_agent.py,sha256=eEiEls6vUET-gEMor1FDyzOpgXCAZVQ3gugSaK3hOHA,2772
 openinference/instrumentation/beeai/processors/agents/tool_calling.py,sha256=yaWP5JmGuvZIha9iUSKgv0MJgI0QSbuiJLLQFnbqUZw,1223
-openinference_instrumentation_beeai-0.1.14.dist-info/METADATA,sha256=YrO30Bkk1Wh_PLCDruC_Al1MSQ0yosi6bb1mMHFvvU0,5543
-openinference_instrumentation_beeai-0.1.14.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-openinference_instrumentation_beeai-0.1.14.dist-info/entry_points.txt,sha256=ee7EUhbWv-XK1dxhPXuFVy9qstzj-lc-265Phe2Ml9s,183
-openinference_instrumentation_beeai-0.1.14.dist-info/RECORD,,
+openinference_instrumentation_beeai-0.1.15.dist-info/METADATA,sha256=kEPDUsLBjOqbjbXwXP0hTTQogarK09hy5hjpteFOdXo,5790
+openinference_instrumentation_beeai-0.1.15.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+openinference_instrumentation_beeai-0.1.15.dist-info/entry_points.txt,sha256=ee7EUhbWv-XK1dxhPXuFVy9qstzj-lc-265Phe2Ml9s,183
+openinference_instrumentation_beeai-0.1.15.dist-info/RECORD,,