Models: one for analyses and forecasts, one for answers; Opus 5.5 default and fallback
- Admin Modellek: summary, analyses + forecast (shared), question-answer (own model) - Every default is Opus 5.5; when the chosen model fails twice (permanent: once), the default model takes over with fresh attempts before the unit is refunded - The page shows how often the fallback was needed in the last 30 days Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
//! Admin: which model writes which kind of analysis, chosen from the models
|
||||
//! OpenRouter offers. A change applies to analyses requested after it.
|
||||
//! Admin: which model writes the analyses and forecasts, the answers to
|
||||
//! questions and the short summary, chosen from the models OpenRouter offers.
|
||||
//! A change applies to texts requested after it.
|
||||
|
||||
use analysis_prompt::Kind;
|
||||
use axum::Json;
|
||||
use axum::extract::{Path, State};
|
||||
use axum_extra::extract::WithRejection;
|
||||
@@ -13,7 +13,7 @@ use super::{Body, St};
|
||||
use crate::AppState;
|
||||
use crate::auth::AdminUser;
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::models::default_model;
|
||||
use crate::models::{Function, default_model};
|
||||
use crate::views::rfc3339;
|
||||
|
||||
fn catalog_error(e: String) -> ApiError {
|
||||
@@ -23,27 +23,38 @@ fn catalog_error(e: String) -> ApiError {
|
||||
}
|
||||
}
|
||||
|
||||
async fn entry(state: &AppState, kind: Kind) -> Result<Value, sqlx::Error> {
|
||||
async fn entry(state: &AppState, function: Function) -> Result<Value, sqlx::Error> {
|
||||
let chosen: Option<(String, OffsetDateTime, Option<String>)> = sqlx::query_as(
|
||||
"SELECT m.model, m.updated_at, u.email FROM model_settings m LEFT JOIN users u ON u.id = m.updated_by \
|
||||
WHERE m.kind = $1",
|
||||
)
|
||||
.bind(kind.as_str())
|
||||
.bind(function.key())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
// Typical size of this kind of analysis, from the latest ones: for the cost estimate.
|
||||
let (input, output, samples): (Option<f64>, Option<f64>, i64) = sqlx::query_as(
|
||||
// Typical size of the latest texts, for the cost estimate, and how often
|
||||
// the default model had to take over in the last 30 days.
|
||||
let (table, kinds) = match function {
|
||||
Function::Summary => ("analyses", "kind = 'summary'"),
|
||||
Function::Analysis => ("analyses", "kind IN ('natal', 'synastry', 'forecast')"),
|
||||
Function::Question => ("questions", "true"),
|
||||
};
|
||||
let (input, output, samples): (Option<f64>, Option<f64>, i64) = sqlx::query_as(&format!(
|
||||
"SELECT avg(input_tokens)::float8, avg(output_tokens)::float8, count(*) FROM ( \
|
||||
SELECT input_tokens, output_tokens FROM analyses \
|
||||
WHERE kind = $1 AND status = 'done' AND input_tokens IS NOT NULL AND output_tokens IS NOT NULL \
|
||||
ORDER BY completed_at DESC LIMIT 50) recent",
|
||||
)
|
||||
.bind(kind.as_str())
|
||||
SELECT input_tokens, output_tokens FROM {table} \
|
||||
WHERE {kinds} AND status = 'done' AND input_tokens IS NOT NULL AND output_tokens IS NOT NULL \
|
||||
ORDER BY completed_at DESC LIMIT 50) recent"
|
||||
))
|
||||
.fetch_one(&state.db)
|
||||
.await?;
|
||||
let default = default_model(state, kind);
|
||||
let (fallbacks, finished): (i64, i64) = sqlx::query_as(&format!(
|
||||
"SELECT count(*) FILTER (WHERE on_fallback), count(*) FROM {table} \
|
||||
WHERE {kinds} AND status IN ('done', 'failed') AND completed_at > now() - interval '30 days'"
|
||||
))
|
||||
.fetch_one(&state.db)
|
||||
.await?;
|
||||
let default = default_model(state, function);
|
||||
Ok(json!({
|
||||
"kind": kind.as_str(),
|
||||
"kind": function.key(),
|
||||
"model": chosen.as_ref().map_or(default, |c| c.0.as_str()),
|
||||
"default": default,
|
||||
"custom": chosen.is_some(),
|
||||
@@ -52,13 +63,15 @@ async fn entry(state: &AppState, kind: Kind) -> Result<Value, sqlx::Error> {
|
||||
"avg_input_tokens": input,
|
||||
"avg_output_tokens": output,
|
||||
"samples": samples,
|
||||
"fallbacks_30d": fallbacks,
|
||||
"finished_30d": finished,
|
||||
}))
|
||||
}
|
||||
|
||||
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
|
||||
let mut functions = Vec::new();
|
||||
for kind in Kind::ANALYSES {
|
||||
functions.push(entry(&state, kind).await?);
|
||||
for function in Function::ALL {
|
||||
functions.push(entry(&state, function).await?);
|
||||
}
|
||||
Ok(Json(json!({ "functions": functions })))
|
||||
}
|
||||
@@ -81,9 +94,9 @@ pub async fn save(
|
||||
WithRejection(Path(kind), _): WithRejection<Path<String>, ApiError>,
|
||||
WithRejection(Json(req), _): Body<SaveModel>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
let kind = Kind::parse(&kind).ok_or(ApiError::NotFound("function"))?;
|
||||
let function = Function::parse(&kind).ok_or(ApiError::NotFound("function"))?;
|
||||
match req.model.as_deref().map(str::trim) {
|
||||
Some(model) if model != default_model(&state, kind) => {
|
||||
Some(model) if model != default_model(&state, function) => {
|
||||
let models = state.models.models().await.map_err(catalog_error)?;
|
||||
if !models.iter().any(|m| m.id == model) {
|
||||
return Err(ApiError::BadRequest(format!(
|
||||
@@ -95,16 +108,16 @@ pub async fn save(
|
||||
ON CONFLICT (kind) DO UPDATE SET model = EXCLUDED.model, updated_by = EXCLUDED.updated_by, \
|
||||
updated_at = now()",
|
||||
)
|
||||
.bind(kind.as_str())
|
||||
.bind(function.key())
|
||||
.bind(model)
|
||||
.bind(admin.id())
|
||||
.execute(&state.db)
|
||||
.await?;
|
||||
}
|
||||
_ => {
|
||||
sqlx::query("DELETE FROM model_settings WHERE kind = $1").bind(kind.as_str()).execute(&state.db).await?;
|
||||
sqlx::query("DELETE FROM model_settings WHERE kind = $1").bind(function.key()).execute(&state.db).await?;
|
||||
}
|
||||
}
|
||||
tracing::info!(admin = %admin.id(), kind = kind.as_str(), "analysis model changed");
|
||||
Ok(Json(entry(&state, kind).await?))
|
||||
tracing::info!(admin = %admin.id(), function = function.key(), "model changed");
|
||||
Ok(Json(entry(&state, function).await?))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user