mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
fixes
This commit is contained in:
@@ -4,15 +4,17 @@ use codex_app_server_protocol::ReasoningEffortOption;
|
||||
use codex_common::model_presets::ModelPreset;
|
||||
use codex_common::model_presets::ReasoningEffortPreset;
|
||||
use codex_common::model_presets::builtin_model_presets;
|
||||
use codex_common::model_presets::default_model_id_for_auth;
|
||||
|
||||
pub fn supported_models(auth_mode: Option<AuthMode>) -> Vec<Model> {
|
||||
let default_model_id = default_model_id_for_auth(auth_mode);
|
||||
builtin_model_presets(auth_mode)
|
||||
.into_iter()
|
||||
.map(model_from_preset)
|
||||
.map(|preset| model_from_preset(preset, default_model_id))
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn model_from_preset(preset: ModelPreset) -> Model {
|
||||
fn model_from_preset(preset: ModelPreset, default_model_id: &str) -> Model {
|
||||
Model {
|
||||
id: preset.id.to_string(),
|
||||
model: preset.model.to_string(),
|
||||
@@ -22,7 +24,7 @@ fn model_from_preset(preset: ModelPreset) -> Model {
|
||||
preset.supported_reasoning_efforts,
|
||||
),
|
||||
default_reasoning_effort: preset.default_reasoning_effort,
|
||||
is_default: preset.is_default,
|
||||
is_default: preset.id == default_model_id,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -256,6 +256,13 @@ pub fn builtin_model_presets(auth_mode: Option<AuthMode>) -> Vec<ModelPreset> {
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn default_model_id_for_auth(auth_mode: Option<AuthMode>) -> &'static str {
|
||||
match auth_mode {
|
||||
Some(AuthMode::ApiKey) => "gpt-5.1-codex",
|
||||
_ => "gpt-5.1-codex-max",
|
||||
}
|
||||
}
|
||||
|
||||
pub fn all_model_presets() -> &'static Vec<ModelPreset> {
|
||||
&PRESETS
|
||||
}
|
||||
@@ -280,4 +287,17 @@ mod tests {
|
||||
.all(|preset| preset.id != "gpt-5.1-codex-max")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn default_model_depends_on_auth_mode() {
|
||||
assert_eq!(
|
||||
default_model_id_for_auth(Some(AuthMode::ChatGPT)),
|
||||
"gpt-5.1-codex-max"
|
||||
);
|
||||
assert_eq!(
|
||||
default_model_id_for_auth(Some(AuthMode::ApiKey)),
|
||||
"gpt-5.1-codex"
|
||||
);
|
||||
assert_eq!(default_model_id_for_auth(None), "gpt-5.1-codex-max");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user