Request compression is no longer tied to the provider

This commit is contained in:
Channing Conger
2026-01-05 12:41:12 -08:00
parent 47366e8417
commit f5adf8291a
22 changed files with 84 additions and 100 deletions
+11 -3
View File
@@ -156,9 +156,12 @@ impl ModelClient {
let mut refreshed = false;
loop {
let auth = auth_manager.as_ref().and_then(|m| m.auth());
let request_compression = self
.provider
.request_compression_for(auth.as_ref().map(|a| a.mode), &self.config.features);
let api_provider = self
.provider
.to_api_provider(auth.as_ref().map(|a| a.mode), &self.config.features)?;
.to_api_provider(auth.as_ref().map(|a| a.mode))?;
let api_auth = auth_provider_from_auth(auth.clone(), &self.provider).await?;
let transport = ReqwestTransport::new(build_reqwest_client());
let (request_telemetry, sse_telemetry) = self.build_streaming_telemetry();
@@ -171,6 +174,7 @@ impl ModelClient {
&api_prompt,
Some(conversation_id.clone()),
Some(session_source.clone()),
request_compression,
)
.await;
@@ -245,9 +249,12 @@ impl ModelClient {
let mut refreshed = false;
loop {
let auth = auth_manager.as_ref().and_then(|m| m.auth());
let request_compression = self
.provider
.request_compression_for(auth.as_ref().map(|a| a.mode), &self.config.features);
let api_provider = self
.provider
.to_api_provider(auth.as_ref().map(|a| a.mode), &self.config.features)?;
.to_api_provider(auth.as_ref().map(|a| a.mode))?;
let api_auth = auth_provider_from_auth(auth.clone(), &self.provider).await?;
let transport = ReqwestTransport::new(build_reqwest_client());
let (request_telemetry, sse_telemetry) = self.build_streaming_telemetry();
@@ -263,6 +270,7 @@ impl ModelClient {
conversation_id: Some(conversation_id.clone()),
session_source: Some(session_source.clone()),
extra_headers: beta_feature_headers(&self.config),
request_compression,
};
let stream_result = client
@@ -332,7 +340,7 @@ impl ModelClient {
let auth = auth_manager.as_ref().and_then(|m| m.auth());
let api_provider = self
.provider
.to_api_provider(auth.as_ref().map(|a| a.mode), &self.config.features)?;
.to_api_provider(auth.as_ref().map(|a| a.mode))?;
let api_auth = auth_provider_from_auth(auth.clone(), &self.provider).await?;
let transport = ReqwestTransport::new(build_reqwest_client());
let request_telemetry = self.build_request_telemetry();
-1
View File
@@ -3090,7 +3090,6 @@ model_verbosity = "high"
base_url: Some("https://api.openai.com/v1".to_string()),
env_key: Some("OPENAI_API_KEY".to_string()),
wire_api: crate::WireApi::Chat,
request_compression: crate::RequestCompression::None,
env_key_instructions: None,
experimental_bearer_token: None,
query_params: None,
-1
View File
@@ -56,7 +56,6 @@ pub use model_provider_info::DEFAULT_OLLAMA_PORT;
pub use model_provider_info::LMSTUDIO_OSS_PROVIDER_ID;
pub use model_provider_info::ModelProviderInfo;
pub use model_provider_info::OLLAMA_OSS_PROVIDER_ID;
pub use model_provider_info::RequestCompression;
pub use model_provider_info::WireApi;
pub use model_provider_info::built_in_model_providers;
pub use model_provider_info::create_oss_provider_with_base_url;
+6 -38
View File
@@ -49,15 +49,6 @@ pub enum WireApi {
Chat,
}
/// Body compression to use for outbound requests.
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "lowercase")]
pub enum RequestCompression {
#[default]
None,
Zstd,
}
/// Serializable representation of a provider definition.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
pub struct ModelProviderInfo {
@@ -81,10 +72,6 @@ pub struct ModelProviderInfo {
#[serde(default)]
pub wire_api: WireApi,
/// Compression applied to request bodies.
#[serde(default)]
pub request_compression: RequestCompression,
/// Optional query parameters to append to the base URL.
pub query_params: Option<HashMap<String, String>>,
@@ -145,7 +132,6 @@ impl ModelProviderInfo {
pub(crate) fn to_api_provider(
&self,
auth_mode: Option<AuthMode>,
features: &Features,
) -> crate::error::Result<ApiProvider> {
let default_base_url = if matches!(auth_mode, Some(AuthMode::ChatGPT)) {
"https://chatgpt.com/backend-api/codex"
@@ -176,10 +162,6 @@ impl ModelProviderInfo {
},
headers,
retry,
request_compression: match self.request_compression_for(auth_mode, features) {
RequestCompression::None => codex_api::provider::RequestCompression::None,
RequestCompression::Zstd => codex_api::provider::RequestCompression::Zstd,
},
stream_idle_timeout: self.stream_idle_timeout(),
})
}
@@ -245,7 +227,6 @@ impl ModelProviderInfo {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: Some(
[("version".to_string(), env!("CARGO_PKG_VERSION").to_string())]
@@ -279,14 +260,14 @@ impl ModelProviderInfo {
&self,
auth_mode: Option<AuthMode>,
features: &Features,
) -> RequestCompression {
) -> codex_api::provider::RequestCompression {
if self.is_openai()
&& matches!(auth_mode, Some(AuthMode::ChatGPT))
&& features.enabled(Feature::RequestCompression)
{
RequestCompression::Zstd
codex_api::provider::RequestCompression::Zstd
} else {
RequestCompression::None
codex_api::provider::RequestCompression::None
}
}
}
@@ -349,7 +330,6 @@ pub fn create_oss_provider_with_base_url(base_url: &str, wire_api: WireApi) -> M
env_key_instructions: None,
experimental_bearer_token: None,
wire_api,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -378,7 +358,6 @@ base_url = "http://localhost:11434/v1"
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Chat,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -407,7 +386,6 @@ query_params = { api-version = "2025-04-01-preview" }
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Chat,
request_compression: RequestCompression::None,
query_params: Some(maplit::hashmap! {
"api-version".to_string() => "2025-04-01-preview".to_string(),
}),
@@ -439,7 +417,6 @@ env_http_headers = { "X-Example-Env-Header" = "EXAMPLE_ENV_VAR" }
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Chat,
request_compression: RequestCompression::None,
query_params: None,
http_headers: Some(maplit::hashmap! {
"X-Example-Header".to_string() => "example-value".to_string(),
@@ -475,7 +452,6 @@ env_http_headers = { "X-Example-Env-Header" = "EXAMPLE_ENV_VAR" }
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -484,9 +460,7 @@ env_http_headers = { "X-Example-Env-Header" = "EXAMPLE_ENV_VAR" }
stream_idle_timeout_ms: None,
requires_openai_auth: false,
};
let api = provider
.to_api_provider(None, &Features::with_defaults())
.expect("api provider");
let api = provider.to_api_provider(None).expect("api provider");
assert!(
api.is_azure_responses_endpoint(),
"expected {base_url} to be detected as Azure"
@@ -500,7 +474,6 @@ env_http_headers = { "X-Example-Env-Header" = "EXAMPLE_ENV_VAR" }
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -509,9 +482,7 @@ env_http_headers = { "X-Example-Env-Header" = "EXAMPLE_ENV_VAR" }
stream_idle_timeout_ms: None,
requires_openai_auth: false,
};
let named_api = named_provider
.to_api_provider(None, &Features::with_defaults())
.expect("api provider");
let named_api = named_provider.to_api_provider(None).expect("api provider");
assert!(named_api.is_azure_responses_endpoint());
let negative_cases = [
@@ -527,7 +498,6 @@ env_http_headers = { "X-Example-Env-Header" = "EXAMPLE_ENV_VAR" }
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -536,9 +506,7 @@ env_http_headers = { "X-Example-Env-Header" = "EXAMPLE_ENV_VAR" }
stream_idle_timeout_ms: None,
requires_openai_auth: false,
};
let api = provider
.to_api_provider(None, &Features::with_defaults())
.expect("api provider");
let api = provider.to_api_provider(None).expect("api provider");
assert!(
!api.is_azure_responses_endpoint(),
"expected {base_url} not to be detected as Azure"
+1 -5
View File
@@ -98,9 +98,7 @@ impl ModelsManager {
return Ok(());
}
let auth = self.auth_manager.auth();
let api_provider = self
.provider
.to_api_provider(Some(AuthMode::ChatGPT), &config.features)?;
let api_provider = self.provider.to_api_provider(Some(AuthMode::ChatGPT))?;
let api_auth = auth_provider_from_auth(auth.clone(), &self.provider).await?;
let transport = ReqwestTransport::new(build_reqwest_client());
let client = ModelsClient::new(transport, api_provider, api_auth);
@@ -327,7 +325,6 @@ mod tests {
use super::cache::ModelsCache;
use super::*;
use crate::CodexAuth;
use crate::RequestCompression;
use crate::auth::AuthCredentialsStoreMode;
use crate::config::ConfigBuilder;
use crate::features::Feature;
@@ -382,7 +379,6 @@ mod tests {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -10,7 +10,6 @@ use codex_core::LocalShellStatus;
use codex_core::ModelClient;
use codex_core::ModelProviderInfo;
use codex_core::Prompt;
use codex_core::RequestCompression;
use codex_core::ResponseItem;
use codex_core::WireApi;
use codex_core::models_manager::manager::ModelsManager;
@@ -53,7 +52,6 @@ async fn run_request(input: Vec<ResponseItem>) -> Value {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Chat,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -8,7 +8,6 @@ use codex_core::ContentItem;
use codex_core::ModelClient;
use codex_core::ModelProviderInfo;
use codex_core::Prompt;
use codex_core::RequestCompression;
use codex_core::ResponseEvent;
use codex_core::ResponseItem;
use codex_core::WireApi;
@@ -52,7 +51,6 @@ async fn run_stream_with_bytes(sse_body: &[u8]) -> Vec<ResponseEvent> {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Chat,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
-6
View File
@@ -7,7 +7,6 @@ use codex_core::ContentItem;
use codex_core::ModelClient;
use codex_core::ModelProviderInfo;
use codex_core::Prompt;
use codex_core::RequestCompression;
use codex_core::ResponseEvent;
use codex_core::ResponseItem;
use codex_core::WireApi;
@@ -48,7 +47,6 @@ async fn responses_stream_includes_subagent_header_on_review() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -143,7 +141,6 @@ async fn responses_stream_includes_subagent_header_on_other() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -234,7 +231,6 @@ async fn responses_respects_model_family_overrides_from_config() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -342,7 +338,6 @@ async fn responses_request_body_is_zstd_encoded() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -440,7 +435,6 @@ async fn responses_request_body_is_uncompressed_when_disabled() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
-4
View File
@@ -9,7 +9,6 @@ use codex_core::ModelClient;
use codex_core::ModelProviderInfo;
use codex_core::NewConversation;
use codex_core::Prompt;
use codex_core::RequestCompression;
use codex_core::ResponseEvent;
use codex_core::ResponseItem;
use codex_core::WireApi;
@@ -1127,7 +1126,6 @@ async fn azure_responses_request_includes_store_and_reasoning_ids() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -1626,7 +1624,6 @@ async fn azure_overrides_assign_properties_used_for_responses_url() {
)])),
env_key_instructions: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
http_headers: Some(std::collections::HashMap::from([(
"Custom-Header".to_string(),
"Value".to_string(),
@@ -1710,7 +1707,6 @@ async fn env_var_overrides_loaded_auth() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
http_headers: Some(std::collections::HashMap::from([(
"Custom-Header".to_string(),
"Value".to_string(),
@@ -1,5 +1,4 @@
use codex_core::ModelProviderInfo;
use codex_core::RequestCompression;
use codex_core::WireApi;
use codex_core::protocol::EventMsg;
use codex_core::protocol::Op;
@@ -67,7 +66,6 @@ async fn continue_after_stream_error() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,
@@ -2,7 +2,6 @@
//! delivering a `response.completed` event.
use codex_core::ModelProviderInfo;
use codex_core::RequestCompression;
use codex_core::WireApi;
use codex_core::protocol::EventMsg;
use codex_core::protocol::Op;
@@ -74,7 +73,6 @@ async fn retries_on_early_close() {
env_key_instructions: None,
experimental_bearer_token: None,
wire_api: WireApi::Responses,
request_compression: RequestCompression::None,
query_params: None,
http_headers: None,
env_http_headers: None,