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

refactor ai serving modules and crates

Browse Source
This commit is contained in:
fawney19
2026-05-02 13:23:54 +08:00
parent 4fc7cecf30
commit c130d0e2c9
309 changed files with 21549 additions and 14265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-gateway/src/handlers/admin/provider/endpoint_keys/quota.rs
+1 -1
View File
@@ -90,7 +90,7 @@ pub(super) async fn maybe_handle(
let endpoint = match normalized_provider_type.as_str() {
"codex" => endpoints.into_iter().find(|endpoint| {
endpoint.is_active
&& crate::ai_pipeline::is_openai_responses_format(&endpoint.api_format)
&& crate::ai_serving::is_openai_responses_format(&endpoint.api_format)
}),
"antigravity" => endpoints.into_iter().find(|endpoint| {
endpoint.is_active
apps/aether-gateway/src/handlers/admin/provider/oauth/dispatch/complete/key.rs
+1 -1
View File
@@ -228,7 +228,7 @@ pub(super) async fn handle_admin_provider_oauth_complete_key(
.await?;
if let Some(endpoint) = endpoints.into_iter().find(|endpoint| {
endpoint.is_active
&& crate::ai_pipeline::is_openai_responses_format(&endpoint.api_format)
&& crate::ai_serving::is_openai_responses_format(&endpoint.api_format)
}) {
let refreshed_key = state
.read_provider_catalog_keys_by_ids(std::slice::from_ref(&key_id))
apps/aether-gateway/src/handlers/admin/provider/oauth/runtime.rs
+1 -1
View File
@@ -19,7 +19,7 @@ pub(crate) fn provider_oauth_runtime_endpoint_for_provider(
.iter()
.find(|endpoint| {
endpoint.is_active
&& crate::ai_pipeline::is_openai_responses_format(&endpoint.api_format)
&& crate::ai_serving::is_openai_responses_format(&endpoint.api_format)
})
.cloned(),
"antigravity" => endpoints
apps/aether-gateway/src/handlers/admin/provider/query/models.rs
+15 -15
View File
@@ -10,7 +10,7 @@ use super::response::{
ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL,
ADMIN_PROVIDER_QUERY_PROVIDER_NOT_FOUND_DETAIL,
};
use crate::ai_pipeline::{maybe_build_sync_finalize_outcome, GatewayControlDecision};
use crate::ai_serving::{maybe_build_sync_finalize_outcome, GatewayControlDecision};
use crate::execution_runtime;
use crate::handlers::admin::request::{AdminAppState, AdminGatewayProviderTransportSnapshot};
use crate::model_fetch::ModelFetchRuntimeState;
@@ -289,7 +289,7 @@ fn provider_query_key_supports_endpoint(
}
fn provider_query_normalize_api_format_alias(value: &str) -> String {
crate::ai_pipeline::normalize_api_format_alias(value)
crate::ai_serving::normalize_api_format_alias(value)
}
fn provider_query_transport_supports_standard_test_execution(
@@ -297,7 +297,7 @@ fn provider_query_transport_supports_standard_test_execution(
transport: &AdminGatewayProviderTransportSnapshot,
api_format: &str,
) -> bool {
match crate::ai_pipeline::normalize_api_format_alias(api_format).as_str() {
match crate::ai_serving::normalize_api_format_alias(api_format).as_str() {
"openai:chat" => {
crate::provider_transport::policy::supports_local_openai_chat_transport(transport)
}
@@ -860,7 +860,7 @@ async fn provider_query_execute_kiro_test_candidate(
provider_query_extract_error_message(&result)
} else if response_body.is_none()
&& provider_query_decode_execution_body(&result)
.is_some_and(|body| crate::ai_pipeline::stream_body_contains_error_event(&body))
.is_some_and(|body| crate::ai_serving::stream_body_contains_error_event(&body))
{
Some("Kiro upstream returned embedded stream error".to_string())
} else {
@@ -930,11 +930,11 @@ async fn provider_query_execute_standard_test_candidate(
let provider_api_format = candidate.endpoint.api_format.as_str();
let normalized_provider_api_format =
crate::ai_pipeline::normalize_api_format_alias(provider_api_format);
crate::ai_serving::normalize_api_format_alias(provider_api_format);
let provider_request_body = match normalized_provider_api_format.as_str() {
"openai:chat" => {
let Some(mut provider_request_body) =
crate::ai_pipeline::build_local_openai_chat_request_body(
crate::ai_serving::build_local_openai_chat_request_body(
&request_body,
&candidate.effective_model,
false,
@@ -959,7 +959,7 @@ async fn provider_query_execute_standard_test_candidate(
}
"claude:messages" | "gemini:generate_content" => {
let Some(mut provider_request_body) =
crate::ai_pipeline::build_cross_format_openai_chat_request_body(
crate::ai_serving::build_cross_format_openai_chat_request_body(
&request_body,
&candidate.effective_model,
normalized_provider_api_format.as_str(),
@@ -985,7 +985,7 @@ async fn provider_query_execute_standard_test_candidate(
}
"openai:responses" => {
let Some(mut provider_request_body) =
crate::ai_pipeline::build_cross_format_openai_chat_request_body(
crate::ai_serving::build_cross_format_openai_chat_request_body(
&request_body,
&candidate.effective_model,
normalized_provider_api_format.as_str(),
@@ -1007,14 +1007,14 @@ async fn provider_query_execute_standard_test_candidate(
format!("Provider request body rules rejected {provider_api_format}"),
));
}
crate::ai_pipeline::apply_codex_openai_responses_special_body_edits(
crate::ai_serving::apply_codex_openai_responses_special_body_edits(
&mut provider_request_body,
transport.provider.provider_type.as_str(),
provider_api_format,
transport.endpoint.body_rules.as_ref(),
Some(candidate.key.id.as_str()),
);
crate::ai_pipeline::apply_openai_responses_compact_special_body_edits(
crate::ai_serving::apply_openai_responses_compact_special_body_edits(
&mut provider_request_body,
provider_api_format,
);
@@ -1036,13 +1036,13 @@ async fn provider_query_execute_standard_test_candidate(
None
};
let oauth_auth =
match crate::ai_pipeline::normalize_api_format_alias(provider_api_format).as_str() {
match crate::ai_serving::normalize_api_format_alias(provider_api_format).as_str() {
"openai:chat" | "openai:responses" | "claude:messages" | "gemini:generate_content" => {
state.resolve_local_oauth_header_auth(&transport).await?
}
_ => None,
};
let auth = match crate::ai_pipeline::normalize_api_format_alias(provider_api_format).as_str() {
let auth = match crate::ai_serving::normalize_api_format_alias(provider_api_format).as_str() {
"openai:chat" | "openai:responses" => {
crate::provider_transport::auth::resolve_local_openai_bearer_auth(&transport)
.or(oauth_auth)
@@ -1156,8 +1156,8 @@ async fn provider_query_execute_standard_test_candidate(
response_body: None,
});
}
if crate::ai_pipeline::is_openai_responses_format(provider_api_format) {
crate::ai_pipeline::apply_codex_openai_responses_special_headers(
if crate::ai_serving::is_openai_responses_format(provider_api_format) {
crate::ai_serving::apply_codex_openai_responses_special_headers(
&mut request_headers,
&provider_request_body,
&parts.headers,
@@ -1264,7 +1264,7 @@ fn provider_query_prefers_chat_standard_test_api_format(api_format: &str) -> boo
fn provider_query_supports_cli_standard_test_api_format(api_format: &str) -> bool {
matches!(
crate::ai_pipeline::normalize_api_format_alias(api_format).as_str(),
crate::ai_serving::normalize_api_format_alias(api_format).as_str(),
"openai:responses" | "claude:messages" | "gemini:generate_content"
)
}
apps/aether-gateway/src/handlers/admin/provider/write/normalize.rs
+3 -3
View File
@@ -16,7 +16,7 @@ pub(crate) fn normalize_api_format_list(values: Vec<String>) -> Vec<String> {
let mut seen = BTreeSet::new();
let mut normalized = Vec::new();
for value in values {
let canonical = crate::ai_pipeline::normalize_api_format_alias(&value);
let canonical = crate::ai_serving::normalize_api_format_alias(&value);
if seen.insert(canonical.clone()) {
normalized.push(canonical);
}
@@ -36,7 +36,7 @@ pub(crate) fn normalize_api_format_json_object_keys(
};
let mut normalized = serde_json::Map::new();
for (key, value) in map {
let canonical = crate::ai_pipeline::normalize_api_format_alias(&key);
let canonical = crate::ai_serving::normalize_api_format_alias(&key);
normalized.insert(canonical, value);
}
Ok(Some(serde_json::Value::Object(normalized)))
@@ -56,7 +56,7 @@ pub(crate) fn normalize_auth_type_by_format(
let allowed = api_formats.iter().cloned().collect::<BTreeSet<_>>();
let mut normalized = serde_json::Map::new();
for (key, value) in map {
let canonical = crate::ai_pipeline::normalize_api_format_alias(&key);
let canonical = crate::ai_serving::normalize_api_format_alias(&key);
if !allowed.is_empty() && !allowed.contains(&canonical) {
return Err(format!("{field_name} 包含未选择的 API 格式: {canonical}"));
}
apps/aether-gateway/src/handlers/admin/provider/write/provider/template.rs
+1 -1
View File
@@ -350,7 +350,7 @@ fn endpoint_matches_fixed_provider_template(
}
fn normalize_api_format_alias(value: &str) -> String {
crate::ai_pipeline::normalize_api_format_alias(value)
crate::ai_serving::normalize_api_format_alias(value)
}
fn api_format_matches(left: &str, right: &str) -> bool {