more

Author: Kludex

pydantic_ai_slim/pydantic_ai/models/google.py

@@ -26,6 +26,8 @@
     ModelResponsePart,
     ModelResponseStreamEvent,
     RetryPromptPart,
+    ServerToolCallPart,
+    ServerToolReturnPart,
     SystemPromptPart,
     TextPart,
     ToolCallPart,
@@ -466,7 +468,17 @@ def _process_response_from_parts(
 ) -> ModelResponse:
     items: list[ModelResponsePart] = []
     for part in parts:
-        if part.text:
+        if part.executable_code is not None:
+            items.append(ServerToolCallPart(args=part.executable_code.model_dump(), tool_name='code_execution'))
+        elif part.code_execution_result is not None:
+            items.append(
+                ServerToolReturnPart(
+                    tool_name='code_execution',
+                    content=part.code_execution_result.output,
+                    tool_call_id="It doesn't have.",
+                )
+            )
+        elif part.text:
             items.append(TextPart(content=part.text))
         elif part.function_call:
             assert part.function_call.name is not None

tests/models/cassettes/test_google/test_google_model_code_execution_tool.yaml

@@ -32,11 +32,11 @@ interactions:
       alt-svc:
       - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
       content-length:
-      - '824'
+      - '1462'
       content-type:
       - application/json; charset=UTF-8
       server-timing:
-      - gfet4t7; dur=634
+      - gfet4t7; dur=7674
       transfer-encoding:
       - chunked
       vary:
@@ -47,24 +47,42 @@ interactions:
       candidates:
       - content:
           parts:
+          - text: |+
+              To determine the current day in Utrecht, I need to know the current date and time. I will use a tool to get this information.
+
+          - executableCode:
+              code: |
+                import datetime
+                import pytz
+
+                utrecht_timezone = pytz.timezone('Europe/Amsterdam')
+                now_utrecht = datetime.datetime.now(utrecht_timezone)
+                print(now_utrecht.strftime("%A, %Y-%m-%d"))
+              language: PYTHON
+          - codeExecutionResult:
+              outcome: OUTCOME_OK
+              output: |
+                Wednesday, 2025-05-28
           - text: |
-              To give you the exact day in Utrecht, I need to know the current date. Can you please provide the date? I can then determine the day.
+              Today is Wednesday, May 28, 2025 in Utrecht.
           role: model
         finishReason: STOP
       modelVersion: gemini-2.0-flash
-      responseId: WN42aLH_CoKZgLUP97W1wQg
+      responseId: 8ww3aLDxJY24qsMP97vYeA
       usageMetadata:
-        candidatesTokenCount: 32
+        candidatesTokenCount: 119
         candidatesTokensDetails:
         - modality: TEXT
-          tokenCount: 32
+          tokenCount: 119
         promptTokenCount: 13
         promptTokensDetails:
         - modality: TEXT
           tokenCount: 13
+        toolUsePromptTokenCount: 114
         toolUsePromptTokensDetails:
         - modality: TEXT
-        totalTokenCount: 45
+          tokenCount: 114
+        totalTokenCount: 246
     status:
       code: 200
       message: OK

tests/models/test_google.py

@@ -27,6 +27,8 @@
     PartDeltaEvent,
     PartStartEvent,
     RetryPromptPart,
+    ServerToolCallPart,
+    ServerToolReturnPart,
     SystemPromptPart,
     TextPart,
     TextPartDelta,
@@ -41,7 +43,7 @@
 
 with try_import() as imports_successful:
     from google.genai import _api_client
-    from google.genai.types import HarmBlockThreshold, HarmCategory
+    from google.genai.types import HarmBlockThreshold, HarmCategory, Language
 
     from pydantic_ai.models.google import GoogleModel, GoogleModelSettings
     from pydantic_ai.providers.google import GoogleProvider
@@ -597,4 +599,60 @@ async def test_google_model_code_execution_tool(allow_model_requests: None, goog
     agent = Agent(m, system_prompt='You are a helpful chatbot.', builtin_tools=[CodeExecutionTool()])
 
     result = await agent.run('What day is today in Utrecht?')
-    assert result.output == snapshot('Today is Wednesday, May 28, 2025, in Utrecht.\n')
+    assert result.all_messages() == snapshot(
+        [
+            ModelRequest(
+                parts=[
+                    SystemPromptPart(content='You are a helpful chatbot.', timestamp=IsDatetime()),
+                    UserPromptPart(content='What day is today in Utrecht?', timestamp=IsDatetime()),
+                ]
+            ),
+            ModelResponse(
+                parts=[
+                    TextPart(
+                        content="""\
+To determine the current day in Utrecht, I need to know the current date and time. I will use a tool to get this information.
+
+"""
+                    ),
+                    ServerToolCallPart(
+                        tool_name='code_execution',
+                        args={
+                            'code': """\
+import datetime
+import pytz
+
+utrecht_timezone = pytz.timezone('Europe/Amsterdam')
+now_utrecht = datetime.datetime.now(utrecht_timezone)
+print(now_utrecht.strftime("%A, %Y-%m-%d"))
+""",
+                            'language': Language.PYTHON,
+                        },
+                        tool_call_id='pyd_ai_8cc0806969e94245b2877a60fab8bf7e',
+                    ),
+                    ServerToolReturnPart(
+                        tool_name='code_execution',
+                        content='Wednesday, 2025-05-28\n',
+                        tool_call_id="It doesn't have.",
+                        timestamp=IsDatetime(),
+                    ),
+                    TextPart(content='Today is Wednesday, May 28, 2025 in Utrecht.\n'),
+                ],
+                usage=Usage(
+                    requests=1,
+                    request_tokens=13,
+                    response_tokens=119,
+                    total_tokens=246,
+                    details={
+                        'tool_use_prompt_tokens': 114,
+                        'text_candidates_tokens': 119,
+                        'text_prompt_tokens': 13,
+                        'text_tool_use_prompt_tokens': 114,
+                    },
+                ),
+                model_name='gemini-2.0-flash',
+                timestamp=IsDatetime(),
+                vendor_details={'finish_reason': 'STOP'},
+            ),
+        ]
+    )

tests/models/test_groq.py

@@ -702,7 +702,7 @@ async def test_groq_model_web_search_tool(allow_model_requests: None, groq_api_k
                     ServerToolCallPart(
                         tool_name='search',
                         args='{"query": "What is the current date?"}',
-                        tool_call_id='0',
+                        tool_call_id=IsStr(),
                         model_name='groq',
                     ),
                     ServerToolReturnPart(
@@ -784,7 +784,7 @@ async def test_groq_model_web_search_tool(allow_model_requests: None, groq_api_k
 Score: 0.2134
 
 """,
-                        tool_call_id='0',
+                        tool_call_id=IsStr(),
                         timestamp=IsDatetime(),
                     ),
                     TextPart(content='The current day is Tuesday.'),