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

feat(codex): align Search and execution protocol

Browse Source
This commit is contained in:
MMEXA
2026-07-12 03:04:15 +08:00
parent 59d37ae1dd
commit 2316df5c9a
121 changed files with 5141 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-admin/src/provider/endpoints.rs
+69 -13
View File
@@ -82,33 +82,89 @@ pub fn endpoint_key_counts_by_format(
) -> (BTreeMap<String, usize>, BTreeMap<String, usize>) {
let mut total = BTreeMap::new();
let mut active = BTreeMap::new();
let inherited_api_formats = active_endpoint_api_formats(endpoints);
let endpoint_api_formats = active_endpoint_api_formats(endpoints);
for key in keys {
if fixed_provider_key_inherits_api_formats(
let inherits_api_formats = fixed_provider_key_inherits_api_formats(
provider_type,
&key.auth_type,
key.encrypted_auth_config.as_deref(),
) {
for api_format in &inherited_api_formats {
*total.entry(api_format.clone()).or_insert(0) += 1;
if key.is_active {
*active.entry(api_format.clone()).or_insert(0) += 1;
}
}
continue;
}
);
let has_unrestricted_api_format_scope = key
.api_formats
.as_ref()
.is_none_or(serde_json::Value::is_null);
let configured_api_formats = configured_key_api_formats(key);
for api_format in configured_key_api_formats(key) {
for api_format in endpoint_api_formats.iter().filter(|api_format| {
inherits_api_formats
|| has_unrestricted_api_format_scope
|| configured_api_formats.iter().any(|allowed| {
aether_ai_formats::api_format_permission_covers(allowed, api_format)
})
}) {
*total.entry(api_format.clone()).or_insert(0) += 1;
if key.is_active {
*active.entry(api_format).or_insert(0) += 1;
*active.entry(api_format.clone()).or_insert(0) += 1;
}
}
}
(total, active)
}
#[cfg(test)]
mod endpoint_key_count_tests {
use super::*;
fn sample_endpoint(id: &str, api_format: &str) -> StoredProviderCatalogEndpoint {
StoredProviderCatalogEndpoint::new(
id.to_string(),
"provider-1".to_string(),
api_format.to_string(),
None,
None,
true,
)
.expect("endpoint should build")
}
fn sample_key(id: &str, api_format: Option<&str>) -> StoredProviderCatalogKey {
let mut key = StoredProviderCatalogKey::new(
id.to_string(),
"provider-1".to_string(),
id.to_string(),
"api_key".to_string(),
None,
true,
)
.expect("key should build");
key.api_formats = api_format.map(|api_format| json!([api_format]));
key
}
#[test]
fn endpoint_counts_follow_one_way_format_permissions() {
let endpoints = vec![
sample_endpoint("responses", "openai:responses"),
sample_endpoint("search", "openai:search"),
];
let mut empty_scope_key = sample_key("empty-scope-key", None);
empty_scope_key.api_formats = Some(json!([]));
let keys = vec![
sample_key("responses-key", Some("openai:responses")),
sample_key("search-key", Some("openai:search")),
sample_key("unrestricted-key", None),
empty_scope_key,
];
let (total, active) = endpoint_key_counts_by_format("custom", &endpoints, &keys);
assert_eq!(total.get("openai:responses"), Some(&2));
assert_eq!(total.get("openai:search"), Some(&3));
assert_eq!(active, total);
}
}
fn masked_proxy_value(proxy: Option<&serde_json::Value>) -> serde_json::Value {
let Some(proxy) = proxy.and_then(serde_json::Value::as_object) else {
return serde_json::Value::Null;