Support python 3.9 for thee -- not for me

Author: strawgate

pydantic_ai_slim/pydantic_ai/agent.py

@@ -1652,12 +1652,9 @@ def toolset(
         agent = Agent('test', deps_type=str)
 
         @agent.toolset
-        def simple_toolset(ctx: RunContext[str]) -> AbstractToolset[str]:
-            return FunctionToolset(foobar)
+        async def simple_toolset(ctx: RunContext[str]) -> AbstractToolset[str]:
+            return FunctionToolset()
 
-        @agent.toolset
-        async def async_toolset(ctx: RunContext[str]) -> AbstractToolset[str]:
-            return FunctionToolset(foobar)
         ```
         """
         if func is None:

pydantic_ai_slim/pydantic_ai/toolsets/abstract.py

@@ -2,10 +2,10 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable, Generic, Literal, Protocol, TypeAlias
+from typing import TYPE_CHECKING, Any, Callable, Generic, Literal, Protocol
 
 from pydantic_core import SchemaValidator
-from typing_extensions import Self
+from typing_extensions import Self, TypeAlias
 
 from .._run_context import AgentDepsT, RunContext
 from ..tools import ToolDefinition, ToolsPrepareFunc

tests/test_agent.py

@@ -3702,7 +3702,7 @@ def bar() -> str:
     assert result.output == snapshot('{"baz":"Hello from baz"}')
 
 
-def test_toolset_decorator():
+def test_toolset_factory():
     toolset = FunctionToolset()
 
     @toolset.tool
@@ -3739,6 +3739,24 @@ def respond(messages: list[ModelMessage], info: AgentInfo) -> ModelResponse:
     assert len(available_tools) == 1
     assert toolset_creation_count == 1
 
+def test_toolset_decorator():
+    toolset = FunctionToolset()
+
+    @toolset.tool
+    def foo() -> str:
+        return 'Hello from foo'
+
+
+    agent = Agent('test')
+
+    @agent.toolset
+    def create_function_toolset(ctx: RunContext[None]) -> AbstractToolset[None]:
+        return toolset
+
+    agent_toolset_functions = agent._toolset_functions  # pyright: ignore[reportPrivateUsage]
+
+    assert len(agent_toolset_functions) == 1
+    assert agent_toolset_functions[0] is create_function_toolset
 
 def test_adding_tools_during_run():
     toolset = FunctionToolset()