ci: fix issues that surfaced in CI

mjschock · mjschock · commit 8f439eeef1f4 · 2025-11-06T10:43:33.000-08:00
diff --git a/examples/agent_patterns/human_in_the_loop.py b/examples/agent_patterns/human_in_the_loop.py
@@ -10,7 +10,7 @@
 import asyncio
 import json
 
-from agents import Agent, Runner, RunState, function_tool
+from agents import Agent, Runner, RunState, ToolApprovalItem, function_tool
 
 
 @function_tool
@@ -101,17 +101,20 @@ async def main():
 
 # Reading state from file (demonstrating deserialization)
 print("Loading state from result.json")
- with open("result.json", "r") as f:
+ with open("result.json") as f:
 stored_state_json = json.load(f)
 
 state = RunState.from_json(agent, stored_state_json)
 
 # Process each interruption
 for interruption in result.interruptions:
- print(f"\nTool call details:")
+ if not isinstance(interruption, ToolApprovalItem):
+ continue
+
+ print("\nTool call details:")
 print(f" Agent:{interruption.agent.name}")
- print(f" Tool:{interruption.raw_item.name}") # type: ignore
- print(f" Arguments:{interruption.raw_item.arguments}") # type: ignore
+ print(f" Tool:{interruption.raw_item.name}")
+ print(f" Arguments:{interruption.raw_item.arguments}")
 
 confirmed = await confirm("\nDo you approve this tool call?")
 
diff --git a/examples/agent_patterns/human_in_the_loop_stream.py b/examples/agent_patterns/human_in_the_loop_stream.py
@@ -10,7 +10,7 @@
 
 import asyncio
 
-from agents import Agent, Runner, function_tool
+from agents import Agent, Runner, ToolApprovalItem, function_tool
 
 
 async def _needs_temperature_approval(_ctx, params, _call_id) -> bool:
@@ -89,10 +89,13 @@ async def main():
 state = result.to_state()
 
 for interruption in result.interruptions:
- print(f"\nTool call details:")
+ if not isinstance(interruption, ToolApprovalItem):
+ continue
+
+ print("\nTool call details:")
 print(f" Agent:{interruption.agent.name}")
- print(f" Tool:{interruption.raw_item.name}") # type: ignore
- print(f" Arguments:{interruption.raw_item.arguments}") # type: ignore
+ print(f" Tool:{interruption.raw_item.name}")
+ print(f" Arguments:{interruption.raw_item.arguments}")
 
 confirmed = await confirm("\nDo you approve this tool call?")
 
diff --git a/src/agents/__init__.py b/src/agents/__init__.py
@@ -246,6 +246,7 @@ def enable_verbose_stdout_logging():
 "RunItem",
 "HandoffCallItem",
 "HandoffOutputItem",
+ "ToolApprovalItem",
 "ToolCallItem",
 "ToolCallOutputItem",
 "ReasoningItem",
@@ -262,6 +263,7 @@ def enable_verbose_stdout_logging():
 "RunResult",
 "RunResultStreaming",
 "RunConfig",
+ "RunState",
 "RawResponsesStreamEvent",
 "RunItemStreamEvent",
 "AgentUpdatedStreamEvent",
diff --git a/src/agents/run.py b/src/agents/run.py
@@ -6,7 +6,7 @@
 import os
 import warnings
 from dataclasses import dataclass, field
