refactor: Extract duplicate Gemini tool call ID cleanup logic (#2438)

Author: hobostay

src/agents/extensions/models/litellm_model.py

@@ -42,7 +42,7 @@
 from ...logger import logger
 from ...model_settings import ModelSettings
 from ...models.chatcmpl_converter import Converter
-from ...models.chatcmpl_helpers import HEADERS, HEADERS_OVERRIDE
+from ...models.chatcmpl_helpers import HEADERS, HEADERS_OVERRIDE, ChatCmplHelpers
 from ...models.chatcmpl_stream_handler import ChatCmplStreamHandler
 from ...models.fake_id import FAKE_RESPONSES_ID
 from ...models.interface import Model, ModelTracing
@@ -819,12 +819,7 @@ def convert_tool_call_to_openai(
     ) -> ChatCompletionMessageFunctionToolCall:
         # Clean up litellm's addition of __thought__ suffix to tool_call.id for
         # Gemini models. See: https://github.com/BerriAI/litellm/pull/16895
-        # This suffix is redundant since we can get thought_signature from
-        # provider_specific_fields, and this hack causes validation errors when
-        # cross-model passing to other models.
-        tool_call_id = tool_call.id
-        if model and "gemini" in model.lower() and "__thought__" in tool_call_id:
-            tool_call_id = tool_call_id.split("__thought__")[0]
+        tool_call_id = ChatCmplHelpers.clean_gemini_tool_call_id(tool_call.id, model)
 
         # Convert litellm's tool call format to chat completion message format
         base_tool_call = ChatCompletionMessageFunctionToolCall(

src/agents/models/chatcmpl_helpers.py

@@ -98,3 +98,25 @@ def convert_logprobs_for_text_delta(
                 )
             )
         return converted
+
+    @classmethod
+    def clean_gemini_tool_call_id(cls, tool_call_id: str, model: str | None = None) -> str:
+        """Clean up litellm's __thought__ suffix from Gemini tool call IDs.
+
+        LiteLLM adds a "__thought__" suffix to Gemini tool call IDs to track thought
+        signatures. This suffix is redundant since we can get thought_signature from
+        provider_specific_fields, and this hack causes validation errors when cross-model
+        passing to other models.
+
+        See: https://github.com/BerriAI/litellm/pull/16895
+
+        Args:
+            tool_call_id: The tool call ID to clean.
+            model: The model name (used to check if it's a Gemini model).
+
+        Returns:
+            The cleaned tool call ID with "__thought__" suffix removed if present.
+        """
+        if model and "gemini" in model.lower() and "__thought__" in tool_call_id:
+            return tool_call_id.split("__thought__")[0]
+        return tool_call_id

src/agents/models/chatcmpl_stream_handler.py

@@ -394,12 +394,7 @@ async def handle_stream(
                     if tc_delta.id:
                         # Clean up litellm's addition of __thought__ suffix to tool_call.id for
                         # Gemini models. See: https://github.com/BerriAI/litellm/pull/16895
-                        # This suffix is redundant since we can get thought_signature from
-                        # provider_specific_fields, and this hack causes validation errors when
-                        # cross-model passing to other models.
-                        tool_call_id = tc_delta.id
-                        if model and "gemini" in model.lower() and "__thought__" in tool_call_id:
-                            tool_call_id = tool_call_id.split("__thought__")[0]
+                        tool_call_id = ChatCmplHelpers.clean_gemini_tool_call_id(tc_delta.id, model)
 
                         state.function_calls[tc_delta.index].call_id = tool_call_id