Some more tweaks

Author: DouweM

pydantic_ai_slim/pydantic_ai/mcp.py

@@ -163,8 +163,7 @@ async def call_tool(
             return content[0] if len(content) == 1 else content
 
     async def prepare_for_run(self, ctx: RunContext[Any]) -> RunToolset[Any]:
-        frozen_self = RunToolset(self, ctx, await self.list_tool_defs())
-        frozen_toolset = frozen_self
+        frozen_toolset = RunToolset(self, ctx, await self.list_tool_defs())
         if self.process_tool_call:
             frozen_toolset = await ProcessedToolset(frozen_toolset, self.process_tool_call).prepare_for_run(ctx)
         if self.tool_prefix:

pydantic_ai_slim/pydantic_ai/toolsets/individually_prepared.py

@@ -33,7 +33,7 @@ async def prepare_for_run(self, ctx: RunContext[AgentDepsT]) -> RunToolset[Agent
             new_name = tool_def.name
             if new_name in tool_defs:
                 if new_name != original_name:
-                    raise UserError(f"Renaming tool '{original_name}' to '{new_name}' conflicts with existing tool.")
+                    raise UserError(f'Renaming tool {original_name!r} to {new_name!r} conflicts with existing tool.')
                 else:
                     raise UserError(f'Tool name conflicts with previously renamed tool: {new_name!r}.')
             name_map[new_name] = original_name