revert changes to validator signature

Author: petersli

pydantic_ai_slim/pydantic_ai/_output.py

@@ -54,19 +54,16 @@
 """
 
 OutputValidatorFunc = (
-    Callable[[RunContext[AgentDepsT], OutputDataT_inv, bool], OutputDataT_inv]
-    | Callable[[RunContext[AgentDepsT], OutputDataT_inv, bool], Awaitable[OutputDataT_inv]]
-    | Callable[[RunContext[AgentDepsT], OutputDataT_inv], OutputDataT_inv]
+    Callable[[RunContext[AgentDepsT], OutputDataT_inv], OutputDataT_inv]
     | Callable[[RunContext[AgentDepsT], OutputDataT_inv], Awaitable[OutputDataT_inv]]
     | Callable[[OutputDataT_inv], OutputDataT_inv]
     | Callable[[OutputDataT_inv], Awaitable[OutputDataT_inv]]
 )
 """
-A function that always takes and returns the same type of data (which is the result type of an agent run). In addition:
+A function that always takes and returns the same type of data (which is the result type of an agent run), and:
 
-* it can optionally take [`RunContext`][pydantic_ai.tools.RunContext] as a first argument
-   * if it takes [`RunContext`][pydantic_ai.tools.RunContext] as a first argument, it can also optionally take `partial: bool` as a last argument
-* it can be async
+* may or may not take [`RunContext`][pydantic_ai.tools.RunContext] as a first argument
+* may or may not be async
 
 Usage `OutputValidatorFunc[AgentDepsT, T]`.
 """
@@ -165,29 +162,24 @@ async def execute_traced_output_function(
 class OutputValidator(Generic[AgentDepsT, OutputDataT_inv]):
     function: OutputValidatorFunc[AgentDepsT, OutputDataT_inv]
     _takes_ctx: bool = field(init=False)
-    _takes_partial: bool = field(init=False)
     _is_async: bool = field(init=False)
 
     def __post_init__(self):
-        sig = inspect.signature(self.function)
-        self._takes_ctx = len(sig.parameters) > 1
-        self._takes_partial = len(sig.parameters) > 2
+        self._takes_ctx = len(inspect.signature(self.function).parameters) > 1
         self._is_async = _utils.is_async_callable(self.function)
 
     async def validate(
         self,
         result: T,
         run_context: RunContext[AgentDepsT],
         wrap_validation_errors: bool = True,
-        partial: bool = False,
     ) -> T:
         """Validate a result but calling the function.
 
         Args:
             result: The result data after Pydantic validation the message content.
             run_context: The current run context.
             wrap_validation_errors: If true, wrap the validation errors in a retry message.
-            partial: Whether the output to validate is partial.
 
         Returns:
             Result of either the validated result data (ok) or a retry message (Err).
@@ -197,9 +189,6 @@ async def validate(
         else:
             args = (result,)
 
-        if self._takes_partial:
-            args = (*args, partial)
-
         try:
             if self._is_async:
                 function = cast(Callable[[Any], Awaitable[T]], self.function)
@@ -1079,7 +1068,7 @@ async def call_tool(
     ) -> Any:
         output = await self.processors[name].call(tool_args, ctx, wrap_validation_errors=False)
         for validator in self.output_validators:
-            output = await validator.validate(output, ctx, wrap_validation_errors=False, partial=ctx.tool_args_partial)
+            output = await validator.validate(output, ctx, wrap_validation_errors=False)
         return output
 
 

pydantic_ai_slim/pydantic_ai/agent/__init__.py

@@ -951,16 +951,6 @@ def decorator(
             self._system_prompt_functions.append(_system_prompt.SystemPromptRunner[AgentDepsT](func, dynamic=dynamic))
             return func
 
-    @overload
-    def output_validator(
-        self, func: Callable[[RunContext[AgentDepsT], OutputDataT, bool], OutputDataT], /
-    ) -> Callable[[RunContext[AgentDepsT], OutputDataT, bool], OutputDataT]: ...
-
-    @overload
-    def output_validator(
-        self, func: Callable[[RunContext[AgentDepsT], OutputDataT, bool], Awaitable[OutputDataT]], /
-    ) -> Callable[[RunContext[AgentDepsT], OutputDataT, bool], Awaitable[OutputDataT]]: ...
-
     @overload
     def output_validator(
         self, func: Callable[[RunContext[AgentDepsT], OutputDataT], OutputDataT], /