openinference-instrumentation-google-adk 0.1.6__tar.gz → 0.1.8__tar.gz

{openinference_instrumentation_google_adk-0.1.6 → openinference_instrumentation_google_adk-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openinference-instrumentation-google-adk
-Version: 0.1.6
+Version: 0.1.8
 Summary: OpenInference Google ADK Instrumentation
 Project-URL: Homepage, https://github.com/Arize-ai/openinference/tree/main/python/instrumentation/openinference-instrumentation-google-adk
 Author-email: OpenInference Authors <oss@arize.com>

{openinference_instrumentation_google_adk-0.1.6 → openinference_instrumentation_google_adk-0.1.8}/src/openinference/instrumentation/google_adk/_wrappers.py

@@ -23,7 +23,7 @@ from google.adk.agents.run_config import RunConfig
 from google.adk.events import Event
 from google.adk.models.llm_request import LlmRequest
 from google.adk.models.llm_response import LlmResponse
-from google.adk.tools import BaseTool
+from google.adk.tools.base_tool import BaseTool
 from google.genai import types
 from opentelemetry import context as context_api
 from opentelemetry import trace as trace_api
@@ -159,6 +159,7 @@ class _BaseAgentRunAsync(_WithTracer):
         name = f"agent_run [{instance.name}]"
         attributes = dict(get_attributes_from_context())
         attributes[SpanAttributes.OPENINFERENCE_SPAN_KIND] = OpenInferenceSpanKindValues.AGENT.value
+        attributes[SpanAttributes.AGENT_NAME] = instance.name
 
         class _AsyncGenerator(wrapt.ObjectProxy):  # type: ignore[misc]
             __wrapped__: AsyncGenerator[Event, None]
@@ -260,7 +261,8 @@ class _TraceCallLlm(_WithTracer):
                         if system_instruction.parts:
                             for k, v in _get_attributes_from_parts(
                                 system_instruction.parts,
-                                prefix=f"{SpanAttributes.LLM_INPUT_MESSAGES}.{input_messages_index}.",
+                                span_attribute=SpanAttributes.LLM_INPUT_MESSAGES,
+                                message_index=input_messages_index,
                                 text_only=True,
                             ):
                                 span.set_attribute(k, v)
@@ -273,7 +275,8 @@ class _TraceCallLlm(_WithTracer):
                 for i, content in enumerate(contents, input_messages_index):
                     for k, v in _get_attributes_from_content(
                         content,
-                        prefix=f"{SpanAttributes.LLM_INPUT_MESSAGES}.{i}.",
+                        span_attribute=SpanAttributes.LLM_INPUT_MESSAGES,
+                        message_index=i,
                     ):
                         span.set_attribute(k, v)
         if llm_response:
@@ -372,7 +375,7 @@ def _get_attributes_from_llm_response(
         yield from _get_attributes_from_usage_metadata(obj.usage_metadata)
     if obj.content:
         yield from _get_attributes_from_content(
-            obj.content, prefix=f"{SpanAttributes.LLM_OUTPUT_MESSAGES}.0."
+            obj.content, span_attribute=SpanAttributes.LLM_OUTPUT_MESSAGES, message_index=0
         )
 
 
@@ -425,12 +428,16 @@ def _get_attributes_from_content(
     obj: types.Content,
     /,
     *,
-    prefix: str = "",
+    span_attribute: str = SpanAttributes.LLM_INPUT_MESSAGES,
+    message_index: int = 0,
 ) -> Iterator[tuple[str, AttributeValue]]:
     role = obj.role or "user"
+    prefix = f"{span_attribute}.{message_index}."
     yield f"{prefix}{MessageAttributes.MESSAGE_ROLE}", role
     if parts := obj.parts:
-        yield from _get_attributes_from_parts(parts, prefix=prefix)
+        yield from _get_attributes_from_parts(
+            parts, span_attribute=span_attribute, message_index=message_index
+        )
 
 
 @stop_on_exception
@@ -438,23 +445,27 @@ def _get_attributes_from_parts(
     obj: Iterable[types.Part],
     /,
     *,
-    prefix: str = "",
+    span_attribute: str = SpanAttributes.LLM_INPUT_MESSAGES,
+    message_index: int = 0,
     text_only: bool = False,
 ) -> Iterator[tuple[str, AttributeValue]]:
     for i, part in enumerate(obj):
         if (text := part.text) is not None:
+            prefix = f"{span_attribute}.{message_index}.{MessageAttributes.MESSAGE_CONTENTS}.{i}."
             yield from _get_attributes_from_text_part(
                 text,
-                prefix=f"{prefix}{MessageAttributes.MESSAGE_CONTENTS}.{i}.",
+                prefix=prefix,
             )
         elif text_only:
             continue
         elif (function_call := part.function_call) is not None:
+            prefix = f"{span_attribute}.{message_index}.{MessageAttributes.MESSAGE_TOOL_CALLS}.{i}."
             yield from _get_attributes_from_function_call(
                 function_call,
-                prefix=f"{prefix}{MessageAttributes.MESSAGE_TOOL_CALLS}.{i}.",
+                prefix=prefix,
             )
         elif (function_response := part.function_response) is not None:
+            prefix = f"{span_attribute}.{message_index}."
             yield f"{prefix}{MessageAttributes.MESSAGE_ROLE}", "tool"
             if function_response.name:
                 yield f"{prefix}{MessageAttributes.MESSAGE_NAME}", function_response.name
@@ -463,6 +474,7 @@ def _get_attributes_from_parts(
                     f"{prefix}{MessageAttributes.MESSAGE_CONTENT}",
                     safe_json_dumps(function_response.response),
                 )
+            message_index += 1
 
 
 @stop_on_exception

openinference_instrumentation_google_adk-0.1.8/src/openinference/instrumentation/google_adk/version.py

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

openinference_instrumentation_google_adk-0.1.6/src/openinference/instrumentation/google_adk/version.py

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