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

fix: preserve codex include fields

Browse Source
This commit is contained in:
fawney19
2026-05-15 03:25:06 +08:00
parent daf33a82a6
commit 01a982bdf6
5 changed files with 60 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
crates/aether-ai-formats/src/formats/openai/responses/codex.rs
View File

@@ -300,13 +300,27 @@ fn ensure_codex_responses_passthrough_fields(
return;
}
if !body_rules_handle_path(body_rules, "parallel_tool_calls") {
body_object.insert("parallel_tool_calls".to_string(), json!(true));
body_object
.entry("parallel_tool_calls".to_string())
.or_insert_with(|| json!(true));
}
if !body_rules_handle_path(body_rules, "include") {
body_object.insert(
"include".to_string(),
json!([CODEX_REASONING_ENCRYPTED_CONTENT_INCLUDE]),
);
match body_object.get_mut("include") {
Some(Value::Array(include)) => {
let has_reasoning_encrypted_content = include
.iter()
.any(|value| value.as_str() == Some(CODEX_REASONING_ENCRYPTED_CONTENT_INCLUDE));
if !has_reasoning_encrypted_content {
include.push(json!(CODEX_REASONING_ENCRYPTED_CONTENT_INCLUDE));
}
}
Some(_) | None => {
body_object.insert(
"include".to_string(),
json!([CODEX_REASONING_ENCRYPTED_CONTENT_INCLUDE]),
);
}
}
}
}
@@ -378,7 +392,7 @@ pub fn apply_codex_openai_responses_special_body_edits(
json!(CODEX_DEFAULT_INSTRUCTIONS),
);
} else if body_object.contains_key("instructions")
&& body_object.get("instructions").map_or(false, |v| v.is_null())
&& body_object.get("instructions").is_some_and(|v| v.is_null())
{
body_object.insert("instructions".to_string(), json!(""));
}
@@ -533,11 +547,19 @@ mod tests {
}
#[test]
fn codex_responses_body_edits_preserve_existing_reasoning_but_use_codex_include() {
fn codex_responses_body_edits_preserve_existing_include_and_parallel_tool_calls() {
let mut provider_request_body = json!( {
"input": [],
"model": "gpt-5.4",
"include": ["file_search_call.results"],
"include": [
"file_search_call.results",
"web_search_call.results",
"web_search_call.action.sources",
"message.input_image.image_url",
"computer_call_output.output.image_url",
"code_interpreter_call.outputs",
"message.output_text.logprobs"
],
"reasoning": {"effort": "high", "summary": "detailed"},
"parallel_tool_calls": false
});
@@ -557,9 +579,18 @@ mod tests {
);
assert_eq!(
provider_request_body["include"],
json!(["reasoning.encrypted_content"])
json!([
"file_search_call.results",
"web_search_call.results",
"web_search_call.action.sources",
"message.input_image.image_url",
"computer_call_output.output.image_url",
"code_interpreter_call.outputs",
"message.output_text.logprobs",
"reasoning.encrypted_content"
])
);
assert_eq!(provider_request_body["parallel_tool_calls"], json!(true));
assert_eq!(provider_request_body["parallel_tool_calls"], json!(false));
}
#[test]
@@ -577,7 +608,10 @@ mod tests {
None,
);
assert_eq!(provider_request_body["reasoning"]["effort"], json!("medium"));
assert_eq!(
provider_request_body["reasoning"]["effort"],
json!("medium")
);
assert_eq!(provider_request_body["reasoning"]["summary"], json!("auto"));
assert_eq!(
provider_request_body["include"],

3
crates/aether-ai-formats/src/formats/shared/standard_matrix.rs
View File

@@ -14,8 +14,7 @@ use serde_json::Value;
use crate::formats::shared::model_directives::apply_model_directive_overrides_from_request;
use crate::formats::openai::responses::codex::{
apply_codex_openai_responses_chat_body_edits,
apply_codex_openai_responses_special_body_edits,
apply_codex_openai_responses_chat_body_edits, apply_codex_openai_responses_special_body_edits,
apply_openai_responses_compact_special_body_edits,
};
use crate::formats::shared::standard_normalize::build_local_openai_chat_request_body_with_model_directives;

25
crates/aether-data/src/repository/auth/postgres.rs
View File

@@ -1536,25 +1536,22 @@ fn map_auth_api_key_export_row(
#[cfg(test)]
mod tests {
use super::{
CREATE_STANDALONE_API_KEY_SQL, CREATE_USER_API_KEY_SQL,
SqlxAuthApiKeySnapshotReadRepository, UPDATE_STANDALONE_API_KEY_BASIC_SQL,
SqlxAuthApiKeySnapshotReadRepository, CREATE_STANDALONE_API_KEY_SQL,
CREATE_USER_API_KEY_SQL, UPDATE_STANDALONE_API_KEY_BASIC_SQL,
};
use crate::driver::postgres::{PostgresPoolConfig, PostgresPoolFactory};
#[test]
fn create_api_key_sql_orders_expiry_before_standalone_flags() {
assert!(CREATE_USER_API_KEY_SQL.contains(
"expires_at,\n auto_delete_on_expiry,\n is_locked,\n is_standalone,"
));
assert!(CREATE_USER_API_KEY_SQL.contains(
"$12,\n $13,\n FALSE,\n FALSE,\n $14,"
));
assert!(CREATE_STANDALONE_API_KEY_SQL.contains(
"expires_at,\n auto_delete_on_expiry,\n is_locked,\n is_standalone,"
));
assert!(CREATE_STANDALONE_API_KEY_SQL.contains(
"$12,\n $13,\n FALSE,\n TRUE,\n $14,"
));
assert!(CREATE_USER_API_KEY_SQL
.contains("expires_at,\n auto_delete_on_expiry,\n is_locked,\n is_standalone,"));
assert!(
CREATE_USER_API_KEY_SQL.contains("$12,\n $13,\n $14,\n FALSE,\n FALSE,\n $15,")
);
assert!(CREATE_STANDALONE_API_KEY_SQL
.contains("expires_at,\n auto_delete_on_expiry,\n is_locked,\n is_standalone,"));
assert!(CREATE_STANDALONE_API_KEY_SQL
.contains("$12,\n $13,\n $14,\n FALSE,\n TRUE,\n $15,"));
}
#[test]