Move RunContext and AgentDepsT into their own module to solve circula…

…r import
pydantic · DouweM · Jul 16, 2025 · Jun 3, 2025 · Jun 3, 2025 · Jun 3, 2025
commit 7de3c0d2ea036f9e6cc0a8ff544c362fbee1ecc2
diff --git a/pydantic_ai_slim/pydantic_ai/_cli.py b/pydantic_ai_slim/pydantic_ai/_cli.py
@@ -14,14 +14,13 @@
 
 from typing_inspection.introspection import get_literal_values
 
-from pydantic_ai.output import OutputDataT
-from pydantic_ai.tools import AgentDepsT
-
 from . import __version__
 from .agent import Agent
 from .exceptions import UserError
 from .messages import ModelMessage
 from .models import KnownModelName, infer_model
+from .output import OutputDataT
+from .run_context import AgentDepsT
 
 try:
     import argcomplete

diff --git a/pydantic_ai_slim/pydantic_ai/_function_schema.py b/pydantic_ai_slim/pydantic_ai/_function_schema.py
@@ -21,7 +21,7 @@
 
 from ._griffe import doc_descriptions
 from ._utils import check_object_json_schema, is_async_callable, is_model_like, run_in_executor
-from .tools import RunContext
+from .run_context import RunContext
 
 if TYPE_CHECKING:
     from .tools import DocstringFormat, ObjectJsonSchema

diff --git a/pydantic_ai_slim/pydantic_ai/_output.py b/pydantic_ai_slim/pydantic_ai/_output.py
@@ -27,7 +27,8 @@
     ToolRetryError,
     _flatten_output_spec,  # pyright: ignore[reportPrivateUsage]
 )
-from .tools import AgentDepsT, GenerateToolJsonSchema, ObjectJsonSchema, RunContext, ToolDefinition
+from .run_context import AgentDepsT, RunContext
+from .tools import GenerateToolJsonSchema, ObjectJsonSchema, ToolDefinition
 
 if TYPE_CHECKING:
     from .profiles import ModelProfile

diff --git a/pydantic_ai_slim/pydantic_ai/_system_prompt.py b/pydantic_ai_slim/pydantic_ai/_system_prompt.py
@@ -6,7 +6,8 @@
 from typing import Any, Callable, Generic, cast
 
 from . import _utils
-from .tools import AgentDepsT, RunContext, SystemPromptFunc
+from .run_context import AgentDepsT, RunContext
+from .tools import SystemPromptFunc
 
 
 @dataclass

diff --git a/pydantic_ai_slim/pydantic_ai/result.py b/pydantic_ai_slim/pydantic_ai/result.py
@@ -25,7 +25,7 @@
     OutputDataT,
     ToolOutput,
 )
-from .tools import AgentDepsT, RunContext
+from .run_context import AgentDepsT, RunContext
 from .usage import Usage, UsageLimits
 
 __all__ = (

diff --git a/pydantic_ai_slim/pydantic_ai/run_context.py b/pydantic_ai_slim/pydantic_ai/run_context.py
@@ -0,0 +1,56 @@
+from __future__ import annotations as _annotations
+
+import dataclasses
+from collections.abc import Sequence
+from dataclasses import field
+from typing import TYPE_CHECKING, Generic
+
+from typing_extensions import TypeVar
+
+from . import _utils, messages as _messages
+
+if TYPE_CHECKING:
+    from .models import Model
+    from .result import Usage
+
+AgentDepsT = TypeVar('AgentDepsT', default=None, contravariant=True)
+"""Type variable for agent dependencies."""
+
+
+@dataclasses.dataclass(repr=False)
+class RunContext(Generic[AgentDepsT]):
+    """Information about the current call."""
+
+    deps: AgentDepsT
+    """Dependencies for the agent."""
+    model: Model
+    """The model used in this run."""
+    usage: Usage
+    """LLM usage associated with the run."""
+    prompt: str | Sequence[_messages.UserContent] | None
+    """The original user prompt passed to the run."""
+    messages: list[_messages.ModelMessage] = field(default_factory=list)
+    """Messages exchanged in the conversation so far."""
+    tool_call_id: str | None = None
+    """The ID of the tool call."""
+    tool_name: str | None = None
+    """Name of the tool being called."""
+    retry: int = 0
+    """Number of retries so far."""
+    run_step: int = 0
+    """The current step in the run."""
+
+    def replace_with(
+        self,
+        retry: int | None = None,
+        tool_name: str | None | _utils.Unset = _utils.UNSET,
+    ) -> RunContext[AgentDepsT]:
+        # Create a new `RunContext` a new `retry` value and `tool_name`.
+        kwargs = {}
+        if retry is not None:
+            kwargs['retry'] = retry
+        if tool_name is not _utils.UNSET:  # pragma: no branch
+            kwargs['tool_name'] = tool_name
+        return dataclasses.replace(self, **kwargs)
+
+    __repr__ = _utils.dataclasses_no_defaults_repr
diff --git a/pydantic_ai_slim/pydantic_ai/tools.py b/pydantic_ai_slim/pydantic_ai/tools.py
@@ -4,7 +4,7 @@
 import json
 from collections.abc import Awaitable, Sequence
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any, Callable, Generic, Literal, Union
+from typing import Any, Callable, Generic, Literal, Union
 
 from opentelemetry.trace import Tracer
 from pydantic import ValidationError
@@ -14,10 +14,7 @@
 
 from . import _function_schema, _utils, messages as _messages
 from .exceptions import ModelRetry, UnexpectedModelBehavior
-
-if TYPE_CHECKING:
-    from .models import Model
-    from .result import Usage
+from .run_context import AgentDepsT, RunContext
 
 __all__ = (
     'AgentDepsT',
@@ -35,48 +32,6 @@
     'ToolDefinition',
 )
 
-AgentDepsT = TypeVar('AgentDepsT', default=None, contravariant=True)
-"""Type variable for agent dependencies."""
-
-
-@dataclasses.dataclass(repr=False)
-class RunContext(Generic[AgentDepsT]):
-    """Information about the current call."""
-
-    deps: AgentDepsT
-    """Dependencies for the agent."""
-    model: Model
-    """The model used in this run."""
-    usage: Usage
-    """LLM usage associated with the run."""
-    prompt: str | Sequence[_messages.UserContent] | None
-    """The original user prompt passed to the run."""
-    messages: list[_messages.ModelMessage] = field(default_factory=list)
-    """Messages exchanged in the conversation so far."""
-    tool_call_id: str | None = None
-    """The ID of the tool call."""
-    tool_name: str | None = None
-    """Name of the tool being called."""
-    retry: int = 0
-    """Number of retries so far."""
-    run_step: int = 0
-    """The current step in the run."""
-
-    def replace_with(
-        self,
-        retry: int | None = None,
-        tool_name: str | None | _utils.Unset = _utils.UNSET,
-    ) -> RunContext[AgentDepsT]:
-        # Create a new `RunContext` a new `retry` value and `tool_name`.
-        kwargs = {}
-        if retry is not None:
-            kwargs['retry'] = retry
-        if tool_name is not _utils.UNSET:  # pragma: no branch
-            kwargs['tool_name'] = tool_name
-        return dataclasses.replace(self, **kwargs)
-
-    __repr__ = _utils.dataclasses_no_defaults_repr
-
 
 ToolParams = ParamSpec('ToolParams', default=...)
 """Retrieval function param spec."""