openinference-instrumentation-google-adk 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

openinference/instrumentation/google_adk/_wrappers.py

@@ -1,3 +1,4 @@
+import base64
 import inspect
 import json
 import logging
@@ -25,7 +26,6 @@ from google.adk.models.llm_response import LlmResponse
 from google.adk.telemetry import _build_llm_request_for_trace
 from google.adk.tools import BaseTool
 from google.genai import types
-from google.genai.types import MediaModality
 from opentelemetry import context as context_api
 from opentelemetry import trace as trace_api
 from opentelemetry.context import _SUPPRESS_INSTRUMENTATION_KEY
@@ -378,22 +378,44 @@ def _get_attributes_from_llm_response(
 def _get_attributes_from_usage_metadata(
     obj: types.GenerateContentResponseUsageMetadata,
 ) -> Iterator[tuple[str, AttributeValue]]:
-    if obj.candidates_token_count:
-        yield SpanAttributes.LLM_TOKEN_COUNT_COMPLETION, obj.candidates_token_count
+    if total := obj.total_token_count:
+        yield SpanAttributes.LLM_TOKEN_COUNT_TOTAL, total
+    if obj.prompt_tokens_details:
+        prompt_details_audio = 0
+        for modality_token_count in obj.prompt_tokens_details:
+            if (
+                modality_token_count.modality is types.MediaModality.AUDIO
+                and modality_token_count.token_count
+            ):
+                prompt_details_audio += modality_token_count.token_count
+        if prompt_details_audio:
+            yield (
+                SpanAttributes.LLM_TOKEN_COUNT_PROMPT_DETAILS_AUDIO,
+                prompt_details_audio,
+            )
+    if prompt := obj.prompt_token_count:
+        yield SpanAttributes.LLM_TOKEN_COUNT_PROMPT, prompt
     if obj.candidates_tokens_details:
         completion_details_audio = 0
         for modality_token_count in obj.candidates_tokens_details:
             if (
-                modality_token_count.modality is MediaModality.AUDIO
+                modality_token_count.modality is types.MediaModality.AUDIO
                 and modality_token_count.token_count
             ):
                 completion_details_audio += modality_token_count.token_count
         if completion_details_audio:
-            yield SpanAttributes.LLM_TOKEN_COUNT_COMPLETION_DETAILS_AUDIO, completion_details_audio
-    if obj.prompt_token_count:
-        yield SpanAttributes.LLM_TOKEN_COUNT_PROMPT, obj.prompt_token_count
-    if obj.total_token_count:
-        yield SpanAttributes.LLM_TOKEN_COUNT_TOTAL, obj.total_token_count
+            yield (
+                SpanAttributes.LLM_TOKEN_COUNT_COMPLETION_DETAILS_AUDIO,
+                completion_details_audio,
+            )
+    completion = 0
+    if candidates := obj.candidates_token_count:
+        completion += candidates
+    if thoughts := obj.thoughts_token_count:
+        yield SpanAttributes.LLM_TOKEN_COUNT_COMPLETION_DETAILS_REASONING, thoughts
+        completion += thoughts
+    if completion:
+        yield SpanAttributes.LLM_TOKEN_COUNT_COMPLETION, completion
 
 
 @stop_on_exception
@@ -509,14 +531,11 @@ def bind_args_kwargs(func: Any, *args: Any, **kwargs: Any) -> OrderedDict[str, A
     return bound.arguments
 
 
-def _default(obj: Any) -> str:
+def _default(obj: Any) -> Any:
     from pydantic import BaseModel
 
     if isinstance(obj, BaseModel):
-        return json.dumps(
-            obj.model_dump(exclude=None),
-            ensure_ascii=False,
-            default=str,
-        )
-    else:
-        return str(obj)
+        return obj.model_dump(exclude_none=True)
+    if isinstance(obj, bytes):
+        return base64.b64encode(obj).decode()
+    return str(obj)

openinference/instrumentation/google_adk/version.py

@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.1.2"

{openinference_instrumentation_google_adk-0.1.0.dist-info → openinference_instrumentation_google_adk-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openinference-instrumentation-google-adk
-Version: 0.1.0
+Version: 0.1.2
 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.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+openinference/instrumentation/google_adk/__init__.py,sha256=HxZ58OnPWAfiCeyEnZom7TmxNKc1kHhuGWkrwFYba2c,6922
+openinference/instrumentation/google_adk/_wrappers.py,sha256=qQA13xHO5qDD6mcTXl3WCEORRUTX4YYjLUwd0dYE9Gg,20152
+openinference/instrumentation/google_adk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openinference/instrumentation/google_adk/version.py,sha256=YvuYzWnKtqBb-IqG8HAu-nhIYAsgj9Vmc_b9o7vO-js,22
+openinference_instrumentation_google_adk-0.1.2.dist-info/METADATA,sha256=DhOeXbKW2YrRY15khmhJqcLJomAlaY3UtptYhaXCT8c,5194
+openinference_instrumentation_google_adk-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+openinference_instrumentation_google_adk-0.1.2.dist-info/entry_points.txt,sha256=SW0GBmqra9efyXhsKjeP6OX4vS7BFpzGeHZgrg_LUzw,211
+openinference_instrumentation_google_adk-0.1.2.dist-info/licenses/LICENSE,sha256=x_Y7OX-lWxSUhmKoivlrD6WN3jWlIHxdug8BJv2SI34,10870
+openinference_instrumentation_google_adk-0.1.2.dist-info/RECORD,,

openinference_instrumentation_google_adk-0.1.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-openinference/instrumentation/google_adk/__init__.py,sha256=HxZ58OnPWAfiCeyEnZom7TmxNKc1kHhuGWkrwFYba2c,6922
-openinference/instrumentation/google_adk/_wrappers.py,sha256=T48Dvxre-2vHLzWVpPU7QN2LJB2RCUE5yhgx-SwgbIw,19399
-openinference/instrumentation/google_adk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openinference/instrumentation/google_adk/version.py,sha256=kUR5RAFc7HCeiqdlX36dZOHkUI5wI6V_43RpEcD8b-0,22
-openinference_instrumentation_google_adk-0.1.0.dist-info/METADATA,sha256=oXPdjGz6oXLaq8-_vajAPh5FKgQvp8aVw76EQQU3n2E,5194
-openinference_instrumentation_google_adk-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-openinference_instrumentation_google_adk-0.1.0.dist-info/entry_points.txt,sha256=SW0GBmqra9efyXhsKjeP6OX4vS7BFpzGeHZgrg_LUzw,211
-openinference_instrumentation_google_adk-0.1.0.dist-info/licenses/LICENSE,sha256=x_Y7OX-lWxSUhmKoivlrD6WN3jWlIHxdug8BJv2SI34,10870
-openinference_instrumentation_google_adk-0.1.0.dist-info/RECORD,,