mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-10 19:29:50 +08:00
feat: add embedding and rerank support
This commit is contained in:
@@ -8,6 +8,38 @@ use aether_data_contracts::repository::global_models::AdminGlobalModelListQuery;
|
||||
use serde_json::json;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
const EMBEDDING_API_FORMATS: &[&str] = &[
|
||||
"openai:embedding",
|
||||
"jina:embedding",
|
||||
"gemini:embedding",
|
||||
"doubao:embedding",
|
||||
];
|
||||
|
||||
fn json_value_contains_string(value: &serde_json::Value, expected: &str) -> bool {
|
||||
match value {
|
||||
serde_json::Value::String(value) => value.trim().eq_ignore_ascii_case(expected),
|
||||
serde_json::Value::Array(values) => values
|
||||
.iter()
|
||||
.any(|value| json_value_contains_string(value, expected)),
|
||||
serde_json::Value::Object(object) => object
|
||||
.values()
|
||||
.any(|value| json_value_contains_string(value, expected)),
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
fn json_value_contains_embedding_metadata(value: &serde_json::Value) -> bool {
|
||||
value
|
||||
.as_object()
|
||||
.and_then(|object| object.get("embedding"))
|
||||
.and_then(serde_json::Value::as_bool)
|
||||
.unwrap_or(false)
|
||||
|| json_value_contains_string(value, "embedding")
|
||||
|| EMBEDDING_API_FORMATS
|
||||
.iter()
|
||||
.any(|api_format| json_value_contains_string(value, api_format))
|
||||
}
|
||||
|
||||
pub(crate) async fn build_admin_global_model_providers_payload(
|
||||
state: &AdminAppState<'_>,
|
||||
global_model_id: &str,
|
||||
@@ -53,6 +85,7 @@ pub(crate) async fn build_admin_global_model_providers_payload(
|
||||
"supports_vision": admin_provider_model_effective_capability(&model, "vision"),
|
||||
"supports_function_calling": admin_provider_model_effective_capability(&model, "function_calling"),
|
||||
"supports_streaming": admin_provider_model_effective_capability(&model, "streaming"),
|
||||
"supports_embedding": admin_provider_model_effective_capability(&model, "embedding"),
|
||||
"is_active": model.is_active,
|
||||
}))
|
||||
})
|
||||
@@ -123,6 +156,14 @@ pub(crate) async fn build_admin_model_catalog_payload(
|
||||
.and_then(|value| value.get("streaming"))
|
||||
.and_then(serde_json::Value::as_bool)
|
||||
.unwrap_or(false);
|
||||
let mut supports_embedding = global_model
|
||||
.supported_capabilities
|
||||
.as_ref()
|
||||
.is_some_and(json_value_contains_embedding_metadata)
|
||||
|| global_model
|
||||
.config
|
||||
.as_ref()
|
||||
.is_some_and(json_value_contains_embedding_metadata);
|
||||
|
||||
for model in provider_models {
|
||||
let Some(provider) = provider_ids.get(&model.provider_id) else {
|
||||
@@ -143,9 +184,12 @@ pub(crate) async fn build_admin_model_catalog_payload(
|
||||
admin_provider_model_effective_capability(&model, "function_calling");
|
||||
let model_supports_streaming =
|
||||
admin_provider_model_effective_capability(&model, "streaming");
|
||||
let model_supports_embedding =
|
||||
admin_provider_model_effective_capability(&model, "embedding");
|
||||
supports_vision |= model_supports_vision;
|
||||
supports_function_calling |= model_supports_function_calling;
|
||||
supports_streaming |= model_supports_streaming;
|
||||
supports_embedding |= model_supports_embedding;
|
||||
providers.push(json!({
|
||||
"provider_id": provider.id,
|
||||
"provider_name": provider.name,
|
||||
@@ -162,6 +206,7 @@ pub(crate) async fn build_admin_model_catalog_payload(
|
||||
"supports_vision": model_supports_vision,
|
||||
"supports_function_calling": model_supports_function_calling,
|
||||
"supports_streaming": model_supports_streaming,
|
||||
"supports_embedding": model_supports_embedding,
|
||||
"is_active": model.is_active,
|
||||
}));
|
||||
}
|
||||
@@ -189,6 +234,7 @@ pub(crate) async fn build_admin_model_catalog_payload(
|
||||
"supports_vision": supports_vision,
|
||||
"supports_function_calling": supports_function_calling,
|
||||
"supports_streaming": supports_streaming,
|
||||
"supports_embedding": supports_embedding,
|
||||
}),
|
||||
}));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user