Questions about an analysis or forecast, answered by the model that wrote it
- 3 questions in every package, +5 questions add-on (1 000 Ft); question units, refund on failure - The answer sees the chart data, the analysis and earlier questions; at most 250 words - Editable question prompt (Promptok → Kérdés-válasz); admins regenerate answers - Package texts and FAQ updated Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
+103
-14
@@ -259,7 +259,7 @@ async fn register_login_verify_logout(pool: PgPool) {
|
||||
let r = app.get("/v1/me", Some(&token)).await;
|
||||
assert_eq!(r.status, StatusCode::OK);
|
||||
assert_eq!(r.body["providers"], json!(["password"]));
|
||||
assert_eq!(r.body["analyses_left"], json!({"natal": 0, "synastry": 0, "forecast": 0}));
|
||||
assert_eq!(r.body["analyses_left"], json!({"natal": 0, "synastry": 0, "forecast": 0, "question": 0}));
|
||||
|
||||
// e-mail verification through the queued e-mail's link
|
||||
let url = app.outbox_url("anna@example.com", "verify_email").await;
|
||||
@@ -382,12 +382,12 @@ async fn roles_and_admin_guard(pool: PgPool) {
|
||||
let r = app.post(&format!("/v1/admin/users/{anna}/credits"), Some(&admin), grant("natal", 5)).await;
|
||||
assert_eq!(
|
||||
(r.status, &r.body["analyses_left"]),
|
||||
(StatusCode::CREATED, &json!({"natal": 5, "synastry": 0, "forecast": 0}))
|
||||
(StatusCode::CREATED, &json!({"natal": 5, "synastry": 0, "forecast": 0, "question": 0}))
|
||||
);
|
||||
let r = app.post(&format!("/v1/admin/users/{anna}/credits"), Some(&admin), grant("chat", 5)).await;
|
||||
assert_eq!(r.status, StatusCode::BAD_REQUEST);
|
||||
let credits = app.get("/v1/credits", Some(&user)).await.body;
|
||||
assert_eq!(credits["balance"], json!({"natal": 5, "synastry": 0, "forecast": 0}));
|
||||
assert_eq!(credits["balance"], json!({"natal": 5, "synastry": 0, "forecast": 0, "question": 0}));
|
||||
assert_eq!((credits["ledger"][0]["unit"].as_str(), &credits["ledger"][0]["delta"]), (Some("natal"), &json!(5)));
|
||||
}
|
||||
|
||||
@@ -558,7 +558,7 @@ async fn analyses_spend_units_and_reuse_results(pool: PgPool) {
|
||||
assert_eq!(model, "anthropic/claude-test");
|
||||
assert_eq!(
|
||||
app.get("/v1/credits", Some(&anna)).await.body["balance"],
|
||||
json!({"natal": 1, "synastry": 0, "forecast": 0})
|
||||
json!({"natal": 1, "synastry": 0, "forecast": 0, "question": 0})
|
||||
);
|
||||
|
||||
// same request again: the same analysis, no charge
|
||||
@@ -568,7 +568,7 @@ async fn analyses_spend_units_and_reuse_results(pool: PgPool) {
|
||||
assert_eq!(r.status, StatusCode::ACCEPTED);
|
||||
assert_eq!(
|
||||
app.get("/v1/credits", Some(&anna)).await.body["balance"],
|
||||
json!({"natal": 0, "synastry": 0, "forecast": 0})
|
||||
json!({"natal": 0, "synastry": 0, "forecast": 0, "question": 0})
|
||||
);
|
||||
let r = app.post(&uri, Some(&anna), json!({"model": "anthropic/claude-other"})).await;
|
||||
assert_eq!(r.status, StatusCode::BAD_REQUEST); // no model choice
|
||||
@@ -759,7 +759,7 @@ async fn synastry_analyses_use_synastry_units(pool: PgPool) {
|
||||
assert_eq!((r.status, r.body["kind"].as_str()), (StatusCode::ACCEPTED, Some("synastry")));
|
||||
assert_eq!(
|
||||
app.get("/v1/credits", Some(&anna)).await.body["balance"],
|
||||
json!({"natal": 1, "synastry": 0, "forecast": 0})
|
||||
json!({"natal": 1, "synastry": 0, "forecast": 0, "question": 0})
|
||||
);
|
||||
}
|
||||
|
||||
@@ -846,7 +846,7 @@ async fn admins_get_free_analyses_and_mock_payments_add_units(pool: PgPool) {
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"unit": "natal"})).await;
|
||||
assert_eq!(
|
||||
(r.status, &r.body["analyses_left"]),
|
||||
(StatusCode::OK, &json!({"natal": 1, "synastry": 0, "forecast": 0})),
|
||||
(StatusCode::OK, &json!({"natal": 1, "synastry": 0, "forecast": 0, "question": 3})),
|
||||
"{}",
|
||||
r.body
|
||||
);
|
||||
@@ -855,7 +855,7 @@ async fn admins_get_free_analyses_and_mock_payments_add_units(pool: PgPool) {
|
||||
assert_eq!((r.status, &r.body["credits_charged"]), (StatusCode::ACCEPTED, &json!(1)), "{}", r.body);
|
||||
assert_eq!(
|
||||
app.get("/v1/credits", Some(&anna)).await.body["balance"],
|
||||
json!({"natal": 0, "synastry": 0, "forecast": 0})
|
||||
json!({"natal": 0, "synastry": 0, "forecast": 0, "question": 3})
|
||||
);
|
||||
|
||||
// without MOCK_PAYMENTS there is no such payment
|
||||
@@ -947,7 +947,8 @@ async fn admins_edit_analysis_prompts(pool: PgPool) {
|
||||
let prompts = r.body["prompts"].as_array().unwrap();
|
||||
let keys: Vec<String> =
|
||||
prompts.iter().map(|p| format!("{}/{}", p["kind"], p["language"]).replace('"', "")).collect();
|
||||
let expected = ["summary", "natal", "synastry", "forecast"].map(|k| [format!("{k}/hu"), format!("{k}/en")]);
|
||||
let expected =
|
||||
["summary", "natal", "synastry", "forecast", "question"].map(|k| [format!("{k}/hu"), format!("{k}/en")]);
|
||||
assert_eq!(keys, expected.concat());
|
||||
let natal = &prompts[2];
|
||||
assert_eq!((&natal["custom"], &natal["system"]), (&json!(false), &natal["default"]));
|
||||
@@ -1143,7 +1144,10 @@ async fn packages_grant_units(pool: PgPool) {
|
||||
// the catalog is public
|
||||
let r = app.get("/v1/packages", None).await;
|
||||
let ids: Vec<&str> = r.body["packages"].as_array().unwrap().iter().map(|p| p["id"].as_str().unwrap()).collect();
|
||||
assert_eq!(ids, ["single", "couple", "family", "addon_synastry", "addon_forecast", "addon_persons"]);
|
||||
assert_eq!(
|
||||
ids,
|
||||
["single", "couple", "family", "addon_synastry", "addon_forecast", "addon_persons", "addon_questions"]
|
||||
);
|
||||
assert_eq!(
|
||||
(&r.body["packages"][2]["badge"], &r.body["packages"][2]["per_analysis_huf"]),
|
||||
(&json!("Legnépszerűbb"), &json!(647))
|
||||
@@ -1155,7 +1159,7 @@ async fn packages_grant_units(pool: PgPool) {
|
||||
let r = grant_package(&app, &admin, &anna_id, "family").await;
|
||||
assert_eq!(
|
||||
(r.status, &r.body["analyses_left"]),
|
||||
(StatusCode::CREATED, &json!({"natal": 6, "synastry": 5, "forecast": 6})),
|
||||
(StatusCode::CREATED, &json!({"natal": 6, "synastry": 5, "forecast": 6, "question": 3})),
|
||||
"{}",
|
||||
r.body
|
||||
);
|
||||
@@ -1170,7 +1174,7 @@ async fn packages_grant_units(pool: PgPool) {
|
||||
|
||||
// a (mock) purchase adds to it and records the price
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "couple"})).await;
|
||||
assert_eq!(r.body["analyses_left"], json!({"natal": 8, "synastry": 6, "forecast": 8}), "{}", r.body);
|
||||
assert_eq!(r.body["analyses_left"], json!({"natal": 8, "synastry": 6, "forecast": 8, "question": 6}), "{}", r.body);
|
||||
let (price,): (i32,) =
|
||||
sqlx::query_as("SELECT price_huf FROM package_orders WHERE package = 'couple'").fetch_one(&pool).await.unwrap();
|
||||
assert_eq!(price, 6000);
|
||||
@@ -1411,14 +1415,14 @@ async fn forecasts_are_free_their_analysis_uses_a_forecast_unit(pool: PgPool) {
|
||||
(StatusCode::PAYMENT_REQUIRED, Some("insufficient_credits"))
|
||||
);
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"unit": "forecast"})).await;
|
||||
assert_eq!(r.body["analyses_left"], json!({"natal": 1, "synastry": 0, "forecast": 1}), "{}", r.body);
|
||||
assert_eq!(r.body["analyses_left"], json!({"natal": 1, "synastry": 0, "forecast": 1, "question": 0}), "{}", r.body);
|
||||
let r = app.call("POST", &analyses, Some(&anna), None).await;
|
||||
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
|
||||
assert_eq!((r.body["kind"].as_str(), r.body["forecast_id"].as_str()), (Some("forecast"), Some(id.as_str())));
|
||||
let analysis = r.body["id"].as_str().unwrap().to_string();
|
||||
assert_eq!(
|
||||
app.get("/v1/credits", Some(&anna)).await.body["balance"],
|
||||
json!({"natal": 1, "synastry": 0, "forecast": 0})
|
||||
json!({"natal": 1, "synastry": 0, "forecast": 0, "question": 0})
|
||||
);
|
||||
assert_eq!(app.call("POST", &analyses, Some(&anna), None).await.status, StatusCode::OK); // the same one, no charge
|
||||
assert_eq!(app.get(&analyses, Some(&anna)).await.body["analyses"].as_array().unwrap().len(), 1);
|
||||
@@ -1548,3 +1552,88 @@ async fn admins_choose_the_model_of_each_function(pool: PgPool) {
|
||||
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);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn questions_about_an_analysis_use_question_units(pool: PgPool) {
|
||||
let app = TestApp::new(pool.clone()).await;
|
||||
let anna = app.register("anna@example.com", "Anna").await;
|
||||
let bob = app.register("bob@example.com", "Bob").await;
|
||||
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||
let chart_id = chart["id"].as_str().unwrap();
|
||||
|
||||
// a package comes with three questions
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "single"})).await;
|
||||
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
|
||||
let left = || async { app.get("/v1/me", Some(&anna)).await.body["analyses_left"]["question"].clone() };
|
||||
assert_eq!(left().await, json!(3));
|
||||
|
||||
let r = app.post(&format!("/v1/charts/{chart_id}/analyses"), Some(&anna), json!({})).await;
|
||||
let analysis = r.body["id"].as_str().unwrap().to_string();
|
||||
let uri = format!("/v1/analyses/{analysis}/questions");
|
||||
let ask = |who: &str, q: &str| {
|
||||
let (app, uri, who, body) = (&app, &uri, who.to_string(), json!({ "question": q }));
|
||||
async move { app.post(uri, Some(&who), body).await }
|
||||
};
|
||||
let r = ask(&anna, "Mi az erősségem?").await;
|
||||
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("analysis_not_ready")));
|
||||
sqlx::query("UPDATE analyses SET status = 'done', content = '{\"title\": \"Cím\"}'").execute(&pool).await.unwrap();
|
||||
|
||||
assert_eq!(ask(&bob, "Mi az erősségem?").await.status, StatusCode::NOT_FOUND);
|
||||
assert_eq!(ask(&anna, "?").await.status, StatusCode::BAD_REQUEST);
|
||||
assert_eq!(ask(&anna, &"x".repeat(601)).await.status, StatusCode::BAD_REQUEST);
|
||||
let r = ask(&anna, " Mi az erősségem? ").await;
|
||||
assert_eq!((r.status, r.body["status"].as_str()), (StatusCode::ACCEPTED, Some("pending")), "{}", r.body);
|
||||
assert_eq!(r.body["question"], "Mi az erősségem?");
|
||||
assert!(r.body.get("model").is_none(), "the model is a secret");
|
||||
assert_eq!(left().await, json!(2));
|
||||
let question = r.body["id"].as_str().unwrap().to_string();
|
||||
// the same model as the analysis answers
|
||||
let (q_model, a_model): (String, String) = sqlx::query_as(
|
||||
"SELECT q.model, a.model FROM questions q JOIN analyses a ON a.id = q.analysis_id WHERE q.id = $1::uuid",
|
||||
)
|
||||
.bind(&question)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(q_model, a_model);
|
||||
// one at a time
|
||||
let r = ask(&anna, "És a munkában?").await;
|
||||
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("question_in_progress")));
|
||||
sqlx::query("UPDATE questions SET status = 'done', answer = 'A kitartásod.'").execute(&pool).await.unwrap();
|
||||
assert_eq!(app.get(&format!("/v1/questions/{question}"), Some(&anna)).await.body["answer"], "A kitartásod.");
|
||||
assert_eq!(app.get(&format!("/v1/questions/{question}"), Some(&bob)).await.status, StatusCode::NOT_FOUND);
|
||||
assert_eq!(ask(&anna, "És a munkában?").await.status, StatusCode::ACCEPTED);
|
||||
sqlx::query("UPDATE questions SET status = 'done', answer = 'Válasz.'").execute(&pool).await.unwrap();
|
||||
assert_eq!(ask(&anna, "És a pénz?").await.status, StatusCode::ACCEPTED);
|
||||
sqlx::query("UPDATE questions SET status = 'done', answer = 'Válasz.'").execute(&pool).await.unwrap();
|
||||
let r = ask(&anna, "És a szerelem?").await;
|
||||
assert_eq!(
|
||||
(r.status, r.body["error"]["code"].as_str()),
|
||||
(StatusCode::PAYMENT_REQUIRED, Some("insufficient_credits"))
|
||||
);
|
||||
let list = app.get(&uri, Some(&anna)).await.body;
|
||||
assert_eq!(list["questions"].as_array().unwrap().len(), 3);
|
||||
assert_eq!(list["questions"][0]["question"], "Mi az erősségem?");
|
||||
|
||||
// more can be bought; the summary cannot be asked about
|
||||
let r = app.post("/v1/payments/mock", Some(&anna), json!({"unit": "question"})).await;
|
||||
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
|
||||
assert_eq!(left().await, json!(5));
|
||||
let summary: String =
|
||||
sqlx::query_scalar("SELECT id::text FROM analyses WHERE kind = 'summary'").fetch_one(&pool).await.unwrap();
|
||||
sqlx::query("UPDATE analyses SET status = 'done', content = '{}' WHERE kind = 'summary'")
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let r = app.post(&format!("/v1/analyses/{summary}/questions"), Some(&anna), json!({"question": "Miért?"})).await;
|
||||
assert_eq!(r.status, StatusCode::BAD_REQUEST);
|
||||
|
||||
// admins regenerate an answer in place
|
||||
let admin = app.register("admin@example.com", "Admin").await;
|
||||
let r = app.post(&format!("/v1/admin/questions/{question}/regenerate"), Some(&admin), json!({})).await;
|
||||
assert_eq!(
|
||||
(r.status, r.body["status"].as_str(), &r.body["answer"]),
|
||||
(StatusCode::OK, Some("pending"), &Value::Null)
|
||||
);
|
||||
assert_eq!(left().await, json!(5), "regenerating charges nobody");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user