mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
test(core): annotate custom model literals
This commit is contained in:
@@ -176,7 +176,7 @@ async fn get_model_info_uses_custom_catalog() {
|
||||
.build()
|
||||
.await
|
||||
.expect("load default test config");
|
||||
let mut overlay = remote_model("gpt-overlay", "Overlay", 0);
|
||||
let mut overlay = remote_model("gpt-overlay", "Overlay", /*priority*/ 0);
|
||||
overlay.supports_image_detail_original = true;
|
||||
|
||||
let auth_manager = AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
|
||||
@@ -210,7 +210,7 @@ async fn get_model_info_matches_namespaced_suffix() {
|
||||
.build()
|
||||
.await
|
||||
.expect("load default test config");
|
||||
let mut remote = remote_model("gpt-image", "Image", 0);
|
||||
let mut remote = remote_model("gpt-image", "Image", /*priority*/ 0);
|
||||
remote.supports_image_detail_original = true;
|
||||
let auth_manager = AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
|
||||
let manager = ModelsManager::new(
|
||||
@@ -266,8 +266,8 @@ async fn get_model_info_rejects_multi_segment_namespace_suffix_matching() {
|
||||
async fn refresh_available_models_sorts_by_priority() {
|
||||
let server = MockServer::start().await;
|
||||
let remote_models = vec![
|
||||
remote_model("priority-low", "Low", 1),
|
||||
remote_model("priority-high", "High", 0),
|
||||
remote_model("priority-low", "Low", /*priority*/ 1),
|
||||
remote_model("priority-high", "High", /*priority*/ 0),
|
||||
];
|
||||
let models_mock = mount_models_once(
|
||||
&server,
|
||||
@@ -317,7 +317,7 @@ async fn refresh_available_models_sorts_by_priority() {
|
||||
#[tokio::test]
|
||||
async fn refresh_available_models_uses_cache_when_fresh() {
|
||||
let server = MockServer::start().await;
|
||||
let remote_models = vec![remote_model("cached", "Cached", 5)];
|
||||
let remote_models = vec![remote_model("cached", "Cached", /*priority*/ 5)];
|
||||
let models_mock = mount_models_once(
|
||||
&server,
|
||||
ModelsResponse {
|
||||
@@ -358,7 +358,7 @@ async fn refresh_available_models_uses_cache_when_fresh() {
|
||||
#[tokio::test]
|
||||
async fn refresh_available_models_refetches_when_cache_stale() {
|
||||
let server = MockServer::start().await;
|
||||
let initial_models = vec![remote_model("stale", "Stale", 1)];
|
||||
let initial_models = vec![remote_model("stale", "Stale", /*priority*/ 1)];
|
||||
let initial_mock = mount_models_once(
|
||||
&server,
|
||||
ModelsResponse {
|
||||
@@ -391,7 +391,7 @@ async fn refresh_available_models_refetches_when_cache_stale() {
|
||||
.await
|
||||
.expect("cache manipulation succeeds");
|
||||
|
||||
let updated_models = vec![remote_model("fresh", "Fresh", 9)];
|
||||
let updated_models = vec![remote_model("fresh", "Fresh", /*priority*/ 9)];
|
||||
server.reset().await;
|
||||
let refreshed_mock = mount_models_once(
|
||||
&server,
|
||||
@@ -421,7 +421,7 @@ async fn refresh_available_models_refetches_when_cache_stale() {
|
||||
#[tokio::test]
|
||||
async fn refresh_available_models_refetches_when_version_mismatch() {
|
||||
let server = MockServer::start().await;
|
||||
let initial_models = vec![remote_model("old", "Old", 1)];
|
||||
let initial_models = vec![remote_model("old", "Old", /*priority*/ 1)];
|
||||
let initial_mock = mount_models_once(
|
||||
&server,
|
||||
ModelsResponse {
|
||||
@@ -454,7 +454,7 @@ async fn refresh_available_models_refetches_when_version_mismatch() {
|
||||
.await
|
||||
.expect("cache mutation succeeds");
|
||||
|
||||
let updated_models = vec![remote_model("new", "New", 2)];
|
||||
let updated_models = vec![remote_model("new", "New", /*priority*/ 2)];
|
||||
server.reset().await;
|
||||
let refreshed_mock = mount_models_once(
|
||||
&server,
|
||||
@@ -484,7 +484,11 @@ async fn refresh_available_models_refetches_when_version_mismatch() {
|
||||
#[tokio::test]
|
||||
async fn refresh_available_models_drops_removed_remote_models() {
|
||||
let server = MockServer::start().await;
|
||||
let initial_models = vec![remote_model("remote-old", "Remote Old", 1)];
|
||||
let initial_models = vec![remote_model(
|
||||
"remote-old",
|
||||
"Remote Old",
|
||||
/*priority*/ 1,
|
||||
)];
|
||||
let initial_mock = mount_models_once(
|
||||
&server,
|
||||
ModelsResponse {
|
||||
@@ -510,7 +514,11 @@ async fn refresh_available_models_drops_removed_remote_models() {
|
||||
.expect("initial refresh succeeds");
|
||||
|
||||
server.reset().await;
|
||||
let refreshed_models = vec![remote_model("remote-new", "Remote New", 1)];
|
||||
let refreshed_models = vec![remote_model(
|
||||
"remote-new",
|
||||
"Remote New",
|
||||
/*priority*/ 1,
|
||||
)];
|
||||
let refreshed_mock = mount_models_once(
|
||||
&server,
|
||||
ModelsResponse {
|
||||
@@ -554,7 +562,7 @@ async fn refresh_available_models_skips_network_without_chatgpt_auth() {
|
||||
let models_mock = mount_models_once(
|
||||
&server,
|
||||
ModelsResponse {
|
||||
models: vec![remote_model(dynamic_slug, "No Auth", 1)],
|
||||
models: vec![remote_model(dynamic_slug, "No Auth", /*priority*/ 1)],
|
||||
},
|
||||
)
|
||||
.await;
|
||||
@@ -699,8 +707,10 @@ fn build_available_models_picks_default_after_hiding_hidden_models() {
|
||||
provider,
|
||||
);
|
||||
|
||||
let hidden_model = remote_model_with_visibility("hidden", "Hidden", 0, "hide");
|
||||
let visible_model = remote_model_with_visibility("visible", "Visible", 1, "list");
|
||||
let hidden_model =
|
||||
remote_model_with_visibility("hidden", "Hidden", /*priority*/ 0, "hide");
|
||||
let visible_model =
|
||||
remote_model_with_visibility("visible", "Visible", /*priority*/ 1, "list");
|
||||
|
||||
let expected_hidden = ModelPreset::from(hidden_model.clone());
|
||||
let mut expected_visible = ModelPreset::from(visible_model.clone());
|
||||
@@ -735,7 +745,7 @@ async fn get_model_info_uses_custom_alias_metadata_and_request_model() {
|
||||
codex_home.path().to_path_buf(),
|
||||
auth_manager,
|
||||
Some(ModelsResponse {
|
||||
models: vec![remote_model("gpt-5.4", "GPT 5.4", 0)],
|
||||
models: vec![remote_model("gpt-5.4", "GPT 5.4", /*priority*/ 0)],
|
||||
}),
|
||||
HashMap::from([(alias.clone(), custom_model)]),
|
||||
CollaborationModesConfig::default(),
|
||||
@@ -776,7 +786,7 @@ async fn get_model_info_prefers_custom_alias_context_over_global_config() {
|
||||
codex_home.path().to_path_buf(),
|
||||
auth_manager,
|
||||
Some(ModelsResponse {
|
||||
models: vec![remote_model("gpt-5.4", "GPT 5.4", 0)],
|
||||
models: vec![remote_model("gpt-5.4", "GPT 5.4", /*priority*/ 0)],
|
||||
}),
|
||||
HashMap::from([(alias.clone(), custom_model)]),
|
||||
CollaborationModesConfig::default(),
|
||||
@@ -813,8 +823,8 @@ async fn get_model_info_prefers_active_config_alias_over_startup_snapshot() {
|
||||
auth_manager,
|
||||
Some(ModelsResponse {
|
||||
models: vec![
|
||||
remote_model("gpt-5.4", "GPT 5.4", 0),
|
||||
remote_model("gpt-5.4-updated", "GPT 5.4 Updated", 1),
|
||||
remote_model("gpt-5.4", "GPT 5.4", /*priority*/ 0),
|
||||
remote_model("gpt-5.4-updated", "GPT 5.4 Updated", /*priority*/ 1),
|
||||
],
|
||||
}),
|
||||
HashMap::from([(
|
||||
@@ -855,7 +865,9 @@ fn build_available_models_includes_custom_aliases() {
|
||||
},
|
||||
)]);
|
||||
|
||||
let available = manager.build_available_models(vec![remote_model("gpt-5.4", "GPT 5.4", 0)]);
|
||||
let available = manager.build_available_models(vec![remote_model(
|
||||
"gpt-5.4", "GPT 5.4", /*priority*/ 0,
|
||||
)]);
|
||||
let alias = available
|
||||
.iter()
|
||||
.find(|preset| preset.model == "gpt-5.4 1m")
|
||||
@@ -885,8 +897,8 @@ fn build_available_models_lists_custom_aliases_before_remote_models() {
|
||||
)]);
|
||||
|
||||
let available = manager.build_available_models(vec![
|
||||
remote_model("gpt-5.4", "GPT 5.4", 0),
|
||||
remote_model("gpt-5.3", "GPT 5.3", 1),
|
||||
remote_model("gpt-5.4", "GPT 5.4", /*priority*/ 0),
|
||||
remote_model("gpt-5.3", "GPT 5.3", /*priority*/ 1),
|
||||
]);
|
||||
|
||||
assert_eq!(
|
||||
|
||||
Reference in New Issue
Block a user