mirror of
https://github.com/openai/codex.git
synced 2026-11-21 22:50:37 +00:00
Report API spend limit errors by scope (#62329)
## Why Generic quota errors hide whether the project or organization spend limit blocked a request. Reporting the scope tells users which limit to check. ## What changed Recognize API key, project, and organization spend limit errors across HTTP, SSE, and WebSocket responses. Show a message that names the scope and treat the error as non-retryable, even when the provider sends `Retry-After`. Apply the existing usage-limit handling to goals and compaction. Expose distinct `CodexErrorInfo` values in the app-server protocol and generated bindings so clients can identify the limit in live errors and failed turn history. ## Testing Extend the transport tests to cover all three scopes and verify that they stop retries. Extend the app-server test to check that the error survives `thread/read` and that a subsequent turn can succeed in the same thread. GitOrigin-RevId: 03341f7a78daa7540e7baa519f1a29ec07e34509
This commit is contained in:
@@ -584,23 +584,52 @@ fn map_api_error_keeps_other_400_errors_generic() {
|
||||
|
||||
#[test]
|
||||
fn map_api_error_distinguishes_http_quota_errors_from_rate_limits() {
|
||||
for error in [
|
||||
serde_json::json!({"type": "insufficient_quota"}),
|
||||
serde_json::json!({"code": "insufficient_quota"}),
|
||||
serde_json::json!({"code": "credit_balance_exhausted"}),
|
||||
serde_json::json!({"code": "organization_spend_limit_exceeded"}),
|
||||
serde_json::json!({"code": "project_spend_limit_exceeded"}),
|
||||
serde_json::json!({"code": "organization_usage_limit_exceeded"}),
|
||||
serde_json::json!({"type": "rate_limit_error", "code": "rate_limit_exceeded"}),
|
||||
serde_json::json!({"type": "rate_limit_error", "code": "slow_down"}),
|
||||
use CodexErrorInfo::ApiKeySpendLimitExceeded;
|
||||
use CodexErrorInfo::OrganizationSpendLimitExceeded;
|
||||
use CodexErrorInfo::ProjectSpendLimitExceeded;
|
||||
use CodexErrorInfo::UsageLimitExceeded;
|
||||
|
||||
let rate_limit = CodexErrorInfo::ResponseTooManyFailedAttempts {
|
||||
http_status_code: Some(429),
|
||||
};
|
||||
for (error, expected) in [
|
||||
(
|
||||
serde_json::json!({"type": "insufficient_quota"}),
|
||||
UsageLimitExceeded,
|
||||
),
|
||||
(
|
||||
serde_json::json!({"code": "insufficient_quota"}),
|
||||
UsageLimitExceeded,
|
||||
),
|
||||
(
|
||||
serde_json::json!({"code": "credit_balance_exhausted"}),
|
||||
UsageLimitExceeded,
|
||||
),
|
||||
(
|
||||
serde_json::json!({"type": "insufficient_quota", "code": "api_key_spend_limit_exceeded"}),
|
||||
ApiKeySpendLimitExceeded,
|
||||
),
|
||||
(
|
||||
serde_json::json!({"type": "insufficient_quota", "code": "organization_spend_limit_exceeded"}),
|
||||
OrganizationSpendLimitExceeded,
|
||||
),
|
||||
(
|
||||
serde_json::json!({"type": "insufficient_quota", "code": "project_spend_limit_exceeded"}),
|
||||
ProjectSpendLimitExceeded,
|
||||
),
|
||||
(
|
||||
serde_json::json!({"code": "organization_usage_limit_exceeded"}),
|
||||
UsageLimitExceeded,
|
||||
),
|
||||
(
|
||||
serde_json::json!({"type": "rate_limit_error", "code": "rate_limit_exceeded"}),
|
||||
rate_limit.clone(),
|
||||
),
|
||||
(
|
||||
serde_json::json!({"type": "rate_limit_error", "code": "slow_down"}),
|
||||
rate_limit,
|
||||
),
|
||||
] {
|
||||
let expected = if error["type"] == "rate_limit_error" {
|
||||
CodexErrorInfo::ResponseTooManyFailedAttempts {
|
||||
http_status_code: Some(429),
|
||||
}
|
||||
} else {
|
||||
CodexErrorInfo::UsageLimitExceeded
|
||||
};
|
||||
let err = map_api_error(ApiError::Transport(TransportError::Http {
|
||||
retry_after: None,
|
||||
status: http::StatusCode::TOO_MANY_REQUESTS,
|
||||
|
||||
Reference in New Issue
Block a user