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:
@@ -2,8 +2,9 @@
|
||||
//! offers (with prices) for the admin page.
|
||||
//!
|
||||
//! The choice is in `model_settings`; without a row the configured default
|
||||
//! is used (`SUMMARY_MODEL` for the short summary, `ANALYSIS_MODEL` else).
|
||||
//! The model is never shown to users (a business secret).
|
||||
//! is used (`SUMMARY_MODEL` for the short summary, `ANALYSIS_MODEL` else,
|
||||
//! both Opus 5.5 by default). When the chosen model fails, the worker falls
|
||||
//! back to the default. The model is never shown to users (a business secret).
|
||||
|
||||
use std::sync::Arc;
|
||||
use std::time::{Duration, Instant};
|
||||
@@ -18,21 +19,66 @@ use crate::AppState;
|
||||
/// The OpenRouter list is fetched at most this often.
|
||||
const CATALOG_TTL: Duration = Duration::from_secs(3600);
|
||||
|
||||
/// The configured default model of a kind.
|
||||
pub fn default_model(state: &AppState, kind: Kind) -> &str {
|
||||
match kind {
|
||||
Kind::Summary => &state.config.summary_model,
|
||||
_ => &state.config.analysis_model,
|
||||
/// The model settings of the admin page: one model writes all analyses and
|
||||
/// forecasts, another the answers to questions, a third the short summary.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum Function {
|
||||
Summary,
|
||||
Analysis,
|
||||
Question,
|
||||
}
|
||||
|
||||
impl Function {
|
||||
pub const ALL: [Function; 3] = [Function::Summary, Function::Analysis, Function::Question];
|
||||
|
||||
pub fn key(self) -> &'static str {
|
||||
match self {
|
||||
Function::Summary => "summary",
|
||||
Function::Analysis => "analysis",
|
||||
Function::Question => "question",
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse(key: &str) -> Option<Function> {
|
||||
Function::ALL.into_iter().find(|f| f.key() == key)
|
||||
}
|
||||
|
||||
pub fn of(kind: Kind) -> Function {
|
||||
match kind {
|
||||
Kind::Summary => Function::Summary,
|
||||
Kind::Question => Function::Question,
|
||||
Kind::Natal | Kind::Synastry | Kind::Forecast => Function::Analysis,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The model new analyses of this kind are written with.
|
||||
pub async fn model_for(state: &AppState, kind: Kind) -> Result<String, sqlx::Error> {
|
||||
/// The configured default model of a function; also the fallback when the
|
||||
/// chosen model fails.
|
||||
pub fn default_model(state: &AppState, function: Function) -> &str {
|
||||
match function {
|
||||
Function::Summary => &state.config.summary_model,
|
||||
Function::Analysis | Function::Question => &state.config.analysis_model,
|
||||
}
|
||||
}
|
||||
|
||||
/// The model new texts of this kind are written with, and the fallback model
|
||||
/// (`None` when the chosen model is the default).
|
||||
pub async fn models_for(state: &AppState, kind: Kind) -> Result<(String, Option<String>), sqlx::Error> {
|
||||
let function = Function::of(kind);
|
||||
let chosen: Option<String> = sqlx::query_scalar("SELECT model FROM model_settings WHERE kind = $1")
|
||||
.bind(kind.as_str())
|
||||
.bind(function.key())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
Ok(chosen.unwrap_or_else(|| default_model(state, kind).to_owned()))
|
||||
let default = default_model(state, function);
|
||||
Ok(match chosen {
|
||||
Some(model) if model != default => (model, Some(default.to_owned())),
|
||||
_ => (default.to_owned(), None),
|
||||
})
|
||||
}
|
||||
|
||||
/// The model new texts of this kind are written with.
|
||||
pub async fn model_for(state: &AppState, kind: Kind) -> Result<String, sqlx::Error> {
|
||||
Ok(models_for(state, kind).await?.0)
|
||||
}
|
||||
|
||||
/// One model OpenRouter offers, with its price in USD per million tokens.
|
||||
|
||||
Reference in New Issue
Block a user