openinference-instrumentation-google-adk 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

openinference/instrumentation/google_adk/__init__.py

@@ -144,7 +144,7 @@ class GoogleADKInstrumentor(BaseInstrumentor):  # type: ignore
 
             setattr(runners, "tracer", _PassthroughTracer(tracer))
 
-        from google.adk.agents.base_agent import (
+        from google.adk.agents.base_agent import (  # type: ignore[attr-defined, unused-ignore]
             tracer,  # pyright: ignore[reportPrivateImportUsage]
         )
 
@@ -164,7 +164,7 @@ class GoogleADKInstrumentor(BaseInstrumentor):  # type: ignore
 
             setattr(runners, "tracer", original)
 
-        from google.adk.agents.base_agent import (
+        from google.adk.agents.base_agent import (  # type: ignore[attr-defined, unused-ignore]
             tracer,  # pyright: ignore[reportPrivateImportUsage]
         )
 

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
@@ -260,7 +260,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 +274,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 +374,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 +427,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 +444,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 +473,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/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.7"

{openinference_instrumentation_google_adk-0.1.5.dist-info → openinference_instrumentation_google_adk-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openinference-instrumentation-google-adk
-Version: 0.1.5
+Version: 0.1.7
 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>
@@ -16,7 +16,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: <3.14,>=3.9
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: <3.15,>=3.9
 Requires-Dist: openinference-instrumentation>=0.1.32
 Requires-Dist: openinference-semantic-conventions>=0.1.17
 Requires-Dist: opentelemetry-api

openinference_instrumentation_google_adk-0.1.7.dist-info/RECORD

@@ -0,0 +1,9 @@
+openinference/instrumentation/google_adk/__init__.py,sha256=sCrItt4ilGC3u5hHbjw8papCk_yhUbdur0pzAEg0SIY,7012
+openinference/instrumentation/google_adk/_wrappers.py,sha256=-HOKXlJJZ_xeIloaH22bVeuKd0OQBp51SWJ2glmlV80,20799
+openinference/instrumentation/google_adk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openinference/instrumentation/google_adk/version.py,sha256=YpKDcdV7CqL8n45u267wKtyloM13FSVbOdrqgNZnSLM,22
+openinference_instrumentation_google_adk-0.1.7.dist-info/METADATA,sha256=Uz6lLP874V1VtNsYa-om4ezi5Jtpf6-jh5DdRc8B8Bc,5245
+openinference_instrumentation_google_adk-0.1.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+openinference_instrumentation_google_adk-0.1.7.dist-info/entry_points.txt,sha256=SW0GBmqra9efyXhsKjeP6OX4vS7BFpzGeHZgrg_LUzw,211
+openinference_instrumentation_google_adk-0.1.7.dist-info/licenses/LICENSE,sha256=x_Y7OX-lWxSUhmKoivlrD6WN3jWlIHxdug8BJv2SI34,10870
+openinference_instrumentation_google_adk-0.1.7.dist-info/RECORD,,

{openinference_instrumentation_google_adk-0.1.5.dist-info → openinference_instrumentation_google_adk-0.1.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

openinference_instrumentation_google_adk-0.1.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-openinference/instrumentation/google_adk/__init__.py,sha256=HxZ58OnPWAfiCeyEnZom7TmxNKc1kHhuGWkrwFYba2c,6922
-openinference/instrumentation/google_adk/_wrappers.py,sha256=h7dP5SvhocUkDfpU3b4JA-FxwOE9WJkkz_qPcdL7MjU,20240
-openinference/instrumentation/google_adk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openinference/instrumentation/google_adk/version.py,sha256=rPSfWgIeq2YWVPyESOAwCBt8vftsTpIkuLAGDEzyRQc,22
-openinference_instrumentation_google_adk-0.1.5.dist-info/METADATA,sha256=i7iBJGzw1lW4VUrR4Vm2AMWrnhZRvqje2hBij2WpMhQ,5194
-openinference_instrumentation_google_adk-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-openinference_instrumentation_google_adk-0.1.5.dist-info/entry_points.txt,sha256=SW0GBmqra9efyXhsKjeP6OX4vS7BFpzGeHZgrg_LUzw,211
-openinference_instrumentation_google_adk-0.1.5.dist-info/licenses/LICENSE,sha256=x_Y7OX-lWxSUhmKoivlrD6WN3jWlIHxdug8BJv2SI34,10870
-openinference_instrumentation_google_adk-0.1.5.dist-info/RECORD,,