Try draft prompts on own charts before saving
Under each prompt on /admin/promptok, "Kipróbálás" writes the summary or detailed analysis with the text in the editor (saved or not) on one of the admin's own charts. Test runs live in prompt_previews: never shown with the chart, not cached, no credits, one attempt, at most three open per admin, removed after 30 days. The worker writes them when no analysis is due. The result shows the model, tokens, cost and time, and the draft can be loaded back. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -79,6 +79,8 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
||||
| `POST /v1/admin/users/{id}/credits` | admin | `{unit: natal\|synastry, delta, note?}`: elemzések jóváírása vagy levonása |
|
||||
| `GET /v1/admin/prompts` | admin | a tömör és a részletes elemzés system promptja nyelvenként: érvényes szöveg, alapértelmezett, változatok |
|
||||
| `PUT /v1/admin/prompts/{kind}/{language}` | admin | `{system}` új változatként menti (`null` vagy az alapértelmezett szöveg: vissza a beépítettre); az új elemzések `prompt_version`-je `v2-r<id>` |
|
||||
| `POST /v1/admin/prompts/{kind}/{language}/preview` | admin | `{system, chart_id}`: próbafuttatás a (mentetlen) szöveggel egy saját képleten; nem kerül a képlethez, nem gyorsítótárazott, nem fogy egység; egyszerre legfeljebb 3 |
|
||||
| `GET /v1/admin/previews/{id}` | admin | a próbafuttatás állapota és eredménye (modell, token, költség) |
|
||||
|
||||
Hibák formátuma: `{"error": {"code", "message"}}`. A születési adatok hibái (például ismeretlen hely, javaslatokkal együtt) változatlanul jönnek tovább a horoscope-api-ból.
|
||||
|
||||
|
||||
@@ -92,6 +92,8 @@ pub fn router(state: Arc<AppState>) -> Router {
|
||||
.route("/v1/admin/users/{id}/credits", post(admin::adjust_credits))
|
||||
.route("/v1/admin/prompts", get(prompts::list))
|
||||
.route("/v1/admin/prompts/{kind}/{language}", axum::routing::put(prompts::save))
|
||||
.route("/v1/admin/prompts/{kind}/{language}/preview", post(prompts::start_preview))
|
||||
.route("/v1/admin/previews/{id}", get(prompts::get_preview))
|
||||
.layer(cors(&state.config.cors_allowed_origins))
|
||||
.layer(
|
||||
TraceLayer::new_for_http()
|
||||
|
||||
@@ -4,26 +4,34 @@
|
||||
//! (kind, language) is in force, `system` NULL meaning the built-in text.
|
||||
//! New analyses record the revision in `prompt_version`, so analyses that
|
||||
//! are already written or queued keep the text they were started with.
|
||||
//!
|
||||
//! A draft can be tried on one of the admin's own charts first: a row in
|
||||
//! `prompt_previews` that the worker writes like an analysis, but it is never
|
||||
//! shown to users, cached or charged.
|
||||
|
||||
use analysis_prompt::{Kind, default_system, user_template};
|
||||
use axum::Json;
|
||||
use axum::extract::{Path, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum_extra::extract::WithRejection;
|
||||
use serde::Deserialize;
|
||||
use serde_json::{Value, json};
|
||||
use sqlx::PgPool;
|
||||
use time::OffsetDateTime;
|
||||
use uuid::Uuid;
|
||||
|
||||
use super::{Body, St};
|
||||
use super::{Body, IdPath, St};
|
||||
use crate::AppState;
|
||||
use crate::auth::AdminUser;
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::rfc3339;
|
||||
use crate::views::{rfc3339, rfc3339_opt};
|
||||
|
||||
/// The kinds whose prompt the admin page edits.
|
||||
const EDITABLE: [Kind; 2] = [Kind::Summary, Kind::Natal];
|
||||
const MAX_CHARS: usize = 50_000;
|
||||
const HISTORY: i64 = 20;
|
||||
/// Test runs of one admin waiting or being written at the same time.
|
||||
const MAX_OPEN_PREVIEWS: i64 = 3;
|
||||
|
||||
/// The revision id of an admin-edited prompt in force, `None` for the built-in one.
|
||||
pub async fn current_revision(db: &PgPool, kind: &str, language: &str) -> Result<Option<i64>, sqlx::Error> {
|
||||
@@ -96,6 +104,18 @@ fn parse_target(state: &AppState, kind: &str, language: &str) -> Result<Kind, Ap
|
||||
Ok(kind)
|
||||
}
|
||||
|
||||
/// Trims a submitted prompt and checks its length.
|
||||
fn clean_system(text: &str) -> Result<String, ApiError> {
|
||||
let text = text.trim().replace("\r\n", "\n");
|
||||
if text.is_empty() {
|
||||
return Err(ApiError::BadRequest("the prompt must not be empty".into()));
|
||||
}
|
||||
if text.chars().count() > MAX_CHARS {
|
||||
return Err(ApiError::BadRequest(format!("the prompt is longer than {MAX_CHARS} characters")));
|
||||
}
|
||||
Ok(text)
|
||||
}
|
||||
|
||||
pub async fn save(
|
||||
State(state): St,
|
||||
AdminUser(admin): AdminUser,
|
||||
@@ -105,11 +125,7 @@ pub async fn save(
|
||||
let kind = parse_target(&state, &kind, &language)?;
|
||||
let default = default_system(kind, &language);
|
||||
// The built-in text is stored as NULL, so later code changes reach it.
|
||||
let system = match req.system.map(|s| s.trim().replace("\r\n", "\n")) {
|
||||
Some(s) if s.is_empty() => return Err(ApiError::BadRequest("the prompt must not be empty".into())),
|
||||
Some(s) if s.chars().count() > MAX_CHARS => {
|
||||
return Err(ApiError::BadRequest(format!("the prompt is longer than {MAX_CHARS} characters")));
|
||||
}
|
||||
let system = match req.system.as_deref().map(clean_system).transpose()? {
|
||||
Some(s) if s == default.trim() => None,
|
||||
other => other,
|
||||
};
|
||||
@@ -136,3 +152,119 @@ pub async fn save(
|
||||
}
|
||||
Ok(Json(entry(&state.db, kind, &language).await?))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct StartPreview {
|
||||
/// The draft to try (it need not be saved).
|
||||
system: String,
|
||||
/// One of the admin's own charts (own or a person).
|
||||
chart_id: Uuid,
|
||||
}
|
||||
|
||||
type PreviewRow = (
|
||||
Uuid,
|
||||
String,
|
||||
Uuid,
|
||||
String,
|
||||
String,
|
||||
String,
|
||||
Option<Value>,
|
||||
Option<String>,
|
||||
Option<String>,
|
||||
Option<i32>,
|
||||
Option<i32>,
|
||||
Option<f64>,
|
||||
OffsetDateTime,
|
||||
Option<OffsetDateTime>,
|
||||
Option<OffsetDateTime>,
|
||||
);
|
||||
|
||||
const PREVIEW_COLUMNS: &str = "id, kind, chart_id, language, model, status, content, error, model_used, \
|
||||
input_tokens, output_tokens, cost_usd, created_at, started_at, completed_at";
|
||||
|
||||
fn preview_view(row: PreviewRow) -> Value {
|
||||
let (
|
||||
id,
|
||||
kind,
|
||||
chart_id,
|
||||
language,
|
||||
model,
|
||||
status,
|
||||
content,
|
||||
error,
|
||||
model_used,
|
||||
input,
|
||||
output,
|
||||
cost,
|
||||
created,
|
||||
started,
|
||||
completed,
|
||||
) = row;
|
||||
let seconds = started.zip(completed).map(|(s, c)| (c - s).whole_seconds());
|
||||
json!({
|
||||
"id": id, "kind": kind, "chart_id": chart_id, "language": language, "model": model, "status": status,
|
||||
"content": content, "error": error, "model_used": model_used, "input_tokens": input, "output_tokens": output,
|
||||
"cost_usd": cost, "created_at": rfc3339(created), "completed_at": rfc3339_opt(completed), "seconds": seconds,
|
||||
})
|
||||
}
|
||||
|
||||
pub async fn start_preview(
|
||||
State(state): St,
|
||||
AdminUser(admin): AdminUser,
|
||||
WithRejection(Path((kind, language)), _): WithRejection<Path<(String, String)>, ApiError>,
|
||||
WithRejection(Json(req), _): Body<StartPreview>,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let kind = parse_target(&state, &kind, &language)?;
|
||||
let system = clean_system(&req.system)?;
|
||||
let own: Option<(Uuid,)> = sqlx::query_as("SELECT id FROM charts WHERE id = $1 AND owner_id = $2")
|
||||
.bind(req.chart_id)
|
||||
.bind(admin.id())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
own.ok_or(ApiError::NotFound("chart"))?;
|
||||
let (open,): (i64,) = sqlx::query_as(
|
||||
"SELECT count(*) FROM prompt_previews WHERE created_by = $1 AND status IN ('pending', 'running')",
|
||||
)
|
||||
.bind(admin.id())
|
||||
.fetch_one(&state.db)
|
||||
.await?;
|
||||
if open >= MAX_OPEN_PREVIEWS {
|
||||
return Err(ApiError::conflict(
|
||||
"too_many_previews",
|
||||
"Egyszerre legfeljebb három próba futhat. Várd meg, amíg valamelyik elkészül.",
|
||||
));
|
||||
}
|
||||
let model = match kind {
|
||||
Kind::Summary => &state.config.summary_model,
|
||||
_ => &state.config.analysis_model,
|
||||
};
|
||||
let row: PreviewRow = sqlx::query_as(&format!(
|
||||
"INSERT INTO prompt_previews (id, kind, chart_id, language, model, system, created_by) \
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING {PREVIEW_COLUMNS}"
|
||||
))
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(kind.as_str())
|
||||
.bind(req.chart_id)
|
||||
.bind(&language)
|
||||
.bind(model)
|
||||
.bind(&system)
|
||||
.bind(admin.id())
|
||||
.fetch_one(&state.db)
|
||||
.await?;
|
||||
Ok((StatusCode::ACCEPTED, Json(preview_view(row))))
|
||||
}
|
||||
|
||||
pub async fn get_preview(
|
||||
State(state): St,
|
||||
AdminUser(admin): AdminUser,
|
||||
WithRejection(Path(id), _): IdPath,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
let row: Option<PreviewRow> =
|
||||
sqlx::query_as(&format!("SELECT {PREVIEW_COLUMNS} FROM prompt_previews WHERE id = $1 AND created_by = $2"))
|
||||
.bind(id)
|
||||
.bind(admin.id())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
Ok(Json(preview_view(row.ok_or(ApiError::NotFound("preview"))?)))
|
||||
}
|
||||
|
||||
@@ -894,3 +894,55 @@ async fn admins_edit_analysis_prompts(pool: PgPool) {
|
||||
assert_eq!((&r.body["custom"], r.body["system"].as_str()), (&json!(false), Some(default.as_str())));
|
||||
assert_eq!(r.body["history"].as_array().unwrap().len(), 2);
|
||||
}
|
||||
|
||||
/// Starts a summary prompt test run on `chart`.
|
||||
async fn start_preview(app: &TestApp, chart: &Value, token: &str) -> Response {
|
||||
let body = json!({"system": " Próba szabályok. ", "chart_id": chart["id"]});
|
||||
app.call("POST", "/v1/admin/prompts/summary/hu/preview", Some(token), Some(body)).await
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn admins_try_prompt_drafts_on_own_charts(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;
|
||||
let own = app.chart(&admin, "Saját", true, "1990-03-15").await;
|
||||
let annas = app.chart(&anna, "Saját", true, "1991-05-01").await;
|
||||
|
||||
assert_eq!(start_preview(&app, &own, &anna).await.status, StatusCode::FORBIDDEN);
|
||||
assert_eq!(start_preview(&app, &annas, &admin).await.status, StatusCode::NOT_FOUND); // only own charts
|
||||
let r = start_preview(&app, &own, &admin).await;
|
||||
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
|
||||
assert_eq!(
|
||||
(r.body["status"].as_str(), r.body["kind"].as_str(), r.body["model"].as_str()),
|
||||
(Some("pending"), Some("summary"), Some("anthropic/claude-summary"))
|
||||
);
|
||||
let id = r.body["id"].as_str().unwrap().to_string();
|
||||
let (system,): (String,) = sqlx::query_as("SELECT system FROM prompt_previews WHERE id = $1::uuid")
|
||||
.bind(&id)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(system, "Próba szabályok.");
|
||||
|
||||
// nothing reaches the chart's analyses, and the saved prompt is unchanged
|
||||
let r = app.get(&format!("/v1/charts/{}/analyses", own["id"].as_str().unwrap()), Some(&admin)).await;
|
||||
assert!(
|
||||
r.body["analyses"].as_array().unwrap().iter().all(|a| a["kind"] == "summary" && a["prompt_version"] == "v1")
|
||||
);
|
||||
assert_eq!(app.get("/v1/admin/prompts", Some(&admin)).await.body["prompts"][0]["custom"], json!(false));
|
||||
|
||||
let r = app.get(&format!("/v1/admin/previews/{id}"), Some(&admin)).await;
|
||||
assert_eq!((r.status, r.body["status"].as_str()), (StatusCode::OK, Some("pending")));
|
||||
assert_eq!(app.get(&format!("/v1/admin/previews/{id}"), Some(&anna)).await.status, StatusCode::FORBIDDEN);
|
||||
|
||||
// at most three at a time
|
||||
start_preview(&app, &own, &admin).await;
|
||||
start_preview(&app, &own, &admin).await;
|
||||
let r = start_preview(&app, &own, &admin).await;
|
||||
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("too_many_previews")));
|
||||
let body = json!({"system": "Részletes próba.", "chart_id": own["id"]});
|
||||
sqlx::query("UPDATE prompt_previews SET status = 'done'").execute(&pool).await.unwrap();
|
||||
let r = app.call("POST", "/v1/admin/prompts/natal/hu/preview", Some(&admin), Some(body)).await;
|
||||
assert_eq!((r.status, r.body["model"].as_str()), (StatusCode::ACCEPTED, Some("anthropic/claude-test")));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user