mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
Centralize app-server turn error conversion (#62096)
## What changed Add a shared `From<ErrorEvent>` implementation for `TurnError` and reuse it in thread history, rollout projection, and live event handling. Preserve the existing field mappings and keep `additional_details` unset. Parameterize the compaction replay test by error code and recoverability, retaining the existing `server_error` case, and document retry expectations for WebSocket closes. GitOrigin-RevId: 3afcc23e9fdc314477febe6b4a4aeb680efafd5a
This commit is contained in:
@@ -3658,8 +3658,10 @@ async fn pre_sampling_compact_falls_back_after_previous_model_invalid_request_on
|
||||
);
|
||||
}
|
||||
|
||||
/// Only a recoverable compaction error can replay on the same or a different model.
|
||||
#[test_case::test_case("server_error", true; "transient")]
|
||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||
async fn pre_sampling_compact_falls_back_after_previous_model_stream_retries_are_exhausted() {
|
||||
async fn pre_sampling_compact_replays_only_recoverable_errors(code: &str, recoverable: bool) {
|
||||
skip_if_no_network!();
|
||||
|
||||
let server = MockServer::start().await;
|
||||
@@ -3676,19 +3678,17 @@ async fn pre_sampling_compact_falls_back_after_previous_model_stream_retries_are
|
||||
)
|
||||
.await;
|
||||
|
||||
let compaction_failure = sse_failed(
|
||||
"compact-failure",
|
||||
"server_error",
|
||||
"previous-model compaction failed",
|
||||
);
|
||||
let request_log = mount_sse_sequence(
|
||||
&server,
|
||||
vec![
|
||||
sse(vec![
|
||||
ev_assistant_message("m1", "before switch"),
|
||||
ev_completed_with_tokens("r1", /*total_tokens*/ 120_000),
|
||||
]),
|
||||
compaction_failure.clone(),
|
||||
let compaction_failure =
|
||||
sse_failed("compact-failure", code, "previous-model compaction failed");
|
||||
let mut responses = vec![
|
||||
sse(vec![
|
||||
ev_assistant_message("m1", "before switch"),
|
||||
ev_completed_with_tokens("r1", /*total_tokens*/ 120_000),
|
||||
]),
|
||||
compaction_failure.clone(),
|
||||
];
|
||||
if recoverable {
|
||||
responses.extend([
|
||||
compaction_failure.clone(),
|
||||
compaction_failure,
|
||||
remote_v2_compaction_response(),
|
||||
@@ -3696,9 +3696,9 @@ async fn pre_sampling_compact_falls_back_after_previous_model_stream_retries_are
|
||||
ev_assistant_message("m3", "after switch"),
|
||||
ev_completed_with_tokens("r3", /*total_tokens*/ 100),
|
||||
]),
|
||||
],
|
||||
)
|
||||
.await;
|
||||
]);
|
||||
}
|
||||
let request_log = mount_sse_sequence(&server, responses).await;
|
||||
|
||||
let mut model_provider = openai_model_provider(&server);
|
||||
model_provider.stream_max_retries = Some(2);
|
||||
@@ -3732,6 +3732,15 @@ async fn pre_sampling_compact_falls_back_after_previous_model_stream_retries_are
|
||||
))
|
||||
.await
|
||||
.expect("submit selected-model turn");
|
||||
if !recoverable {
|
||||
wait_for_event(&test.codex, |event| matches!(event, EventMsg::Error(_))).await;
|
||||
wait_for_event(&test.codex, |event| {
|
||||
matches!(event, EventMsg::TurnComplete(_))
|
||||
})
|
||||
.await;
|
||||
assert_eq!(request_log.requests().len(), 2);
|
||||
return;
|
||||
}
|
||||
assert_compaction_uses_turn_lifecycle_id(&test.codex).await;
|
||||
|
||||
let actual_models = request_log
|
||||
|
||||
@@ -35,6 +35,7 @@ enum Rejection {
|
||||
GoingAway,
|
||||
}
|
||||
|
||||
/// Transient closes can retry. A classifier rejection ends the turn and the next turn uses WebSocket.
|
||||
#[test_case::test_case(Rejection::AdvertisedLimit, 0, 1; "advertised_limit_skips_websocket_upload")]
|
||||
#[test_case::test_case(Rejection::Oversized, 1, 1; "size_rejection_before_any_text")]
|
||||
#[test_case::test_case(Rejection::OversizedWarmup, 0, 1; "size_rejection_during_prewarm")]
|
||||
|
||||
Reference in New Issue
Block a user