From d2e876403a7b0bccb67c0e69ef6ee4086ad509b8 Mon Sep 17 00:00:00 2001 From: jif-oai Date: Thu, 13 Nov 2025 17:14:50 +0100 Subject: [PATCH] Clippy --- codex-rs/backend-client/src/client.rs | 2 +- codex-rs/core/src/auth.rs | 10 +++++----- codex-rs/core/src/client/responses.rs | 4 ++-- codex-rs/core/src/default_client.rs | 1 - codex-rs/core/src/lib.rs | 1 - codex-rs/core/src/model_provider_info.rs | 7 +++---- codex-rs/core/src/otel_init.rs | 2 +- codex-rs/core/src/rollout/recorder.rs | 2 +- codex-rs/login/src/server.rs | 2 +- codex-rs/mcp-server/src/message_processor.rs | 3 +-- 10 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 codex-rs/core/src/default_client.rs diff --git a/codex-rs/backend-client/src/client.rs b/codex-rs/backend-client/src/client.rs index 28a51598eb..8cb0334994 100644 --- a/codex-rs/backend-client/src/client.rs +++ b/codex-rs/backend-client/src/client.rs @@ -5,7 +5,6 @@ use crate::types::RateLimitWindowSnapshot; use crate::types::TurnAttemptsSiblingTurnsResponse; use anyhow::Result; use codex_core::auth::CodexAuth; -use codex_core::default_client::get_codex_user_agent; use codex_protocol::protocol::RateLimitSnapshot; use codex_protocol::protocol::RateLimitWindow; use reqwest::header::AUTHORIZATION; @@ -15,6 +14,7 @@ use reqwest::header::HeaderName; use reqwest::header::HeaderValue; use reqwest::header::USER_AGENT; use serde::de::DeserializeOwned; +use codex_core::client::http::get_codex_user_agent; #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum PathStyle { diff --git a/codex-rs/core/src/auth.rs b/codex-rs/core/src/auth.rs index d874435e8e..17f4158d9a 100644 --- a/codex-rs/core/src/auth.rs +++ b/codex-rs/core/src/auth.rs @@ -23,7 +23,6 @@ pub use crate::auth::storage::AuthDotJson; use crate::auth::storage::AuthStorageBackend; use crate::auth::storage::create_auth_storage; use crate::config::Config; -use crate::default_client::CodexHttpClient; use crate::error::RefreshTokenFailedError; use crate::error::RefreshTokenFailedReason; use crate::token_data::KnownPlan as InternalKnownPlan; @@ -272,7 +271,7 @@ impl CodexAuth { mode: AuthMode::ChatGPT, storage: create_auth_storage(PathBuf::new(), AuthCredentialsStoreMode::File), auth_dot_json, - client: crate::default_client::create_client(), + client: crate::client::http::create_client(), } } @@ -287,7 +286,7 @@ impl CodexAuth { } pub fn from_api_key(api_key: &str) -> Self { - Self::from_api_key_with_client(api_key, crate::default_client::create_client()) + Self::from_api_key_with_client(api_key, crate::client::http::create_client()) } } @@ -447,7 +446,7 @@ fn load_auth( auth_credentials_store_mode: AuthCredentialsStoreMode, ) -> std::io::Result> { if enable_codex_api_key_env && let Some(api_key) = read_codex_api_key_from_env() { - let client = crate::default_client::create_client(); + let client = crate::client::http::create_client(); return Ok(Some(CodexAuth::from_api_key_with_client( api_key.as_str(), client, @@ -456,7 +455,7 @@ fn load_auth( let storage = create_auth_storage(codex_home.to_path_buf(), auth_credentials_store_mode); - let client = crate::default_client::create_client(); + let client = crate::client::http::create_client(); let auth_dot_json = match storage.load()? { Some(auth) => auth, None => return Ok(None), @@ -632,6 +631,7 @@ fn refresh_token_endpoint() -> String { .unwrap_or_else(|_| REFRESH_TOKEN_URL.to_string()) } +use crate::client::http::CodexHttpClient; use std::sync::RwLock; /// Internal cached auth state. diff --git a/codex-rs/core/src/client/responses.rs b/codex-rs/core/src/client/responses.rs index 1cb65fc332..4e44ac587f 100644 --- a/codex-rs/core/src/client/responses.rs +++ b/codex-rs/core/src/client/responses.rs @@ -32,13 +32,13 @@ use crate::client::ResponseEvent; use crate::client::ResponseStream; use crate::client::ResponsesApiRequest; use crate::client::create_text_param_for_request; +use crate::client::http::CodexHttpClient; +use crate::client::http::create_client; use crate::client::rate_limits::parse_rate_limit_snapshot; use crate::client::retry::RetryableStreamError; use crate::client::retry::retry_stream; use crate::client_common::Prompt; use crate::config::Config; -use crate::default_client::CodexHttpClient; -use crate::default_client::create_client; use crate::error::CodexErr; use crate::error::ConnectionFailedError; use crate::error::ResponseStreamFailed; diff --git a/codex-rs/core/src/default_client.rs b/codex-rs/core/src/default_client.rs deleted file mode 100644 index b601ffd724..0000000000 --- a/codex-rs/core/src/default_client.rs +++ /dev/null @@ -1 +0,0 @@ -pub use crate::client::http::*; diff --git a/codex-rs/core/src/lib.rs b/codex-rs/core/src/lib.rs index 3d27950806..5845f2fe67 100644 --- a/codex-rs/core/src/lib.rs +++ b/codex-rs/core/src/lib.rs @@ -53,7 +53,6 @@ pub use conversation_manager::NewConversation; // Re-export common auth types for workspace consumers pub use auth::AuthManager; pub use auth::CodexAuth; -pub mod default_client; pub mod model_family; mod openai_model_info; pub mod project_doc; diff --git a/codex-rs/core/src/model_provider_info.rs b/codex-rs/core/src/model_provider_info.rs index 8dc252aa7c..e8411ca0d0 100644 --- a/codex-rs/core/src/model_provider_info.rs +++ b/codex-rs/core/src/model_provider_info.rs @@ -6,16 +6,15 @@ //! key. These override or extend the defaults at runtime. use crate::CodexAuth; -use crate::default_client::CodexHttpClient; -use crate::default_client::CodexRequestBuilder; +use crate::client::http::CodexHttpClient; +use crate::client::http::CodexRequestBuilder; +use crate::error::EnvVarError; use codex_app_server_protocol::AuthMode; use serde::Deserialize; use serde::Serialize; use std::collections::HashMap; use std::env::VarError; use std::time::Duration; - -use crate::error::EnvVarError; const DEFAULT_STREAM_IDLE_TIMEOUT_MS: u64 = 300_000; const DEFAULT_STREAM_MAX_RETRIES: u64 = 5; const DEFAULT_REQUEST_MAX_RETRIES: u64 = 4; diff --git a/codex-rs/core/src/otel_init.rs b/codex-rs/core/src/otel_init.rs index 5931d7caf9..f81bc359ba 100644 --- a/codex-rs/core/src/otel_init.rs +++ b/codex-rs/core/src/otel_init.rs @@ -1,7 +1,7 @@ +use crate::client::http::originator; use crate::config::Config; use crate::config::types::OtelExporterKind as Kind; use crate::config::types::OtelHttpProtocol as Protocol; -use crate::default_client::originator; use codex_otel::config::OtelExporter; use codex_otel::config::OtelHttpProtocol; use codex_otel::config::OtelSettings; diff --git a/codex-rs/core/src/rollout/recorder.rs b/codex-rs/core/src/rollout/recorder.rs index a39f85c823..9ecaeb3ec8 100644 --- a/codex-rs/core/src/rollout/recorder.rs +++ b/codex-rs/core/src/rollout/recorder.rs @@ -23,8 +23,8 @@ use super::list::ConversationsPage; use super::list::Cursor; use super::list::get_conversations; use super::policy::is_persisted_response_item; +use crate::client::http::originator; use crate::config::Config; -use crate::default_client::originator; use crate::git_info::collect_git_info; use codex_protocol::protocol::InitialHistory; use codex_protocol::protocol::ResumedHistory; diff --git a/codex-rs/login/src/server.rs b/codex-rs/login/src/server.rs index 999c19072e..573f1ee0c0 100644 --- a/codex-rs/login/src/server.rs +++ b/codex-rs/login/src/server.rs @@ -17,7 +17,6 @@ use chrono::Utc; use codex_core::auth::AuthCredentialsStoreMode; use codex_core::auth::AuthDotJson; use codex_core::auth::save_auth; -use codex_core::default_client::originator; use codex_core::token_data::TokenData; use codex_core::token_data::parse_id_token; use rand::RngCore; @@ -27,6 +26,7 @@ use tiny_http::Request; use tiny_http::Response; use tiny_http::Server; use tiny_http::StatusCode; +use codex_core::client::http::originator; const DEFAULT_ISSUER: &str = "https://auth.openai.com"; const DEFAULT_PORT: u16 = 1455; diff --git a/codex-rs/mcp-server/src/message_processor.rs b/codex-rs/mcp-server/src/message_processor.rs index 81eb80764b..398978652f 100644 --- a/codex-rs/mcp-server/src/message_processor.rs +++ b/codex-rs/mcp-server/src/message_processor.rs @@ -13,8 +13,6 @@ use codex_protocol::protocol::SessionSource; use codex_core::AuthManager; use codex_core::ConversationManager; use codex_core::config::Config; -use codex_core::default_client::USER_AGENT_SUFFIX; -use codex_core::default_client::get_codex_user_agent; use codex_core::protocol::Submission; use mcp_types::CallToolRequestParams; use mcp_types::CallToolResult; @@ -35,6 +33,7 @@ use serde_json::json; use std::sync::Arc; use tokio::sync::Mutex; use tokio::task; +use codex_core::client::http::{get_codex_user_agent, USER_AGENT_SUFFIX}; pub(crate) struct MessageProcessor { outgoing: Arc,