openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-05 15:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address remote plugin retry review

Browse Source
This commit is contained in:
Alex Phonpradith
2026-06-24 11:51:30 -07:00
parent 2ef507cd53
commit 6300085167
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
codex-rs/core-plugins/src/remote.rs
View File

@@ -2000,28 +2000,36 @@ fn retry_delay_for_remote_plugin_catalog_get_error(
retry_after: RetryAfterDelay,
) -> Option<Duration> {
match err {
RemotePluginCatalogError::Request { source, .. } => (source.is_timeout()
|| source.is_connect())
.then_some(REMOTE_PLUGIN_CATALOG_GET_RETRY_DELAY),
RemotePluginCatalogError::Request { source, .. } => {
(source.is_timeout() || source.is_connect() || source.is_body())
.then_some(REMOTE_PLUGIN_CATALOG_GET_RETRY_DELAY)
}
RemotePluginCatalogError::UnexpectedStatus { status, .. }
if *status == reqwest::StatusCode::TOO_MANY_REQUESTS =>
{
match retry_after {
RetryAfterDelay::Delay(delay) if delay <= REMOTE_PLUGIN_CATALOG_GET_RETRY_DELAY => {
Some(delay)
}
RetryAfterDelay::Delay(_) | RetryAfterDelay::Unparsable => None,
RetryAfterDelay::None => Some(REMOTE_PLUGIN_CATALOG_GET_RETRY_DELAY),
}
bounded_retry_after_delay(retry_after)
}
RemotePluginCatalogError::UnexpectedStatus { status, .. } => {
(*status == reqwest::StatusCode::REQUEST_TIMEOUT || status.is_server_error())
.then_some(REMOTE_PLUGIN_CATALOG_GET_RETRY_DELAY)
if *status == reqwest::StatusCode::REQUEST_TIMEOUT || status.is_server_error() {
bounded_retry_after_delay(retry_after)
} else {
None
}
}
_ => None,
}
}
fn bounded_retry_after_delay(retry_after: RetryAfterDelay) -> Option<Duration> {
match retry_after {
RetryAfterDelay::Delay(delay) if delay <= REMOTE_PLUGIN_CATALOG_GET_RETRY_DELAY => {
Some(delay)
}
RetryAfterDelay::Delay(_) | RetryAfterDelay::Unparsable => None,
RetryAfterDelay::None => Some(REMOTE_PLUGIN_CATALOG_GET_RETRY_DELAY),
}
}
fn parse_retry_after_delay(headers: &reqwest::header::HeaderMap) -> RetryAfterDelay {
let Some(retry_after) = headers.get(RETRY_AFTER) else {
return RetryAfterDelay::None;