eeymoo/claw-code
1
0
Fork 0
mirror of https://github.com/instructkr/claw-code.git synced 2026-04-07 16:44:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix retry exhaustion failure classification

Browse Source
This commit is contained in:
Yeachan-Heo
2026-04-06 01:08:23 +00:00
parent d94d792a48
commit 22e3f8c5e3
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rust/crates/api/src/error.rs
View File

@@ -93,20 +93,18 @@ impl ApiError {
#[must_use] #[must_use]
pub fn safe_failure_class(&self) -> &'static str { pub fn safe_failure_class(&self) -> &'static str {
match self { match self {
Self::RetriesExhausted { .. } => "provider_retry_exhausted",
Self::MissingCredentials { .. } | Self::ExpiredOAuthToken | Self::Auth(_) => { Self::MissingCredentials { .. } | Self::ExpiredOAuthToken | Self::Auth(_) => {
"provider_auth" "provider_auth"
} }
Self::Api { status, .. } if matches!(status.as_u16(), 401 | 403) => "provider_auth", Self::Api { status, .. } if matches!(status.as_u16(), 401 | 403) => "provider_auth",
Self::ContextWindowExceeded { .. } => "context_window", Self::ContextWindowExceeded { .. } => "context_window",
Self::Api { status, .. } if status.as_u16() == 429 => "provider_rate_limit", Self::Api { status, .. } if status.as_u16() == 429 => "provider_rate_limit",
Self::Api { .. } | Self::RetriesExhausted { .. } if self.is_generic_fatal_wrapper() => { Self::Api { .. } if self.is_generic_fatal_wrapper() => "provider_internal",
"provider_internal"
}
Self::Api { .. } => "provider_error", Self::Api { .. } => "provider_error",
Self::Http(_) | Self::InvalidSseFrame(_) | Self::BackoffOverflow { .. } => { Self::Http(_) | Self::InvalidSseFrame(_) | Self::BackoffOverflow { .. } => {
"provider_transport" "provider_transport"
} }
Self::RetriesExhausted { .. } => "provider_retry_exhausted",
Self::InvalidApiKeyEnv(_) | Self::Io(_) | Self::Json(_) => "runtime_io", Self::InvalidApiKeyEnv(_) | Self::Io(_) | Self::Json(_) => "runtime_io",
} }
} }
@@ -173,22 +171,21 @@ impl Display for ApiError {
request_id, request_id,
body, body,
.. ..
} => match (error_type, message) { } => {
(Some(error_type), Some(message)) => { if let (Some(error_type), Some(message)) = (error_type, message) {
write!(f, "api returned {status} ({error_type})")?; write!(f, "api returned {status} ({error_type})")?;
if let Some(request_id) = request_id { if let Some(request_id) = request_id {
write!(f, " [trace {request_id}]")?; write!(f, " [trace {request_id}]")?;
} }
write!(f, ": {message}") write!(f, ": {message}")
} } else {
_ => {
write!(f, "api returned {status}")?; write!(f, "api returned {status}")?;
if let Some(request_id) = request_id { if let Some(request_id) = request_id {
write!(f, " [trace {request_id}]")?; write!(f, " [trace {request_id}]")?;
} }
write!(f, ": {body}") write!(f, ": {body}")
} }
}, }
Self::RetriesExhausted { Self::RetriesExhausted {
attempts, attempts,
last_error, last_error,
@@ -280,7 +277,7 @@ mod tests {
}; };
assert!(error.is_generic_fatal_wrapper()); assert!(error.is_generic_fatal_wrapper());
assert_eq!(error.safe_failure_class(), "provider_internal"); assert_eq!(error.safe_failure_class(), "provider_retry_exhausted");
assert_eq!(error.request_id(), Some("req_nested_456")); assert_eq!(error.request_id(), Some("req_nested_456"));
} }
} }