mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-03 01:40:21 +08:00
refactor ai serving modules and crates
This commit is contained in:
@@ -6,7 +6,7 @@ use sha2::{Digest, Sha256};
|
||||
use url::form_urlencoded;
|
||||
|
||||
use crate::{
|
||||
ai_pipeline::extract_gemini_model_from_path,
|
||||
ai_serving::extract_gemini_model_from_path,
|
||||
headers::{header_value_str, is_json_request},
|
||||
};
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ async fn request_model_resolves_to_allowed_model(
|
||||
let Some(client_api_format) = decision
|
||||
.auth_endpoint_signature
|
||||
.as_deref()
|
||||
.map(crate::ai_pipeline::normalize_api_format_alias)
|
||||
.map(crate::ai_serving::normalize_api_format_alias)
|
||||
.filter(|value| !value.trim().is_empty())
|
||||
else {
|
||||
return Ok(false);
|
||||
@@ -128,14 +128,14 @@ async fn request_model_resolves_to_allowed_model(
|
||||
fn candidate_api_formats_for_model_resolution(client_api_format: &str) -> Vec<String> {
|
||||
let mut api_formats = Vec::new();
|
||||
push_unique_api_format(&mut api_formats, client_api_format);
|
||||
for api_format in crate::ai_pipeline::request_candidate_api_formats(client_api_format, false) {
|
||||
for api_format in crate::ai_serving::request_candidate_api_formats(client_api_format, false) {
|
||||
push_unique_api_format(&mut api_formats, api_format);
|
||||
}
|
||||
api_formats
|
||||
}
|
||||
|
||||
fn push_unique_api_format(api_formats: &mut Vec<String>, api_format: &str) {
|
||||
let api_format = crate::ai_pipeline::normalize_api_format_alias(api_format);
|
||||
let api_format = crate::ai_serving::normalize_api_format_alias(api_format);
|
||||
if api_format.is_empty() || api_formats.iter().any(|value| value == &api_format) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -663,7 +663,7 @@ fn contains_api_format_or_alias(items: &[String], target: &str) -> bool {
|
||||
}
|
||||
|
||||
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 {
|
||||
@@ -795,7 +795,7 @@ fn endpoint_matches_requested_provider(
|
||||
return true;
|
||||
}
|
||||
let endpoint_api_format = normalize_api_format_alias(&endpoint.api_format);
|
||||
if crate::ai_pipeline::request_conversion_kind(requested_api_format, &endpoint_api_format)
|
||||
if crate::ai_serving::request_conversion_kind(requested_api_format, &endpoint_api_format)
|
||||
.is_some()
|
||||
{
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user