i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 09:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix provider model mapping selection (#354)

Browse Source
This commit is contained in:
Kayphoon
2026-04-28 09:23:39 +08:00
committed by GitHub
parent 321f21ad49
commit 5311eb0da1
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/aether-gateway/src/data/tests.rs
View File

@@ -641,7 +641,7 @@ async fn data_state_reads_minimal_candidate_selection_with_auth_filters() {
assert_eq!(selection[1].key_id, "key-3"); assert_eq!(selection[1].key_id, "key-3");
assert_eq!( assert_eq!(
selection[1].selected_provider_model_name, selection[1].selected_provider_model_name,
"gpt-4.1-edge".to_string() "gpt-4.1-canary".to_string()
); );
assert_eq!( assert_eq!(
selection[1].mapping_matched_model, selection[1].mapping_matched_model,

6
apps/aether-gateway/src/scheduler/candidate/tests/model.rs
View File

@@ -39,13 +39,13 @@ fn candidate_model_names_keep_base_and_scoped_mappings() {
#[test] #[test]
fn resolves_mapping_matched_model_from_key_allowed_models() { fn resolves_mapping_matched_model_from_key_allowed_models() {
let mut row = sample_row(); let mut row = sample_row();
row.key_allowed_models = Some(vec!["gpt-4.1-canary".to_string()]); row.key_allowed_models = Some(vec!["gpt-4.1-upstream".to_string()]);
let resolved = resolve_provider_model_name(&row, "gpt-4.1", "openai:chat") let resolved = resolve_provider_model_name(&row, "gpt-4.1", "openai:chat")
.expect("candidate should resolve"); .expect("candidate should resolve");
assert_eq!(resolved.0, "gpt-4.1-canary"); assert_eq!(resolved.0, "gpt-4.1-canary");
assert_eq!(resolved.1, Some("gpt-4.1-canary".to_string())); assert_eq!(resolved.1, Some("gpt-4.1-upstream".to_string()));
} }
#[test] #[test]
@@ -56,7 +56,7 @@ fn resolves_mapping_matched_model_from_global_regex_mapping() {
let resolved = resolve_provider_model_name(&row, "gpt-4.1", "openai:chat") let resolved = resolve_provider_model_name(&row, "gpt-4.1", "openai:chat")
.expect("candidate should resolve"); .expect("candidate should resolve");
assert_eq!(resolved.0, "gpt-4.1-variant"); assert_eq!(resolved.0, "gpt-4.1-canary");
assert_eq!(resolved.1, Some("gpt-4.1-variant".to_string())); assert_eq!(resolved.1, Some("gpt-4.1-variant".to_string()));
} }

4
crates/aether-scheduler-core/src/model.rs
View File

@@ -114,7 +114,7 @@ pub fn resolve_provider_model_name(
for &allowed_model in &sorted_allowed_models { for &allowed_model in &sorted_allowed_models {
if row_has_candidate_model_name(row, api_format, allowed_model) { if row_has_candidate_model_name(row, api_format, allowed_model) {
let allowed_model = allowed_model.to_owned(); let allowed_model = allowed_model.to_owned();
return Some((allowed_model.clone(), Some(allowed_model))); return Some((selected_provider_model_name.clone(), Some(allowed_model)));
} }
} }
@@ -123,7 +123,7 @@ pub fn resolve_provider_model_name(
for pattern in global_model_mappings { for pattern in global_model_mappings {
if matches_model_mapping(pattern, allowed_model) { if matches_model_mapping(pattern, allowed_model) {
let allowed_model = allowed_model.to_owned(); let allowed_model = allowed_model.to_owned();
return Some((allowed_model.clone(), Some(allowed_model))); return Some((selected_provider_model_name.clone(), Some(allowed_model)));
} }
} }
} }