mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
## Why An explicit `service_tier = "flex"` could be dropped when fast mode was disabled or the model catalog did not advertise Flex, even though Flex is an API request option. ## What changed - Preserve configured `flex` through core session settings, TUI tier resolution, and request construction regardless of fast-mode or catalog support. - Omit `service_tier` from Amazon Bedrock requests, including with custom catalogs, because Bedrock only supports the implicit default tier. ## Testing Add regression coverage for Flex configured at startup or through thread settings, connected thread startup, and TUI turn submission. Update review coverage to expect Flex with fast mode disabled, and verify that both Bedrock providers omit `service_tier`. GitOrigin-RevId: 98f2761bdd780603839ebfec75cb983a5d55e554
74 lines
2.2 KiB
Rust
74 lines
2.2 KiB
Rust
use crate::legacy_core::config::Config;
|
|
use codex_features::Feature;
|
|
use codex_protocol::config_types::SERVICE_TIER_DEFAULT_REQUEST_VALUE;
|
|
use codex_protocol::config_types::ServiceTier;
|
|
use codex_protocol::openai_models::ModelPreset;
|
|
|
|
pub(crate) fn configured_service_tier(
|
|
config: &Config,
|
|
notices: &codex_config::types::Notice,
|
|
) -> Option<String> {
|
|
config.service_tier.clone().or_else(|| {
|
|
(notices.fast_default_opt_out == Some(true))
|
|
.then(|| SERVICE_TIER_DEFAULT_REQUEST_VALUE.to_string())
|
|
})
|
|
}
|
|
|
|
pub(crate) fn effective_service_tier(
|
|
config: &Config,
|
|
notices: &codex_config::types::Notice,
|
|
model: &str,
|
|
models: &[ModelPreset],
|
|
) -> Option<String> {
|
|
let configured = configured_service_tier(config, notices);
|
|
if configured.as_deref() == Some(ServiceTier::Flex.request_value()) {
|
|
return configured;
|
|
}
|
|
if !config.features.enabled(Feature::FastMode) {
|
|
return None;
|
|
}
|
|
|
|
let Some(preset) = models.iter().find(|preset| preset.model == model) else {
|
|
return configured;
|
|
};
|
|
|
|
match configured.as_deref() {
|
|
Some(service_tier) if service_tier == SERVICE_TIER_DEFAULT_REQUEST_VALUE => configured,
|
|
Some(service_tier) if model_supports_service_tier(preset, service_tier) => configured,
|
|
Some(_) => None,
|
|
None => preset
|
|
.default_service_tier
|
|
.clone()
|
|
.filter(|service_tier| model_supports_service_tier(preset, service_tier)),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn service_tier_update_for_core(
|
|
config: &Config,
|
|
notices: &codex_config::types::Notice,
|
|
model: &str,
|
|
models: &[ModelPreset],
|
|
) -> Option<Option<String>> {
|
|
let effective = effective_service_tier(config, notices, model, models);
|
|
if let Some(service_tier) = effective {
|
|
return Some(Some(service_tier));
|
|
}
|
|
|
|
if !config.features.enabled(Feature::FastMode) {
|
|
return None;
|
|
}
|
|
|
|
if !models.iter().any(|preset| preset.model == model) {
|
|
return None;
|
|
}
|
|
|
|
Some(Some(SERVICE_TIER_DEFAULT_REQUEST_VALUE.to_string()))
|
|
}
|
|
|
|
pub(crate) fn model_supports_service_tier(model: &ModelPreset, service_tier: &str) -> bool {
|
|
model
|
|
.service_tiers
|
|
.iter()
|
|
.any(|tier| tier.id == service_tier)
|
|
}
|