chore(ag-ui): support additional toolsets

stevenh · stevenh · commit 62d975ae8da6 · 2025-07-10T16:34:19.000+01:00
Update to support the new `toolsets` behaviour which is now additional
instead of replacing the existing toolsets.
diff --git a/pydantic_ai_slim/pydantic_ai/ag_ui.py b/pydantic_ai_slim/pydantic_ai/ag_ui.py
@@ -358,13 +358,7 @@ async def run(
                     for tool in run_input.tools
                 ]
             )
-            # Maintain the current user toolsets if they exist, otherwise use the provided toolset.
-            user_toolsets: list[AbstractToolset[AgentDepsT]] = (
-                list(self.agent._user_toolsets) if toolsets is None else list(toolsets)  # type: ignore[reportPrivateUsage]
-            )
-            # Add the AG-UI toolset to the user toolsets.
-            user_toolsets.append(toolset)
-            toolsets = user_toolsets
+            toolsets = list(toolsets or []) + [toolset]
 
         try:
             yield encoder.encode(

Original file line number	Diff line number	Diff line change
`@@ -358,13 +358,7 @@ async def run(`
`358`	`358`	`for tool in run_input.tools`
`359`	`359`	`]`
`360`	`360`	`)`
`361`		`- # Maintain the current user toolsets if they exist, otherwise use the provided toolset.`
`362`		`- user_toolsets: list[AbstractToolset[AgentDepsT]] = (`
`363`		`- list(self.agent._user_toolsets) if toolsets is None else list(toolsets) # type: ignore[reportPrivateUsage]`
`364`		`- )`
`365`		`- # Add the AG-UI toolset to the user toolsets.`
`366`		`- user_toolsets.append(toolset)`
`367`		`- toolsets = user_toolsets`
	`361`	`+ toolsets = list(toolsets or []) + [toolset]`
`368`	`362`
`369`	`363`	`try:`
`370`	`364`	`yield encoder.encode(`