-from typing import Any, Callable, Generic, cast, get_args
+from typing import Any, Callable, Generic, Union, cast, get_args
 
 from openai.types.responses import (
 ResponseCompletedEvent,
@@ -537,7 +537,7 @@ async def run(
 context = run_state._context.context
 else:
 # Keep original user input separate from session-prepared input
- raw_input = cast(str | list[TResponseInputItem], input)
+ raw_input = cast(Union[str, list[TResponseInputItem]], input)
 original_user_input = raw_input
 prepared_input = await self._prepare_input_with_session(
 raw_input, session, run_config.session_input_callback
@@ -901,7 +901,7 @@ def run_streamed(
 # Use context wrapper from RunState
 context_wrapper = cast(RunContextWrapper[TContext], run_state._context)
 else:
- input_for_result = cast(str | list[TResponseInputItem], input)
+ input_for_result = cast(Union[str, list[TResponseInputItem]], input)
 context_wrapper = RunContextWrapper(context=context) # type: ignore
 
 streamed_result = RunResultStreaming(
diff --git a/src/agents/run_state.py b/src/agents/run_state.py
@@ -8,16 +8,17 @@
 
 from typing_extensions import TypeVar
 
+from ._run_impl import NextStepInterruption
 from .exceptions import UserError
+from .items import ToolApprovalItem
 from .logger import logger
 from .run_context import RunContextWrapper
 from .usage import Usage
 
 if TYPE_CHECKING:
- from ._run_impl import NextStepInterruption
 from .agent import Agent
 from .guardrail import InputGuardrailResult, OutputGuardrailResult
- from .items import ModelResponse, RunItem, ToolApprovalItem
+ from .items import ModelResponse, RunItem
 
 TContext = TypeVar("TContext", default=Any)
 TAgent = TypeVar("TAgent", bound="Agent[Any]", default="Agent[Any]")
@@ -105,8 +106,6 @@ def get_interruptions(self) -> list[RunItem]:
 Returns:
 List of tool approval items awaiting approval, or empty list if no interruptions.
 """
- from ._run_impl import NextStepInterruption
-
 if self._current_step is None or not isinstance(self._current_step, NextStepInterruption):
 return []
 return self._current_step.interruptions
@@ -235,8 +234,6 @@ def to_json(self) -> dict[str, Any]:
 
 def _serialize_current_step(self) -> dict[str, Any] | None:
 """Serialize the current step if it's an interruption."""
- from ._run_impl import NextStepInterruption
-
 if self._current_step is None or not isinstance(self._current_step, NextStepInterruption):
 return None
 
@@ -245,10 +242,15 @@ def _serialize_current_step(self) -> dict[str, Any] | None:
 "interruptions": [
{
 "type": "tool_approval_item",
- "rawItem": item.raw_item.model_dump(exclude_unset=True),
+ "rawItem": (
+ item.raw_item.model_dump(exclude_unset=True)
+ if hasattr(item.raw_item, "model_dump")
+ else item.raw_item
+ ),
 "agent":{"name": item.agent.name},
 }
 for item in self._current_step.interruptions
+ if isinstance(item, ToolApprovalItem)
 ],
 }
 
@@ -366,10 +368,7 @@ def from_string(initial_agent: Agent[Any], state_string: str) -> RunState[Any, A
 if current_step_data and current_step_data.get("type") == "next_step_interruption":
 from openai.types.responses import ResponseFunctionToolCall
 
- from ._run_impl import NextStepInterruption
- from .items import ToolApprovalItem
-
- interruptions = []
+ interruptions: list[RunItem] = []
 for item_data in current_step_data.get("interruptions", []):
 agent_name = item_data["agent"]["name"]
 agent = agent_map.get(agent_name)
@@ -458,10 +457,7 @@ def from_json(
 if current_step_data and current_step_data.get("type") == "next_step_interruption":
 from openai.types.responses import ResponseFunctionToolCall
 
- from ._run_impl import NextStepInterruption
- from .items import ToolApprovalItem
-
- interruptions = []
+ interruptions: list[RunItem] = []
 for item_data in current_step_data.get("interruptions", []):
 agent_name = item_data["agent"]["name"]
 agent = agent_map.get(agent_name)
diff --git a/tests/extensions/memory/test_advanced_sqlite_session.py b/tests/extensions/memory/test_advanced_sqlite_session.py
@@ -74,6 +74,7 @@ def create_mock_run_result(
 tool_output_guardrail_results=[],
 context_wrapper=context_wrapper,
 _last_agent=agent,
+ interruptions=[],
 )
 
 
diff --git a/tests/test_result_cast.py b/tests/test_result_cast.py
@@ -18,6 +18,7 @@ def create_run_result(final_output: Any) -> RunResult:
 tool_output_guardrail_results=[],
 _last_agent=Agent(name="test"),
 context_wrapper=RunContextWrapper(context=None),
+ interruptions=[],
 )
 
 

-Original file line number
+Diff line change
 importasyncio
 importjson
 -fromagentsimportAgent, Runner, RunState, function_tool
 +fromagentsimportAgent, Runner, RunState, ToolApprovalItem, function_tool
 @function_tool
 # Reading state from file (demonstrating deserialization)
 print("Loading state from result.json")
 -withopen("result.json", "r") asf:
 +withopen("result.json") asf:
 stored_state_json=json.load(f)
 state=RunState.from_json(agent, stored_state_json)
 # Process each interruption
 forinterruptioninresult.interruptions:
 -print(f"\nTool call details:")
 +ifnotisinstance(interruption, ToolApprovalItem):
 +continue
++
 +print("\nTool call details:")
 print(f" Agent: {interruption.agent.name}")
 -print(f" Tool: {interruption.raw_item.name}")# type: ignore
 -print(f" Arguments: {interruption.raw_item.arguments}")# type: ignore
 +print(f" Tool: {interruption.raw_item.name}")
 +print(f" Arguments: {interruption.raw_item.arguments}")
 confirmed=awaitconfirm("\nDo you approve this tool call?")
-Original file line number
+Diff line change
 importos
 importwarnings
 fromdataclassesimportdataclass, field
 -fromtypingimportAny, Callable, Generic, cast, get_args
 +fromtypingimportAny, Callable, Generic, Union, cast, get_args
 fromopenai.types.responsesimport (
 ResponseCompletedEvent,
 context=run_state._context.context
 else:
 # Keep original user input separate from session-prepared input
 -raw_input=cast(str|list[TResponseInputItem], input)
 +raw_input=cast(Union[str, list[TResponseInputItem]], input)
 original_user_input=raw_input
 prepared_input=awaitself._prepare_input_with_session(
 raw_input, session, run_config.session_input_callback
 # Use context wrapper from RunState
 context_wrapper=cast(RunContextWrapper[TContext], run_state._context)
 else:
 -input_for_result=cast(str|list[TResponseInputItem], input)
 +input_for_result=cast(Union[str, list[TResponseInputItem]], input)
 context_wrapper=RunContextWrapper(context=context) # type: ignore
 streamed_result=RunResultStreaming(
-Original file line number
+Diff line change
 fromtyping_extensionsimportTypeVar
 +from ._run_implimportNextStepInterruption
 from .exceptionsimportUserError
 +from .itemsimportToolApprovalItem
 from .loggerimportlogger
 from .run_contextimportRunContextWrapper
 from .usageimportUsage
 ifTYPE_CHECKING:
 -from ._run_implimportNextStepInterruption
 from .agentimportAgent
 from .guardrailimportInputGuardrailResult, OutputGuardrailResult
 -from .itemsimportModelResponse, RunItem, ToolApprovalItem
 +from .itemsimportModelResponse, RunItem
 TContext=TypeVar("TContext", default=Any)
 TAgent=TypeVar("TAgent", bound="Agent[Any]", default="Agent[Any]")
  Returns:
  List of tool approval items awaiting approval, or empty list if no interruptions.
  """
 -from ._run_implimportNextStepInterruption
+-
 ifself._current_stepisNoneornotisinstance(self._current_step, NextStepInterruption):
 return []
 returnself._current_step.interruptions
 def_serialize_current_step(self) ->dict[str, Any] |None:
 """Serialize the current step if it's an interruption."""
 -from ._run_implimportNextStepInterruption
+-
 ifself._current_stepisNoneornotisinstance(self._current_step, NextStepInterruption):
 returnNone
 "interruptions": [
+{
 "type": "tool_approval_item",
 -"rawItem": item.raw_item.model_dump(exclude_unset=True),
 +"rawItem": (
 +item.raw_item.model_dump(exclude_unset=True)
 +ifhasattr(item.raw_item, "model_dump")
 +elseitem.raw_item
 + ),
 "agent":{"name": item.agent.name},
+ }
 foriteminself._current_step.interruptions
 +ifisinstance(item, ToolApprovalItem)
  ],
+ }
 ifcurrent_step_dataandcurrent_step_data.get("type") =="next_step_interruption":
 fromopenai.types.responsesimportResponseFunctionToolCall
 -from ._run_implimportNextStepInterruption
 -from .itemsimportToolApprovalItem
+-
 -interruptions= []
 +interruptions: list[RunItem] = []
 foritem_dataincurrent_step_data.get("interruptions", []):
 agent_name=item_data["agent"]["name"]
 agent=agent_map.get(agent_name)
 ifcurrent_step_dataandcurrent_step_data.get("type") =="next_step_interruption":
 fromopenai.types.responsesimportResponseFunctionToolCall
 -from ._run_implimportNextStepInterruption
 -from .itemsimportToolApprovalItem
+-
 -interruptions= []
 +interruptions: list[RunItem] = []
 foritem_dataincurrent_step_data.get("interruptions", []):
 agent_name=item_data["agent"]["name"]
 agent=agent_map.get(agent_name)
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ def create_mock_run_result(`
`74`	`74`	`tool_output_guardrail_results=[],`
`75`	`75`	`context_wrapper=context_wrapper,`
`76`	`76`	`_last_agent=agent,`
	`77`	`+interruptions=[],`
`77`	`78`	`)`
`78`	`79`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ def create_run_result(final_output: Any) -> RunResult:`
`18`	`18`	`tool_output_guardrail_results=[],`
`19`	`19`	`_last_agent=Agent(name="test"),`
`20`	`20`	`context_wrapper=RunContextWrapper(context=None),`
	`21`	`+interruptions=[],`
`21`	`22`	`)`
`22`	`23`
`23`	`24`