mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
codex: keep service tier id out of PR #20978
Remove the config-level service_tier_id plumbing from the slash-command PR so PR #20974 remains the owner of that API. Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
@@ -62,6 +62,7 @@ use codex_model_provider_info::LMSTUDIO_OSS_PROVIDER_ID;
|
||||
use codex_model_provider_info::OLLAMA_OSS_PROVIDER_ID;
|
||||
use codex_model_provider_info::WireApi;
|
||||
use codex_models_manager::bundled_models_response;
|
||||
use codex_protocol::config_types::ServiceTier;
|
||||
use codex_protocol::models::ActivePermissionProfile;
|
||||
use codex_protocol::models::ActivePermissionProfileModification;
|
||||
use codex_protocol::models::ManagedFileSystemPermissions;
|
||||
@@ -7138,7 +7139,7 @@ async fn explicit_null_service_tier_override_sets_fast_default_opt_out() -> std:
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn explicit_fast_service_tier_override_preserves_request_id() -> std::io::Result<()> {
|
||||
async fn legacy_fast_service_tier_override_uses_priority_request_value() -> std::io::Result<()> {
|
||||
let fixture = create_test_fixture()?;
|
||||
|
||||
let config = Config::load_from_base_config_with_overrides(
|
||||
@@ -7152,7 +7153,10 @@ async fn explicit_fast_service_tier_override_preserves_request_id() -> std::io::
|
||||
)
|
||||
.await?;
|
||||
|
||||
assert_eq!(config.service_tier, Some("fast".to_string()));
|
||||
assert_eq!(
|
||||
config.service_tier,
|
||||
Some(ServiceTier::Fast.request_value().to_string())
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
@@ -2738,15 +2738,20 @@ impl Config {
|
||||
notices.fast_default_opt_out = Some(true);
|
||||
None
|
||||
}
|
||||
None => config_profile.service_tier.or(cfg.service_tier).and_then(
|
||||
|service_tier| match service_tier {
|
||||
ServiceTier::Fast => features
|
||||
.enabled(Feature::FastMode)
|
||||
.then(|| ServiceTier::Fast.request_value().to_string()),
|
||||
ServiceTier::Flex => Some(ServiceTier::Flex.request_value().to_string()),
|
||||
},
|
||||
),
|
||||
None => config_profile
|
||||
.service_tier
|
||||
.or(cfg.service_tier)
|
||||
.map(|service_tier| service_tier.request_value().to_string()),
|
||||
};
|
||||
let service_tier = service_tier.and_then(|service_tier| {
|
||||
match ServiceTier::from_request_value(&service_tier) {
|
||||
Some(ServiceTier::Fast) => features
|
||||
.enabled(Feature::FastMode)
|
||||
.then(|| ServiceTier::Fast.request_value().to_string()),
|
||||
Some(ServiceTier::Flex) => Some(ServiceTier::Flex.request_value().to_string()),
|
||||
None => Some(service_tier),
|
||||
}
|
||||
});
|
||||
|
||||
let compact_prompt = compact_prompt.or(cfg.compact_prompt).and_then(|value| {
|
||||
let trimmed = value.trim();
|
||||
|
||||
Reference in New Issue
Block a user