Main #12
@@ -0,0 +1,14 @@
|
||||
-- The yearly forecast prompt is editable on the admin page too, and can be
|
||||
-- tried on one of the admin's own forecasts.
|
||||
ALTER TABLE prompt_revisions DROP CONSTRAINT prompt_revisions_kind_check;
|
||||
ALTER TABLE prompt_revisions ADD CONSTRAINT prompt_revisions_kind_check
|
||||
CHECK (kind IN ('summary', 'natal', 'synastry', 'forecast'));
|
||||
|
||||
ALTER TABLE prompt_previews DROP CONSTRAINT prompt_previews_target;
|
||||
ALTER TABLE prompt_previews
|
||||
ADD COLUMN forecast_id uuid REFERENCES forecasts ON DELETE CASCADE,
|
||||
ADD CONSTRAINT prompt_previews_target CHECK (
|
||||
(kind IN ('summary', 'natal') AND chart_id IS NOT NULL AND synastry_id IS NULL AND forecast_id IS NULL)
|
||||
OR (kind = 'synastry' AND synastry_id IS NOT NULL AND chart_id IS NULL AND forecast_id IS NULL)
|
||||
OR (kind = 'forecast' AND forecast_id IS NOT NULL AND chart_id IS NULL AND synastry_id IS NULL)
|
||||
);
|
||||
@@ -27,7 +27,7 @@ use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::{rfc3339, rfc3339_opt};
|
||||
|
||||
/// The kinds whose prompt the admin page edits.
|
||||
const EDITABLE: [Kind; 3] = [Kind::Summary, Kind::Natal, Kind::Synastry];
|
||||
const EDITABLE: [Kind; 4] = [Kind::Summary, Kind::Natal, Kind::Synastry, Kind::Forecast];
|
||||
const MAX_CHARS: usize = 50_000;
|
||||
const HISTORY: i64 = 20;
|
||||
/// Test runs of one admin waiting or being written at the same time.
|
||||
@@ -162,6 +162,8 @@ pub struct StartPreview {
|
||||
chart_id: Option<Uuid>,
|
||||
/// One of the admin's own comparisons, for a synastry analysis.
|
||||
synastry_id: Option<Uuid>,
|
||||
/// A yearly forecast of one of the admin's own charts, for a forecast analysis.
|
||||
forecast_id: Option<Uuid>,
|
||||
}
|
||||
|
||||
#[derive(sqlx::FromRow)]
|
||||
@@ -170,6 +172,7 @@ struct PreviewRow {
|
||||
kind: String,
|
||||
chart_id: Option<Uuid>,
|
||||
synastry_id: Option<Uuid>,
|
||||
forecast_id: Option<Uuid>,
|
||||
language: String,
|
||||
model: String,
|
||||
status: String,
|
||||
@@ -184,7 +187,7 @@ struct PreviewRow {
|
||||
completed_at: Option<OffsetDateTime>,
|
||||
}
|
||||
|
||||
const PREVIEW_COLUMNS: &str = "id, kind, chart_id, synastry_id, language, model, status, content, error, model_used, \
|
||||
const PREVIEW_COLUMNS: &str = "id, kind, chart_id, synastry_id, forecast_id, language, model, status, content, error, model_used, \
|
||||
input_tokens, output_tokens, cost_usd, created_at, started_at, completed_at";
|
||||
|
||||
impl PreviewRow {
|
||||
@@ -192,6 +195,7 @@ impl PreviewRow {
|
||||
let seconds = self.started_at.zip(self.completed_at).map(|(s, c)| (c - s).whole_seconds());
|
||||
json!({
|
||||
"id": self.id, "kind": self.kind, "chart_id": self.chart_id, "synastry_id": self.synastry_id,
|
||||
"forecast_id": self.forecast_id,
|
||||
"language": self.language, "model": self.model, "status": self.status, "content": self.content,
|
||||
"error": self.error, "model_used": self.model_used, "input_tokens": self.input_tokens,
|
||||
"output_tokens": self.output_tokens, "cost_usd": self.cost_usd, "created_at": rfc3339(self.created_at),
|
||||
@@ -208,29 +212,27 @@ pub async fn start_preview(
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let kind = parse_target(&state, &kind, &language)?;
|
||||
let system = clean_system(&req.system)?;
|
||||
// The target must be the admin's own: a chart, or for a synastry analysis a comparison.
|
||||
let (chart_id, synastry_id, found) = match (kind, req.chart_id, req.synastry_id) {
|
||||
(Kind::Synastry, None, Some(id)) => {
|
||||
let row: Option<(Uuid,)> = sqlx::query_as("SELECT id FROM synastries WHERE id = $1 AND owner_id = $2")
|
||||
.bind(id)
|
||||
.bind(admin.id())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
(None, Some(id), row.map(|_| "synastry"))
|
||||
// The target must be the admin's own: a chart, a comparison or a forecast.
|
||||
let (chart_id, synastry_id, forecast_id) = (req.chart_id, req.synastry_id, req.forecast_id);
|
||||
let (query, id, what) = match (kind, chart_id, synastry_id, forecast_id) {
|
||||
(Kind::Summary | Kind::Natal, Some(id), None, None) => {
|
||||
("SELECT id FROM charts WHERE id = $1 AND owner_id = $2", id, "chart")
|
||||
}
|
||||
(Kind::Summary | Kind::Natal, Some(id), None) => {
|
||||
let row: Option<(Uuid,)> = sqlx::query_as("SELECT id FROM charts WHERE id = $1 AND owner_id = $2")
|
||||
.bind(id)
|
||||
.bind(admin.id())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
(Some(id), None, row.map(|_| "chart"))
|
||||
(Kind::Synastry, None, Some(id), None) => {
|
||||
("SELECT id FROM synastries WHERE id = $1 AND owner_id = $2", id, "synastry")
|
||||
}
|
||||
(Kind::Forecast, None, None, Some(id)) => (
|
||||
"SELECT f.id FROM forecasts f JOIN charts c ON c.id = f.chart_id WHERE f.id = $1 AND c.owner_id = $2",
|
||||
id,
|
||||
"forecast",
|
||||
),
|
||||
(Kind::Synastry, ..) => return Err(ApiError::BadRequest("a synastry analysis needs synastry_id".into())),
|
||||
(Kind::Forecast, ..) => return Err(ApiError::BadRequest("a forecast analysis needs forecast_id".into())),
|
||||
_ => return Err(ApiError::BadRequest("this analysis needs chart_id".into())),
|
||||
};
|
||||
let found: Option<(Uuid,)> = sqlx::query_as(query).bind(id).bind(admin.id()).fetch_optional(&state.db).await?;
|
||||
if found.is_none() {
|
||||
return Err(ApiError::NotFound(if synastry_id.is_some() { "synastry" } else { "chart" }));
|
||||
return Err(ApiError::NotFound(what));
|
||||
}
|
||||
let (open,): (i64,) = sqlx::query_as(
|
||||
"SELECT count(*) FROM prompt_previews WHERE created_by = $1 AND status IN ('pending', 'running')",
|
||||
@@ -249,13 +251,14 @@ pub async fn start_preview(
|
||||
_ => &state.config.analysis_model,
|
||||
};
|
||||
let row: PreviewRow = sqlx::query_as(&format!(
|
||||
"INSERT INTO prompt_previews (id, kind, chart_id, synastry_id, language, model, system, created_by) \
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING {PREVIEW_COLUMNS}"
|
||||
"INSERT INTO prompt_previews (id, kind, chart_id, synastry_id, forecast_id, language, model, system, created_by) \
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING {PREVIEW_COLUMNS}"
|
||||
))
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(kind.as_str())
|
||||
.bind(chart_id)
|
||||
.bind(synastry_id)
|
||||
.bind(forecast_id)
|
||||
.bind(&language)
|
||||
.bind(model)
|
||||
.bind(&system)
|
||||
|
||||
@@ -929,7 +929,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();
|
||||
assert_eq!(keys, ["summary/hu", "summary/en", "natal/hu", "natal/en", "synastry/hu", "synastry/en"]);
|
||||
let expected = ["summary", "natal", "synastry", "forecast"].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"]));
|
||||
assert!(natal["user_template"].as_str().unwrap().contains("{chart data}"));
|
||||
@@ -1048,6 +1049,32 @@ async fn admins_try_prompt_drafts_on_own_charts(pool: PgPool) {
|
||||
"{}",
|
||||
r.body
|
||||
);
|
||||
|
||||
// a yearly forecast is tried on a forecast of one of the admin's charts
|
||||
sqlx::query("UPDATE prompt_previews SET status = 'done'").execute(&pool).await.unwrap();
|
||||
let own_id = own["id"].as_str().unwrap();
|
||||
let forecast = app.post(&format!("/v1/charts/{own_id}/forecasts"), Some(&admin), json!({})).await;
|
||||
assert_eq!(forecast.status, StatusCode::CREATED, "{}", forecast.body);
|
||||
let annas_id = annas["id"].as_str().unwrap();
|
||||
let annas_forecast = app.post(&format!("/v1/charts/{annas_id}/forecasts"), Some(&anna), json!({})).await;
|
||||
let uri = "/v1/admin/prompts/forecast/hu/preview";
|
||||
let r = app.call("POST", uri, Some(&admin), Some(json!({"system": "Próba.", "chart_id": own["id"]}))).await;
|
||||
assert_eq!(r.status, StatusCode::BAD_REQUEST);
|
||||
let body = json!({"system": "Próba.", "forecast_id": annas_forecast.body["id"]});
|
||||
assert_eq!(app.call("POST", uri, Some(&admin), Some(body)).await.status, StatusCode::NOT_FOUND);
|
||||
let body = json!({"system": "Próba.", "forecast_id": forecast.body["id"]});
|
||||
let r = app.call("POST", uri, Some(&admin), Some(body)).await;
|
||||
assert_eq!(
|
||||
(r.status, r.body["forecast_id"].as_str()),
|
||||
(StatusCode::ACCEPTED, forecast.body["id"].as_str()),
|
||||
"{}",
|
||||
r.body
|
||||
);
|
||||
// and its prompt is listed and can be saved like the others
|
||||
let prompts = app.get("/v1/admin/prompts", Some(&admin)).await.body;
|
||||
assert!(prompts["prompts"].as_array().unwrap().iter().any(|p| p["kind"] == "forecast"));
|
||||
let r = app.call("PUT", "/v1/admin/prompts/forecast/hu", Some(&admin), Some(json!({"system": "Saját."}))).await;
|
||||
assert_eq!((r.status, &r.body["custom"]), (StatusCode::OK, &json!(true)), "{}", r.body);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
|
||||
@@ -28,6 +28,13 @@ const KINDS: { kind: PromptKind; id: string; label: string; about: string }[] =
|
||||
label: "Kapcsolati elemzés",
|
||||
about: "Fizetős összevetés-elemzés két képletről: öt fejezet, erősségek, kihívások és útravaló. Kérésre készül.",
|
||||
},
|
||||
{
|
||||
kind: "forecast",
|
||||
id: "elorejelzes",
|
||||
label: "Éves előrejelzés",
|
||||
about:
|
||||
"Fizetős elemzés egy születésnaptól a következőig: szolár, lassú tranzitok, progresszió, profekció, fogyatkozások. Öt fejezet, lehetőségek, kihívások és útravaló. Kérésre készül.",
|
||||
},
|
||||
];
|
||||
|
||||
const LANGUAGES: Record<string, string> = { hu: "Magyar", en: "Angol" };
|
||||
|
||||
@@ -7,7 +7,7 @@ import { AnalysisView } from "@/components/AnalysisView";
|
||||
import { api, errorText } from "@/lib/api";
|
||||
import { formatDate } from "@/lib/astro";
|
||||
import { listName } from "@/lib/synastry";
|
||||
import type { ChartListItem, PromptKind, PromptPreview, SynastryListItem } from "@/lib/types";
|
||||
import type { ChartListItem, ForecastList, ForecastSummary, PromptKind, PromptPreview, SynastryListItem } from "@/lib/types";
|
||||
|
||||
const POLL_MS = 4000;
|
||||
const MAX_POLLS = 150; // 10 minutes
|
||||
@@ -36,6 +36,7 @@ export function PromptTrial({
|
||||
onLoad: (system: string) => void;
|
||||
}) {
|
||||
const synastry = kind === "synastry";
|
||||
const forecastKind = kind === "forecast";
|
||||
const [chartId, setChartId] = useState(charts.find((c) => c.is_primary)?.id ?? charts[0]?.id ?? "");
|
||||
const [synastries, setSynastries] = useState<SynastryListItem[]>([]);
|
||||
const [synastryId, setSynastryId] = useState("");
|
||||
@@ -50,7 +51,23 @@ export function PromptTrial({
|
||||
})
|
||||
.catch(() => setSynastries([]));
|
||||
}, [synastry]);
|
||||
const targetId = synastry ? synastryId : chartId;
|
||||
// A forecast is tried on one of the chosen chart's calculated years.
|
||||
const [forecasts, setForecasts] = useState<ForecastSummary[] | null>(null);
|
||||
const [forecastId, setForecastId] = useState("");
|
||||
const [allForecasts, setAllForecasts] = useState<ForecastSummary[]>([]);
|
||||
useEffect(() => {
|
||||
if (!forecastKind || !chartId) return;
|
||||
setForecasts(null);
|
||||
api<ForecastList>(`/charts/${chartId}/forecasts`)
|
||||
.then((d) => {
|
||||
setForecasts(d.forecasts);
|
||||
setForecastId(d.forecasts[0]?.id ?? "");
|
||||
setAllForecasts((all) => [...all.filter((f) => f.chart_id !== chartId), ...d.forecasts]);
|
||||
})
|
||||
.catch(() => setForecasts([]));
|
||||
}, [forecastKind, chartId]);
|
||||
const targetId = synastry ? synastryId : forecastKind ? forecastId : chartId;
|
||||
const forecastName = (f: ForecastSummary) => `${f.year}–${f.year + 1} · ${f.place ?? "születési hely"}`;
|
||||
const comparisonName = (s: SynastryListItem) => `${listName(s.chart1, charts)} és ${listName(s.chart2, charts)}`;
|
||||
const [trials, setTrials] = useState<Trial[]>([]);
|
||||
const [busy, setBusy] = useState(false);
|
||||
@@ -62,7 +79,11 @@ export function PromptTrial({
|
||||
setError(null);
|
||||
try {
|
||||
const preview = await api<PromptPreview>(`/admin/prompts/${kind}/${language}/preview`, {
|
||||
body: synastry ? { system: draft, synastry_id: synastryId } : { system: draft, chart_id: chartId },
|
||||
body: synastry
|
||||
? { system: draft, synastry_id: synastryId }
|
||||
: forecastKind
|
||||
? { system: draft, forecast_id: forecastId }
|
||||
: { system: draft, chart_id: chartId },
|
||||
});
|
||||
setTrials((all) => [{ preview, system: draft }, ...all]);
|
||||
} catch (e) {
|
||||
@@ -84,7 +105,8 @@ export function PromptTrial({
|
||||
<h2 id={`${selectId}-title`}>Kipróbálás</h2>
|
||||
<p className="hint">
|
||||
A szerkesztőben lévő szöveggel (mentés nélkül is) megírja az elemzést egy saját{" "}
|
||||
{synastry ? "összevetésedre" : "képletedre"}. Az eredmény nem kerül {synastry ? "az összevetéshez" : "a képlethez"},
|
||||
{synastry ? "összevetésedre" : forecastKind ? "előrejelzésedre" : "képletedre"}. Az eredmény nem kerül{" "}
|
||||
{synastry ? "az összevetéshez" : forecastKind ? "az előrejelzéshez" : "a képlethez"},
|
||||
csak itt látod. Valódi modellhívás, ezért költsége van.
|
||||
</p>
|
||||
</div>
|
||||
@@ -110,6 +132,54 @@ export function PromptTrial({
|
||||
</div>
|
||||
) : charts.length === 0 ? (
|
||||
<p className="muted">Kipróbáláshoz előbb legyen legalább egy képleted.</p>
|
||||
) : forecastKind ? (
|
||||
<div className="prompt-trial-form">
|
||||
<div className="field">
|
||||
<label htmlFor={selectId}>Képlet</label>
|
||||
<select id={selectId} className="inp" value={chartId} onChange={(e) => setChartId(e.target.value)}>
|
||||
{charts.map((c) => (
|
||||
<option key={c.id} value={c.id}>
|
||||
{c.is_primary ? `Én (${c.label})` : c.label}
|
||||
{c.birth.time ? "" : " – idő nélkül"}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
{forecasts === null ? (
|
||||
<p className="hint">Betöltés…</p>
|
||||
) : forecasts.length === 0 ? (
|
||||
<p className="muted">
|
||||
Ehhez a képlethez még nincs kiszámolt év. Előbb kérj egyet az{" "}
|
||||
<a href={`/kepletek/${chartId}/elorejelzes`}>előrejelzés oldalán</a> (a számítás ingyenes).
|
||||
</p>
|
||||
) : (
|
||||
<>
|
||||
<div className="field">
|
||||
<label htmlFor={`${selectId}-year`}>Év</label>
|
||||
<select
|
||||
id={`${selectId}-year`}
|
||||
className="inp"
|
||||
value={forecastId}
|
||||
onChange={(e) => setForecastId(e.target.value)}
|
||||
>
|
||||
{forecasts.map((f) => (
|
||||
<option key={f.id} value={f.id}>
|
||||
{forecastName(f)}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-primary"
|
||||
onClick={start}
|
||||
disabled={busy || !targetId || !draft.trim()}
|
||||
>
|
||||
{busy ? "Indítás…" : "Kipróbálás"}
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div className="prompt-trial-form">
|
||||
<div className="field">
|
||||
@@ -138,7 +208,13 @@ export function PromptTrial({
|
||||
key={t.preview.id}
|
||||
trial={t}
|
||||
chartLabel={
|
||||
t.preview.synastry_id
|
||||
t.preview.forecast_id
|
||||
? (() => {
|
||||
const f = allForecasts.find((x) => x.id === t.preview.forecast_id);
|
||||
const c = f && charts.find((x) => x.id === f.chart_id);
|
||||
return f ? `${c?.label ?? "Képlet"}, ${forecastName(f)}` : "Előrejelzés";
|
||||
})()
|
||||
: t.preview.synastry_id
|
||||
? (() => {
|
||||
const s = synastries.find((x) => x.id === t.preview.synastry_id);
|
||||
return s ? comparisonName(s) : "Összevetés";
|
||||
@@ -218,7 +294,13 @@ function TrialResult({
|
||||
{waiting ? (
|
||||
<AnalysisLoading
|
||||
compact
|
||||
text={p.kind === "summary" ? "Készül az összefoglaló, kb. 10–30 másodperc." : "Készül az elemzés, kb. 1–3 perc."}
|
||||
text={
|
||||
p.kind === "summary"
|
||||
? "Készül az összefoglaló, kb. 10–30 másodperc."
|
||||
: p.kind === "forecast"
|
||||
? "Készül az előrejelzés, kb. 2–4 perc."
|
||||
: "Készül az elemzés, kb. 1–3 perc."
|
||||
}
|
||||
/>
|
||||
) : p.status === "failed" ? (
|
||||
<p className="msg msg-error" role="alert">
|
||||
@@ -231,7 +313,7 @@ function TrialResult({
|
||||
<p className="summary-text">{p.content.summary}</p>
|
||||
</div>
|
||||
) : (
|
||||
<AnalysisView content={p.content} kind={p.kind === "synastry" ? "synastry" : "natal"} />
|
||||
<AnalysisView content={p.content} kind={p.kind} />
|
||||
)
|
||||
) : null}
|
||||
{meta.length > 0 && !waiting && <p className="hint">{meta.join(" · ")}</p>}
|
||||
|
||||
@@ -229,7 +229,7 @@ export interface AdminUser {
|
||||
analyses_left: UnitBalance;
|
||||
}
|
||||
|
||||
export type PromptKind = "summary" | "natal" | "synastry";
|
||||
export type PromptKind = "summary" | "natal" | "synastry" | "forecast";
|
||||
|
||||
export interface PromptRevision {
|
||||
id: number;
|
||||
@@ -261,6 +261,7 @@ export interface PromptPreview {
|
||||
kind: PromptKind;
|
||||
chart_id: string | null;
|
||||
synastry_id: string | null;
|
||||
forecast_id: string | null;
|
||||
language: string;
|
||||
model: string;
|
||||
status: "pending" | "running" | "done" | "failed";
|
||||
|
||||
@@ -48,6 +48,7 @@ pub struct PreviewJob {
|
||||
pub kind: String,
|
||||
pub chart_id: Option<Uuid>,
|
||||
pub synastry_id: Option<Uuid>,
|
||||
pub forecast_id: Option<Uuid>,
|
||||
pub language: String,
|
||||
pub model: String,
|
||||
pub system: String,
|
||||
@@ -159,7 +160,7 @@ impl Analyzer {
|
||||
"UPDATE prompt_previews SET status = 'running', started_at = now() \
|
||||
WHERE id = (SELECT id FROM prompt_previews WHERE status = 'pending' \
|
||||
ORDER BY created_at LIMIT 1 FOR UPDATE SKIP LOCKED) \
|
||||
RETURNING id, kind, chart_id, synastry_id, language, model, system",
|
||||
RETURNING id, kind, chart_id, synastry_id, forecast_id, language, model, system",
|
||||
)
|
||||
.fetch_optional(&self.db)
|
||||
.await?;
|
||||
@@ -177,7 +178,8 @@ impl Analyzer {
|
||||
Kind::parse(&job.kind).ok_or_else(|| LlmError::Permanent(format!("unknown kind '{}'", job.kind)))?;
|
||||
let text = match kind {
|
||||
Kind::Synastry => self.synastry_text(job.synastry_id).await?,
|
||||
_ => self.natal_text(job.chart_id).await?,
|
||||
Kind::Forecast => self.forecast_text(job.forecast_id).await?,
|
||||
Kind::Natal | Kind::Summary => self.natal_text(job.chart_id).await?,
|
||||
};
|
||||
let built = prompt::build(kind, &job.language, &text, Some(&job.system));
|
||||
let mut c = self.llm.complete(&job.model, &built).await?;
|
||||
|
||||
Reference in New Issue
Block a user