mirror of
https://github.com/openai/codex.git
synced 2026-09-06 15:29:32 +00:00
codex: fix app-server service tier overrides
Split string service tier requests into legacy service_tier and service_tier_id config overrides so arbitrary tier ids keep flowing through the app-server path. Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
@@ -343,6 +343,7 @@ use codex_protocol::ThreadId;
|
||||
use codex_protocol::config_types::CollaborationMode;
|
||||
use codex_protocol::config_types::ForcedLoginMethod;
|
||||
use codex_protocol::config_types::Personality;
|
||||
use codex_protocol::config_types::ServiceTier;
|
||||
use codex_protocol::config_types::TrustLevel;
|
||||
use codex_protocol::config_types::WindowsSandboxLevel;
|
||||
use codex_protocol::dynamic_tools::DynamicToolSpec as CoreDynamicToolSpec;
|
||||
|
||||
@@ -1193,10 +1193,22 @@ impl ThreadRequestProcessor {
|
||||
developer_instructions: Option<String>,
|
||||
personality: Option<Personality>,
|
||||
) -> ConfigOverrides {
|
||||
let (service_tier, service_tier_id) = match service_tier {
|
||||
Some(Some(service_tier)) => {
|
||||
let legacy_service_tier = ServiceTier::from_request_value(&service_tier);
|
||||
let service_tier_id = legacy_service_tier
|
||||
.map(|service_tier| service_tier.request_value().to_string())
|
||||
.unwrap_or(service_tier);
|
||||
(Some(legacy_service_tier), Some(Some(service_tier_id)))
|
||||
}
|
||||
Some(None) => (Some(None), Some(None)),
|
||||
None => (None, None),
|
||||
};
|
||||
let mut overrides = ConfigOverrides {
|
||||
model,
|
||||
model_provider,
|
||||
service_tier,
|
||||
service_tier_id,
|
||||
cwd: cwd.map(PathBuf::from),
|
||||
approval_policy: approval_policy
|
||||
.map(codex_app_server_protocol::AskForApproval::to_core),
|
||||
|
||||
Reference in New Issue
Block a user