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

fix(admin): align global model responses with repository counts

Browse Source
This commit is contained in:
fawney19
2026-04-11 02:55:02 +08:00
parent a54ac76688
commit 34d295c1e0
6 changed files with 91 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-gateway/src/handlers/admin/model/global/payloads.rs
+9 -28
View File
@@ -1,22 +1,16 @@
use super::super::super::shared::json_string_list;
use super::super::payloads::timestamp_or_now;
use super::helpers::{
admin_global_model_provider_counts, admin_global_model_provider_models_by_global_model_id,
admin_global_models_now_unix_secs, build_admin_global_model_price_range,
};
use super::helpers::{admin_global_models_now_unix_secs, build_admin_global_model_price_range};
use crate::handlers::admin::request::AdminAppState;
use aether_data_contracts::repository::global_models::{
AdminGlobalModelListQuery, StoredAdminGlobalModel, StoredAdminProviderModel,
AdminGlobalModelListQuery, StoredAdminGlobalModel,
};
use serde_json::json;
pub(crate) fn build_admin_global_model_response(
global_model: &StoredAdminGlobalModel,
provider_models: &[StoredAdminProviderModel],
now_unix_secs: u64,
) -> serde_json::Value {
let (_, provider_count, active_provider_count) =
admin_global_model_provider_counts(provider_models);
json!({
"id": &global_model.id,
"name": &global_model.name,
@@ -26,9 +20,9 @@ pub(crate) fn build_admin_global_model_response(
"default_tiered_pricing": global_model.default_tiered_pricing.clone(),
"supported_capabilities": json_string_list(global_model.supported_capabilities.as_ref()),
"config": global_model.config.clone(),
"provider_count": provider_count,
"active_provider_count": active_provider_count,
"usage_count": 0,
"provider_count": global_model.provider_count,
"active_provider_count": global_model.active_provider_count,
"usage_count": global_model.usage_count,
"created_at": timestamp_or_now(global_model.created_at_unix_ms, now_unix_secs),
"updated_at": timestamp_or_now(global_model.updated_at_unix_secs, now_unix_secs),
})
@@ -60,22 +54,9 @@ pub(crate) async fn build_admin_global_models_payload(
.cmp(&right.name)
.then_with(|| left.id.cmp(&right.id))
});
let global_model_ids = models
.iter()
.map(|model| model.id.clone())
.collect::<Vec<_>>();
let mut provider_models_by_global_model =
admin_global_model_provider_models_by_global_model_id(state, &global_model_ids).await;
let mut payload_models = Vec::with_capacity(models.len());
for model in models {
let provider_models = provider_models_by_global_model
.remove(&model.id)
.unwrap_or_default();
payload_models.push(build_admin_global_model_response(
&model,
&provider_models,
now_unix_secs,
));
payload_models.push(build_admin_global_model_response(&model, now_unix_secs));
}
Some(json!({
"models": payload_models,
@@ -100,11 +81,11 @@ pub(crate) async fn build_admin_global_model_payload(
.ok()
.unwrap_or_default();
let now_unix_secs = admin_global_models_now_unix_secs();
let (total_models, total_providers, _) = admin_global_model_provider_counts(&provider_models);
let mut payload = build_admin_global_model_response(&model, &provider_models, now_unix_secs);
let total_models = provider_models.len();
let mut payload = build_admin_global_model_response(&model, now_unix_secs);
if let Some(object) = payload.as_object_mut() {
object.insert("total_models".to_string(), json!(total_models));
object.insert("total_providers".to_string(), json!(total_providers));
object.insert("total_providers".to_string(), json!(model.provider_count));
object.insert(
"price_range".to_string(),
build_admin_global_model_price_range(&model, &provider_models),