Addressing comments

Author: Artui

pydantic_ai_slim/pydantic_ai/models/anthropic.py

@@ -419,21 +419,21 @@ def _add_builtin_tools(
                 tools = [tool for tool in tools if tool['name'] != 'memory']
                 tools.append(BetaMemoryTool20250818Param(name='memory', type='memory_20250818'))
                 beta_features.append('context-management-2025-06-27')
-                if isinstance(tool, MCPServerTool) and tool.url:
-                    tool_configuration = BetaRequestMCPServerToolConfigurationParam(
-                        enabled=True,
-                        allowed_tools=tool.allowed_tools,
-                    )
-                    mcp_servers.append(
-                        BetaRequestMCPServerURLDefinitionParam(
-                            type='url',
-                            name=tool.label,
-                            url=tool.url,
-                            authorization_token=tool.authorization,
-                            tool_configuration=tool_configuration,
-                        )
+            elif isinstance(tool, MCPServerTool) and tool.url:
+                tool_configuration = BetaRequestMCPServerToolConfigurationParam(
+                    enabled=True,
+                    allowed_tools=tool.allowed_tools,
+                )
+                mcp_servers.append(
+                    BetaRequestMCPServerURLDefinitionParam(
+                        type='url',
+                        name=tool.label,
+                        url=tool.url,
+                        authorization_token=tool.authorization,
+                        tool_configuration=tool_configuration,
                     )
-                    beta_features.append('mcp-client-2025-04-04')
+                )
+                beta_features.append('mcp-client-2025-04-04')
             else:  # pragma: no cover
                 raise UserError(
                     f'`{tool.__class__.__name__}` is not supported by `AnthropicModel`. If it should be, please file an issue.'
@@ -545,13 +545,12 @@ async def _map_message(self, messages: list[ModelMessage]) -> tuple[str, list[Be
                                 )
                                 assistant_content_params.append(server_tool_use_block_param)
                             elif response_part.tool_name == MCPServerTool.kind:  # pragma: no branch
-                                args = response_part.args_as_dict()
                                 mcp_tool_use_block_param = BetaMCPToolUseBlockParam(
                                     id=tool_use_id,
                                     type='mcp_tool_use',
-                                    name=response_part.tool_name,
-                                    server_name=cast(str, args.get('server_name')),
-                                    input=args.get('input'),
+                                    name='mcp_server',
+                                    server_name=response_part.tool_name,
+                                    input=response_part.args_as_dict(),
                                 )
                                 assistant_content_params.append(mcp_tool_use_block_param)
                     elif isinstance(response_part, BuiltinToolReturnPart):
@@ -886,7 +885,7 @@ def _map_mcp_server_use_block(item: BetaMCPToolUseBlock, provider_name: str) ->
     return BuiltinToolCallPart(
         provider_name=provider_name,
         tool_name=MCPServerTool.kind,
-        args=cast(dict[str, Any], {'input': item.input, 'server_name': item.server_name}) or None,
+        args=cast(dict[str, Any], item.input) or None,
         tool_call_id=item.id,
     )
 

tests/models/test_anthropic.py

@@ -3098,7 +3098,7 @@ async def test_anthropic_mcp_servers(allow_model_requests: None, anthropic_api_k
                         provider_name='anthropic',
                     ),
                     BuiltinToolReturnPart(
-                        tool_name='code_execution',
+                        tool_name='mcp_server',
                         content=[{'citations': None, 'text': '["Lies of P","Bloodborne","Sekiro"]', 'type': 'text'}],
                         tool_call_id='mcptoolu_01TwwBu8ALMaffJS5riJmE8r',
                         timestamp=IsDatetime(),
@@ -3172,7 +3172,7 @@ async def test_anthropic_mcp_servers_stream(allow_model_requests: None, anthropi
                         provider_name='anthropic',
                     ),
                     BuiltinToolReturnPart(
-                        tool_name='code_execution',
+                        tool_name='mcp_server',
                         content=[{'citations': None, 'text': '["Lies of P","Bloodborne","Sekiro"]', 'type': 'text'}],
                         tool_call_id='mcptoolu_01WaYLgtwyroxT1CQWGFfTTy',
                         timestamp=IsDatetime(),
@@ -3230,7 +3230,13 @@ async def test_anthropic_mcp_servers_stream(allow_model_requests: None, anthropi
             PartDeltaEvent(
                 index=0, delta=ThinkingPartDelta(content_delta=' so I can call it directly.', provider_name='anthropic')
             ),
-            PartDeltaEvent(index=0, delta=ThinkingPartDelta(signature_delta=IsStr(), provider_name='anthropic')),
+            PartDeltaEvent(
+                index=0,
+                delta=ThinkingPartDelta(
+                    signature_delta='Ev4CCkYICBgCKkC2CV8NXGK/AuQ4/m1/1qE91t9kn26YXfJqV4GLu+pQ5arslF66ul0lb2tjDaq6jEoScCgXONCbjVTTGXRgL31OEgz6Hf2+sxQphfOM0NsaDAGUIjrX8JtDLUHYCSIwDiCjhcg4JzBLobWmlquAlva+JlrB3yUlyWBCOe3z0GBxqs9MGtaEsmROBfy9w5bVKuUBPWfEKKcSIj57MWaQKquRHrl+EaaTVI2/dS3fU0opvd7HTbJ647RvWIKatcw1u3Q9WlNuGhts2TzwpqvzliIkheOjbv3URnfdW2vjka5WN6sntwoqdMrmmJTMD33PLXs2PZlnFUJ2BAS0lglihGbrOrIE1gRsTjZVrhXI8ZpJWPMYJ07FdtLwd+v0F3gf32z282QuQdNlaVliNjdcV+IvfJJL8BCF7coL+fKahuu8GCLVCjwmitJEIgC3ykzuVxCGT7U6hCuEM3Oe7UcLlay9n89O2jmW/FbQIuUpNmVFrrmM3Mn1GBgB',
+                    provider_name='anthropic',
+                ),
+            ),
             PartStartEvent(
                 index=1,
                 part=BuiltinToolCallPart(
@@ -3243,7 +3249,7 @@ async def test_anthropic_mcp_servers_stream(allow_model_requests: None, anthropi
             PartStartEvent(
                 index=2,
                 part=BuiltinToolReturnPart(
-                    tool_name='code_execution',
+                    tool_name='mcp_server',
                     content=[{'citations': None, 'text': '["Lies of P","Bloodborne","Sekiro"]', 'type': 'text'}],
                     tool_call_id='mcptoolu_01WaYLgtwyroxT1CQWGFfTTy',
                     timestamp=IsDatetime(),
@@ -3268,16 +3274,16 @@ async def test_anthropic_mcp_servers_stream(allow_model_requests: None, anthropi
                     args='',
                     tool_call_id='mcptoolu_01WaYLgtwyroxT1CQWGFfTTy',
                     provider_name='anthropic',
-                )
+                ),
             ),
             BuiltinToolResultEvent(  # pyright: ignore[reportDeprecated]
                 result=BuiltinToolReturnPart(
-                    tool_name='code_execution',
+                    tool_name='mcp_server',
                     content=[{'citations': None, 'text': '["Lies of P","Bloodborne","Sekiro"]', 'type': 'text'}],
                     tool_call_id='mcptoolu_01WaYLgtwyroxT1CQWGFfTTy',
                     timestamp=IsDatetime(),
                     provider_name='anthropic',
-                )
+                ),
             ),
         ]
     )