Hungarian prompts in Hungarian, model choice per analysis kind, admin regenerate
- The built-in Hungarian system prompts and the user message frame are written in Hungarian - Admin page Modellek: the model of each analysis kind, chosen from the OpenRouter list (structured-output models only) with prices and a cost estimate per analysis - Admin: regenerate any analysis in place with the current prompt and model (no charge) - Fix: a failed forecast analysis refunds a forecast unit, not a natal one Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -96,8 +96,24 @@ async fn fake_jwks() -> Json<Value> {
|
||||
)
|
||||
}
|
||||
|
||||
async fn fake_openrouter_models() -> Json<Value> {
|
||||
let model = |id: &str, name: &str, structured: bool| {
|
||||
json!({
|
||||
"id": id, "name": name, "context_length": 200000,
|
||||
"pricing": {"prompt": "0.000003", "completion": "0.000015"},
|
||||
"supported_parameters": if structured { json!(["tools", "structured_outputs"]) } else { json!(["tools"]) },
|
||||
})
|
||||
};
|
||||
Json(json!({"data": [
|
||||
model("anthropic/claude-test", "Claude Test", true),
|
||||
model("vendor/plain", "Plain (no JSON)", false),
|
||||
model("openai/gpt-x", "GPT X", true),
|
||||
]}))
|
||||
}
|
||||
|
||||
async fn fake_services() -> String {
|
||||
let app = Router::new()
|
||||
.route("/openrouter/models", get(fake_openrouter_models))
|
||||
.route("/v1/natal", post(fake_natal))
|
||||
.route("/v1/synastry", post(fake_synastry))
|
||||
.route("/v1/forecast", post(fake_forecast))
|
||||
@@ -1460,3 +1476,75 @@ async fn recalculate_refreshes_calculations_and_queues_every_analysis_again(pool
|
||||
assert_eq!(app.get("/v1/me", Some(&anna)).await.body["analyses_left"], before);
|
||||
assert_eq!(syn.status, StatusCode::CREATED);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn admins_choose_the_model_of_each_function(pool: PgPool) {
|
||||
let app = TestApp::new(pool.clone()).await;
|
||||
let admin = app.register("admin@example.com", "Admin").await;
|
||||
let anna = app.register("anna@example.com", "Anna").await;
|
||||
assert_eq!(app.get("/v1/admin/models", Some(&anna)).await.status, StatusCode::FORBIDDEN);
|
||||
|
||||
let r = app.get("/v1/admin/models", Some(&admin)).await;
|
||||
let models: Vec<(&str, &str, bool)> = r.body["functions"]
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.iter()
|
||||
.map(|f| (f["kind"].as_str().unwrap(), f["model"].as_str().unwrap(), f["custom"].as_bool().unwrap()))
|
||||
.collect();
|
||||
assert_eq!(
|
||||
models,
|
||||
[
|
||||
("summary", "anthropic/claude-summary", false),
|
||||
("natal", "anthropic/claude-test", false),
|
||||
("synastry", "anthropic/claude-test", false),
|
||||
("forecast", "anthropic/claude-test", false),
|
||||
]
|
||||
);
|
||||
|
||||
// the list has only models that give structured answers, with prices per million tokens
|
||||
let r = app.get("/v1/admin/models/catalog", Some(&admin)).await;
|
||||
let ids: Vec<&str> = r.body["models"].as_array().unwrap().iter().map(|m| m["id"].as_str().unwrap()).collect();
|
||||
assert_eq!(ids, ["anthropic/claude-test", "openai/gpt-x"]);
|
||||
assert_eq!(r.body["models"][1]["input_per_million"].as_f64().map(|p| (p * 100.0).round()), Some(300.0));
|
||||
|
||||
let put = |kind: &str, model: Value| {
|
||||
let uri = format!("/v1/admin/models/{kind}");
|
||||
let (app, admin) = (&app, &admin);
|
||||
async move { app.call("PUT", &uri, Some(admin), Some(json!({ "model": model }))).await }
|
||||
};
|
||||
assert_eq!(put("natal", json!("vendor/plain")).await.status, StatusCode::BAD_REQUEST);
|
||||
assert_eq!(put("composite", json!("openai/gpt-x")).await.status, StatusCode::NOT_FOUND);
|
||||
let r = put("natal", json!("openai/gpt-x")).await;
|
||||
assert_eq!((r.status, &r.body["model"], &r.body["custom"]), (StatusCode::OK, &json!("openai/gpt-x"), &json!(true)));
|
||||
|
||||
// new analyses use it; regenerating writes it again in place with the current model
|
||||
let chart = app.chart(&admin, "Saját", true, "1990-03-15").await;
|
||||
let chart_id = chart["id"].as_str().unwrap();
|
||||
let r = app.post(&format!("/v1/charts/{chart_id}/analyses"), Some(&admin), json!({})).await;
|
||||
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
|
||||
let id = r.body["id"].as_str().unwrap().to_string();
|
||||
let model =
|
||||
|| sqlx::query_scalar::<_, String>("SELECT model FROM analyses WHERE id = $1::uuid").bind(&id).fetch_one(&pool);
|
||||
assert_eq!(model().await.unwrap(), "openai/gpt-x");
|
||||
let regenerate_uri = format!("/v1/admin/analyses/{id}/regenerate");
|
||||
let regenerate = || app.post(®enerate_uri, Some(&admin), json!({}));
|
||||
assert_eq!(regenerate().await.status, StatusCode::CONFLICT); // still being written
|
||||
sqlx::query("UPDATE analyses SET status = 'done', content = '{\"title\": \"Régi\"}', completed_at = now()")
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(put("natal", Value::Null).await.body["model"], "anthropic/claude-test");
|
||||
assert_eq!(
|
||||
app.post(&format!("/v1/admin/analyses/{id}/regenerate"), Some(&anna), json!({})).await.status,
|
||||
StatusCode::FORBIDDEN
|
||||
);
|
||||
let r = regenerate().await;
|
||||
assert_eq!(
|
||||
(r.status, r.body["status"].as_str(), &r.body["content"]),
|
||||
(StatusCode::OK, Some("pending"), &Value::Null)
|
||||
);
|
||||
assert_eq!(r.body["id"].as_str(), Some(id.as_str()));
|
||||
assert_eq!(model().await.unwrap(), "anthropic/claude-test");
|
||||
let r = app.get(&format!("/v1/charts/{chart_id}/analyses"), Some(&admin)).await;
|
||||
assert_eq!(r.body["analyses"].as_array().unwrap().iter().filter(|a| a["kind"] == "natal").count(), 1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user