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

fix(codex): serve versioned dynamic model catalogs

Browse Source
This commit is contained in:
zhefox
2026-08-14 18:41:44 +08:00
parent a1d64e5239
commit 810c3dfe2b
39 changed files with 6147 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-ai/formats/src/api.rs
+3 -3
View File
@@ -188,9 +188,9 @@ pub use crate::formats::{
apply_codex_openai_special_headers,
apply_openai_responses_compact_special_body_edits,
build_codex_model_catalog_metadata, parse_codex_auth_identity,
resolve_codex_responses_model_capabilities, CodexAuthIdentity,
CodexResponsesModelCapabilities, CODEX_OPENAI_IMAGE_DEFAULT_MODEL,
CODEX_OPENAI_IMAGE_DEFAULT_OUTPUT_FORMAT,
project_codex_catalog_model_card, resolve_codex_responses_model_capabilities,
CodexAuthIdentity, CodexResponsesModelCapabilities,
CODEX_OPENAI_IMAGE_DEFAULT_MODEL, CODEX_OPENAI_IMAGE_DEFAULT_OUTPUT_FORMAT,
CODEX_OPENAI_IMAGE_DEFAULT_VARIATION_MODEL,
CODEX_OPENAI_IMAGE_DEFAULT_VARIATION_PROMPT, CODEX_OPENAI_IMAGE_INTERNAL_MODEL,
},
crates/aether-ai/formats/src/formats/openai/responses/codex.rs
+134 -1
View File
@@ -236,6 +236,40 @@ pub fn build_codex_model_catalog_metadata(cards: &[Value]) -> Value {
})
}
/// Projects an upstream Codex catalog card onto an authorized Aether model name.
///
/// Catalog cards are versioned by Codex and may gain fields that Aether does not know about. Keep
/// the matching card opaque: only the Aether-internal identity fields are removed and `slug` is
/// replaced with the downstream model name. A non-empty, exact `id` or `slug` match is the only
/// schema requirement.
pub fn project_codex_catalog_model_card(
catalog_models: &[Value],
source_model: &str,
global_model: &str,
) -> Option<Value> {
if source_model.trim().is_empty() || global_model.trim().is_empty() {
return None;
}
let mut card = catalog_models
.iter()
.filter_map(Value::as_object)
.find(|card| {
["id", "slug"].iter().any(|field| {
card.get(*field)
.and_then(Value::as_str)
.filter(|identity| !identity.trim().is_empty())
.is_some_and(|identity| identity == source_model)
})
})?
.clone();
card.remove("id");
card.remove("api_formats");
card.insert("slug".to_string(), Value::String(global_model.to_string()));
Some(Value::Object(card))
}
fn codex_execution_model_card(card: &Value) -> Value {
const EXCLUDED_FIELDS: [&str; 3] =
["base_instructions", "model_messages", "available_in_plans"];
@@ -1989,7 +2023,7 @@ mod tests {
apply_codex_openai_responses_special_body_edits_with_source_model_and_capabilities,
apply_codex_openai_special_headers, apply_openai_responses_compact_special_body_edits,
build_codex_model_catalog_metadata, bundled_codex_model_cards, effective_codex_model_cards,
resolve_codex_responses_model_capabilities,
project_codex_catalog_model_card, resolve_codex_responses_model_capabilities,
validate_codex_openai_responses_compact_request_contract, CODEX_CLIENT_ORIGINATOR,
CODEX_CLIENT_USER_AGENT, CODEX_OPENAI_IMAGE_INTERNAL_MODEL,
CODEX_OPENAI_RESPONSES_UNSUPPORTED_BODY_FIELDS, CODEX_RESPONSES_LITE_HEADER,
@@ -2091,6 +2125,105 @@ mod tests {
);
}
#[test]
fn projects_current_codex_catalog_card_as_opaque_json() {
let card = json!({
"id": "upstream-internal-id",
"slug": "gpt-future-dynamic",
"api_formats": ["openai:responses"],
"model_messages": {
"instructions_template": "Current instructions for {{ personality }}"
},
"available_in_plans": ["plus", "pro"],
"future_capability": {
"mode": "native",
"unknown_nested_field": [1, 2, 3]
}
});
let projected =
project_codex_catalog_model_card(&[card], "gpt-future-dynamic", "future-model-alias")
.expect("current Codex card should project");
assert_eq!(projected["slug"], "future-model-alias");
assert!(projected.get("id").is_none());
assert!(projected.get("api_formats").is_none());
assert_eq!(
projected["model_messages"]["instructions_template"],
"Current instructions for {{ personality }}"
);
assert_eq!(projected["available_in_plans"], json!(["plus", "pro"]));
assert_eq!(
projected["future_capability"],
json!({
"mode": "native",
"unknown_nested_field": [1, 2, 3]
})
);
}
#[test]
fn projects_legacy_codex_catalog_card_by_id_without_known_schema_fields() {
let card = json!({
"id": "gpt-future-dynamic",
"base_instructions": "Legacy instructions",
"available_in_plans": ["team"],
"future_capability": true
});
let projected = project_codex_catalog_model_card(
&[json!("not an object"), card],
"gpt-future-dynamic",
"legacy-model-alias",
)
.expect("legacy Codex card should project by id");
assert_eq!(
projected,
json!({
"slug": "legacy-model-alias",
"base_instructions": "Legacy instructions",
"available_in_plans": ["team"],
"future_capability": true
})
);
}
#[test]
fn codex_catalog_projection_requires_a_non_empty_exact_identity() {
let cards = [
json!(null),
json!({}),
json!({"id": "", "slug": " "}),
json!({"slug": "gpt-future-dynamic-preview"}),
];
assert!(project_codex_catalog_model_card(
&cards,
"gpt-future-dynamic",
"future-model-alias"
)
.is_none());
assert!(project_codex_catalog_model_card(
&[json!({"slug": "gpt-future-dynamic"})],
"",
"future-model-alias"
)
.is_none());
assert!(project_codex_catalog_model_card(
&[json!({"slug": "gpt-future-dynamic"})],
" gpt-future-dynamic ",
"future-model-alias"
)
.is_none());
assert!(project_codex_catalog_model_card(
&[json!({"slug": "gpt-future-dynamic"})],
"gpt-future-dynamic",
" "
)
.is_none());
}
#[test]
fn codex_responses_lite_header_is_omitted_for_server_side_compaction() {
let mut headers = std::collections::BTreeMap::from([(
crates/aether-ai/formats/src/formats/openai/responses/history.rs
+8 -4
View File
@@ -397,8 +397,8 @@ mod tests {
use super::{
expand_previous_response_for_chat, hydrate_response_history,
record_converted_response_history, response_history_storage_key, response_history_store,
ResponseHistoryStore,
record_converted_response_history, response_history_key, response_history_storage_key,
response_history_store,
};
fn conversion_report_context(original_request_body: serde_json::Value) -> serde_json::Value {
@@ -496,9 +496,13 @@ mod tests {
assert!(!record.storage_key.contains("distributed-history-key-a"));
assert!(!record.storage_key.contains("resp_distributed_history_1"));
*response_history_store()
response_history_store()
.lock()
.unwrap_or_else(|poisoned| poisoned.into_inner()) = ResponseHistoryStore::default();
.unwrap_or_else(|poisoned| poisoned.into_inner())
.remove(&response_history_key(
"resp_distributed_history_1",
Some("distributed-history-key-a"),
));
let continuation = json!({
"model": "deepseek-v4-flash",
"previous_response_id": "resp_distributed_history_1",
crates/aether-ai/formats/src/lib.rs
+4 -3
View File
@@ -44,9 +44,10 @@ pub use formats::openai::request_contract::{
};
pub use formats::openai::responses::codex::{
build_codex_model_catalog_metadata, bundled_codex_model_cards, effective_codex_model_cards,
parse_codex_auth_identity, resolve_codex_responses_model_capabilities, CodexAuthIdentity,
CodexResponsesModelCapabilities, CODEX_CLIENT_ORIGINATOR, CODEX_CLIENT_USER_AGENT,
CODEX_CLIENT_VERSION, CODEX_MODEL_CATALOG_METADATA_FIELD, CODEX_RESPONSES_LITE_HEADER,
parse_codex_auth_identity, project_codex_catalog_model_card,
resolve_codex_responses_model_capabilities, CodexAuthIdentity, CodexResponsesModelCapabilities,
CODEX_CLIENT_ORIGINATOR, CODEX_CLIENT_USER_AGENT, CODEX_CLIENT_VERSION,
CODEX_MODEL_CATALOG_METADATA_FIELD, CODEX_RESPONSES_LITE_HEADER,
};
pub use formats::openai::responses::request::{
validate_openai_responses_request_contract, OpenAiResponsesRequestContractViolation,