sidelinja/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AI-admin: vis faktisk modellnavn i tokenforbruk + fiks kolonnelayout

Browse source 
- Worker slår opp faktisk modellnavn (f.eks. google/gemini-2.5-flash-lite)
  fra providers-tabellen og lagrer det i model_actual
- Stripper openrouter/gemini-prefiks for lesbarhet
- Tokenforbruk-tabellen bruker faste kolonnebredder for korrekt justering

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
vegard 2026-03-16 07:48:26 +01:00
parent 85f0cd9d30
commit 7899b2f224
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/src/routes/server-admin/ai/+page.svelte
View file

@ -2040,7 +2040,7 @@
/* Usage/tokenforbruk */ /* Usage/tokenforbruk */
.usage-row { .usage-row {
grid-template-columns: auto auto auto auto auto auto auto; grid-template-columns: 1fr 2fr 70px 80px 80px 80px 70px;
} }
.col-model-actual { .col-model-actual {

29
worker/src/handlers/ai_text_process.rs
View file

@ -80,9 +80,16 @@ impl JobHandler for AiTextProcessHandler {
let prompt_override = payload.get("prompt_override").and_then(|v| v.as_str()); let prompt_override = payload.get("prompt_override").and_then(|v| v.as_str());
// Slå opp modellalias fra jobbrutingen, fall tilbake til payload eller default // Slå opp modellalias og faktisk modellnavn fra jobbrutingen
let model_from_routing: Option<String> = sqlx::query_scalar( let routing_info: Option<(String, String)> = sqlx::query_as(
"SELECT a.alias FROM ai_job_routing r JOIN ai_model_aliases a ON a.id = r.alias_id WHERE r.job_type = 'ai_text_process'" r#"SELECT a.alias, p.litellm_model
FROM ai_job_routing r
JOIN ai_model_aliases a ON a.id = r.alias_id
JOIN ai_model_providers p ON p.alias_id = a.id
JOIN ai_api_keys k ON k.env_name = p.api_key_env
WHERE r.job_type = 'ai_text_process'
AND p.is_active = true AND k.is_enabled = true
ORDER BY p.priority ASC LIMIT 1"#
) )
.fetch_optional(pool) .fetch_optional(pool)
.await .await
@ -93,9 +100,11 @@ impl JobHandler for AiTextProcessHandler {
.get("model") .get("model")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
.map(|s| s.to_string()) .map(|s| s.to_string())
.or(model_from_routing) .or_else(|| routing_info.as_ref().map(|(alias, _)| alias.clone()))
.unwrap_or_else(|| "sidelinja/rutine".to_string()); .unwrap_or_else(|| "sidelinja/rutine".to_string());
let expected_model = routing_info.map(|(_, m)| m);
info!( info!(
message_id = %message_id, message_id = %message_id,
action = action, action = action,
@ -192,6 +201,14 @@ impl JobHandler for AiTextProcessHandler {
.context("Feil ved oppdatering av metadata")?; .context("Feil ved oppdatering av metadata")?;
// 8. Logg tokenforbruk til ai_usage_log // 8. Logg tokenforbruk til ai_usage_log
// LiteLLM returnerer alias-navnet i model-feltet — bruk expected_model fra DB
let actual_model = match &ai_resp.model_actual {
Some(m) if m != &model => Some(m.clone()), // Gateway returnerte faktisk modellnavn
_ => expected_model, // Bruk oppslaget fra providers-tabellen
};
// Strip openrouter/-prefiks for lesbarhet
let actual_model_clean = actual_model.map(|m| m.replace("openrouter/", "").replace("gemini/", "google/"));
sqlx::query( sqlx::query(
r#" r#"
INSERT INTO ai_usage_log (workspace_id, job_id, job_type, model_alias, model_actual, prompt_tokens, completion_tokens, total_tokens) INSERT INTO ai_usage_log (workspace_id, job_id, job_type, model_alias, model_actual, prompt_tokens, completion_tokens, total_tokens)
@ -200,8 +217,8 @@ impl JobHandler for AiTextProcessHandler {
) )
.bind(workspace_id) .bind(workspace_id)
.bind(job_id) .bind(job_id)
.bind(model) .bind(&model)
.bind(&ai_resp.model_actual) .bind(&actual_model_clean)
.bind(ai_resp.prompt_tokens) .bind(ai_resp.prompt_tokens)
.bind(ai_resp.completion_tokens) .bind(ai_resp.completion_tokens)
.bind(ai_resp.total_tokens) .bind(ai_resp.total_tokens)