Changes requested by rm-openai

Author: DanieleMorotti

src/agents/exceptions.py

@@ -1,4 +1,6 @@
-from typing import TYPE_CHECKING, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from .guardrail import InputGuardrailResult, OutputGuardrailResult
@@ -13,9 +15,9 @@ class MaxTurnsExceeded(AgentsException):
     """Exception raised when the maximum number of turns is exceeded."""
 
     message: str
-    run_error_details: Optional["RunErrorDetails"]
+    run_error_details: RunErrorDetails | None
 
-    def __init__(self, message: str, run_error_details: Optional["RunErrorDetails"] = None):
+    def __init__(self, message: str, run_error_details: RunErrorDetails | None = None):
         self.message = message
         self.run_error_details = run_error_details
 
@@ -43,10 +45,10 @@ def __init__(self, message: str):
 class InputGuardrailTripwireTriggered(AgentsException):
     """Exception raised when a guardrail tripwire is triggered."""
 
-    guardrail_result: "InputGuardrailResult"
+    guardrail_result: InputGuardrailResult
     """The result data of the guardrail that was triggered."""
 
-    def __init__(self, guardrail_result: "InputGuardrailResult"):
+    def __init__(self, guardrail_result: InputGuardrailResult):
         self.guardrail_result = guardrail_result
         super().__init__(
             f"Guardrail {guardrail_result.guardrail.__class__.__name__} triggered tripwire"
@@ -56,10 +58,10 @@ def __init__(self, guardrail_result: "InputGuardrailResult"):
 class OutputGuardrailTripwireTriggered(AgentsException):
     """Exception raised when a guardrail tripwire is triggered."""
 
-    guardrail_result: "OutputGuardrailResult"
+    guardrail_result: OutputGuardrailResult
     """The result data of the guardrail that was triggered."""
 
-    def __init__(self, guardrail_result: "OutputGuardrailResult"):
+    def __init__(self, guardrail_result: OutputGuardrailResult):
         self.guardrail_result = guardrail_result
         super().__init__(
             f"Guardrail {guardrail_result.guardrail.__class__.__name__} triggered tripwire"

src/agents/result.py

@@ -249,8 +249,28 @@ def _cleanup_tasks(self):
     def __str__(self) -> str:
         return pretty_print_run_result_streaming(self)
 
+
 @dataclass
-class RunErrorDetails(RunResultBase):
+class RunErrorDetails:
+    input: str | list[TResponseInputItem]
+    """The original input items i.e. the items before run() was called. This may be a mutated
+    version of the input, if there are handoff input filters that mutate the input.
+    """
+
+    new_items: list[RunItem]
+    """The new items generated during the agent run. These include things like new messages, tool
+    calls and their outputs, etc.
+    """
+
+    raw_responses: list[ModelResponse]
+    """The raw LLM responses generated by the model during the agent run."""
+
+    input_guardrail_results: list[InputGuardrailResult]
+    """Guardrail results for the input messages."""
+
+    context_wrapper: RunContextWrapper[Any]
+    """The context wrapper for the agent run."""
+
     _last_agent: Agent[Any]
 
     @property

src/agents/run.py

@@ -1,3 +1,4 @@
+
 from __future__ import annotations
 
 import asyncio
@@ -208,19 +209,8 @@ async def run(
                                 data={"max_turns": max_turns},
                             ),
                         )
-                        run_error_details = RunErrorDetails(
-                            input=original_input,
-                            new_items=generated_items,
-                            raw_responses=model_responses,
-                            final_output=None,
-                            input_guardrail_results=input_guardrail_results,
-                            output_guardrail_results=[],
-                            context_wrapper=context_wrapper,
-                            _last_agent=current_agent
-                        )
                         raise MaxTurnsExceeded(
-                            f"Max turns ({max_turns}) exceeded",
-                            run_error_details
+                            f"Max turns ({max_turns}) exceeded"
                         )
 
                     logger.debug(
@@ -296,6 +286,23 @@ async def run(
                         raise AgentsException(
                             f"Unknown next step type: {type(turn_result.next_step)}"
                         )
+            except Exception as e:
+                run_error_details = RunErrorDetails(
+                    input=original_input,
+                    new_items=generated_items,
+                    raw_responses=model_responses,
+                    input_guardrail_results=input_guardrail_results,
+                    context_wrapper=context_wrapper,
+                    _last_agent=current_agent
+                )
+                # Re-raise with the error details
+                if isinstance(e, MaxTurnsExceeded):
+                    raise MaxTurnsExceeded(
+                        f"Max turns ({max_turns}) exceeded",
+                        run_error_details
+                    ) from e
+                else:
+                    raise
             finally:
                 if current_span:
                     current_span.finish(reset_current=True)