mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
Preserve invalid_prompt as a distinct error classification (#47353)
## Why `invalid_prompt` responses were classified as generic invalid requests, losing the server's specific error classification. ## What changed Add `InvalidPrompt` variants to the API and core error types and serialize the core protocol classification as `invalid_prompt`. Recognize the code in HTTP 400 responses, wrapped WebSocket errors, and SSE `response.failed` events while preserving server messages and keeping the error non-retryable. Map it to `other` in the app-server v2 protocol. ## Testing Extend coverage for typed error mapping, missing and blank messages, protocol conversion, and guardian retry handling. Exercise HTTP and SSE failures in core integration tests, asserting the error message, serialized classification, and a single request without retry. GitOrigin-RevId: 5d9a299a013b06158a4dc27a4054f3dbc5fd0f4d
This commit is contained in:
@@ -53,6 +53,9 @@ pub fn map_api_error(err: ApiError) -> CodexErr {
|
||||
})
|
||||
}
|
||||
ApiError::InvalidRequest { message } => CodexErr::InvalidRequest(message),
|
||||
ApiError::InvalidPrompt { message } => {
|
||||
CodexErr::new(CodexErrorDetails::InvalidPrompt { message })
|
||||
}
|
||||
ApiError::CyberPolicy { message } => {
|
||||
CodexErr::new(CodexErrorDetails::CyberPolicy { message })
|
||||
}
|
||||
@@ -118,11 +121,16 @@ pub fn map_api_error(err: ApiError) -> CodexErr {
|
||||
if status == http::StatusCode::BAD_REQUEST {
|
||||
if let Ok(parsed) = serde_json::from_str::<Value>(&body_text)
|
||||
&& let Some(error) = parsed.get("error")
|
||||
&& let Some(code @ (CYBER_POLICY_ERROR_CODE | BIO_POLICY_ERROR_CODE)) =
|
||||
error.get("code").and_then(Value::as_str)
|
||||
&& let Some(
|
||||
code @ (CYBER_POLICY_ERROR_CODE
|
||||
| BIO_POLICY_ERROR_CODE
|
||||
| INVALID_PROMPT_ERROR_CODE),
|
||||
) = error.get("code").and_then(Value::as_str)
|
||||
{
|
||||
let fallback_message = if code == BIO_POLICY_ERROR_CODE {
|
||||
BIO_POLICY_FALLBACK_MESSAGE
|
||||
} else if code == INVALID_PROMPT_ERROR_CODE {
|
||||
INVALID_PROMPT_FALLBACK_MESSAGE
|
||||
} else {
|
||||
CYBER_POLICY_FALLBACK_MESSAGE
|
||||
};
|
||||
@@ -134,6 +142,8 @@ pub fn map_api_error(err: ApiError) -> CodexErr {
|
||||
.unwrap_or_else(|| fallback_message.to_string());
|
||||
if code == BIO_POLICY_ERROR_CODE {
|
||||
CodexErr::new(CodexErrorDetails::BioPolicy { message })
|
||||
} else if code == INVALID_PROMPT_ERROR_CODE {
|
||||
CodexErr::new(CodexErrorDetails::InvalidPrompt { message })
|
||||
} else {
|
||||
CodexErr::new(CodexErrorDetails::CyberPolicy { message })
|
||||
}
|
||||
@@ -234,6 +244,8 @@ const OAI_REQUEST_ID_HEADER: &str = "x-oai-request-id";
|
||||
const CF_RAY_HEADER: &str = "cf-ray";
|
||||
const X_OPENAI_AUTHORIZATION_ERROR_HEADER: &str = "x-openai-authorization-error";
|
||||
const X_ERROR_JSON_HEADER: &str = "x-error-json";
|
||||
const INVALID_PROMPT_ERROR_CODE: &str = "invalid_prompt";
|
||||
const INVALID_PROMPT_FALLBACK_MESSAGE: &str = "Invalid request.";
|
||||
const CYBER_POLICY_ERROR_CODE: &str = "cyber_policy";
|
||||
const CYBER_POLICY_FALLBACK_MESSAGE: &str =
|
||||
"This request has been flagged for possible cybersecurity risk.";
|
||||
|
||||
@@ -185,48 +185,72 @@ fn map_api_error_uses_cyber_policy_fallback_for_missing_message() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn map_api_error_preserves_bio_policy() {
|
||||
let err = map_api_error(ApiError::BioPolicy {
|
||||
message: "This request was blocked by bio policy.".to_string(),
|
||||
});
|
||||
assert_eq!(err.to_codex_protocol_error(), CodexErrorInfo::BioPolicy);
|
||||
assert_eq!(err.to_string(), "This request was blocked by bio policy.");
|
||||
assert_eq!(err.retry_delay(/*retry_count*/ 1), None);
|
||||
fn map_api_error_preserves_typed_errors() {
|
||||
let message = "This request was rejected.";
|
||||
for (error, expected_info) in [
|
||||
(
|
||||
ApiError::BioPolicy {
|
||||
message: message.to_string(),
|
||||
},
|
||||
CodexErrorInfo::BioPolicy,
|
||||
),
|
||||
(
|
||||
ApiError::InvalidPrompt {
|
||||
message: message.to_string(),
|
||||
},
|
||||
CodexErrorInfo::InvalidPrompt,
|
||||
),
|
||||
] {
|
||||
let err = map_api_error(error);
|
||||
assert_eq!(err.to_codex_protocol_error(), expected_info);
|
||||
assert_eq!(err.to_string(), message);
|
||||
assert_eq!(err.retry_delay(/*retry_count*/ 1), None);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn map_api_error_maps_http_and_wrapped_websocket_bio_policy() {
|
||||
for wrapped in [false, true] {
|
||||
for message in [
|
||||
Some("This request was blocked by bio policy."),
|
||||
None,
|
||||
Some(""),
|
||||
Some(" "),
|
||||
] {
|
||||
let mut body = serde_json::json!({"error": {"code": "bio_policy"}});
|
||||
if let Some(message) = message {
|
||||
body["error"]["message"] = serde_json::json!(message);
|
||||
}
|
||||
if wrapped {
|
||||
body["type"] = serde_json::json!("error");
|
||||
body["status"] = serde_json::json!(400);
|
||||
}
|
||||
let err = map_api_error(ApiError::Transport(TransportError::Http {
|
||||
status: http::StatusCode::BAD_REQUEST,
|
||||
url: None,
|
||||
headers: None,
|
||||
body: Some(body.to_string()),
|
||||
}));
|
||||
fn map_api_error_maps_http_and_wrapped_websocket_typed_errors() {
|
||||
for (code, expected_info, fallback) in [
|
||||
(
|
||||
"bio_policy",
|
||||
CodexErrorInfo::BioPolicy,
|
||||
"This content was flagged for possible biological risk.",
|
||||
),
|
||||
(
|
||||
"invalid_prompt",
|
||||
CodexErrorInfo::InvalidPrompt,
|
||||
"Invalid request.",
|
||||
),
|
||||
] {
|
||||
for wrapped in [false, true] {
|
||||
for (message, expected) in [
|
||||
(
|
||||
Some("This request was rejected."),
|
||||
"This request was rejected.",
|
||||
),
|
||||
(None, fallback),
|
||||
(Some(""), fallback),
|
||||
(Some(" "), fallback),
|
||||
] {
|
||||
let mut body = serde_json::json!({"error": {"code": code}});
|
||||
if let Some(message) = message {
|
||||
body["error"]["message"] = serde_json::json!(message);
|
||||
}
|
||||
if wrapped {
|
||||
body["type"] = serde_json::json!("error");
|
||||
body["status"] = serde_json::json!(400);
|
||||
}
|
||||
let err = map_api_error(ApiError::Transport(TransportError::Http {
|
||||
status: http::StatusCode::BAD_REQUEST,
|
||||
url: None,
|
||||
headers: None,
|
||||
body: Some(body.to_string()),
|
||||
}));
|
||||
|
||||
let expected = message
|
||||
.filter(|message| !message.trim().is_empty())
|
||||
.unwrap_or("This content was flagged for possible biological risk.");
|
||||
let CodexErrorDetails::BioPolicy { message } = err.details() else {
|
||||
panic!("expected CodexErrorDetails::BioPolicy, got {err:?}");
|
||||
};
|
||||
assert_eq!(message, expected);
|
||||
assert_eq!(err.to_codex_protocol_error(), CodexErrorInfo::BioPolicy);
|
||||
assert_eq!(err.retry_delay(/*retry_count*/ 1), None);
|
||||
assert_eq!(err.to_string(), expected);
|
||||
assert_eq!(err.to_codex_protocol_error(), expected_info);
|
||||
assert_eq!(err.retry_delay(/*retry_count*/ 1), None);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -359,25 +383,27 @@ fn map_api_error_preserves_misalignment_details_from_wrapped_websocket_error() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn map_api_error_keeps_unknown_400_errors_generic() {
|
||||
let body = serde_json::json!({
|
||||
"error": {
|
||||
"message": "Some other bad request.",
|
||||
"code": "some_other_policy"
|
||||
}
|
||||
})
|
||||
.to_string();
|
||||
let err = map_api_error(ApiError::Transport(TransportError::Http {
|
||||
status: http::StatusCode::BAD_REQUEST,
|
||||
url: Some("http://example.com/v1/responses".to_string()),
|
||||
headers: None,
|
||||
body: Some(body.clone()),
|
||||
}));
|
||||
fn map_api_error_keeps_other_400_errors_generic() {
|
||||
for code in ["invalid_request", "some_other_policy"] {
|
||||
let body = serde_json::json!({
|
||||
"error": {
|
||||
"message": "Some other bad request.",
|
||||
"code": code
|
||||
}
|
||||
})
|
||||
.to_string();
|
||||
let err = map_api_error(ApiError::Transport(TransportError::Http {
|
||||
status: http::StatusCode::BAD_REQUEST,
|
||||
url: Some("http://example.com/v1/responses".to_string()),
|
||||
headers: None,
|
||||
body: Some(body.clone()),
|
||||
}));
|
||||
|
||||
let CodexErrorDetails::InvalidRequest(message) = err.details() else {
|
||||
panic!("expected CodexErrorDetails::InvalidRequest, got {err:?}");
|
||||
};
|
||||
assert_eq!(message, &body);
|
||||
let CodexErrorDetails::InvalidRequest(message) = err.details() else {
|
||||
panic!("expected CodexErrorDetails::InvalidRequest, got {err:?}");
|
||||
};
|
||||
assert_eq!(message, &body);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -33,6 +33,8 @@ pub enum ApiError {
|
||||
RateLimit(String),
|
||||
#[error("invalid request: {message}")]
|
||||
InvalidRequest { message: String },
|
||||
#[error("invalid prompt: {message}")]
|
||||
InvalidPrompt { message: String },
|
||||
#[error("cyber policy: {message}")]
|
||||
CyberPolicy { message: String },
|
||||
#[error("bio policy: {message}")]
|
||||
|
||||
@@ -455,7 +455,7 @@ pub fn process_responses_event(
|
||||
let message = error
|
||||
.message
|
||||
.unwrap_or_else(|| "Invalid request.".to_string());
|
||||
response_error = ApiError::InvalidRequest { message };
|
||||
response_error = ApiError::InvalidPrompt { message };
|
||||
} else if is_server_overloaded_error(&error) {
|
||||
response_error = ApiError::ServerOverloaded;
|
||||
} else {
|
||||
@@ -1404,7 +1404,7 @@ mod tests {
|
||||
|
||||
assert_eq!(events.len(), 1);
|
||||
match (code, &events[0]) {
|
||||
("invalid_prompt", Err(ApiError::InvalidRequest { message }))
|
||||
("invalid_prompt", Err(ApiError::InvalidPrompt { message }))
|
||||
| ("bio_policy", Err(ApiError::BioPolicy { message })) => {
|
||||
assert_eq!(message, expected_message);
|
||||
}
|
||||
@@ -1414,23 +1414,35 @@ mod tests {
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn bio_policy_error_uses_fallback_for_missing_or_blank_message() {
|
||||
for message in [None, Some(""), Some(" ")] {
|
||||
let mut event = json!({
|
||||
"type": "response.failed",
|
||||
"response": { "error": { "code": "bio_policy" } },
|
||||
});
|
||||
if let Some(message) = message {
|
||||
event["response"]["error"]["message"] = json!(message);
|
||||
}
|
||||
let sse = format!("event: response.failed\ndata: {event}\n\n");
|
||||
let events = collect_events(&[sse.as_bytes()]).await;
|
||||
match events.as_slice() {
|
||||
[Err(ApiError::BioPolicy { message })] => assert_eq!(
|
||||
message,
|
||||
"This content was flagged for possible biological risk."
|
||||
),
|
||||
other => panic!("unexpected events: {other:?}"),
|
||||
async fn typed_errors_handle_missing_or_blank_message() {
|
||||
for (code, fallback) in [
|
||||
(
|
||||
"bio_policy",
|
||||
"This content was flagged for possible biological risk.",
|
||||
),
|
||||
("invalid_prompt", "Invalid request."),
|
||||
] {
|
||||
for message in [None, Some(""), Some(" ")] {
|
||||
let mut event = json!({
|
||||
"type": "response.failed",
|
||||
"response": { "error": { "code": code } },
|
||||
});
|
||||
if let Some(message) = message {
|
||||
event["response"]["error"]["message"] = json!(message);
|
||||
}
|
||||
let expected = match (code, message) {
|
||||
("invalid_prompt", Some(message)) => message,
|
||||
_ => fallback,
|
||||
};
|
||||
let sse = format!("event: response.failed\ndata: {event}\n\n");
|
||||
let events = collect_events(&[sse.as_bytes()]).await;
|
||||
match (code, events.as_slice()) {
|
||||
("bio_policy", [Err(ApiError::BioPolicy { message })])
|
||||
| ("invalid_prompt", [Err(ApiError::InvalidPrompt { message })]) => {
|
||||
assert_eq!(message, expected);
|
||||
}
|
||||
other => panic!("unexpected events: {other:?}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user