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

merge(pr287): absorb remaining rust branch changes

Browse Source 
Absorb the remaining changes from PR #287 into aether-rust-pioneer after resolving conflicts locally and preserving the admin fixes already landed in this branch.

Closes #287
Co-authored-by: AAEE86 <ppk0227@hotmail.com>
This commit is contained in:
fawney19
2026-04-11 03:07:26 +08:00
parent 34d295c1e0 174f11604a
commit 848f99d3e5
64 changed files with 8004 additions and 2530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/aether-ai-pipeline/src/conversion/registry.rs
View File

@@ -114,9 +114,11 @@ pub fn sync_cli_response_conversion_kind(
if !is_standard_api_format(provider_api_format.as_str()) {
return None;
}
request_conversion_kind(client_api_format.as_str(), provider_api_format.as_str())?;
if client_api_format != "openai:compact" {
request_conversion_kind(client_api_format.as_str(), provider_api_format.as_str())?;
}
match client_api_format.as_str() {
"openai:cli" => Some(SyncCliResponseConversionKind::ToOpenAIFamilyCli),
"openai:cli" | "openai:compact" => Some(SyncCliResponseConversionKind::ToOpenAIFamilyCli),
"claude:cli" => Some(SyncCliResponseConversionKind::ToClaudeCli),
"gemini:cli" => Some(SyncCliResponseConversionKind::ToGeminiCli),
_ => None,
@@ -303,7 +305,7 @@ mod tests {
);
assert_eq!(
sync_cli_response_conversion_kind("claude:cli", "openai:compact"),
None
Some(SyncCliResponseConversionKind::ToOpenAIFamilyCli)
);
assert_eq!(
sync_cli_response_conversion_kind("openai:compact", "claude:cli"),

79
crates/aether-ai-pipeline/src/finalize/sync_products.rs
View File

@@ -211,14 +211,9 @@ pub fn maybe_build_openai_cli_cross_format_sync_product_from_normalized_payload(
.trim()
.to_ascii_lowercase();
if !matches!(client_api_format.as_str(), "openai:cli" | "openai:compact") {
return Ok(None);
}
if !matches!(
provider_api_format.as_str(),
"openai:cli" | "claude:chat" | "claude:cli" | "gemini:chat" | "gemini:cli"
) {
if !matches!(client_api_format.as_str(), "openai:cli" | "openai:compact")
|| sync_cli_response_conversion_kind(&provider_api_format, &client_api_format).is_none()
{
return Ok(None);
}
@@ -439,8 +434,13 @@ fn maybe_build_openai_cli_same_family_sync_body(
.unwrap_or_default()
.trim()
.to_ascii_lowercase();
let needs_conversion = report_context
.get("needs_conversion")
.and_then(Value::as_bool)
.unwrap_or(false);
if !is_openai_cli_family_api_format(&provider_api_format)
|| !is_openai_cli_family_api_format(&client_api_format)
|| (provider_api_format == client_api_format && needs_conversion)
{
return None;
}
@@ -479,8 +479,13 @@ fn maybe_build_openai_cli_same_family_stream_sync_body(
.unwrap_or_default()
.trim()
.to_ascii_lowercase();
let needs_conversion = report_context
.get("needs_conversion")
.and_then(Value::as_bool)
.unwrap_or(false);
if !is_openai_cli_family_api_format(&provider_api_format)
|| !is_openai_cli_family_api_format(&client_api_format)
|| (provider_api_format == client_api_format && needs_conversion)
{
return Ok(None);
}
@@ -1544,6 +1549,33 @@ mod tests {
assert_eq!(body_json, provider_body_json);
}
#[test]
fn allows_openai_cli_same_family_cross_format_sync_when_conversion_is_flagged() {
let report_context = json!({
"provider_api_format": "openai:compact",
"client_api_format": "openai:cli",
"needs_conversion": true,
});
let provider_body_json = json!({
"id": "resp_family_123",
"object": "response",
"status": "completed",
"output": []
});
let body_json = maybe_build_openai_cli_same_family_sync_body_from_normalized_payload(
"openai_cli_sync_finalize",
200,
Some(&report_context),
Some(&provider_body_json),
None,
)
.expect("openai-cli cross-family sync should succeed")
.expect("body should exist");
assert_eq!(body_json, provider_body_json);
}
#[test]
fn rejects_openai_cli_same_family_error_body_json() {
let report_context = json!({
@@ -1863,6 +1895,37 @@ mod tests {
);
}
#[test]
fn standard_sync_finalize_product_handles_openai_cli_same_family_cross_format_body() {
let report_context = json!({
"provider_api_format": "openai:compact",
"client_api_format": "openai:cli",
"needs_conversion": true,
});
let provider_body_json = json!({
"id": "resp_family_123",
"object": "response",
"status": "completed",
"output": []
});
let product = maybe_build_standard_sync_finalize_product_from_normalized_payload(
"openai_cli_sync_finalize",
200,
Some(&report_context),
Some(&provider_body_json),
None,
)
.expect("dispatch should succeed");
assert_eq!(
product,
Some(StandardSyncFinalizeNormalizedProduct::SuccessBody(
provider_body_json
))
);
}
#[test]
fn standard_sync_finalize_product_handles_openai_chat_cross_format() {
let report_context = json!({