GenAI Utils | Update ToolCall Type (#4218)

Author: keith-decker

instrumentation-genai/opentelemetry-instrumentation-anthropic/src/opentelemetry/instrumentation/anthropic/utils.py

@@ -38,7 +38,7 @@
     MessagePart,
     Reasoning,
     Text,
-    ToolCall,
+    ToolCallRequest,
     ToolCallResponse,
 )
 
@@ -114,7 +114,7 @@ def _convert_dict_block_to_part(
 
     if block_type == "tool_use":
         inp = block.get("input")
-        return ToolCall(
+        return ToolCallRequest(
             arguments=inp if isinstance(inp, dict) else None,
             name=str(block.get("name", "")),
             id=str(block.get("id", "")),
@@ -144,7 +144,9 @@ def _convert_content_block_to_part(
         return Text(content=block.text)
 
     if isinstance(block, (ToolUseBlock, ServerToolUseBlock)):
-        return ToolCall(arguments=block.input, name=block.name, id=block.id)
+        return ToolCallRequest(
+            arguments=block.input, name=block.name, id=block.id
+        )
 
     if isinstance(block, (ThinkingBlock, RedactedThinkingBlock)):
         content = (
@@ -229,7 +231,7 @@ def stream_block_state_to_part(state: StreamBlockState) -> MessagePart | None:
                 arguments = json.loads(state.input_json)
             except ValueError:
                 arguments = state.input_json
-        return ToolCall(
+        return ToolCallRequest(
             arguments=arguments,
             name=state.tool_name,
             id=state.tool_id,

instrumentation-genai/opentelemetry-instrumentation-google-genai/pyproject.toml

@@ -39,10 +39,10 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-api ~=1.37",
-  "opentelemetry-instrumentation >=0.58b0, <2",
-  "opentelemetry-semantic-conventions >=0.58b0, <2",
-  "opentelemetry-util-genai >= 0.3b0, <0.4b0",
+  "opentelemetry-api ~=1.39",
+  "opentelemetry-instrumentation >=0.60b0, <2",
+  "opentelemetry-semantic-conventions >=0.60b0, <2",
+  "opentelemetry-util-genai >= 0.4b0.dev, <0.5b0",
 ]
 
 [project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/message.py

@@ -15,20 +15,20 @@
 from __future__ import annotations
 
 import logging
-from dataclasses import dataclass
 from enum import Enum
-from typing import Literal
 
 from google.genai import types as genai_types
 
 from opentelemetry.util.genai.types import (
+    Blob,
     FinishReason,
     InputMessage,
     MessagePart,
     OutputMessage,
     Text,
-    ToolCall,
+    ToolCallRequest,
     ToolCallResponse,
+    Uri,
 )
 
 
@@ -39,23 +39,6 @@ class Role(str, Enum):
     TOOL = "tool"
 
 
-@dataclass
-class BlobPart:
-    data: bytes
-    mime_type: str
-    type: Literal["blob"] = "blob"
-
-
-@dataclass
-class FileDataPart:
-    mime_type: str
-    uri: str
-    type: Literal["file_data"] = "file_data"
-
-    class Config:
-        extra = "allow"
-
-
 _logger = logging.getLogger(__name__)
 
 
@@ -121,16 +104,26 @@ def tool_call_id(name: str | None) -> str:
     if (text := part.text) is not None:
         return Text(content=text)
 
-    if data := part.inline_data:
-        return BlobPart(mime_type=data.mime_type or "", data=data.data or b"")
+    if inline_data := part.inline_data:
+        mime_type = inline_data.mime_type or ""
+        modality = mime_type.split("/")[0] if mime_type else ""
+        return Blob(
+            mime_type=mime_type,
+            modality=modality,
+            content=inline_data.data or b"",
+        )
 
-    if data := part.file_data:
-        return FileDataPart(
-            mime_type=data.mime_type or "", uri=data.file_uri or ""
+    if file_data := part.file_data:
+        mime_type = file_data.mime_type or ""
+        modality = mime_type.split("/")[0] if mime_type else ""
+        return Uri(
+            mime_type=mime_type,
+            modality=modality,
+            uri=file_data.file_uri or "",
         )
 
     if call := part.function_call:
-        return ToolCall(
+        return ToolCallRequest(
             id=call.id or tool_call_id(call.name),
             name=call.name or "",
             arguments=call.args,

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.oldest.txt

@@ -21,11 +21,11 @@ pytest-vcr==1.0.2
 
 google-auth==2.15.0
 google-genai==1.32.0
-opentelemetry-api==1.37.0
-opentelemetry-sdk==1.37.0
-opentelemetry-semantic-conventions==0.58b0
-opentelemetry-instrumentation==0.58b0
-opentelemetry-util-genai[upload]==0.3b0
+opentelemetry-api==1.39.0
+opentelemetry-sdk==1.39.0
+opentelemetry-semantic-conventions==0.60b0
+opentelemetry-instrumentation==0.60b0
+-e util/opentelemetry-util-genai[upload]
 
 fsspec==2025.9.0
 

instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional
+from typing import Any, Optional, cast
 from uuid import UUID
 
 from langchain_core.callbacks import BaseCallbackHandler
@@ -29,6 +29,7 @@
     Error,
     InputMessage,
     LLMInvocation,
+    MessagePart,
     OutputMessage,
     Text,
 )
@@ -133,7 +134,11 @@ def on_chat_model_start(
                                     Text(content=text_value, type="text")
                                 )
 
-                input_messages.append(InputMessage(parts=parts, role=role))
+                input_messages.append(
+                    InputMessage(
+                        parts=cast(list[MessagePart], parts), role=role
+                    )
+                )
 
         llm_invocation = LLMInvocation(
             request_model=request_model,
@@ -206,7 +211,7 @@ def on_llm_end(
                     role = chat_generation.message.type
                     output_message = OutputMessage(
                         role=role,
-                        parts=parts,
+                        parts=cast(list[MessagePart], parts),
                         finish_reason=finish_reason,
                     )
                     output_messages.append(output_message)

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/patch.py

@@ -39,7 +39,7 @@
     LLMInvocation,
     OutputMessage,
     Text,
-    ToolCall,
+    ToolCallRequest,
 )
 
 from .instruments import Instruments
@@ -914,7 +914,7 @@ def _set_output_messages(self):
                             arguments = json.loads(arguments_str)
                         except json.JSONDecodeError:
                             arguments = arguments_str
-                    tool_call_part = ToolCall(
+                    tool_call_part = ToolCallRequest(
                         name=tool_call.function_name,
                         id=tool_call.tool_call_id,
                         arguments=arguments,

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/utils.py

@@ -41,7 +41,7 @@
     LLMInvocation,
     OutputMessage,
     Text,
-    ToolCall,
+    ToolCallRequest,
     ToolCallResponse,
 )
 
@@ -452,7 +452,7 @@ def _prepare_input_messages(messages) -> List[InputMessage]:
     return chat_messages
 
 
-def extract_tool_calls_new(tool_calls) -> list[ToolCall]:
+def extract_tool_calls_new(tool_calls) -> list[ToolCallRequest]:
     parts = []
     for tool_call in tool_calls:
         call_id = get_property_value(tool_call, "id")
@@ -470,7 +470,9 @@ def extract_tool_calls_new(tool_calls) -> list[ToolCall]:
                     arguments = arguments_str
 
         # TODO: support custom
-        parts.append(ToolCall(id=call_id, name=func_name, arguments=arguments))
+        parts.append(
+            ToolCallRequest(id=call_id, name=func_name, arguments=arguments)
+        )
     return parts
 
 

instrumentation-genai/opentelemetry-instrumentation-vertexai/pyproject.toml

@@ -26,10 +26,10 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "opentelemetry-api ~= 1.37",
-  "opentelemetry-instrumentation ~= 0.58b0",
-  "opentelemetry-semantic-conventions ~= 0.58b0",
-  "opentelemetry-util-genai >= 0.2b0, <0.4b0",
+  "opentelemetry-api ~= 1.39",
+  "opentelemetry-instrumentation ~= 0.60b0",
+  "opentelemetry-semantic-conventions ~= 0.60b0",
+  "opentelemetry-util-genai >= 0.4b0.dev, <0.5b0",
 ]
 
 [project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/utils.py

@@ -52,12 +52,14 @@
 )
 from opentelemetry.semconv.attributes import server_attributes
 from opentelemetry.util.genai.types import (
+    Blob,
     ContentCapturingMode,
     FinishReason,
     MessagePart,
     Text,
-    ToolCall,
+    ToolCallRequest,
     ToolCallResponse,
+    Uri,
 )
 from opentelemetry.util.genai.utils import get_content_capturing_mode
 from opentelemetry.util.types import AnyValue, AttributeValue
@@ -308,21 +310,15 @@ def request_to_events(
         yield user_event(role=content.role, content=request_content)
 
 
-@dataclass
-class BlobPart:
-    data: bytes
-    mime_type: str
-    type: Literal["blob"] = "blob"
-
-
-@dataclass
-class FileDataPart:
-    mime_type: str
-    uri: str
-    type: Literal["file_data"] = "file_data"
-
-    class Config:
-        extra = "allow"
+def _modality_from_mime_type(mime_type: str) -> str:
+    """Infer modality from MIME type prefix."""
+    if mime_type.startswith("image/"):
+        return "image"
+    if mime_type.startswith("video/"):
+        return "video"
+    if mime_type.startswith("audio/"):
+        return "audio"
+    return mime_type
 
 
 def convert_content_to_message_parts(
@@ -341,7 +337,7 @@ def convert_content_to_message_parts(
         elif "function_call" in part:
             part = part.function_call
             parts.append(
-                ToolCall(
+                ToolCallRequest(
                     id=f"{part.name}_{idx}",
                     name=part.name,
                     arguments=json_format.MessageToDict(
@@ -353,14 +349,22 @@ def convert_content_to_message_parts(
             parts.append(Text(content=part.text))
         elif "inline_data" in part:
             part = part.inline_data
+            mime_type = part.mime_type or ""
             parts.append(
-                BlobPart(mime_type=part.mime_type or "", data=part.data or b"")
+                Blob(
+                    mime_type=mime_type,
+                    modality=_modality_from_mime_type(mime_type),
+                    content=part.data or b"",
+                )
             )
         elif "file_data" in part:
             part = part.file_data
+            mime_type = part.mime_type or ""
             parts.append(
-                FileDataPart(
-                    mime_type=part.mime_type or "", uri=part.file_uri or ""
+                Uri(
+                    mime_type=mime_type,
+                    modality=_modality_from_mime_type(mime_type),
+                    uri=part.file_uri or "",
                 )
             )
         else:

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/requirements.oldest.txt

@@ -65,11 +65,12 @@ grpcio>=1.75.1 ; python_version >= "3.14"
 shapely==2.0.6 ; python_version < "3.10"
 shapely==2.1.2 ; python_version >= "3.10"
 # when updating, also update in pyproject.toml
-opentelemetry-api==1.37
-opentelemetry-sdk==1.37
-opentelemetry-semantic-conventions==0.58b0
-opentelemetry-instrumentation==0.58b0
-opentelemetry-util-genai[upload]==0.2b0
+opentelemetry-api==1.39
+opentelemetry-sdk==1.39
+opentelemetry-semantic-conventions==0.60b0
+opentelemetry-instrumentation==0.60b0
+# opentelemetry-util-genai[upload]==0.2b0
+-e util/opentelemetry-util-genai[upload]
 fsspec==2025.9.0
 
 -e instrumentation-genai/opentelemetry-instrumentation-vertexai[instruments]