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

feat: scope model mappings by endpoint

Browse Source
This commit is contained in:
fawney19
2026-05-07 00:48:15 +08:00
parent 4e9f063385
commit 012f8bcdf7
58 changed files with 731 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/aether-data/src/repository/candidate_selection/memory.rs
View File

@@ -167,6 +167,10 @@ fn row_matches_requested_model(
formats
.iter()
.any(|value| api_format_matches(value, api_format))
}) && mapping.endpoint_ids.as_ref().is_none_or(|endpoint_ids| {
endpoint_ids
.iter()
.any(|endpoint_id| endpoint_id == &row.endpoint_id)
}) && mapping.name == requested_model_name
})
})
@@ -281,6 +285,7 @@ mod tests {
name: "alias-gpt-4.1".to_string(),
priority: 0,
api_formats: Some(vec!["openai:chat".to_string()]),
endpoint_ids: None,
},
]);
let repository = InMemoryMinimalCandidateSelectionReadRepository::seed(vec![

11
crates/aether-data/src/repository/candidate_selection/mysql.rs
View File

@@ -272,6 +272,10 @@ fn row_matches_requested_model(
formats
.iter()
.any(|value| api_format_matches(value, api_format))
}) && mapping.endpoint_ids.as_ref().is_none_or(|endpoint_ids| {
endpoint_ids
.iter()
.any(|endpoint_id| endpoint_id == &row.endpoint_id)
}) && mapping.name == requested_model_name
})
})
@@ -514,6 +518,7 @@ fn parse_embedded_provider_model_mappings(
name: raw.to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
}]))
}
@@ -533,6 +538,7 @@ fn parse_provider_model_mappings_array(
name: raw.trim().to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
});
}
_ => {}
@@ -573,6 +579,10 @@ fn parse_provider_model_mapping_object_lenient(
.map(|value| normalize_api_format(&value))
.collect()
});
let endpoint_ids = parse_string_list(
object.get("endpoint_ids").cloned(),
"models.provider_model_mappings.endpoint_ids",
)?;
Ok(Some(StoredProviderModelMapping {
name: name.to_string(),
@@ -582,6 +592,7 @@ fn parse_provider_model_mapping_object_lenient(
))
})?,
api_formats,
endpoint_ids,
}))
}

20
crates/aether-data/src/repository/candidate_selection/postgres.rs
View File

@@ -694,6 +694,15 @@ fn requested_model_selection_sql() -> String {
WHERE LOWER(BTRIM(fmt.value)) = ANY($3::text[])
)
)
AND (
mapping.value -> 'endpoint_ids' IS NULL
OR jsonb_typeof(mapping.value -> 'endpoint_ids') <> 'array'
OR EXISTS (
SELECT 1
FROM jsonb_array_elements_text(mapping.value -> 'endpoint_ids') AS endpoint(value)
WHERE endpoint.value = pe.id
)
)
)
)
)"#,
@@ -933,6 +942,7 @@ fn parse_embedded_provider_model_mappings(
name: raw.to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
}]))
}
@@ -954,6 +964,7 @@ fn parse_provider_model_mappings_array(
name: raw.to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
});
}
}
@@ -1006,6 +1017,10 @@ fn parse_provider_model_mapping_object_lenient(
.map(|value| aether_ai_formats::normalize_api_format_alias(&value))
.collect()
});
let endpoint_ids = parse_string_list(
object.get("endpoint_ids").cloned(),
"models.provider_model_mappings.endpoint_ids",
)?;
Ok(Some(StoredProviderModelMapping {
name: name.to_string(),
@@ -1015,6 +1030,7 @@ fn parse_provider_model_mapping_object_lenient(
))
})?,
api_formats,
endpoint_ids,
}))
}
@@ -1119,6 +1135,7 @@ mod tests {
name: "gpt-5.2".to_string(),
priority: 2,
api_formats: Some(vec!["openai:chat".to_string()]),
endpoint_ids: None,
}])
);
}
@@ -1134,6 +1151,7 @@ mod tests {
name: "gpt-5.2".to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
}])
);
}
@@ -1156,11 +1174,13 @@ mod tests {
name: "gpt-5.2".to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
},
StoredProviderModelMapping {
name: "gpt-5.2-mini".to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
}
])
);

11
crates/aether-data/src/repository/candidate_selection/sqlite.rs
View File

@@ -272,6 +272,10 @@ fn row_matches_requested_model(
formats
.iter()
.any(|value| api_format_matches(value, api_format))
}) && mapping.endpoint_ids.as_ref().is_none_or(|endpoint_ids| {
endpoint_ids
.iter()
.any(|endpoint_id| endpoint_id == &row.endpoint_id)
}) && mapping.name == requested_model_name
})
})
@@ -514,6 +518,7 @@ fn parse_embedded_provider_model_mappings(
name: raw.to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
}]))
}
@@ -533,6 +538,7 @@ fn parse_provider_model_mappings_array(
name: raw.trim().to_string(),
priority: 1,
api_formats: None,
endpoint_ids: None,
});
}
_ => {}
@@ -573,6 +579,10 @@ fn parse_provider_model_mapping_object_lenient(
.map(|value| normalize_api_format(&value))
.collect()
});
let endpoint_ids = parse_string_list(
object.get("endpoint_ids").cloned(),
"models.provider_model_mappings.endpoint_ids",
)?;
Ok(Some(StoredProviderModelMapping {
name: name.to_string(),
@@ -582,6 +592,7 @@ fn parse_provider_model_mapping_object_lenient(
))
})?,
api_formats,
endpoint_ids,
}))
}