mirror of
https://github.com/openai/codex.git
synced 2026-05-25 21:45:22 +00:00
## Why
`TurnHandle.run()` returned the raw app-server `Turn`, whose live
start/completed payloads do not include loaded `items`, so users saw
empty `items` after starting a turn. That made the handle-based path
behave differently from `Thread.run(...)`, and pushed examples toward
persisted-thread reads plus helper extraction.
This PR makes the run APIs standalone: starting a turn and running it
returns collected turn data directly, or fails visibly when required
stream events are missing.
## What Changed
- Replaces the public `RunResult` export with `TurnResult`.
- Adds turn metadata to `TurnResult`: `id`, `status`, `error`,
`started_at`, `completed_at`, and `duration_ms`, alongside
`final_response`, `items`, and `usage`.
- Changes `TurnHandle.run()` and `AsyncTurnHandle.run()` to consume
stream events with the same collector used by `Thread.run(...)`.
- Exports `TurnError` from `openai_codex.types` for the new result
shape.
- Updates tests, examples, docs, and the walkthrough notebook to use
`result.final_response` and `result.items` directly.
- Removes persisted-thread helper paths and placeholder/skipped control
flows from the public examples and notebook.
## Verification
- `python3 -m py_compile ...` over changed SDK, example, and test Python
files.
- `python3 -c "import json;
json.load(open('sdk/python/notebooks/sdk_walkthrough.ipynb'))"`
- `git diff --check`
- `PYTHONPATH=sdk/python/src python3 -c ...` import/signature smoke for
`TurnResult`, `TurnHandle.run`, and `AsyncTurnHandle.run`.
134 lines
4.2 KiB
Python
134 lines
4.2 KiB
Python
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
from typing import AsyncIterator, Iterator
|
|
|
|
from .generated.v2_all import (
|
|
AgentMessageThreadItem,
|
|
ItemCompletedNotification,
|
|
MessagePhase,
|
|
ThreadItem,
|
|
ThreadTokenUsage,
|
|
ThreadTokenUsageUpdatedNotification,
|
|
Turn as AppServerTurn,
|
|
TurnCompletedNotification,
|
|
TurnError,
|
|
TurnStatus,
|
|
)
|
|
from .models import Notification
|
|
|
|
|
|
@dataclass(slots=True)
|
|
class TurnResult:
|
|
id: str
|
|
status: TurnStatus
|
|
error: TurnError | None
|
|
started_at: int | None
|
|
completed_at: int | None
|
|
duration_ms: int | None
|
|
final_response: str | None
|
|
items: list[ThreadItem]
|
|
usage: ThreadTokenUsage | None
|
|
|
|
|
|
def _agent_message_item_from_thread_item(
|
|
item: ThreadItem,
|
|
) -> AgentMessageThreadItem | None:
|
|
thread_item = item.root if hasattr(item, "root") else item
|
|
if isinstance(thread_item, AgentMessageThreadItem):
|
|
return thread_item
|
|
return None
|
|
|
|
|
|
def _final_assistant_response_from_items(items: list[ThreadItem]) -> str | None:
|
|
last_unknown_phase_response: str | None = None
|
|
|
|
for item in reversed(items):
|
|
agent_message = _agent_message_item_from_thread_item(item)
|
|
if agent_message is None:
|
|
continue
|
|
if agent_message.phase == MessagePhase.final_answer:
|
|
return agent_message.text
|
|
if agent_message.phase is None and last_unknown_phase_response is None:
|
|
last_unknown_phase_response = agent_message.text
|
|
|
|
return last_unknown_phase_response
|
|
|
|
|
|
def _raise_for_failed_turn(turn: AppServerTurn) -> None:
|
|
if turn.status != TurnStatus.failed:
|
|
return
|
|
if turn.error is not None and turn.error.message:
|
|
raise RuntimeError(turn.error.message)
|
|
raise RuntimeError(f"turn failed with status {turn.status.value}")
|
|
|
|
|
|
def _collect_turn_result(stream: Iterator[Notification], *, turn_id: str) -> TurnResult:
|
|
completed: TurnCompletedNotification | None = None
|
|
items: list[ThreadItem] = []
|
|
usage: ThreadTokenUsage | None = None
|
|
|
|
for event in stream:
|
|
payload = event.payload
|
|
if isinstance(payload, ItemCompletedNotification) and payload.turn_id == turn_id:
|
|
items.append(payload.item)
|
|
continue
|
|
if isinstance(payload, ThreadTokenUsageUpdatedNotification) and payload.turn_id == turn_id:
|
|
usage = payload.token_usage
|
|
continue
|
|
if isinstance(payload, TurnCompletedNotification) and payload.turn.id == turn_id:
|
|
completed = payload
|
|
|
|
if completed is None:
|
|
raise RuntimeError("turn completed event not received")
|
|
|
|
_raise_for_failed_turn(completed.turn)
|
|
turn = completed.turn
|
|
return TurnResult(
|
|
id=turn.id,
|
|
status=turn.status,
|
|
error=turn.error,
|
|
started_at=turn.started_at,
|
|
completed_at=turn.completed_at,
|
|
duration_ms=turn.duration_ms,
|
|
final_response=_final_assistant_response_from_items(items),
|
|
items=items,
|
|
usage=usage,
|
|
)
|
|
|
|
|
|
async def _collect_async_turn_result(
|
|
stream: AsyncIterator[Notification], *, turn_id: str
|
|
) -> TurnResult:
|
|
completed: TurnCompletedNotification | None = None
|
|
items: list[ThreadItem] = []
|
|
usage: ThreadTokenUsage | None = None
|
|
|
|
async for event in stream:
|
|
payload = event.payload
|
|
if isinstance(payload, ItemCompletedNotification) and payload.turn_id == turn_id:
|
|
items.append(payload.item)
|
|
continue
|
|
if isinstance(payload, ThreadTokenUsageUpdatedNotification) and payload.turn_id == turn_id:
|
|
usage = payload.token_usage
|
|
continue
|
|
if isinstance(payload, TurnCompletedNotification) and payload.turn.id == turn_id:
|
|
completed = payload
|
|
|
|
if completed is None:
|
|
raise RuntimeError("turn completed event not received")
|
|
|
|
_raise_for_failed_turn(completed.turn)
|
|
turn = completed.turn
|
|
return TurnResult(
|
|
id=turn.id,
|
|
status=turn.status,
|
|
error=turn.error,
|
|
started_at=turn.started_at,
|
|
completed_at=turn.completed_at,
|
|
duration_ms=turn.duration_ms,
|
|
final_response=_final_assistant_response_from_items(items),
|
|
items=items,
|
|
usage=usage,
|
|
)
|