Compare commits
11
Commits
771ece41b1
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c58a52725 | ||
|
|
d79df2cf76 | ||
|
|
13cc1e6e7b | ||
|
|
ce3d3804a7 | ||
|
|
450174c273 | ||
|
|
269e3167e2 | ||
|
|
e789e5a981 | ||
|
|
1f177f859e | ||
|
|
4aabb7343c | ||
|
|
b30a6c8fb1 | ||
|
|
812b2d4f73 |
@@ -0,0 +1,127 @@
|
||||
# Tests, image build and deployment on every push to main.
|
||||
#
|
||||
# Runs on the self-hosted runner in ci/runner (label `linux`). Jobs use the
|
||||
# host's Docker daemon, so image builds share its BuildKit cache.
|
||||
#
|
||||
# Repository settings (Settings → Actions):
|
||||
# secrets.REGISTRY_TOKEN Gitea access token with package write access
|
||||
# secrets.DEPLOY_SSH_KEY private key of the deploy user on the server
|
||||
# vars.DEPLOY_HOST user@host of the server; deployment is skipped when unset
|
||||
# vars.DEPLOY_KNOWN_HOSTS `ssh-keyscan <host>` output
|
||||
# vars.DEPLOY_PATH directory on the server (default /opt/sorsfonalak)
|
||||
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
REGISTRY: registry.sagifer.com
|
||||
IMAGE_PREFIX: registry.sagifer.com/sagifer/sorsfonalak
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: sh
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: linux
|
||||
container:
|
||||
image: rust:1.99-alpine
|
||||
# Kept between runs, so only changed crates are compiled again.
|
||||
volumes:
|
||||
- sorsfonalak-ci-cargo:/usr/local/cargo/registry
|
||||
- sorsfonalak-ci-target:/ci-target
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:18-alpine
|
||||
env:
|
||||
POSTGRES_USER: sorsfonalak
|
||||
POSTGRES_PASSWORD: ci
|
||||
POSTGRES_DB: sorsfonalak
|
||||
env:
|
||||
CARGO_TARGET_DIR: /ci-target
|
||||
DATABASE_URL: postgres://sorsfonalak:ci@postgres:5432/sorsfonalak
|
||||
steps:
|
||||
- name: Checkout
|
||||
run: |
|
||||
apk add --no-cache -q git musl-dev
|
||||
git init -q . && git remote add origin "${{ github.server_url }}/${{ github.repository }}.git"
|
||||
git fetch -q --depth 1 origin "${{ github.sha }}" && git checkout -q FETCH_HEAD
|
||||
- name: Wait for Postgres
|
||||
run: |
|
||||
for i in $(seq 30); do nc -z postgres 5432 && exit 0; sleep 1; done
|
||||
echo "postgres did not start" >&2; exit 1
|
||||
# astro-engine and horoscope-api need the Swiss Ephemeris sources and
|
||||
# data (scripts/fetch-deps.sh); their tests run locally.
|
||||
- name: Test
|
||||
run: cargo test --locked -p backend -p worker -p db -p horoscope-client -p service-kit
|
||||
|
||||
build:
|
||||
needs: test
|
||||
runs-on: linux
|
||||
steps:
|
||||
- name: Checkout
|
||||
run: |
|
||||
apk add --no-cache -q git
|
||||
git init -q . && git remote add origin "${{ github.server_url }}/${{ github.repository }}.git"
|
||||
git fetch -q --depth 1 origin "${{ github.sha }}" && git checkout -q FETCH_HEAD
|
||||
- name: Log in to the registry
|
||||
env:
|
||||
TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
||||
run: printf '%s' "$TOKEN" | docker login "$REGISTRY" -u "${{ github.repository_owner }}" --password-stdin
|
||||
# The frontend build also type-checks the TypeScript code.
|
||||
- name: Build and push images
|
||||
run: |
|
||||
set -eu
|
||||
tag=$(echo "${{ github.sha }}" | cut -c1-12)
|
||||
build() {
|
||||
image="$IMAGE_PREFIX-$1"; shift
|
||||
docker build --label sorsfonalak.ci=1 -t "$image:$tag" -t "$image:latest" "$@"
|
||||
docker push -q "$image:$tag"
|
||||
docker push -q "$image:latest"
|
||||
}
|
||||
build horoscope-api -f services/horoscope-api/Dockerfile .
|
||||
build backend -f services/backend/Dockerfile .
|
||||
build worker -f services/worker/Dockerfile .
|
||||
build frontend services/frontend
|
||||
- name: Clean up
|
||||
if: always()
|
||||
run: |
|
||||
docker logout "$REGISTRY" || true
|
||||
docker image prune -f --filter label=sorsfonalak.ci=1 >/dev/null
|
||||
|
||||
deploy:
|
||||
needs: build
|
||||
if: vars.DEPLOY_HOST != ''
|
||||
runs-on: linux
|
||||
steps:
|
||||
- name: Checkout
|
||||
run: |
|
||||
apk add --no-cache -q git openssh-client
|
||||
git init -q . && git remote add origin "${{ github.server_url }}/${{ github.repository }}.git"
|
||||
git fetch -q --depth 1 origin "${{ github.sha }}" && git checkout -q FETCH_HEAD
|
||||
- name: SSH key
|
||||
env:
|
||||
KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||
KNOWN_HOSTS: ${{ vars.DEPLOY_KNOWN_HOSTS }}
|
||||
run: |
|
||||
mkdir -p ~/.ssh && chmod 700 ~/.ssh
|
||||
(umask 077 && printf '%s\n' "$KEY" > ~/.ssh/id_ed25519)
|
||||
printf '%s\n' "$KNOWN_HOSTS" > ~/.ssh/known_hosts
|
||||
# Copies the compose files, pins TAG in the server's .env and restarts
|
||||
# the changed services. The database migrations run when the backend starts.
|
||||
- name: Deploy
|
||||
env:
|
||||
HOST: ${{ vars.DEPLOY_HOST }}
|
||||
DIR: ${{ vars.DEPLOY_PATH || '/opt/sorsfonalak' }}
|
||||
run: |
|
||||
set -eu
|
||||
tag=$(echo "${{ github.sha }}" | cut -c1-12)
|
||||
scp -q deploy/docker-compose.yml deploy/Caddyfile "$HOST:$DIR/"
|
||||
ssh "$HOST" "cd '$DIR' && \
|
||||
(grep -q '^TAG=' .env && sed -i 's/^TAG=.*/TAG=$tag/' .env || echo 'TAG=$tag' >> .env) && \
|
||||
docker compose pull -q && docker compose up -d --remove-orphans --wait && \
|
||||
docker image prune -f >/dev/null"
|
||||
Generated
+3
@@ -2860,6 +2860,9 @@ dependencies = [
|
||||
"axum",
|
||||
"db",
|
||||
"lettre",
|
||||
"rand 0.9.5",
|
||||
"reqwest",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"service-kit",
|
||||
"sqlx",
|
||||
|
||||
@@ -6,7 +6,8 @@ Asztrológiai rendszer konténeres backendje. A frontenden kívül minden Rustba
|
||||
|---|---|
|
||||
| `services/horoscope-api` | HTTP API: születési adatokból születési horoszkóp (radix) és szinasztria |
|
||||
| `services/backend` | felhasználók, belépés, mentett képletek, szinasztriák, meghívók, elemzések, kreditek, megosztás. Részletek: [services/backend/README.md](services/backend/README.md) |
|
||||
| `services/worker` | háttérmunkák: e-mail-küldés, takarítás (később az LLM-elemzések). Részletek: [services/worker/README.md](services/worker/README.md) |
|
||||
| `services/worker` | háttérmunkák: e-mail-küldés, LLM-elemzések, takarítás. Részletek: [services/worker/README.md](services/worker/README.md) |
|
||||
| `services/frontend` | Next.js webes felület: Google-belépés, profil, születési adatok, admin. Részletek: [services/frontend/README.md](services/frontend/README.md) |
|
||||
| `crates/db` | PostgreSQL-séma (migrációk) és a szolgáltatások közös adatelérése |
|
||||
| `crates/horoscope-client` | a horoscope-api HTTP-kliense (a backend és később a worker használja) |
|
||||
| `crates/service-kit` | közös alapok: naplózás, listen cím, healthcheck, leállítás |
|
||||
@@ -32,6 +33,8 @@ A `docker compose up` a `docker-compose.override.yml` fájlt is betölti. Ebben
|
||||
SMTP_URL=smtps://user:jelszo@smtp.example.com:465 docker compose -f docker-compose.yml up -d
|
||||
```
|
||||
|
||||
Az éles szerverre a CI telepít (Gitea Actions, Caddy és https): lásd [deploy/README.md](deploy/README.md).
|
||||
|
||||
A horoscope-api image önálló (`scratch` alapú, kb. 70 MB, nem root felhasználóval fut). Benne van a statikus bináris és az összes adat. A container induláskor ~2 mp alatt betölti az adatokat, és ~190 MB memóriát használ. Egy horoszkóp kiszámítása 2–3 ms.
|
||||
|
||||
Build-argumentumok (`docker compose build --build-arg …`):
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
# act_runner configuration (see `act_runner generate-config` for every option).
|
||||
log:
|
||||
level: info
|
||||
|
||||
runner:
|
||||
file: .runner
|
||||
capacity: 1
|
||||
timeout: 1h
|
||||
# Jobs without their own `container:` run in the Docker CLI image.
|
||||
labels:
|
||||
- "linux:docker://docker:29.9.3-cli"
|
||||
|
||||
cache:
|
||||
# Not used: the cargo and BuildKit caches live in Docker volumes.
|
||||
enabled: false
|
||||
|
||||
container:
|
||||
network: ""
|
||||
privileged: false
|
||||
# The host's Docker socket is mounted into every job container (docker_host
|
||||
# empty), so `docker build` uses the host daemon and its build cache.
|
||||
docker_host: ""
|
||||
# Only the CI cache volumes may be mounted by workflows.
|
||||
valid_volumes:
|
||||
- "sorsfonalak-ci-*"
|
||||
force_pull: false
|
||||
@@ -0,0 +1,26 @@
|
||||
# Gitea Actions runner for this repository, on the dev server.
|
||||
#
|
||||
# First start (registers the runner; the token is only needed once):
|
||||
# GITEA_RUNNER_REGISTRATION_TOKEN=... docker compose up -d
|
||||
# Afterwards: docker compose up -d
|
||||
|
||||
name: sorsfonalak-runner
|
||||
|
||||
services:
|
||||
runner:
|
||||
image: gitea/act_runner:0.6.1
|
||||
environment:
|
||||
CONFIG_FILE: /config.yaml
|
||||
GITEA_INSTANCE_URL: ${GITEA_INSTANCE_URL:-http://10.0.0.114:30008}
|
||||
GITEA_RUNNER_REGISTRATION_TOKEN: ${GITEA_RUNNER_REGISTRATION_TOKEN:-}
|
||||
GITEA_RUNNER_NAME: ${GITEA_RUNNER_NAME:-dev-195}
|
||||
volumes:
|
||||
- ./config.yaml:/config.yaml:ro
|
||||
# Registration (.runner) lives here.
|
||||
- runner-data:/data
|
||||
# Job containers are started on the host daemon.
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
runner-data:
|
||||
@@ -0,0 +1,4 @@
|
||||
// Rebuild when a migration is added or changed (`sqlx::migrate!` embeds them).
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=migrations");
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
-- Text analyses written by the worker: retries with backoff, the model that
|
||||
-- actually answered (e.g. behind 'openrouter/auto'), cost, a notification for
|
||||
-- new requests, and at most one refund per analysis.
|
||||
|
||||
ALTER TABLE analyses
|
||||
ADD COLUMN attempts integer NOT NULL DEFAULT 0,
|
||||
ADD COLUMN next_attempt_at timestamptz NOT NULL DEFAULT now(),
|
||||
ADD COLUMN model_used text,
|
||||
ADD COLUMN cost_usd double precision;
|
||||
|
||||
COMMENT ON COLUMN analyses.content IS
|
||||
'Structured result: {title, summary, sections: {key: {title, body}}, strengths: [], challenges: [], advice}';
|
||||
|
||||
DROP INDEX analyses_pending_idx;
|
||||
CREATE INDEX analyses_due_idx ON analyses (next_attempt_at) WHERE status = 'pending';
|
||||
|
||||
CREATE UNIQUE INDEX credit_ledger_refund_once ON credit_ledger (analysis_id) WHERE reason = 'refund';
|
||||
|
||||
CREATE FUNCTION notify_analyses() RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
BEGIN
|
||||
PERFORM pg_notify('analyses', '');
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$;
|
||||
|
||||
CREATE TRIGGER analyses_notify
|
||||
AFTER INSERT ON analyses
|
||||
FOR EACH STATEMENT EXECUTE FUNCTION notify_analyses();
|
||||
@@ -0,0 +1,5 @@
|
||||
-- Subscription tiers as roles: 'premium' and 'vip' unlock the models marked
|
||||
-- for them in the backend's LLM_MODELS.
|
||||
ALTER TABLE users DROP CONSTRAINT users_roles_valid;
|
||||
ALTER TABLE users ADD CONSTRAINT users_roles_valid
|
||||
CHECK (cardinality(roles) > 0 AND roles <@ ARRAY['admin', 'creator', 'premium', 'vip', 'user']::text[]);
|
||||
@@ -0,0 +1,14 @@
|
||||
-- Free short summaries: a few sentences about a natal chart, written by a
|
||||
-- cheap model when the chart is saved. The detailed analyses stay paid.
|
||||
|
||||
ALTER TABLE analyses DROP CONSTRAINT analyses_kind_check;
|
||||
ALTER TABLE analyses ADD CONSTRAINT analyses_kind_check CHECK (kind IN ('natal', 'synastry', 'summary'));
|
||||
|
||||
ALTER TABLE analyses DROP CONSTRAINT analyses_target;
|
||||
ALTER TABLE analyses ADD CONSTRAINT analyses_target CHECK (
|
||||
(kind IN ('natal', 'summary') AND chart_id IS NOT NULL AND synastry_id IS NULL)
|
||||
OR (kind = 'synastry' AND synastry_id IS NOT NULL AND chart_id IS NULL)
|
||||
);
|
||||
|
||||
COMMENT ON COLUMN analyses.content IS
|
||||
'Structured result. natal/synastry: {title, summary, sections: {key: {title, body}}, strengths: [], challenges: [], advice}; summary: {title, summary}';
|
||||
@@ -0,0 +1,14 @@
|
||||
-- Paid analyses are counted per kind instead of generic credits: a
|
||||
-- detailed natal analysis uses one 'natal' unit, a synastry analysis one
|
||||
-- 'synastry' unit. Units are bought in packages (or granted by an admin).
|
||||
-- The free monthly credits are gone: the free part is the short summary.
|
||||
|
||||
DELETE FROM credit_ledger WHERE reason = 'monthly_grant';
|
||||
|
||||
ALTER TABLE credit_ledger ADD COLUMN unit text NOT NULL DEFAULT 'natal' CHECK (unit IN ('natal', 'synastry'));
|
||||
ALTER TABLE credit_ledger ALTER COLUMN unit DROP DEFAULT;
|
||||
|
||||
DROP INDEX credit_ledger_user_idx;
|
||||
CREATE INDEX credit_ledger_user_idx ON credit_ledger (user_id, unit, created_at DESC);
|
||||
|
||||
COMMENT ON COLUMN analyses.credits_charged IS 'Units of the analysis kind spent on it (0 or 1; 0 for summaries and copies)';
|
||||
+22
-1
@@ -17,6 +17,15 @@ pub use sqlx;
|
||||
/// All schema migrations, embedded at compile time.
|
||||
pub static MIGRATOR: sqlx::migrate::Migrator = sqlx::migrate!("./migrations");
|
||||
|
||||
/// Applies the pending migrations. Migrations newer than this binary (applied
|
||||
/// by an already updated service) are tolerated, so services can be rebuilt
|
||||
/// one at a time.
|
||||
pub async fn migrate(pool: &PgPool) -> Result<(), sqlx::migrate::MigrateError> {
|
||||
let mut migrator = sqlx::migrate!("./migrations");
|
||||
migrator.set_ignore_missing(true);
|
||||
migrator.run(pool).await
|
||||
}
|
||||
|
||||
pub async fn connect(url: &str) -> Result<PgPool, sqlx::Error> {
|
||||
PgPoolOptions::new().max_connections(20).acquire_timeout(Duration::from_secs(5)).connect(url).await
|
||||
}
|
||||
@@ -27,16 +36,22 @@ pub enum Role {
|
||||
Admin,
|
||||
/// May write articles (phase 2).
|
||||
Creator,
|
||||
/// Paid tier: may use the models marked `@premium`.
|
||||
Premium,
|
||||
/// Top tier: may use the `@vip` and `@premium` models.
|
||||
Vip,
|
||||
User,
|
||||
}
|
||||
|
||||
impl Role {
|
||||
pub const ALL: [Role; 3] = [Role::Admin, Role::Creator, Role::User];
|
||||
pub const ALL: [Role; 5] = [Role::Admin, Role::Creator, Role::Premium, Role::Vip, Role::User];
|
||||
|
||||
pub fn as_str(self) -> &'static str {
|
||||
match self {
|
||||
Role::Admin => "admin",
|
||||
Role::Creator => "creator",
|
||||
Role::Premium => "premium",
|
||||
Role::Vip => "vip",
|
||||
Role::User => "user",
|
||||
}
|
||||
}
|
||||
@@ -63,6 +78,12 @@ impl User {
|
||||
self.roles.iter().any(|r| r == role.as_str())
|
||||
}
|
||||
|
||||
/// Whether the user may use something that needs `role`: admins may use
|
||||
/// everything, and the VIP tier includes the premium one.
|
||||
pub fn has_access(&self, role: Role) -> bool {
|
||||
self.has_role(role) || self.has_role(Role::Admin) || (role == Role::Premium && self.has_role(Role::Vip))
|
||||
}
|
||||
|
||||
pub fn role_list(&self) -> Vec<Role> {
|
||||
self.roles.iter().filter_map(|r| Role::parse(r)).collect()
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
# Copy to /opt/sorsfonalak/.env on the server and fill in.
|
||||
|
||||
# Public domain (Caddy gets the certificate for it and www.<domain>)
|
||||
DOMAIN=sorsfonalak.hu
|
||||
# Long random string: openssl rand -hex 24
|
||||
POSTGRES_PASSWORD=
|
||||
|
||||
# Google OAuth client ID(s), comma-separated
|
||||
GOOGLE_CLIENT_IDS=
|
||||
# These accounts become admins at their first login
|
||||
BOOTSTRAP_ADMIN_EMAILS=
|
||||
|
||||
# Outgoing mail, e.g. smtps://user:password@smtp.example.com:465
|
||||
SMTP_URL=
|
||||
MAIL_FROM=Sorsfonalak <noreply@sorsfonalak.hu>
|
||||
|
||||
# Image version; every deployment rewrites it
|
||||
TAG=latest
|
||||
@@ -0,0 +1,20 @@
|
||||
# Behind the Cloudflare proxy. The certificate comes from Let's Encrypt
|
||||
# (HTTP-01 challenge through Cloudflare), so "Always Use HTTPS" must stay off
|
||||
# in Cloudflare; Caddy does the redirect itself. SSL mode: Full (strict).
|
||||
{
|
||||
servers {
|
||||
# Cloudflare ranges (https://www.cloudflare.com/ips): the visitor's
|
||||
# address is taken from CF-Connecting-IP and passed on in X-Forwarded-For.
|
||||
trusted_proxies static 173.245.48.0/20 103.21.244.0/22 103.22.200.0/22 103.31.4.0/22 141.101.64.0/18 108.162.192.0/18 190.93.240.0/20 188.114.96.0/20 197.234.240.0/22 198.41.128.0/17 162.158.0.0/15 104.16.0.0/13 104.24.0.0/14 172.64.0.0/13 131.0.72.0/22 2400:cb00::/32 2606:4700::/32 2803:f800::/32 2405:b500::/32 2405:8100::/32 2a06:98c0::/29 2c0f:f248::/32
|
||||
client_ip_headers CF-Connecting-IP
|
||||
}
|
||||
}
|
||||
|
||||
{$DOMAIN} {
|
||||
encode zstd gzip
|
||||
reverse_proxy frontend:3000
|
||||
}
|
||||
|
||||
www.{$DOMAIN} {
|
||||
redir https://{$DOMAIN}{uri} permanent
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
# Build és telepítés
|
||||
|
||||
Minden `main`-re pusholt commit után lefut a `.gitea/workflows/ci.yml` (Gitea Actions):
|
||||
|
||||
1. **test**: `cargo test` a backendre, a workerre, a db-re, a horoscope-clientre és a service-kitre, egy Postgres szolgáltatás-konténerrel.
|
||||
2. **build**: megépíti a négy image-et, és feltölti őket a `registry.sagifer.com/sagifer/sorsfonalak-<szolgáltatás>` címre. A címke a commit hash első 12 karaktere, plusz `latest`. A frontend buildje a TypeScript-típusokat is ellenőrzi.
|
||||
3. **deploy** (csak ha a `DEPLOY_HOST` be van állítva): felmásolja a `docker-compose.yml`-t és a `Caddyfile`-t a szerverre, beírja az új `TAG`-et a szerveren lévő `.env`-be, majd `docker compose pull && up -d`. Az adatbázis-migrációk a backend indulásakor futnak le.
|
||||
|
||||
Kézzel is indítható a repó Actions oldaláról (workflow_dispatch).
|
||||
|
||||
## Runner (dev szerver)
|
||||
|
||||
A runner a `ci/runner` mappában van. A jobokat a gép Dockerén indítja, így az image-buildek a meglévő BuildKit cache-t használják. A tesztek cargo-cache-e a `sorsfonalak-ci-*` kötetekben marad meg.
|
||||
|
||||
1. Regisztrációs token: Gitea → repó → Beállítások → Actions → Runners → *Create new runner*.
|
||||
2. Indítás:
|
||||
```sh
|
||||
cd ci/runner
|
||||
GITEA_RUNNER_REGISTRATION_TOKEN=<token> docker compose up -d
|
||||
```
|
||||
A regisztráció a `runner-data` kötetbe kerül. A későbbi indításokhoz már nem kell token.
|
||||
|
||||
A jobok elérik a gép Docker-socketjét, ez root-jogot jelent a dev szerveren. A workflow csak a repóba pusholt commitokra fut, forkból érkező pull requestekre nem.
|
||||
|
||||
## Repó-beállítások
|
||||
|
||||
Gitea → repó → Beállítások → Actions:
|
||||
|
||||
| Név | Fajta | Érték |
|
||||
|---|---|---|
|
||||
| `REGISTRY_TOKEN` | secret | a `sagifer` fiók access tokenje, `write:package` jogosultsággal |
|
||||
| `DEPLOY_SSH_KEY` | secret | a szerveren lévő deploy felhasználó privát kulcsa |
|
||||
| `DEPLOY_HOST` | variable | `deploy@<szerver IP>` |
|
||||
| `DEPLOY_KNOWN_HOSTS` | variable | az `ssh-keyscan <szerver IP>` kimenete |
|
||||
| `DEPLOY_PATH` | variable | nem kötelező, alapértéke `/opt/sorsfonalak` |
|
||||
|
||||
## Szerver (egyszeri beállítás)
|
||||
|
||||
Egy friss Ubuntu dropleten, rootként:
|
||||
|
||||
```sh
|
||||
# Docker
|
||||
curl -fsSL https://get.docker.com | sh
|
||||
# 2 GB swap a 2 GB RAM mellé
|
||||
fallocate -l 2G /swapfile && chmod 600 /swapfile && mkswap /swapfile && swapon /swapfile
|
||||
echo '/swapfile none swap sw 0 0' >> /etc/fstab
|
||||
# deploy felhasználó, aki dockert futtathat
|
||||
adduser --disabled-password --gecos '' deploy && usermod -aG docker deploy
|
||||
mkdir -p /home/deploy/.ssh && echo '<publikus kulcs>' > /home/deploy/.ssh/authorized_keys
|
||||
chown -R deploy: /home/deploy/.ssh && chmod 700 /home/deploy/.ssh && chmod 600 /home/deploy/.ssh/authorized_keys
|
||||
mkdir -p /opt/sorsfonalak && chown deploy: /opt/sorsfonalak
|
||||
# tűzfal: SSH bárhonnan, HTTP/HTTPS csak a Cloudflare felől
|
||||
ufw allow OpenSSH
|
||||
for net in $(curl -s https://www.cloudflare.com/ips-v4) $(curl -s https://www.cloudflare.com/ips-v6); do
|
||||
ufw allow from "$net" to any port 80,443 proto tcp
|
||||
done
|
||||
ufw enable
|
||||
```
|
||||
|
||||
A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as és a 443-as portot a DigitalOcean Cloud Firewall-ban is érdemes a Cloudflare tartományaira korlátozni: Networking → Firewalls, Inbound: SSH, és HTTP/HTTPS a Cloudflare IP-listával.
|
||||
|
||||
`deploy` felhasználóként, a `/opt/sorsfonalak` mappában:
|
||||
|
||||
- `.env`: az itteni `.env.example` kitöltve.
|
||||
- `.env.secrets`: `OPENROUTER_API_KEY=...`.
|
||||
- `docker login registry.sagifer.com` egy `read:package` jogú tokennel. Amíg a `sagifer` fiók nyilvános, erre nincs szükség.
|
||||
|
||||
### Cloudflare (sorsfonalak.hu)
|
||||
|
||||
- DNS: `A sorsfonalak.hu → 165.22.194.5` és `CNAME www → sorsfonalak.hu`, mindkettő proxyzva (narancs felhő).
|
||||
- SSL/TLS mód: **Full (strict)**.
|
||||
- **Always Use HTTPS: ki.** A Let's Encrypt a Cloudflare-en át, sima HTTP-n ellenőrzi a domaint, a tanúsítvány megújításakor is. A HTTP→HTTPS átirányítást a Caddy maga végzi.
|
||||
- A Caddy a Cloudflare címtartományaiban megbízik, ezért a naplókban és a backendnél a látogató valódi IP-címe látszik (`CF-Connecting-IP`).
|
||||
|
||||
A Google OAuth kliensnél a `https://sorsfonalak.hu` címet fel kell venni az engedélyezett JavaScript-források közé.
|
||||
|
||||
## Üzemeltetés
|
||||
|
||||
- Naplók: `docker compose logs -f backend worker`
|
||||
- Visszaállás korábbi verzióra: `.env`-ben `TAG=<régebbi hash>`, utána `docker compose up -d`
|
||||
- Mentés: naponta egy `pg_dump` a `/opt/sorsfonalak/backups` mappába, 14 napig megmarad. A mentéseket érdemes a szerverről is elvinni (DigitalOcean backup, vagy `rsync` otthonra).
|
||||
- Visszatöltés: `gunzip -c backups/sorsfonalak-<dátum>.sql.gz | docker compose exec -T postgres psql -U sorsfonalak sorsfonalak`
|
||||
@@ -0,0 +1,132 @@
|
||||
# Production stack on the server (copied there by the CI deploy job).
|
||||
#
|
||||
# Needs next to it: .env (see .env.example) and .env.secrets
|
||||
# (OPENROUTER_API_KEY). TAG in .env is set by every deployment.
|
||||
|
||||
x-logging: &logging
|
||||
driver: json-file
|
||||
options:
|
||||
max-size: "10m"
|
||||
max-file: "3"
|
||||
|
||||
services:
|
||||
caddy:
|
||||
image: caddy:2.11.9-alpine
|
||||
ports:
|
||||
- "80:80"
|
||||
- "443:443"
|
||||
- "443:443/udp"
|
||||
environment:
|
||||
DOMAIN: ${DOMAIN:?set DOMAIN in .env}
|
||||
volumes:
|
||||
- ./Caddyfile:/etc/caddy/Caddyfile:ro
|
||||
- caddy-data:/data
|
||||
- caddy-config:/config
|
||||
depends_on:
|
||||
- frontend
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
horoscope-api:
|
||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-horoscope-api:${TAG:-latest}
|
||||
read_only: true
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
postgres:
|
||||
image: postgres:18-alpine
|
||||
environment:
|
||||
POSTGRES_USER: sorsfonalak
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD in .env}
|
||||
POSTGRES_DB: sorsfonalak
|
||||
volumes:
|
||||
- pgdata:/var/lib/postgresql
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U sorsfonalak -d sorsfonalak"]
|
||||
interval: 5s
|
||||
timeout: 3s
|
||||
retries: 10
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
# Daily compressed dump into ./backups, kept for 14 days.
|
||||
backup:
|
||||
image: postgres:18-alpine
|
||||
environment:
|
||||
PGHOST: postgres
|
||||
PGUSER: sorsfonalak
|
||||
PGPASSWORD: ${POSTGRES_PASSWORD}
|
||||
PGDATABASE: sorsfonalak
|
||||
volumes:
|
||||
- ./backups:/backups
|
||||
entrypoint: ["/bin/sh", "-c"]
|
||||
command:
|
||||
- |
|
||||
while true; do
|
||||
f=/backups/sorsfonalak-$$(date +%F).sql.gz
|
||||
pg_dump --no-owner | gzip > "$$f.tmp" && mv "$$f.tmp" "$$f"
|
||||
find /backups -name 'sorsfonalak-*.sql.gz' -mtime +14 -delete
|
||||
sleep 86400
|
||||
done
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
backend:
|
||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-backend:${TAG:-latest}
|
||||
environment:
|
||||
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
|
||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
||||
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
||||
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
horoscope-api:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
worker:
|
||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
|
||||
environment:
|
||||
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
|
||||
SMTP_URL: ${SMTP_URL:-}
|
||||
MAIL_FROM: ${MAIL_FROM:-}
|
||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||
env_file:
|
||||
- path: .env.secrets
|
||||
required: false
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-frontend:${TAG:-latest}
|
||||
environment:
|
||||
BACKEND_URL: http://backend:8081
|
||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /app/.next/cache
|
||||
- /tmp
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
pgdata:
|
||||
caddy-data:
|
||||
caddy-config:
|
||||
+31
-2
@@ -42,12 +42,17 @@ services:
|
||||
environment:
|
||||
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD:-sorsfonalak-dev}@postgres:5432/sorsfonalak
|
||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3000}
|
||||
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3001}
|
||||
# Plain HTTP in development; leave the default (true) in production.
|
||||
COOKIE_SECURE: ${COOKIE_SECURE:-false}
|
||||
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
||||
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
||||
LLM_MODELS: ${LLM_MODELS:-openrouter/auto}
|
||||
# Paid detailed analyses (empty: anthropic/claude-opus-5.5).
|
||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||
# Free short summary of every saved chart (empty: anthropic/claude-sonnet-5.5).
|
||||
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
||||
# E-mail + password login; off by default (Google, Apple and Facebook only).
|
||||
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
@@ -67,11 +72,35 @@ services:
|
||||
# points it at Mailpit.
|
||||
SMTP_URL: ${SMTP_URL:-}
|
||||
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <noreply@sorsfonalak.local>}
|
||||
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3001}
|
||||
# OPENROUTER_API_KEY (not in git); without it analyses stay pending.
|
||||
env_file:
|
||||
- path: .env.secrets
|
||||
required: false
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: services/frontend
|
||||
image: sorsfonalak/frontend:latest
|
||||
# Host port 3001 (3000 is taken on the dev server).
|
||||
ports:
|
||||
- "3001:3000"
|
||||
environment:
|
||||
BACKEND_URL: http://backend:8081
|
||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /app/.next/cache
|
||||
- /tmp
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
pgdata:
|
||||
|
||||
+20
-18
@@ -1,6 +1,6 @@
|
||||
# backend
|
||||
|
||||
Felhasználók, belépés, mentett születési képletek, szinasztriák és meghívók, szöveges elemzések, kreditek és nyilvános megosztás. A képleteket a `horoscope-api` számolja, az adatok PostgreSQL-ben vannak. A migrációk a `crates/db/migrations` mappában vannak, és induláskor lefutnak.
|
||||
Felhasználók, belépés, mentett születési képletek, szinasztriák és meghívók, szöveges elemzések, elemzési egységek és nyilvános megosztás. A képleteket a `horoscope-api` számolja, az adatok PostgreSQL-ben vannak. A migrációk a `crates/db/migrations` mappában vannak, és induláskor lefutnak.
|
||||
|
||||
## Konfiguráció (környezeti változók)
|
||||
|
||||
@@ -13,27 +13,27 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
||||
| `COOKIE_SECURE` | `true` | csak helyi, sima HTTP-s fejlesztéshez legyen `false` |
|
||||
| `COOKIE_DOMAIN` | – | pl. `.sorsfonalak.hu`, ha a frontend és az API más aldomainen fut |
|
||||
| `SESSION_TTL_DAYS` | `30` | a munkamenet élettartama |
|
||||
| `PASSWORD_LOGIN` | `false` | e-mail + jelszó regisztráció és belépés; élesben ki van kapcsolva (csak Google, Apple, Facebook), a jelszavas végpontok ilyenkor 403-at adnak |
|
||||
| `GOOGLE_CLIENT_IDS` | – | Google OAuth kliens-azonosító(k); üresen a Google-belépés ki van kapcsolva |
|
||||
| `BOOTSTRAP_ADMIN_EMAILS` | – | ezek a címek regisztrációkor vagy belépéskor admin szerepet kapnak (így lesz meg az első admin) |
|
||||
| `SUPPORTED_LOCALES` | `hu,en` | felület- és elemzésnyelvek; az első az alapértelmezett |
|
||||
| `MONTHLY_FREE_CREDITS` | `10` | havi ingyenes kreditkeret |
|
||||
| `ANALYSIS_COST` | `1` | egy új elemzés ára kreditben |
|
||||
| `LLM_MODELS` | `openrouter/auto` | választható OpenRouter-modellek; az első az alapértelmezett |
|
||||
| `ANALYSIS_PROMPT_VERSION` | `v1` | a prompt verziója (az elemzés-gyorsítótár kulcsának része) |
|
||||
| `ANALYSIS_MODEL` | `anthropic/claude-opus-5.5` | ez írja a fizetős részletes elemzéseket |
|
||||
| `SUMMARY_MODEL` | `anthropic/claude-sonnet-5.5` | ez írja minden mentett képlet ingyenes rövid összefoglalóját (kb. 1 cent darabonként) |
|
||||
| `ANALYSIS_PROMPT_VERSION` | `v2` | a prompt verziója (az elemzés-gyorsítótár kulcsának része) |
|
||||
| `MAX_CHARTS_PER_USER` | `50` | ennyi képletet menthet egy felhasználó |
|
||||
| `BIND_ADDR`, `LOG_FORMAT`, `RUST_LOG` | `0.0.0.0:8081`, `text`, `info` | |
|
||||
|
||||
## Belépés és jogosultság
|
||||
|
||||
- **Munkamenet:** véletlen token, HttpOnly + SameSite=Lax sütiben (`sf_session`). A belépési válasz törzsében is ott van, hogy nem böngészős kliens `Authorization: Bearer <token>` fejléccel küldhesse vissza. Az adatbázis csak a token SHA-256 hash-ét tárolja, így a munkamenet visszavonható (kijelentkezés, jelszócsere, fióktörlés).
|
||||
- **E-mail + jelszó:**
|
||||
- **E-mail + jelszó** (csak `PASSWORD_LOGIN=true` mellett; élesben csak közösségi belépés lesz, hogy ne lehessen tömegesen ingyenes fiókokat nyitni):
|
||||
- a jelszó legalább 10 karakter, Argon2id hash-sel tárolva;
|
||||
- címenként 15 percen belül 10 hibás próbálkozás után átmenetileg tiltás jár;
|
||||
- ismeretlen címnél is ugyanannyi ideig tart a válasz.
|
||||
- **Google:** a frontend a Google Identity Services gombbal vagy a One Tap felülettel szerez ID tokent, és elküldi a `POST /v1/auth/google` végpontra. A backend Google kulcsaival ellenőrzi az aláírást, a kiállítót és a kliens-azonosítót.
|
||||
- Ismeretlen Google-fióknál, ha a Google által igazolt e-mail-címmel már van felhasználó, ahhoz kapcsolja; ha nincs, újat hoz létre.
|
||||
- Ugyanaz a felhasználó több belépési móddal is rendelkezhet (`auth_identities`). A Facebook, az Apple és a passkey ugyanígy adható hozzá.
|
||||
- **Szerepek** (`users.roles`, tömb): `user` (alap), `creator` (cikkírás, 2. fázis), `admin`.
|
||||
- **Szerepek** (`users.roles`, tömb): `user` (alap), `creator` (cikkírás, 2. fázis), `premium` és `vip` (jelenleg nincs hozzájuk funkció; a fizetős elemzés egységekkel megy), `admin`.
|
||||
- **Guardok:**
|
||||
- `AuthUser`: belépés kell (401);
|
||||
- `AdminUser`: admin szerep is kell (403).
|
||||
@@ -44,7 +44,7 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
||||
|
||||
| Végpont | Guard | Leírás |
|
||||
|---|---|---|
|
||||
| `GET /v1/config` | – | Google kliens-azonosító, nyelvek, modellek, kreditárak |
|
||||
| `GET /v1/config` | – | Google kliens-azonosító, `password_login`, nyelvek, elemző és összefoglaló modell |
|
||||
| `POST /v1/auth/register` | – | `{email, password, display_name?, locale?}` → munkamenet; megerősítő e-mailt küld |
|
||||
| `POST /v1/auth/login` | – | `{email, password}` |
|
||||
| `POST /v1/auth/google` | – | `{id_token}`; `created: true`, ha most jött létre a fiók |
|
||||
@@ -56,9 +56,10 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
||||
| `GET`/`PATCH`/`DELETE /v1/me` | user | profil (`display_name`, `locale`); törlés: `{confirm: "DELETE"}` |
|
||||
| `POST /v1/me/password` | user | `{current_password?, new_password}`; Google-fiókhoz jelszót is ad |
|
||||
| `GET /v1/me/export` | user | GDPR: minden adat egy JSON-ban |
|
||||
| `GET /v1/credits` | user | egyenleg és kreditmozgások |
|
||||
| `GET /v1/credits` | user | megmaradt elemzések típusonként (`balance: {natal, synastry}`) és a mozgások |
|
||||
| `GET`/`POST /v1/charts` | user | képletek listája; új képlet: `{label, is_primary, birth}`, ahol a `birth` a horoscope-api `/v1/natal` kérésformátuma |
|
||||
| `GET`/`PATCH`/`DELETE /v1/charts/{id}` | tulajdonos | a születési adat nem módosítható: a javított képlet új képlet |
|
||||
| `GET`/`PATCH`/`DELETE /v1/charts/{id}` | tulajdonos | a születési adat nem módosítható: a javított képlet új képlet. Ugyanarra a születési adatra a `POST /v1/charts` a meglévő képletet adja vissza (200), nem számol újat |
|
||||
| `POST /v1/charts/{id}/summary` | tulajdonos | az ingyenes rövid összefoglaló (`kind: summary`, `{title, summary}`); mentéskor magától sorba áll, ez visszaadja, és ha elbukott, újra sorba állítja |
|
||||
| `GET`/`POST /v1/synastries` | user | `{chart1_id, chart2_id}`, mindkét képlet a sajátod |
|
||||
| `GET`/`DELETE /v1/synastries/{id}` | résztvevő | |
|
||||
| `GET`/`POST /v1/invites` | user | „Mennyire illünk össze?” link; alapból a saját (primary) képlettel |
|
||||
@@ -70,9 +71,9 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
||||
| `GET /v1/analyses/{id}` | jogosult | |
|
||||
| `GET`/`POST /v1/shares`, `DELETE /v1/shares/{id}` | user | `{kind: chart\|synastry\|analysis, target_id, title?, show_birth_data?}` |
|
||||
| `GET /v1/public/shares/{slug}` | – | a megosztott tartalom (oldal + OG-kép adatai) |
|
||||
| `GET /v1/admin/users?q=` | admin | felhasználók kereséssel, szerepekkel, kreditekkel |
|
||||
| `GET /v1/admin/users?q=` | admin | felhasználók kereséssel, szerepekkel, megmaradt elemzésekkel |
|
||||
| `PATCH /v1/admin/users/{id}` | admin | `{roles: [...]}`; a saját admin szerep nem vehető el |
|
||||
| `POST /v1/admin/users/{id}/credits` | admin | `{delta, note?}` |
|
||||
| `POST /v1/admin/users/{id}/credits` | admin | `{unit: natal\|synastry, delta, note?}`: elemzések jóváírása vagy levonása |
|
||||
|
||||
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.
|
||||
|
||||
@@ -87,7 +88,7 @@ Hibák formátuma: `{"error": {"code", "message"}}`. A születési adatok hibái
|
||||
| `synastries` | két képlet összevetése (`result`: fényszögek, házak, kompozit), `synastry_hash` |
|
||||
| `synastry_invites` | meghívó linkek: token hash, lejárat, ki fogadta el, melyik szinasztria lett belőle |
|
||||
| `analyses` | szöveges elemzések: típus, nyelv, modell, promptverzió, `cache_key`, állapot (`pending` → `running` → `done`/`failed`), strukturált `content` |
|
||||
| `credit_ledger` | csak hozzáírható kreditnapló; az egyenleg `SUM(delta)`; havi keret lustán, egyszer havonta |
|
||||
| `credit_ledger` | csak hozzáírható egységnapló (`unit`: `natal` vagy `synastry`); az egyenleg típusonként `SUM(delta)` |
|
||||
| `shares` | nyilvános linkek: véletlen `slug`, mit mutat, `show_birth_data`, nézettség, visszavonás |
|
||||
| `email_outbox` | kimenő e-mailek; a worker küldi ki (újrapróbálással) |
|
||||
|
||||
@@ -97,15 +98,16 @@ Hibák formátuma: `{"error": {"code", "message"}}`. A születési adatok hibái
|
||||
- A szinasztria másik fele csak a pozíciókat látja, a születési adatokat nem.
|
||||
- A fiók törlése mindent töröl, ami a felhasználóhoz tartozik, beleértve a más által létrehozott, de az ő képletét használó szinasztriákat is.
|
||||
|
||||
## Elemzések és kreditek
|
||||
## Elemzések és egységek
|
||||
|
||||
- **Kérés:** a `POST .../analyses` létrehoz egy `pending` elemzést, és levonja az `ANALYSIS_COST` kreditet; a szöveget később a worker írja meg. Ha nincs elég kredit, 402 `insufficient_credits` a válasz.
|
||||
- **Ingyenes rész:** minden mentett képlethez elkészül egy rövid összefoglaló (`summary`, `SUMMARY_MODEL`), ezért nem kell fizetni.
|
||||
- **Fizetős rész:** a részletes elemzés darabra megy. A képletelemzés egy `natal`, a szinasztria-elemzés egy `synastry` egységet von le (`credit_ledger.unit`). Az egységek csomagvásárlásból (Stripe, később) vagy admin jóváírásból jönnek. Havi ingyenes keret nincs.
|
||||
- **Modell:** egyetlen, az `ANALYSIS_MODEL` (alapból Opus 5.5, a 2026-11-es összevetés legjobbja, lásd `services/worker/README.md`). A kliens nem választ modellt.
|
||||
- **Kérés:** a `POST .../analyses` (`{language?}`) létrehoz egy `pending` elemzést, és levon egy egységet; a szöveget a worker írja meg, általában 1–2 perc alatt. A kliens a `GET /v1/analyses/{id}` végponton kérdezi le az állapotát. Ha nincs egység, 402 `insufficient_credits` a válasz (`unit`, `balance` részletekkel). Hiba esetén a worker visszaadja az egységet.
|
||||
- **Gyorsítótár:** a kulcs `sha256(típus | képlet- vagy szinasztria-hash | promptverzió | modell | nyelv)`.
|
||||
- Ha ugyanarra a képletre már kértek ilyet, ugyanazt adja vissza (200).
|
||||
- Ha bárhol van kész elemzés ugyanezzel a kulccsal (például ugyanaz a születési adat egy másik felhasználónál), ingyen átmásolja (201, `done`).
|
||||
|
||||
## Háttérmunkák
|
||||
|
||||
A [worker](../worker/README.md) már kiküldi az e-maileket az `email_outbox`-ból, és óránként takarít. Még hátravan:
|
||||
- az elemzések megírása (OpenRouter, strukturált JSON, streaming);
|
||||
- sikertelen elemzésnél a kredit visszatérítése (`refund`).
|
||||
A [worker](../worker/README.md) kiküldi az e-maileket, megírja az elemzéseket (OpenRouter, strukturált JSON; hibánál visszaadja az egységet), és óránként takarít. Még hátravan az elemzés streamelése a frontend felé.
|
||||
|
||||
@@ -21,6 +21,9 @@ pub struct Config {
|
||||
pub cookie_domain: Option<String>,
|
||||
/// `SESSION_TTL_DAYS` (default 30).
|
||||
pub session_ttl_days: i64,
|
||||
/// `PASSWORD_LOGIN` (default `false`): e-mail and password registration and
|
||||
/// login. Off in production, where only Google, Apple and Facebook are offered.
|
||||
pub password_login: bool,
|
||||
/// `GOOGLE_CLIENT_IDS`: comma-separated OAuth client ids accepted as the
|
||||
/// ID token audience; empty disables Google login.
|
||||
pub google_client_ids: Vec<String>,
|
||||
@@ -31,14 +34,13 @@ pub struct Config {
|
||||
pub bootstrap_admin_emails: Vec<String>,
|
||||
/// `SUPPORTED_LOCALES` (default `hu,en`); the first is the default.
|
||||
pub supported_locales: Vec<String>,
|
||||
/// `MONTHLY_FREE_CREDITS` (default 10).
|
||||
pub monthly_free_credits: i32,
|
||||
/// `ANALYSIS_COST` credits per new analysis (default 1).
|
||||
pub analysis_cost: i32,
|
||||
/// `LLM_MODELS`: comma-separated OpenRouter model ids users may choose;
|
||||
/// the first is the default (default `openrouter/auto`).
|
||||
pub llm_models: Vec<String>,
|
||||
/// `ANALYSIS_PROMPT_VERSION` (default `v1`); part of the analysis cache key.
|
||||
/// `ANALYSIS_MODEL`: writes the paid detailed analyses (default
|
||||
/// `anthropic/claude-opus-5.5`, the best of the 2026-11 comparison).
|
||||
pub analysis_model: String,
|
||||
/// `SUMMARY_MODEL`: writes the free short summary of every saved chart
|
||||
/// (default `anthropic/claude-sonnet-5.5`, about 1 US cent each).
|
||||
pub summary_model: String,
|
||||
/// `ANALYSIS_PROMPT_VERSION` (default `v2`); part of the analysis cache key.
|
||||
pub prompt_version: String,
|
||||
/// `MAX_CHARTS_PER_USER` (default 50).
|
||||
pub max_charts_per_user: i64,
|
||||
@@ -76,10 +78,6 @@ impl Config {
|
||||
if supported_locales.is_empty() {
|
||||
supported_locales = vec!["hu".into(), "en".into()];
|
||||
}
|
||||
let mut llm_models = list("LLM_MODELS");
|
||||
if llm_models.is_empty() {
|
||||
llm_models.push("openrouter/auto".into());
|
||||
}
|
||||
let config = Self {
|
||||
database_url: var("DATABASE_URL").context("DATABASE_URL is required")?,
|
||||
horoscope_api_url: var("HOROSCOPE_API_URL").unwrap_or_else(|| "http://localhost:8080".into()),
|
||||
@@ -88,23 +86,20 @@ impl Config {
|
||||
cookie_secure: parsed("COOKIE_SECURE", true)?,
|
||||
cookie_domain: var("COOKIE_DOMAIN"),
|
||||
session_ttl_days: parsed("SESSION_TTL_DAYS", 30)?,
|
||||
password_login: parsed("PASSWORD_LOGIN", false)?,
|
||||
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
||||
google_jwks_url: var("GOOGLE_JWKS_URL")
|
||||
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
||||
bootstrap_admin_emails: list("BOOTSTRAP_ADMIN_EMAILS").into_iter().map(|e| e.to_lowercase()).collect(),
|
||||
supported_locales,
|
||||
monthly_free_credits: parsed("MONTHLY_FREE_CREDITS", 10)?,
|
||||
analysis_cost: parsed("ANALYSIS_COST", 1)?,
|
||||
llm_models,
|
||||
prompt_version: var("ANALYSIS_PROMPT_VERSION").unwrap_or_else(|| "v1".into()),
|
||||
analysis_model: var("ANALYSIS_MODEL").unwrap_or_else(|| "anthropic/claude-opus-5.5".into()),
|
||||
summary_model: var("SUMMARY_MODEL").unwrap_or_else(|| "anthropic/claude-sonnet-5.5".into()),
|
||||
prompt_version: var("ANALYSIS_PROMPT_VERSION").unwrap_or_else(|| "v2".into()),
|
||||
max_charts_per_user: parsed("MAX_CHARTS_PER_USER", 50)?,
|
||||
};
|
||||
if config.session_ttl_days < 1 {
|
||||
bail!("SESSION_TTL_DAYS must be at least 1");
|
||||
}
|
||||
if config.monthly_free_credits < 0 || config.analysis_cost < 0 {
|
||||
bail!("MONTHLY_FREE_CREDITS and ANALYSIS_COST must not be negative");
|
||||
}
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
@@ -119,13 +114,13 @@ impl Config {
|
||||
cookie_secure: true,
|
||||
cookie_domain: None,
|
||||
session_ttl_days: 30,
|
||||
password_login: true,
|
||||
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
||||
google_jwks_url,
|
||||
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
||||
supported_locales: vec!["hu".into(), "en".into()],
|
||||
monthly_free_credits: 2,
|
||||
analysis_cost: 1,
|
||||
llm_models: vec!["openrouter/auto".into(), "anthropic/claude-test".into()],
|
||||
analysis_model: "anthropic/claude-test".into(),
|
||||
summary_model: "anthropic/claude-summary".into(),
|
||||
prompt_version: "v1".into(),
|
||||
max_charts_per_user: 50,
|
||||
}
|
||||
|
||||
@@ -1,78 +1,78 @@
|
||||
//! Credit ledger: every LLM call costs credits; users get a free monthly
|
||||
//! allowance, granted lazily on the first balance query or spend of a month.
|
||||
//! Analysis units: a detailed natal analysis uses one `natal` unit, a
|
||||
//! synastry analysis one `synastry` unit. Units come from purchases or an
|
||||
//! admin; a failed analysis gives its unit back (the worker does that).
|
||||
|
||||
use sqlx::{PgConnection, PgPool};
|
||||
use time::OffsetDateTime;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::{Value, json};
|
||||
use sqlx::PgConnection;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::error::ApiError;
|
||||
|
||||
pub fn current_period() -> String {
|
||||
let now = OffsetDateTime::now_utc();
|
||||
format!("{:04}-{:02}", now.year(), u8::from(now.month()))
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum Unit {
|
||||
Natal,
|
||||
Synastry,
|
||||
}
|
||||
|
||||
/// Grants this month's free credits if not granted yet.
|
||||
pub async fn ensure_monthly_grant(conn: &mut PgConnection, user_id: Uuid, amount: i32) -> Result<(), ApiError> {
|
||||
if amount <= 0 {
|
||||
return Ok(());
|
||||
impl Unit {
|
||||
pub fn as_str(self) -> &'static str {
|
||||
match self {
|
||||
Unit::Natal => "natal",
|
||||
Unit::Synastry => "synastry",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Units left per kind.
|
||||
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
||||
pub struct Balance {
|
||||
pub natal: i64,
|
||||
pub synastry: i64,
|
||||
}
|
||||
|
||||
impl Balance {
|
||||
pub fn of(self, unit: Unit) -> i64 {
|
||||
match unit {
|
||||
Unit::Natal => self.natal,
|
||||
Unit::Synastry => self.synastry,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn view(self) -> Value {
|
||||
json!({ "natal": self.natal, "synastry": self.synastry })
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn balance(conn: &mut PgConnection, user_id: Uuid) -> Result<Balance, ApiError> {
|
||||
let (natal, synastry): (i64, i64) = sqlx::query_as(
|
||||
"SELECT COALESCE(SUM(delta) FILTER (WHERE unit = 'natal'), 0)::bigint, \
|
||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'synastry'), 0)::bigint \
|
||||
FROM credit_ledger WHERE user_id = $1",
|
||||
)
|
||||
.bind(user_id)
|
||||
.fetch_one(conn)
|
||||
.await?;
|
||||
Ok(Balance { natal, synastry })
|
||||
}
|
||||
|
||||
/// Spends one unit inside the caller's transaction. The user row is locked
|
||||
/// so concurrent requests cannot overspend.
|
||||
pub async fn spend(tx: &mut PgConnection, user_id: Uuid, unit: Unit, analysis_id: Uuid) -> Result<(), ApiError> {
|
||||
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user_id).execute(&mut *tx).await?;
|
||||
let left = balance(tx, user_id).await?.of(unit);
|
||||
if left < 1 {
|
||||
return Err(ApiError::InsufficientCredits { unit: unit.as_str(), balance: left });
|
||||
}
|
||||
sqlx::query(
|
||||
"INSERT INTO credit_ledger (id, user_id, delta, reason, period, note) \
|
||||
VALUES ($1, $2, $3, 'monthly_grant', $4, 'monthly free credits') \
|
||||
ON CONFLICT (user_id, period) WHERE reason = 'monthly_grant' DO NOTHING",
|
||||
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, analysis_id) VALUES ($1, $2, $3, -1, 'analysis', $4)",
|
||||
)
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(user_id)
|
||||
.bind(amount)
|
||||
.bind(current_period())
|
||||
.execute(conn)
|
||||
.bind(unit.as_str())
|
||||
.bind(analysis_id)
|
||||
.execute(tx)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn balance_of(conn: &mut PgConnection, user_id: Uuid) -> Result<i64, ApiError> {
|
||||
let (balance,): (i64,) =
|
||||
sqlx::query_as("SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger WHERE user_id = $1")
|
||||
.bind(user_id)
|
||||
.fetch_one(conn)
|
||||
.await?;
|
||||
Ok(balance)
|
||||
}
|
||||
|
||||
/// Current balance including this month's allowance.
|
||||
pub async fn balance(pool: &PgPool, user_id: Uuid, monthly: i32) -> Result<i64, ApiError> {
|
||||
let mut conn = pool.acquire().await?;
|
||||
ensure_monthly_grant(&mut conn, user_id, monthly).await?;
|
||||
balance_of(&mut conn, user_id).await
|
||||
}
|
||||
|
||||
/// Spends `cost` credits inside the caller's transaction. The user row is
|
||||
/// locked so concurrent requests cannot overspend.
|
||||
pub async fn spend(
|
||||
tx: &mut PgConnection,
|
||||
user_id: Uuid,
|
||||
cost: i32,
|
||||
monthly: i32,
|
||||
reason: &str,
|
||||
analysis_id: Option<Uuid>,
|
||||
) -> Result<(), ApiError> {
|
||||
if cost <= 0 {
|
||||
return Ok(());
|
||||
}
|
||||
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user_id).execute(&mut *tx).await?;
|
||||
ensure_monthly_grant(tx, user_id, monthly).await?;
|
||||
let balance = balance_of(tx, user_id).await?;
|
||||
if balance < i64::from(cost) {
|
||||
return Err(ApiError::InsufficientCredits { needed: cost, balance });
|
||||
}
|
||||
sqlx::query("INSERT INTO credit_ledger (id, user_id, delta, reason, analysis_id) VALUES ($1, $2, $3, $4, $5)")
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(user_id)
|
||||
.bind(-cost)
|
||||
.bind(reason)
|
||||
.bind(analysis_id)
|
||||
.execute(tx)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -24,8 +24,8 @@ pub enum ApiError {
|
||||
Gone(String),
|
||||
#[error("the link is invalid or has expired")]
|
||||
InvalidToken,
|
||||
#[error("not enough credits: {needed} needed, {balance} available")]
|
||||
InsufficientCredits { needed: i32, balance: i64 },
|
||||
#[error("no {unit} analysis left (balance {balance})")]
|
||||
InsufficientCredits { unit: &'static str, balance: i64 },
|
||||
#[error("too many attempts; try again later")]
|
||||
TooManyRequests,
|
||||
/// Birth data rejected by the horoscope service; its error object is passed through.
|
||||
|
||||
@@ -59,7 +59,7 @@ async fn main() -> anyhow::Result<()> {
|
||||
service_kit::init_logging();
|
||||
let config = Config::from_env()?;
|
||||
let pool = db::connect(&config.database_url).await.context("connecting to the database")?;
|
||||
db::MIGRATOR.run(&pool).await.context("running database migrations")?;
|
||||
db::migrate(&pool).await.context("running database migrations")?;
|
||||
tracing::info!(
|
||||
google_login = !config.google_client_ids.is_empty(),
|
||||
horoscope_api = %config.horoscope_api_url,
|
||||
|
||||
@@ -28,12 +28,12 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
.bind(auth.id())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
let balance = credits::balance(&state.db, auth.id(), state.config.monthly_free_credits).await?;
|
||||
let balance = credits::balance(&mut *state.db.acquire().await?, auth.id()).await?;
|
||||
Ok(Json(json!({
|
||||
"user": UserView::from(&auth.user),
|
||||
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
||||
"primary_chart_id": primary.map(|(id,)| id),
|
||||
"credits": balance,
|
||||
"analyses_left": balance.view(),
|
||||
})))
|
||||
}
|
||||
|
||||
@@ -85,6 +85,7 @@ pub async fn change_password(
|
||||
auth: AuthUser,
|
||||
WithRejection(Json(req), _): Body<ChangePassword>,
|
||||
) -> ApiResult<StatusCode> {
|
||||
super::auth::password_login_enabled(&state)?;
|
||||
validate_password(&req.new_password)?;
|
||||
let existing: Option<(String,)> =
|
||||
sqlx::query_as("SELECT password_hash FROM auth_identities WHERE user_id = $1 AND provider = 'password'")
|
||||
@@ -111,22 +112,20 @@ pub async fn change_password(
|
||||
}
|
||||
|
||||
pub async fn credits(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
let balance = credits::balance(&state.db, auth.id(), state.config.monthly_free_credits).await?;
|
||||
type Row = (Uuid, i32, String, Option<String>, Option<Uuid>, Option<String>, OffsetDateTime);
|
||||
let balance = credits::balance(&mut *state.db.acquire().await?, auth.id()).await?;
|
||||
type Row = (Uuid, String, i32, String, Option<Uuid>, Option<String>, OffsetDateTime);
|
||||
let ledger: Vec<Row> = sqlx::query_as(
|
||||
"SELECT id, delta, reason, period, analysis_id, note, created_at FROM credit_ledger \
|
||||
"SELECT id, unit, delta, reason, analysis_id, note, created_at FROM credit_ledger \
|
||||
WHERE user_id = $1 ORDER BY created_at DESC LIMIT 100",
|
||||
)
|
||||
.bind(auth.id())
|
||||
.fetch_all(&state.db)
|
||||
.await?;
|
||||
Ok(Json(json!({
|
||||
"balance": balance,
|
||||
"monthly_free_credits": state.config.monthly_free_credits,
|
||||
"analysis_cost": state.config.analysis_cost,
|
||||
"period": credits::current_period(),
|
||||
"ledger": ledger.into_iter().map(|(id, delta, reason, period, analysis_id, note, at)| json!({
|
||||
"id": id, "delta": delta, "reason": reason, "period": period,
|
||||
"balance": balance.view(),
|
||||
"analysis_model": state.config.analysis_model,
|
||||
"ledger": ledger.into_iter().map(|(id, unit, delta, reason, analysis_id, note, at)| json!({
|
||||
"id": id, "unit": unit, "delta": delta, "reason": reason,
|
||||
"analysis_id": analysis_id, "note": note, "created_at": rfc3339(at),
|
||||
})).collect::<Vec<_>>(),
|
||||
})))
|
||||
@@ -152,7 +151,7 @@ pub async fn export(State(state): St, auth: AuthUser) -> ApiResult<impl IntoResp
|
||||
"synastries": rows("SELECT json_build_object('id', s.id, 'owner_id', s.owner_id, 'chart1_id', s.chart1_id, 'chart2_id', s.chart2_id, 'result', s.result, 'created_at', s.created_at) FROM synastries s JOIN charts c1 ON c1.id = s.chart1_id JOIN charts c2 ON c2.id = s.chart2_id WHERE s.owner_id = $1 OR c1.owner_id = $1 OR c2.owner_id = $1").await?,
|
||||
"invites": rows("SELECT json_build_object('id', id, 'chart_id', inviter_chart_id, 'message', message, 'created_at', created_at, 'expires_at', expires_at, 'accepted_at', accepted_at) FROM synastry_invites WHERE inviter_id = $1").await?,
|
||||
"analyses": rows("SELECT json_build_object('id', a.id, 'kind', a.kind, 'chart_id', a.chart_id, 'synastry_id', a.synastry_id, 'language', a.language, 'model', a.model, 'status', a.status, 'content', a.content, 'created_at', a.created_at) FROM analyses a WHERE a.requested_by = $1 OR a.chart_id IN (SELECT id FROM charts WHERE owner_id = $1)").await?,
|
||||
"credit_ledger": rows("SELECT json_build_object('delta', delta, 'reason', reason, 'period', period, 'note', note, 'created_at', created_at) FROM credit_ledger WHERE user_id = $1 ORDER BY created_at").await?,
|
||||
"credit_ledger": rows("SELECT json_build_object('unit', unit, 'delta', delta, 'reason', reason, 'note', note, 'created_at', created_at) FROM credit_ledger WHERE user_id = $1 ORDER BY created_at").await?,
|
||||
"shares": rows("SELECT json_build_object('slug', slug, 'kind', kind, 'title', title, 'show_birth_data', show_birth_data, 'view_count', view_count, 'created_at', created_at, 'revoked_at', revoked_at) FROM shares WHERE owner_id = $1").await?,
|
||||
});
|
||||
Ok(([("content-disposition", "attachment; filename=\"sorsfonalak-export.json\"")], Json(document)))
|
||||
|
||||
@@ -12,6 +12,7 @@ use uuid::Uuid;
|
||||
|
||||
use super::{Body, IdPath, St};
|
||||
use crate::auth::AdminUser;
|
||||
use crate::credits::{self, Unit};
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::{rfc3339, rfc3339_opt};
|
||||
|
||||
@@ -31,11 +32,12 @@ pub async fn list_users(
|
||||
let limit = query.limit.unwrap_or(50).clamp(1, 200);
|
||||
let offset = query.offset.unwrap_or(0).max(0);
|
||||
let pattern = query.q.as_deref().map(|q| format!("%{}%", q.trim().replace(['%', '_'], "")));
|
||||
type Row = (Uuid, String, Option<String>, Vec<String>, bool, OffsetDateTime, Option<OffsetDateTime>, i64, i64);
|
||||
type Row = (Uuid, String, Option<String>, Vec<String>, bool, OffsetDateTime, Option<OffsetDateTime>, i64, i64, i64);
|
||||
let rows: Vec<Row> = sqlx::query_as(
|
||||
"SELECT u.id, u.email, u.display_name, u.roles, u.email_verified_at IS NOT NULL, u.created_at, u.last_login_at, \
|
||||
(SELECT count(*) FROM charts c WHERE c.owner_id = u.id), \
|
||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id) \
|
||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'natal'), \
|
||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'synastry') \
|
||||
FROM users u \
|
||||
WHERE $1::text IS NULL OR u.email ILIKE $1 OR u.display_name ILIKE $1 \
|
||||
ORDER BY u.created_at DESC LIMIT $2 OFFSET $3",
|
||||
@@ -47,11 +49,11 @@ pub async fn list_users(
|
||||
.await?;
|
||||
let users: Vec<Value> = rows
|
||||
.into_iter()
|
||||
.map(|(id, email, name, roles, verified, created, last_login, charts, credits)| {
|
||||
.map(|(id, email, name, roles, verified, created, last_login, charts, natal, synastry)| {
|
||||
json!({
|
||||
"id": id, "email": email, "display_name": name, "roles": roles, "email_verified": verified,
|
||||
"created_at": rfc3339(created), "last_login_at": rfc3339_opt(last_login),
|
||||
"charts": charts, "credits": credits,
|
||||
"charts": charts, "analyses_left": {"natal": natal, "synastry": synastry},
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
@@ -93,6 +95,7 @@ pub async fn update_user(
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct AdjustCredits {
|
||||
unit: Unit,
|
||||
/// Positive to add, negative to take away.
|
||||
delta: i32,
|
||||
note: Option<String>,
|
||||
@@ -111,19 +114,17 @@ pub async fn adjust_credits(
|
||||
sqlx::query_as("SELECT id FROM users WHERE id = $1").bind(id).fetch_optional(&state.db).await?;
|
||||
exists.ok_or(ApiError::NotFound("user"))?;
|
||||
sqlx::query(
|
||||
"INSERT INTO credit_ledger (id, user_id, delta, reason, note, created_by) VALUES ($1, $2, $3, 'admin_adjust', $4, $5)",
|
||||
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note, created_by) \
|
||||
VALUES ($1, $2, $3, $4, 'admin_adjust', $5, $6)",
|
||||
)
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(id)
|
||||
.bind(req.unit.as_str())
|
||||
.bind(req.delta)
|
||||
.bind(req.note.map(|n| n.chars().take(500).collect::<String>()))
|
||||
.bind(admin.id())
|
||||
.execute(&state.db)
|
||||
.await?;
|
||||
let (balance,): (i64,) =
|
||||
sqlx::query_as("SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger WHERE user_id = $1")
|
||||
.bind(id)
|
||||
.fetch_one(&state.db)
|
||||
.await?;
|
||||
Ok((StatusCode::CREATED, Json(json!({ "user_id": id, "balance": balance }))))
|
||||
let balance = credits::balance(&mut *state.db.acquire().await?, id).await?;
|
||||
Ok((StatusCode::CREATED, Json(json!({ "user_id": id, "analyses_left": balance.view() }))))
|
||||
}
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
//! Text analyses (LLM) of charts and synastries.
|
||||
//!
|
||||
//! A request creates a `pending` analysis and spends credits; the worker
|
||||
//! A request creates a `pending` analysis and spends one unit of its kind
|
||||
//! (`natal` or `synastry`, see [`credits`]); the worker
|
||||
//! writes the text later. A finished analysis with the same cache key (same
|
||||
//! chart or synastry hash, prompt version, model and language) is copied
|
||||
//! instead, free of charge, so the same chart is never paid for twice.
|
||||
//!
|
||||
//! Every saved chart also gets a free short summary (`summary` kind, written
|
||||
//! by `SUMMARY_MODEL`); the detailed analyses are paid.
|
||||
|
||||
use axum::Json;
|
||||
use axum::body::Bytes;
|
||||
@@ -17,12 +21,12 @@ use time::OffsetDateTime;
|
||||
use uuid::Uuid;
|
||||
|
||||
use super::auth::validate_locale;
|
||||
use super::charts::{find_chart, owned_chart};
|
||||
use super::charts::{ChartRow, find_chart, owned_chart};
|
||||
use super::synastries::{load_synastry, visible_synastry};
|
||||
use super::{IdPath, St};
|
||||
use crate::AppState;
|
||||
use crate::auth::AuthUser;
|
||||
use crate::credits;
|
||||
use crate::credits::{self, Unit};
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::{rfc3339, rfc3339_opt, sha256_hex};
|
||||
|
||||
@@ -90,8 +94,6 @@ pub async fn can_see(db: &PgPool, analysis: &AnalysisRow, user: Uuid) -> Result<
|
||||
pub struct AnalysisRequest {
|
||||
/// Defaults to the user's locale.
|
||||
language: Option<String>,
|
||||
/// One of the configured models; defaults to the first.
|
||||
model: Option<String>,
|
||||
}
|
||||
|
||||
/// The request body is optional: empty means all defaults.
|
||||
@@ -104,6 +106,7 @@ fn optional_body(body: &[u8]) -> Result<AnalysisRequest, ApiError> {
|
||||
|
||||
enum Target {
|
||||
Natal { chart_id: Uuid, hash: String },
|
||||
Summary { chart_id: Uuid, hash: String },
|
||||
Synastry { synastry_id: Uuid, hash: String },
|
||||
}
|
||||
|
||||
@@ -114,15 +117,29 @@ async fn request(
|
||||
req: AnalysisRequest,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let language = validate_locale(state, Some(req.language.as_deref().unwrap_or(&auth.user.locale)))?;
|
||||
let model = req.model.unwrap_or_else(|| state.config.llm_models[0].clone());
|
||||
if !state.config.llm_models.contains(&model) {
|
||||
return Err(ApiError::BadRequest(format!(
|
||||
"unknown model '{model}'; available: {}",
|
||||
state.config.llm_models.join(", ")
|
||||
)));
|
||||
}
|
||||
let (kind, hash, chart_id, synastry_id) = match &target {
|
||||
let unit = match target {
|
||||
Target::Synastry { .. } => Unit::Synastry,
|
||||
_ => Unit::Natal,
|
||||
};
|
||||
let model = state.config.analysis_model.clone();
|
||||
let (status, row) = queue(state, auth.id(), &target, &language, &model, Some(unit)).await?;
|
||||
Ok((status, Json(row.view())))
|
||||
}
|
||||
|
||||
/// Returns the existing analysis with the same cache key for this target,
|
||||
/// copies a finished one from another chart with the same data, or queues a
|
||||
/// new one (spending one `unit`, if given). 200, 201 and 202 respectively.
|
||||
async fn queue(
|
||||
state: &AppState,
|
||||
user: Uuid,
|
||||
target: &Target,
|
||||
language: &str,
|
||||
model: &str,
|
||||
unit: Option<Unit>,
|
||||
) -> Result<(StatusCode, AnalysisRow), ApiError> {
|
||||
let (kind, hash, chart_id, synastry_id) = match target {
|
||||
Target::Natal { chart_id, hash } => ("natal", hash, Some(*chart_id), None),
|
||||
Target::Summary { chart_id, hash } => ("summary", hash, Some(*chart_id), None),
|
||||
Target::Synastry { synastry_id, hash } => ("synastry", hash, None, Some(*synastry_id)),
|
||||
};
|
||||
let prompt_version = &state.config.prompt_version;
|
||||
@@ -140,7 +157,7 @@ async fn request(
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
if let Some(row) = existing {
|
||||
return Ok((StatusCode::OK, Json(row.view())));
|
||||
return Ok((StatusCode::OK, row));
|
||||
}
|
||||
|
||||
let insert = format!(
|
||||
@@ -163,9 +180,9 @@ async fn request(
|
||||
.bind(kind)
|
||||
.bind(chart_id)
|
||||
.bind(synastry_id)
|
||||
.bind(auth.id())
|
||||
.bind(&language)
|
||||
.bind(&model)
|
||||
.bind(user)
|
||||
.bind(language)
|
||||
.bind(model)
|
||||
.bind(prompt_version)
|
||||
.bind(&cache_key)
|
||||
.bind("done")
|
||||
@@ -176,33 +193,51 @@ async fn request(
|
||||
.bind(OffsetDateTime::now_utc())
|
||||
.fetch_one(&state.db)
|
||||
.await?;
|
||||
return Ok((StatusCode::CREATED, Json(row.view())));
|
||||
return Ok((StatusCode::CREATED, row));
|
||||
}
|
||||
|
||||
// New analysis: spend credits and queue it for the worker.
|
||||
let cost = state.config.analysis_cost;
|
||||
// New analysis: spend a unit and queue it for the worker.
|
||||
let mut tx = state.db.begin().await?;
|
||||
let row: AnalysisRow = sqlx::query_as(&insert)
|
||||
.bind(id)
|
||||
.bind(kind)
|
||||
.bind(chart_id)
|
||||
.bind(synastry_id)
|
||||
.bind(auth.id())
|
||||
.bind(&language)
|
||||
.bind(&model)
|
||||
.bind(user)
|
||||
.bind(language)
|
||||
.bind(model)
|
||||
.bind(prompt_version)
|
||||
.bind(&cache_key)
|
||||
.bind("pending")
|
||||
.bind(None::<Value>)
|
||||
.bind(None::<i32>)
|
||||
.bind(None::<i32>)
|
||||
.bind(cost)
|
||||
.bind(i32::from(unit.is_some()))
|
||||
.bind(None::<OffsetDateTime>)
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
credits::spend(&mut tx, auth.id(), cost, state.config.monthly_free_credits, "analysis", Some(id)).await?;
|
||||
if let Some(unit) = unit {
|
||||
credits::spend(&mut tx, user, unit, id).await?;
|
||||
}
|
||||
tx.commit().await?;
|
||||
Ok((StatusCode::ACCEPTED, Json(row.view())))
|
||||
Ok((StatusCode::ACCEPTED, row))
|
||||
}
|
||||
|
||||
/// The free short summary of a chart (in the owner's language): queued if
|
||||
/// it does not exist yet or the last attempt failed.
|
||||
pub async fn ensure_summary(state: &AppState, owner: &AuthUser, chart: &ChartRow) -> Result<AnalysisRow, ApiError> {
|
||||
let target = Target::Summary { chart_id: chart.id, hash: chart.chart_hash.clone() };
|
||||
let model = state.config.summary_model.clone();
|
||||
Ok(queue(state, owner.id(), &target, &owner.user.locale, &model, None).await?.1)
|
||||
}
|
||||
|
||||
pub async fn summary_for_chart(
|
||||
State(state): St,
|
||||
auth: AuthUser,
|
||||
WithRejection(Path(id), _): IdPath,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
let chart = owned_chart(&state.db, id, auth.id()).await?;
|
||||
Ok(Json(ensure_summary(&state, &auth, &chart).await?.view()))
|
||||
}
|
||||
|
||||
async fn list_where(db: &PgPool, column: &str, id: Uuid) -> Result<Json<Value>, ApiError> {
|
||||
|
||||
@@ -158,12 +158,22 @@ pub struct RegisterRequest {
|
||||
locale: Option<String>,
|
||||
}
|
||||
|
||||
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
|
||||
pub fn password_login_enabled(state: &crate::AppState) -> Result<(), ApiError> {
|
||||
if state.config.password_login {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(ApiError::Forbidden("e-mail and password login is disabled; use Google, Apple or Facebook".into()))
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn register(
|
||||
State(state): St,
|
||||
headers: HeaderMap,
|
||||
jar: CookieJar,
|
||||
WithRejection(Json(req), _): Body<RegisterRequest>,
|
||||
) -> ApiResult<impl IntoResponse> {
|
||||
password_login_enabled(&state)?;
|
||||
let email = normalize_email(&req.email)?;
|
||||
validate_password(&req.password)?;
|
||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||
@@ -213,6 +223,7 @@ pub async fn login(
|
||||
jar: CookieJar,
|
||||
WithRejection(Json(req), _): Body<LoginRequest>,
|
||||
) -> ApiResult<impl IntoResponse> {
|
||||
password_login_enabled(&state)?;
|
||||
let invalid = || ApiError::InvalidCredentials("wrong e-mail address or password".into());
|
||||
let email = normalize_email(&req.email).map_err(|_| invalid())?;
|
||||
state.login_limiter.check(&email)?;
|
||||
@@ -394,6 +405,7 @@ pub async fn request_password_reset(
|
||||
State(state): St,
|
||||
WithRejection(Json(req), _): Body<ResetRequest>,
|
||||
) -> ApiResult<StatusCode> {
|
||||
password_login_enabled(&state)?;
|
||||
let Ok(email) = normalize_email(&req.email) else { return Ok(StatusCode::ACCEPTED) };
|
||||
let mut tx = state.db.begin().await?;
|
||||
let user: Option<User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE email = $1"))
|
||||
@@ -422,6 +434,7 @@ pub async fn confirm_password_reset(
|
||||
State(state): St,
|
||||
WithRejection(Json(req), _): Body<ResetConfirmRequest>,
|
||||
) -> ApiResult<StatusCode> {
|
||||
password_login_enabled(&state)?;
|
||||
validate_password(&req.password)?;
|
||||
let hash = hash_password(req.password).await?;
|
||||
let mut tx = state.db.begin().await?;
|
||||
|
||||
@@ -106,22 +106,64 @@ pub struct CreateChart {
|
||||
/// Calculates a chart from birth data; the `name` field is dropped so no
|
||||
/// personal name reaches the calculation (or, later, the LLM).
|
||||
pub async fn calculate(state: &AppState, birth: Value) -> Result<(Value, Value, String), ApiError> {
|
||||
let Value::Object(mut birth) = birth else {
|
||||
return Err(ApiError::BadRequest("birth must be an object".into()));
|
||||
};
|
||||
birth.remove("name");
|
||||
let birth = Value::Object(birth);
|
||||
let birth = clean_birth(birth)?;
|
||||
let result = state.horoscope.natal(&birth).await?;
|
||||
let hash = chart_hash(&result);
|
||||
Ok((birth, result, hash))
|
||||
}
|
||||
|
||||
/// Queues the free short summary; a failure here does not fail the save
|
||||
/// (the chart page asks for the summary again).
|
||||
async fn queue_summary(state: &AppState, auth: &AuthUser, chart: &ChartRow) {
|
||||
if let Err(e) = super::analyses::ensure_summary(state, auth, chart).await {
|
||||
tracing::warn!(chart = %chart.id, error = %e, "queueing the chart summary failed");
|
||||
}
|
||||
}
|
||||
|
||||
fn clean_birth(birth: Value) -> Result<Value, ApiError> {
|
||||
let Value::Object(mut birth) = birth else {
|
||||
return Err(ApiError::BadRequest("birth must be an object".into()));
|
||||
};
|
||||
birth.remove("name");
|
||||
Ok(Value::Object(birth))
|
||||
}
|
||||
|
||||
/// Saves a new chart. If the user already has a chart with exactly the same
|
||||
/// birth data, that one is returned (and made primary if asked) instead of
|
||||
/// calculating it again.
|
||||
pub async fn create(
|
||||
State(state): St,
|
||||
auth: AuthUser,
|
||||
WithRejection(Json(req), _): Body<CreateChart>,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let label = clean_label(&req.label)?;
|
||||
let birth = clean_birth(req.birth)?;
|
||||
let existing: Option<ChartRow> =
|
||||
sqlx::query_as(&format!("SELECT {CHART_COLUMNS} FROM charts WHERE owner_id = $1 AND birth_data = $2 LIMIT 1"))
|
||||
.bind(auth.id())
|
||||
.bind(&birth)
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
if let Some(chart) = existing {
|
||||
if req.is_primary && !chart.is_primary {
|
||||
let mut tx = state.db.begin().await?;
|
||||
sqlx::query("UPDATE charts SET is_primary = false, updated_at = now() WHERE owner_id = $1 AND is_primary")
|
||||
.bind(auth.id())
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
let row: ChartRow = sqlx::query_as(&format!(
|
||||
"UPDATE charts SET is_primary = true, updated_at = now() WHERE id = $1 RETURNING {CHART_COLUMNS}"
|
||||
))
|
||||
.bind(chart.id)
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
tx.commit().await?;
|
||||
queue_summary(&state, &auth, &row).await;
|
||||
return Ok((StatusCode::OK, Json(row.owner_view())));
|
||||
}
|
||||
queue_summary(&state, &auth, &chart).await;
|
||||
return Ok((StatusCode::OK, Json(chart.owner_view())));
|
||||
}
|
||||
let (count,): (i64,) =
|
||||
sqlx::query_as("SELECT count(*) FROM charts WHERE owner_id = $1").bind(auth.id()).fetch_one(&state.db).await?;
|
||||
if count >= state.config.max_charts_per_user {
|
||||
@@ -130,7 +172,7 @@ pub async fn create(
|
||||
format!("at most {} charts can be saved", state.config.max_charts_per_user),
|
||||
));
|
||||
}
|
||||
let (birth, result, hash) = calculate(&state, req.birth).await?;
|
||||
let (birth, result, hash) = calculate(&state, birth).await?;
|
||||
|
||||
let mut tx = state.db.begin().await?;
|
||||
if req.is_primary {
|
||||
@@ -153,6 +195,7 @@ pub async fn create(
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
tx.commit().await?;
|
||||
queue_summary(&state, &auth, &row).await;
|
||||
Ok((StatusCode::CREATED, Json(row.owner_view())))
|
||||
}
|
||||
|
||||
|
||||
@@ -67,6 +67,7 @@ pub fn router(state: Arc<AppState>) -> Router {
|
||||
.route("/v1/charts", get(charts::list).post(charts::create))
|
||||
.route("/v1/charts/{id}", get(charts::get_one).patch(charts::update).delete(charts::remove))
|
||||
.route("/v1/charts/{id}/analyses", get(analyses::list_for_chart).post(analyses::request_for_chart))
|
||||
.route("/v1/charts/{id}/summary", post(analyses::summary_for_chart))
|
||||
// synastries and invitations
|
||||
.route("/v1/synastries", get(synastries::list).post(synastries::create))
|
||||
.route("/v1/synastries/{id}", get(synastries::get_one).delete(synastries::remove))
|
||||
@@ -115,9 +116,9 @@ async fn public_config(State(state): St) -> Json<Value> {
|
||||
Json(json!({
|
||||
"google_login": { "enabled": state.google.enabled(), "client_id": c.google_client_ids.first() },
|
||||
"locales": c.supported_locales,
|
||||
"llm_models": c.llm_models,
|
||||
"analysis_cost": c.analysis_cost,
|
||||
"monthly_free_credits": c.monthly_free_credits,
|
||||
"analysis_model": c.analysis_model,
|
||||
"summary_model": c.summary_model,
|
||||
"password_login": c.password_login,
|
||||
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
|
||||
}))
|
||||
}
|
||||
|
||||
+112
-18
@@ -115,8 +115,13 @@ struct Response {
|
||||
|
||||
impl TestApp {
|
||||
async fn new(pool: PgPool) -> Self {
|
||||
Self::with_config(pool, |_| {}).await
|
||||
}
|
||||
|
||||
async fn with_config(pool: PgPool, change: impl FnOnce(&mut Config)) -> Self {
|
||||
let fake = fake_services().await;
|
||||
let config = Config::for_tests(String::new(), fake.clone(), format!("{fake}/jwks"));
|
||||
let mut config = Config::for_tests(String::new(), fake.clone(), format!("{fake}/jwks"));
|
||||
change(&mut config);
|
||||
Self { router: routes::router(Arc::new(AppState::new(pool.clone(), config))), pool }
|
||||
}
|
||||
|
||||
@@ -217,7 +222,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["credits"], 2);
|
||||
assert_eq!(r.body["analyses_left"], json!({"natal": 0, "synastry": 0}));
|
||||
|
||||
// e-mail verification through the queued e-mail's link
|
||||
let url = app.outbox_url("anna@example.com", "verify_email").await;
|
||||
@@ -336,10 +341,14 @@ async fn roles_and_admin_guard(pool: PgPool) {
|
||||
app.call("PATCH", &format!("/v1/admin/users/{admin_id}"), Some(&admin), Some(json!({"roles": ["user"]}))).await;
|
||||
assert_eq!(r.status, StatusCode::CONFLICT);
|
||||
|
||||
let r =
|
||||
app.post(&format!("/v1/admin/users/{anna}/credits"), Some(&admin), json!({"delta": 5, "note": "bonus"})).await;
|
||||
assert_eq!(r.status, StatusCode::CREATED);
|
||||
assert_eq!(app.get("/v1/credits", Some(&user)).await.body["balance"], 7); // 2 monthly + 5
|
||||
let grant = |unit: &str, delta: i32| json!({"unit": unit, "delta": delta, "note": "bonus"});
|
||||
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})));
|
||||
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}));
|
||||
assert_eq!((credits["ledger"][0]["unit"].as_str(), &credits["ledger"][0]["delta"]), (Some("natal"), &json!(5)));
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
@@ -358,6 +367,25 @@ async fn charts_are_private(pool: PgPool) {
|
||||
assert_eq!(list["charts"][0]["id"], other["id"]); // the new primary first
|
||||
assert_eq!(list["charts"][1]["is_primary"], false);
|
||||
|
||||
// the same birth data again: the saved chart is reused, not calculated again
|
||||
let r = app
|
||||
.post(
|
||||
"/v1/charts",
|
||||
Some(&anna),
|
||||
json!({"label": "Újra", "is_primary": true,
|
||||
"birth": {"date": "1990-03-15", "time": "14:30", "country": "HU", "place": "Szeged"}}),
|
||||
)
|
||||
.await;
|
||||
assert_eq!((r.status, r.body["id"].as_str(), &r.body["is_primary"]), (StatusCode::OK, Some(id), &json!(true)));
|
||||
assert_eq!(app.get("/v1/charts", Some(&anna)).await.body["charts"].as_array().unwrap().len(), 2);
|
||||
app.call(
|
||||
"PATCH",
|
||||
&format!("/v1/charts/{}", other["id"].as_str().unwrap()),
|
||||
Some(&anna),
|
||||
Some(json!({"is_primary": true})),
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_eq!(app.get(&format!("/v1/charts/{id}"), Some(&bela)).await.status, StatusCode::NOT_FOUND);
|
||||
assert_eq!(app.call("DELETE", &format!("/v1/charts/{id}"), Some(&bela), None).await.status, StatusCode::NOT_FOUND);
|
||||
assert_eq!(app.get("/v1/charts/not-a-uuid", Some(&anna)).await.status, StatusCode::BAD_REQUEST);
|
||||
@@ -432,31 +460,62 @@ async fn invitation_links_two_users(pool: PgPool) {
|
||||
assert!(app.outbox_url("anna@example.com", "invite_accepted").await.ends_with(&synastry_id));
|
||||
}
|
||||
|
||||
/// Gives `token`'s user analysis units (the admin endpoint is tested in `roles_and_admin_guard`).
|
||||
async fn grant_units(app: &TestApp, token: &str, unit: &str, delta: i32) {
|
||||
let id = app.get("/v1/me", Some(token)).await.body["user"]["id"].as_str().unwrap().to_string();
|
||||
sqlx::query(
|
||||
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason) VALUES (gen_random_uuid(), $1::uuid, $2, $3, 'purchase')",
|
||||
)
|
||||
.bind(id)
|
||||
.bind(unit)
|
||||
.bind(delta)
|
||||
.execute(&app.pool)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn analyses_spend_credits_and_reuse_results(pool: PgPool) {
|
||||
async fn analyses_spend_units_and_reuse_results(pool: PgPool) {
|
||||
let app = TestApp::new(pool.clone()).await;
|
||||
let anna = app.register("anna@example.com", "Anna").await;
|
||||
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||
let uri = format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap());
|
||||
|
||||
// saving the chart queued the free short summary
|
||||
let list = app.get(&uri, Some(&anna)).await.body;
|
||||
let summary = &list["analyses"][0];
|
||||
assert_eq!(
|
||||
(summary["kind"].as_str(), summary["status"].as_str(), summary["model"].as_str(), &summary["credits_charged"]),
|
||||
(Some("summary"), Some("pending"), Some("anthropic/claude-summary"), &json!(0))
|
||||
);
|
||||
let r = app.call("POST", &format!("/v1/charts/{}/summary", chart["id"].as_str().unwrap()), Some(&anna), None).await;
|
||||
assert_eq!((r.status, &r.body["id"]), (StatusCode::OK, &summary["id"]));
|
||||
|
||||
// the detailed analysis is paid: no unit, no analysis
|
||||
let r = app.call("POST", &uri, Some(&anna), None).await;
|
||||
assert_eq!(
|
||||
(r.status, r.body["error"]["code"].as_str()),
|
||||
(StatusCode::PAYMENT_REQUIRED, Some("insufficient_credits"))
|
||||
);
|
||||
grant_units(&app, &anna, "natal", 2).await;
|
||||
|
||||
let r = app.call("POST", &uri, Some(&anna), None).await;
|
||||
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
|
||||
assert_eq!((r.body["status"].as_str(), r.body["language"].as_str()), (Some("pending"), Some("hu")));
|
||||
assert_eq!(
|
||||
(r.body["status"].as_str(), r.body["language"].as_str(), r.body["model"].as_str(), &r.body["credits_charged"]),
|
||||
(Some("pending"), Some("hu"), Some("anthropic/claude-test"), &json!(1))
|
||||
);
|
||||
let first = r.body["id"].as_str().unwrap().to_string();
|
||||
assert_eq!(app.get("/v1/credits", Some(&anna)).await.body["balance"], 1);
|
||||
assert_eq!(app.get("/v1/credits", Some(&anna)).await.body["balance"], json!({"natal": 1, "synastry": 0}));
|
||||
|
||||
// same request again: the same analysis, no charge
|
||||
let r = app.call("POST", &uri, Some(&anna), None).await;
|
||||
assert_eq!((r.status, r.body["id"].as_str()), (StatusCode::OK, Some(first.as_str())));
|
||||
let r = app.post(&uri, Some(&anna), json!({"language": "en"})).await;
|
||||
assert_eq!(r.status, StatusCode::ACCEPTED);
|
||||
let r = app.post(&uri, Some(&anna), json!({"model": "anthropic/claude-test"})).await;
|
||||
assert_eq!(
|
||||
(r.status, r.body["error"]["code"].as_str()),
|
||||
(StatusCode::PAYMENT_REQUIRED, Some("insufficient_credits"))
|
||||
);
|
||||
let r = app.post(&uri, Some(&anna), json!({"model": "unknown/model"})).await;
|
||||
assert_eq!(r.status, StatusCode::BAD_REQUEST);
|
||||
assert_eq!(app.get("/v1/credits", Some(&anna)).await.body["balance"], json!({"natal": 0, "synastry": 0}));
|
||||
let r = app.post(&uri, Some(&anna), json!({"model": "anthropic/claude-other"})).await;
|
||||
assert_eq!(r.status, StatusCode::BAD_REQUEST); // no model choice
|
||||
|
||||
// the worker finishes the first one; another user with the same birth data gets it for free
|
||||
sqlx::query("UPDATE analyses SET status = 'done', content = $1, completed_at = now() WHERE id = $2::uuid")
|
||||
@@ -471,10 +530,24 @@ async fn analyses_spend_credits_and_reuse_results(pool: PgPool) {
|
||||
let r = app.call("POST", &format!("/v1/charts/{}/analyses", same["id"].as_str().unwrap()), Some(&bela), None).await;
|
||||
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
|
||||
assert_eq!((r.body["status"].as_str(), &r.body["credits_charged"]), (Some("done"), &json!(0)));
|
||||
assert_eq!(app.get("/v1/credits", Some(&bela)).await.body["balance"], 2);
|
||||
|
||||
assert_eq!(app.get(&format!("/v1/analyses/{first}"), Some(&bela)).await.status, StatusCode::NOT_FOUND);
|
||||
assert_eq!(app.get(&uri, Some(&anna)).await.body["analyses"].as_array().unwrap().len(), 2);
|
||||
assert_eq!(app.get(&uri, Some(&anna)).await.body["analyses"].as_array().unwrap().len(), 3); // 2 + summary
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn password_login_can_be_disabled(pool: PgPool) {
|
||||
let app = TestApp::with_config(pool, |c| c.password_login = false).await;
|
||||
assert_eq!(app.get("/v1/config", None).await.body["password_login"], false);
|
||||
let r = app
|
||||
.post("/v1/auth/register", None, json!({"email": "anna@example.com", "password": "titkos-jelszo-123"}))
|
||||
.await;
|
||||
assert_eq!(r.status, StatusCode::FORBIDDEN);
|
||||
let r =
|
||||
app.post("/v1/auth/login", None, json!({"email": "anna@example.com", "password": "titkos-jelszo-123"})).await;
|
||||
assert_eq!(r.status, StatusCode::FORBIDDEN);
|
||||
let r = app.post("/v1/auth/password-reset", None, json!({"email": "anna@example.com"})).await;
|
||||
assert_eq!(r.status, StatusCode::FORBIDDEN);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
@@ -556,5 +629,26 @@ async fn public_config_and_health(pool: PgPool) {
|
||||
assert_eq!(r.body["google_login"]["enabled"], true);
|
||||
assert_eq!(r.body["google_login"]["client_id"], GOOGLE_CLIENT);
|
||||
assert_eq!(r.body["locales"], json!(["hu", "en"]));
|
||||
assert_eq!(r.body["analysis_model"], "anthropic/claude-test");
|
||||
assert_eq!(r.body["summary_model"], "anthropic/claude-summary");
|
||||
assert_eq!(app.get("/healthz", None).await.status, StatusCode::OK);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn synastry_analyses_use_synastry_units(pool: PgPool) {
|
||||
let app = TestApp::new(pool).await;
|
||||
let anna = app.register("anna@example.com", "Anna").await;
|
||||
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||
let other = app.chart(&anna, "Anya", false, "1950-03-01").await;
|
||||
let r = app.post("/v1/synastries", Some(&anna), json!({"chart1_id": own["id"], "chart2_id": other["id"]})).await;
|
||||
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
|
||||
let uri = format!("/v1/synastries/{}/analyses", r.body["id"].as_str().unwrap());
|
||||
|
||||
grant_units(&app, &anna, "natal", 1).await;
|
||||
let r = app.call("POST", &uri, Some(&anna), None).await;
|
||||
assert_eq!(r.status, StatusCode::PAYMENT_REQUIRED); // a natal unit does not pay for a synastry
|
||||
grant_units(&app, &anna, "synastry", 1).await;
|
||||
let r = app.call("POST", &uri, Some(&anna), None).await;
|
||||
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}));
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
node_modules
|
||||
.next
|
||||
*.tsbuildinfo
|
||||
.env
|
||||
.env.*
|
||||
@@ -0,0 +1,4 @@
|
||||
/node_modules/
|
||||
/.next/
|
||||
/next-env.d.ts
|
||||
*.tsbuildinfo
|
||||
@@ -0,0 +1,23 @@
|
||||
# Next.js frontend (standalone output) on Node 22.
|
||||
FROM node:22.23-alpine AS deps
|
||||
WORKDIR /app
|
||||
COPY package.json package-lock.json ./
|
||||
RUN --mount=type=cache,target=/root/.npm,sharing=locked npm ci --no-audit --no-fund
|
||||
|
||||
FROM node:22.23-alpine AS build
|
||||
WORKDIR /app
|
||||
ENV NEXT_TELEMETRY_DISABLED=1
|
||||
COPY --from=deps /app/node_modules ./node_modules
|
||||
COPY . .
|
||||
RUN npm run build
|
||||
|
||||
FROM node:22.23-alpine
|
||||
WORKDIR /app
|
||||
ENV NODE_ENV=production NEXT_TELEMETRY_DISABLED=1 PORT=3000 HOSTNAME=0.0.0.0
|
||||
RUN addgroup -S app && adduser -S -G app app
|
||||
COPY --from=build --chown=app:app /app/.next/standalone ./
|
||||
COPY --from=build --chown=app:app /app/.next/static ./.next/static
|
||||
USER app
|
||||
EXPOSE 3000
|
||||
HEALTHCHECK --interval=10s --timeout=3s --retries=5 CMD wget -qO- http://127.0.0.1:3000/healthz >/dev/null || exit 1
|
||||
CMD ["node", "server.js"]
|
||||
@@ -0,0 +1,70 @@
|
||||
# Frontend
|
||||
|
||||
Next.js (App Router, TypeScript) webes felület. A compose-ban a **3001-es** porton fut, mert a dev szerveren a 3000-est más használja.
|
||||
|
||||
## Ami kész
|
||||
|
||||
- **Belépés** (`/belepes`): Google-fiókkal, a Google Identity Services gombbal. A kapott ID tokent a `POST /v1/auth/google` végpont ellenőrzi; az első belépéskor létrejön a fiók.
|
||||
- **Profil** (`/profil`):
|
||||
- fiókadatok: e-mail, belépési mód, szerepkörök, megmaradt elemzések;
|
||||
- a megjelenített név és az elemzések nyelve szerkeszthető;
|
||||
- **saját születési adatok**: dátum, idő (vagy „nem tudom”), ország és település helykeresővel. Mentéskor kiszámolja a képletet, és megmutatja a pozíciókat (bolygók, tengelyek, házcsúcsok).
|
||||
- A javított adatokból új képlet lesz (a backend a születési adatot nem módosítja), és az lesz a saját képlet.
|
||||
- Ha a megadott időpont az óraátállítás miatt kétszer is előfordult, a felület megkérdezi, melyikről van szó.
|
||||
- **Admin** (`/admin`, csak `admin` szerepkörrel; másnak 404):
|
||||
- felhasználók keresése;
|
||||
- szerepkörök be- és kikapcsolása (felhasználó, prémium, VIP, szerző, admin);
|
||||
- elemzések jóváírása típusonként (képlet, szinasztria).
|
||||
- **Jogosultság:** a belépést nem igénylő oldalakon kívül minden oldal a szerveren ellenőrzi a munkamenetet; belépés nélkül a belépőoldalra irányít, majd vissza.
|
||||
|
||||
## Felépítés
|
||||
|
||||
- `src/app/api/v1/[...path]`: proxy a backend felé. A böngésző csak a frontend címét hívja, így a munkamenet-süti (`sf_session`, HttpOnly) a frontend domainjén él, és nem kell CORS.
|
||||
- `src/app/api/geo/[kind]`: a horoscope-api ország- és helykeresője (`countries`, `places`). Más végpontot nem enged át.
|
||||
- `src/lib/server.ts`: backend-hívás szerveroldalon a látogató munkamenetével (`getMe`, `requireMe`).
|
||||
- `src/lib/api.ts`: backend-hívás a böngészőből.
|
||||
- `src/lib/astro.ts`: magyar jegy- és bolygónevek, jelek, dátumformázás.
|
||||
- A színek és betűk a design-vászonból jönnek (`src/app/globals.css`): éjkék háttér, arany kiemelés, Cormorant Garamond és Inter.
|
||||
|
||||
## Beállítás
|
||||
|
||||
| Változó | Alapérték | Mire |
|
||||
|---|---|---|
|
||||
| `BACKEND_URL` | `http://localhost:8081` | a backend belső címe |
|
||||
| `HOROSCOPE_API_URL` | `http://localhost:8080` | a horoscope-api belső címe (helykereső) |
|
||||
|
||||
A Google kliens-azonosítót a frontend a backend `GET /v1/config` végpontjáról kapja, ezért a frontendnek nem kell külön beállítás.
|
||||
|
||||
## Google-belépés beállítása
|
||||
|
||||
1. A Google Cloud Console-ban (APIs & Services → Credentials) hozz létre egy **OAuth client ID**-t **Web application** típussal.
|
||||
2. Az **Authorized JavaScript origins** listába vedd fel azokat a címeket, ahonnan a felületet megnyitod, például:
|
||||
- `http://localhost:3001` (fejlesztés);
|
||||
- később az éles domaint, `https://` előtaggal.
|
||||
|
||||
A Google csak `https://` vagy `localhost` címet fogad el. A dev szervert ezért SSH-alagúton keresztül nyisd meg: `ssh -L 3001:localhost:3001 dev`, utána a böngészőben `http://localhost:3001`.
|
||||
3. A repó gyökerében lévő `.env` fájlba (nincs a gitben) írd be:
|
||||
|
||||
```
|
||||
GOOGLE_CLIENT_IDS=<kliens-azonosító>.apps.googleusercontent.com
|
||||
BOOTSTRAP_ADMIN_EMAILS=<a te Gmail-címed>
|
||||
```
|
||||
|
||||
A `BOOTSTRAP_ADMIN_EMAILS` címek az első belépéskor admin szerepkört kapnak.
|
||||
4. `docker compose up -d backend`
|
||||
|
||||
## Fejlesztés
|
||||
|
||||
```bash
|
||||
cd services/frontend
|
||||
npm ci
|
||||
BACKEND_URL=http://localhost:8081 HOROSCOPE_API_URL=http://localhost:8080 npm run dev # http://localhost:3001
|
||||
npm run typecheck
|
||||
```
|
||||
|
||||
## Később
|
||||
|
||||
- interaktív radix SVG-komponens (ugyanaz rajzolja az OG-képet is);
|
||||
- szinasztria, meghívók, elemzések kérése és megjelenítése;
|
||||
- angol felület;
|
||||
- további belépési módok (e-mail és jelszó, Facebook, Apple, passkey).
|
||||
@@ -0,0 +1,9 @@
|
||||
import type { NextConfig } from "next";
|
||||
|
||||
const config: NextConfig = {
|
||||
// Small self-contained server for the container image.
|
||||
output: "standalone",
|
||||
poweredByHeader: false,
|
||||
};
|
||||
|
||||
export default config;
|
||||
Generated
+1023
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"name": "sorsfonalak-frontend",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev -p 3001",
|
||||
"build": "next build",
|
||||
"start": "next start -p 3001",
|
||||
"typecheck": "tsc --noEmit"
|
||||
},
|
||||
"dependencies": {
|
||||
"next": "16.4.6",
|
||||
"react": "19.3.1",
|
||||
"react-dom": "19.3.1",
|
||||
"server-only": "0.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "22.20.5",
|
||||
"@types/react": "19.3.0",
|
||||
"@types/react-dom": "19.3.0",
|
||||
"typescript": "5.9.3"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,208 @@
|
||||
"use client";
|
||||
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
|
||||
import { api, errorText } from "@/lib/api";
|
||||
import { ROLE_LABELS, formatDate } from "@/lib/astro";
|
||||
import type { AdminUser, Role } from "@/lib/types";
|
||||
|
||||
const EDITABLE_ROLES: Role[] = ["user", "creator", "admin"];
|
||||
const UNITS: { value: "natal" | "synastry"; label: string }[] = [
|
||||
{ value: "natal", label: "képlet" },
|
||||
{ value: "synastry", label: "szinasztria" },
|
||||
];
|
||||
|
||||
export function AdminUsers({ selfId }: { selfId: string }) {
|
||||
const [query, setQuery] = useState("");
|
||||
const [users, setUsers] = useState<AdminUser[] | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const load = useCallback(async (q: string) => {
|
||||
try {
|
||||
const data = await api<{ users: AdminUser[] }>(`/admin/users?q=${encodeURIComponent(q)}`);
|
||||
setUsers(data.users);
|
||||
setError(null);
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const t = setTimeout(() => load(query.trim()), 250);
|
||||
return () => clearTimeout(t);
|
||||
}, [query, load]);
|
||||
|
||||
return (
|
||||
<section className="card" aria-label="Felhasználók listája">
|
||||
<div className="field" style={{ maxWidth: 420 }}>
|
||||
<label htmlFor="user-search">Keresés név vagy e-mail alapján</label>
|
||||
<input
|
||||
id="user-search"
|
||||
className="inp"
|
||||
type="search"
|
||||
value={query}
|
||||
onChange={(e) => setQuery(e.target.value)}
|
||||
placeholder="pl. anna@"
|
||||
/>
|
||||
</div>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
{users === null ? (
|
||||
<p className="muted">Betöltés…</p>
|
||||
) : users.length === 0 ? (
|
||||
<p className="muted">Nincs találat.</p>
|
||||
) : (
|
||||
<div className="table-wrap">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Felhasználó</th>
|
||||
<th scope="col">Szerepkörök</th>
|
||||
<th scope="col">Részletes elemzések</th>
|
||||
<th scope="col">Képletek</th>
|
||||
<th scope="col">Regisztrált</th>
|
||||
<th scope="col">Utoljára belépett</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{users.map((u) => (
|
||||
<UserRow
|
||||
key={u.id}
|
||||
user={u}
|
||||
isSelf={u.id === selfId}
|
||||
onChange={(next) => setUsers((list) => list?.map((x) => (x.id === next.id ? next : x)) ?? null)}
|
||||
/>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
function UserRow({ user, isSelf, onChange }: { user: AdminUser; isSelf: boolean; onChange: (u: AdminUser) => void }) {
|
||||
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [delta, setDelta] = useState("");
|
||||
const [unit, setUnit] = useState<"natal" | "synastry">("natal");
|
||||
|
||||
async function toggleRole(role: Role, on: boolean) {
|
||||
const roles = on ? [...user.roles, role] : user.roles.filter((r) => r !== role);
|
||||
if (roles.length === 0) return setStatus({ ok: false, text: "Legalább egy szerepkör kell." });
|
||||
setBusy(true);
|
||||
setStatus(null);
|
||||
try {
|
||||
const res = await api<{ roles: Role[] }>(`/admin/users/${user.id}`, { method: "PATCH", body: { roles } });
|
||||
onChange({ ...user, roles: res.roles });
|
||||
} catch (e) {
|
||||
setStatus({ ok: false, text: errorText(e) });
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function grant(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
const n = Number.parseInt(delta, 10);
|
||||
if (!Number.isFinite(n) || n === 0) return setStatus({ ok: false, text: "Adj meg egy nem nulla egész számot." });
|
||||
setBusy(true);
|
||||
setStatus(null);
|
||||
try {
|
||||
const res = await api<{ analyses_left: AdminUser["analyses_left"] }>(`/admin/users/${user.id}/credits`, {
|
||||
body: { unit, delta: n, note: "admin" },
|
||||
});
|
||||
onChange({ ...user, analyses_left: res.analyses_left });
|
||||
setDelta("");
|
||||
const label = UNITS.find((u) => u.value === unit)?.label;
|
||||
setStatus({ ok: true, text: `${n > 0 ? "+" : ""}${n} ${label}` });
|
||||
} catch (e) {
|
||||
setStatus({ ok: false, text: errorText(e) });
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<tr>
|
||||
<td>
|
||||
<div>{user.display_name || <span className="muted">(nincs név)</span>}</div>
|
||||
<div className="muted" style={{ fontSize: 13 }}>
|
||||
{user.email}
|
||||
{isSelf && " · te"}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div className="row" style={{ gap: 4 }}>
|
||||
{EDITABLE_ROLES.map((role) => {
|
||||
const on = user.roles.includes(role);
|
||||
const locked = isSelf && role === "admin";
|
||||
return (
|
||||
<label key={role} className="check" style={{ minHeight: 28, fontSize: 13, marginRight: 8 }}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={on}
|
||||
disabled={busy || locked}
|
||||
onChange={(e) => toggleRole(role, e.target.checked)}
|
||||
title={locked ? "A saját admin szerepköröd nem veheted el." : undefined}
|
||||
/>
|
||||
{ROLE_LABELS[role]}
|
||||
</label>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<form onSubmit={grant} className="row" style={{ gap: 6, flexWrap: "nowrap" }}>
|
||||
<span className="num" style={{ minWidth: 92, fontSize: 13 }}>
|
||||
képlet {user.analyses_left.natal}
|
||||
<br />
|
||||
szinasztria {user.analyses_left.synastry}
|
||||
</span>
|
||||
<label className="sr-only" htmlFor={`unit-${user.id}`}>
|
||||
Elemzés fajtája
|
||||
</label>
|
||||
<select
|
||||
id={`unit-${user.id}`}
|
||||
className="inp"
|
||||
style={{ width: 118, minHeight: 36 }}
|
||||
value={unit}
|
||||
onChange={(e) => setUnit(e.target.value as "natal" | "synastry")}
|
||||
>
|
||||
{UNITS.map((u) => (
|
||||
<option key={u.value} value={u.value}>
|
||||
{u.label}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<label className="sr-only" htmlFor={`delta-${user.id}`}>
|
||||
Jóváírt darabszám
|
||||
</label>
|
||||
<input
|
||||
id={`delta-${user.id}`}
|
||||
className="inp"
|
||||
style={{ width: 76, minHeight: 36 }}
|
||||
inputMode="numeric"
|
||||
placeholder="+1"
|
||||
value={delta}
|
||||
onChange={(e) => setDelta(e.target.value)}
|
||||
/>
|
||||
<button type="submit" className="btn btn-sm" disabled={busy || !delta}>
|
||||
Jóváír
|
||||
</button>
|
||||
</form>
|
||||
{status && (
|
||||
<span className={status.ok ? "msg msg-ok" : "msg msg-error"} role="status">
|
||||
{status.text}
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="num">{user.charts}</td>
|
||||
<td className="num">{formatDate(user.created_at)}</td>
|
||||
<td className="num">{formatDate(user.last_login_at, true)}</td>
|
||||
</tr>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
import type { Metadata } from "next";
|
||||
import { notFound } from "next/navigation";
|
||||
|
||||
import { requireMe } from "@/lib/server";
|
||||
|
||||
import { AdminUsers } from "./AdminUsers";
|
||||
|
||||
export const metadata: Metadata = { title: "Admin" };
|
||||
|
||||
export default async function AdminPage() {
|
||||
const me = await requireMe("/admin");
|
||||
// Non-admins see the same 404 as for a missing page.
|
||||
if (!me.user.roles.includes("admin")) notFound();
|
||||
return (
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
<div className="page-head">
|
||||
<h1>Felhasználók</h1>
|
||||
<p className="muted">Szerepkörök kezelése és részletes elemzések jóváírása (ajándék, reklamáció). A vásárlások is ide könyvelődnek majd.</p>
|
||||
</div>
|
||||
<AdminUsers selfId={me.user.id} />
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
// Country list and place search for the birth data form (public data from
|
||||
// the horoscope-api; only these two endpoints are passed through).
|
||||
import type { NextRequest } from "next/server";
|
||||
|
||||
const HOROSCOPE_API_URL = (process.env.HOROSCOPE_API_URL ?? "http://localhost:8080").replace(/\/$/, "");
|
||||
const ALLOWED = new Set(["countries", "places"]);
|
||||
|
||||
export async function GET(req: NextRequest, ctx: { params: Promise<{ kind: string }> }) {
|
||||
const { kind } = await ctx.params;
|
||||
if (!ALLOWED.has(kind)) return Response.json({ error: { code: "not_found", message: "not found" } }, { status: 404 });
|
||||
try {
|
||||
const res = await fetch(`${HOROSCOPE_API_URL}/v1/${kind}${req.nextUrl.search}`, {
|
||||
// The country list rarely changes.
|
||||
...(kind === "countries" ? { next: { revalidate: 86400 } } : { cache: "no-store" as const }),
|
||||
});
|
||||
return new Response(res.body, {
|
||||
status: res.status,
|
||||
headers: { "content-type": res.headers.get("content-type") ?? "application/json" },
|
||||
});
|
||||
} catch {
|
||||
return Response.json({ error: { code: "unavailable", message: "A helykereső most nem érhető el." } }, { status: 502 });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
// Forwards /api/v1/* to the backend, so the browser talks to one origin and
|
||||
// the session cookie belongs to the frontend's host (no CORS needed).
|
||||
import type { NextRequest } from "next/server";
|
||||
|
||||
import { BACKEND_URL } from "@/lib/server";
|
||||
|
||||
const REQUEST_HEADERS = ["accept", "accept-language", "authorization", "content-type", "cookie", "user-agent"];
|
||||
// Hop-by-hop or re-computed by the runtime.
|
||||
const SKIP_RESPONSE_HEADERS = new Set(["connection", "content-encoding", "content-length", "set-cookie", "transfer-encoding"]);
|
||||
|
||||
async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[] }> }) {
|
||||
const { path } = await ctx.params;
|
||||
const target = `${BACKEND_URL}/v1/${path.map(encodeURIComponent).join("/")}${req.nextUrl.search}`;
|
||||
|
||||
const headers = new Headers();
|
||||
for (const name of REQUEST_HEADERS) {
|
||||
const value = req.headers.get(name);
|
||||
if (value) headers.set(name, value);
|
||||
}
|
||||
const forwardedFor = req.headers.get("x-forwarded-for");
|
||||
if (forwardedFor) headers.set("x-forwarded-for", forwardedFor);
|
||||
|
||||
let res: Response;
|
||||
try {
|
||||
res = await fetch(target, {
|
||||
method: req.method,
|
||||
headers,
|
||||
body: req.method === "GET" || req.method === "HEAD" ? undefined : await req.arrayBuffer(),
|
||||
redirect: "manual",
|
||||
cache: "no-store",
|
||||
});
|
||||
} catch {
|
||||
return Response.json({ error: { code: "backend_unavailable", message: "A szerver most nem érhető el." } }, { status: 502 });
|
||||
}
|
||||
|
||||
const out = new Headers();
|
||||
res.headers.forEach((value, name) => {
|
||||
if (!SKIP_RESPONSE_HEADERS.has(name)) out.set(name, value);
|
||||
});
|
||||
for (const cookie of res.headers.getSetCookie()) out.append("set-cookie", cookie);
|
||||
return new Response(res.body, { status: res.status, headers: out });
|
||||
}
|
||||
|
||||
export const GET = forward;
|
||||
export const POST = forward;
|
||||
export const PATCH = forward;
|
||||
export const PUT = forward;
|
||||
export const DELETE = forward;
|
||||
@@ -0,0 +1,63 @@
|
||||
"use client";
|
||||
|
||||
import Script from "next/script";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
|
||||
import { api, errorText } from "@/lib/api";
|
||||
|
||||
export function GoogleLogin({ clientId, target }: { clientId: string; target: string }) {
|
||||
const router = useRouter();
|
||||
const slot = useRef<HTMLDivElement>(null);
|
||||
const [ready, setReady] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
const onCredential = useCallback(
|
||||
async (response: GoogleCredentialResponse) => {
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
try {
|
||||
await api("/auth/google", { body: { id_token: response.credential } });
|
||||
router.replace(target);
|
||||
router.refresh();
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
setBusy(false);
|
||||
}
|
||||
},
|
||||
[router, target],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const google = window.google;
|
||||
if (!ready || !google || !slot.current) return;
|
||||
google.accounts.id.initialize({ client_id: clientId, callback: onCredential, ux_mode: "popup", itp_support: true });
|
||||
google.accounts.id.renderButton(slot.current, {
|
||||
theme: "filled_black",
|
||||
size: "large",
|
||||
text: "continue_with",
|
||||
shape: "rectangular",
|
||||
locale: "hu",
|
||||
width: Math.min(400, slot.current.clientWidth || 400),
|
||||
});
|
||||
}, [ready, clientId, onCredential]);
|
||||
|
||||
return (
|
||||
<div className="field">
|
||||
<Script
|
||||
src="https://accounts.google.com/gsi/client"
|
||||
strategy="afterInteractive"
|
||||
onReady={() => setReady(true)}
|
||||
onError={() => setError("Nem sikerült betölteni a Google-belépést. Ellenőrizd a hálózatot vagy a reklámblokkolót.")}
|
||||
/>
|
||||
<div ref={slot} className="gsi-slot" aria-busy={busy} />
|
||||
{busy && <p className="msg muted">Belépés…</p>}
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import type { Metadata } from "next";
|
||||
import { redirect } from "next/navigation";
|
||||
|
||||
import { Logo } from "@/components/SiteHeader";
|
||||
import { ZodiacWheel } from "@/components/ZodiacWheel";
|
||||
import { BACKEND_URL, getMe } from "@/lib/server";
|
||||
import type { PublicConfig } from "@/lib/types";
|
||||
|
||||
import { GoogleLogin } from "./GoogleLogin";
|
||||
|
||||
export const metadata: Metadata = { title: "Belépés" };
|
||||
|
||||
/** Only local paths, so the login cannot redirect to another site. */
|
||||
function safeTarget(value: string | string[] | undefined): string {
|
||||
const v = Array.isArray(value) ? value[0] : value;
|
||||
return v && v.startsWith("/") && !v.startsWith("//") ? v : "/";
|
||||
}
|
||||
|
||||
async function loadConfig(): Promise<PublicConfig | null> {
|
||||
try {
|
||||
const res = await fetch(`${BACKEND_URL}/v1/config`, { cache: "no-store" });
|
||||
return res.ok ? ((await res.json()) as PublicConfig) : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
export default async function LoginPage({ searchParams }: { searchParams: Promise<Record<string, string | string[]>> }) {
|
||||
const target = safeTarget((await searchParams).vissza);
|
||||
if (await getMe()) redirect(target);
|
||||
const config = await loadConfig();
|
||||
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
|
||||
|
||||
return (
|
||||
<div className="auth">
|
||||
<aside className="auth-aside">
|
||||
<Logo />
|
||||
<ZodiacWheel className="wheel" />
|
||||
<div className="row" style={{ flexDirection: "column", alignItems: "flex-start", gap: 10, maxWidth: 460 }}>
|
||||
<p className="tagline">Ahol a csillagok összekötnek.</p>
|
||||
<p className="muted" style={{ fontSize: 16 }}>
|
||||
Születési képlet, szinasztria és közösség – egy helyen.
|
||||
</p>
|
||||
</div>
|
||||
</aside>
|
||||
<main className="auth-main">
|
||||
<div className="auth-box">
|
||||
<div className="page-head">
|
||||
<h1 style={{ fontSize: 44 }}>Belépés</h1>
|
||||
<p className="muted">Lépj be a Google-fiókoddal. Ha még nincs fiókod, az első belépéskor létrejön.</p>
|
||||
</div>
|
||||
{config === null ? (
|
||||
<p className="msg msg-error" role="alert">
|
||||
A szerver most nem érhető el. Próbáld újra egy kicsit később.
|
||||
</p>
|
||||
) : clientId ? (
|
||||
<GoogleLogin clientId={clientId} target={target} />
|
||||
) : (
|
||||
<p className="msg msg-error" role="alert">
|
||||
A Google-belépés még nincs beállítva (a backend <code>GOOGLE_CLIENT_IDS</code> változója üres).
|
||||
</p>
|
||||
)}
|
||||
<p className="hint">
|
||||
A belépéssel elfogadod, hogy a születési adataidat a képleted kiszámításához tároljuk. Bármikor törölheted
|
||||
őket a profilodban.
|
||||
</p>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,231 @@
|
||||
/* Sorsfonalak – night sky with gold accents (from the design canvas). */
|
||||
:root {
|
||||
--bg: #0d1220;
|
||||
--panel: #111729;
|
||||
--panel-2: #0f1426;
|
||||
--line: #1f2740;
|
||||
--line-2: #2c3654;
|
||||
--ink: #ece6d8;
|
||||
--ink-2: #c9cfdc;
|
||||
--muted: #a3abc0;
|
||||
--gold: #d9b46a;
|
||||
--gold-hover: #e6c482;
|
||||
--gold-ink: #141a2c;
|
||||
--danger: #f2a0a0;
|
||||
--ok: #9fd8b0;
|
||||
--harmonic: #7fb0e0;
|
||||
--tense: #e38b8b;
|
||||
--radius: 10px;
|
||||
--font-display: var(--font-cormorant), "Cormorant Garamond", Georgia, serif;
|
||||
--font-body: var(--font-inter), Inter, system-ui, sans-serif;
|
||||
--font-symbols: "Noto Sans Symbols", "Segoe UI Symbol", "DejaVu Sans", sans-serif;
|
||||
color-scheme: dark;
|
||||
}
|
||||
|
||||
* { box-sizing: border-box; }
|
||||
html, body { margin: 0; }
|
||||
body {
|
||||
min-height: 100vh;
|
||||
background: var(--bg);
|
||||
color: var(--ink);
|
||||
font: 400 15px/1.55 var(--font-body);
|
||||
}
|
||||
a { color: var(--gold); }
|
||||
a:hover { color: var(--gold-hover); }
|
||||
:focus-visible { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||
h1, h2, h3 { font-family: var(--font-display); font-weight: 600; line-height: 1.1; margin: 0; }
|
||||
h1 { font-size: 40px; }
|
||||
h2 { font-size: 28px; }
|
||||
h3 { font-size: 20px; }
|
||||
p { margin: 0; }
|
||||
.muted { color: var(--muted); }
|
||||
.sym { font-family: var(--font-symbols); }
|
||||
|
||||
/* Header */
|
||||
.site-header {
|
||||
position: sticky; top: 0; z-index: 10;
|
||||
display: flex; align-items: center; gap: 24px; flex-wrap: wrap;
|
||||
padding: 12px 24px; background: rgba(13, 18, 32, 0.94);
|
||||
border-bottom: 1px solid var(--line); backdrop-filter: blur(6px);
|
||||
}
|
||||
.logo { font-family: var(--font-display); font-size: 28px; font-weight: 600; color: var(--ink); text-decoration: none; letter-spacing: 0.3px; }
|
||||
.logo span { color: var(--gold); }
|
||||
.logo:hover { color: var(--ink); }
|
||||
.nav { display: flex; gap: 4px; flex: 1; }
|
||||
.nav a { color: var(--ink-2); text-decoration: none; padding: 10px 12px; border-radius: 8px; min-height: 44px; display: inline-flex; align-items: center; }
|
||||
.nav a:hover, .nav a[aria-current="page"] { color: var(--gold); background: rgba(217, 180, 106, 0.08); }
|
||||
.who { display: flex; align-items: center; gap: 12px; color: var(--muted); font-size: 14px; }
|
||||
|
||||
/* Layout */
|
||||
.page { max-width: 960px; margin: 0 auto; padding: 32px 16px 64px; display: flex; flex-direction: column; gap: 24px; }
|
||||
.page-head { display: flex; flex-direction: column; gap: 6px; }
|
||||
.card { background: var(--panel); border: 1px solid var(--line); border-radius: 14px; padding: 24px; display: flex; flex-direction: column; gap: 18px; }
|
||||
.card-head { display: flex; justify-content: space-between; align-items: baseline; gap: 12px; flex-wrap: wrap; }
|
||||
.grid-2 { display: grid; grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); gap: 16px; }
|
||||
.facts { display: grid; grid-template-columns: max-content 1fr; gap: 8px 20px; margin: 0; }
|
||||
.facts dt { color: var(--muted); }
|
||||
.facts dd { margin: 0; }
|
||||
|
||||
/* Forms */
|
||||
.field { display: flex; flex-direction: column; gap: 8px; }
|
||||
.field label, .label { font-size: 14px; font-weight: 500; }
|
||||
.hint { font-size: 13px; color: var(--muted); }
|
||||
.inp {
|
||||
width: 100%; min-height: 48px; padding: 0 14px; border-radius: var(--radius);
|
||||
border: 1px solid var(--line-2); background: var(--panel-2); color: var(--ink);
|
||||
font: 400 15px var(--font-body);
|
||||
}
|
||||
select.inp { padding-right: 32px; }
|
||||
.inp::placeholder { color: #8a93ab; }
|
||||
.inp:focus { outline: none; border-color: var(--gold); box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); }
|
||||
.inp:disabled { opacity: 0.55; }
|
||||
.check { display: flex; align-items: center; gap: 10px; font-size: 14px; color: var(--ink-2); min-height: 32px; cursor: pointer; }
|
||||
.check input { width: 18px; height: 18px; accent-color: var(--gold); margin: 0; }
|
||||
.row { display: flex; gap: 12px; flex-wrap: wrap; align-items: center; }
|
||||
.form-actions { display: flex; gap: 12px; flex-wrap: wrap; align-items: center; }
|
||||
|
||||
.btn {
|
||||
min-height: 44px; padding: 0 18px; border-radius: var(--radius); border: 1px solid var(--line-2);
|
||||
background: transparent; color: var(--ink); font: 500 15px var(--font-body); cursor: pointer;
|
||||
display: inline-flex; align-items: center; justify-content: center; gap: 8px; text-decoration: none;
|
||||
}
|
||||
.btn:hover { border-color: #5a6790; background: rgba(255, 255, 255, 0.03); color: var(--ink); }
|
||||
.btn:disabled { opacity: 0.55; cursor: default; }
|
||||
.btn-primary { background: var(--gold); border-color: var(--gold); color: var(--gold-ink); font-weight: 600; }
|
||||
.btn-primary:hover { background: var(--gold-hover); border-color: var(--gold-hover); color: var(--gold-ink); }
|
||||
.btn-ghost { border-color: transparent; color: var(--muted); padding: 0 12px; }
|
||||
.btn-ghost:hover { color: var(--ink); border-color: transparent; }
|
||||
.btn-sm { min-height: 36px; padding: 0 12px; font-size: 14px; }
|
||||
|
||||
.msg { font-size: 14px; }
|
||||
.msg-error { color: var(--danger); }
|
||||
.msg-ok { color: var(--ok); }
|
||||
|
||||
.badge {
|
||||
display: inline-flex; align-items: center; min-height: 24px; padding: 0 10px; border-radius: 999px;
|
||||
border: 1px solid var(--line-2); font-size: 12px; color: var(--ink-2); white-space: nowrap;
|
||||
}
|
||||
.badge-gold { border-color: rgba(217, 180, 106, 0.5); color: var(--gold); }
|
||||
|
||||
/* Place search */
|
||||
.combo { position: relative; }
|
||||
.combo-list {
|
||||
position: absolute; z-index: 5; left: 0; right: 0; top: calc(100% + 4px); margin: 0; padding: 4px;
|
||||
list-style: none; background: var(--panel-2); border: 1px solid var(--line-2); border-radius: var(--radius);
|
||||
max-height: 280px; overflow-y: auto;
|
||||
}
|
||||
.combo-list button {
|
||||
width: 100%; text-align: left; background: transparent; border: 0; color: var(--ink); cursor: pointer;
|
||||
padding: 10px 12px; border-radius: 8px; font: inherit; min-height: 44px;
|
||||
}
|
||||
.combo-list button:hover, .combo-list button[aria-selected="true"] { background: rgba(217, 180, 106, 0.1); }
|
||||
.combo-list small { color: var(--muted); }
|
||||
|
||||
/* Tables */
|
||||
.table-wrap { overflow-x: auto; }
|
||||
table { width: 100%; border-collapse: collapse; font-size: 14px; }
|
||||
th, td { text-align: left; padding: 9px 10px; border-bottom: 1px solid var(--line); vertical-align: middle; }
|
||||
th { color: var(--muted); font-weight: 500; font-size: 13px; }
|
||||
td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
.retro { color: var(--gold); font-size: 12px; margin-left: 4px; }
|
||||
|
||||
/* Big three */
|
||||
.big3 { display: grid; grid-template-columns: repeat(3, 1fr); gap: 12px; }
|
||||
.big3 > div { background: var(--panel-2); border: 1px solid var(--line); border-radius: var(--radius); padding: 14px; display: flex; flex-direction: column; gap: 4px; }
|
||||
.big3 .glyph { font-size: 26px; color: var(--gold); line-height: 1; }
|
||||
.big3 strong { font-family: var(--font-display); font-size: 24px; font-weight: 600; }
|
||||
|
||||
/* Login */
|
||||
.auth { min-height: 100vh; display: flex; flex-wrap: wrap; }
|
||||
.auth-aside {
|
||||
flex: 1 1 480px; min-height: 320px; background: var(--panel); border-right: 1px solid var(--line);
|
||||
padding: 40px 48px; display: flex; flex-direction: column; justify-content: space-between; gap: 32px;
|
||||
}
|
||||
.auth-main { flex: 1 1 480px; display: flex; align-items: center; justify-content: center; padding: 48px 24px; }
|
||||
.auth-box { width: 100%; max-width: 420px; display: flex; flex-direction: column; gap: 28px; }
|
||||
.wheel { width: min(380px, 80%); aspect-ratio: 1; margin: 0 auto; }
|
||||
.tagline { font-family: var(--font-display); font-size: 36px; font-weight: 600; line-height: 1.1; }
|
||||
.gsi-slot { min-height: 44px; display: flex; justify-content: center; }
|
||||
|
||||
/* Detailed analysis */
|
||||
.analysis-card { gap: 14px; }
|
||||
.analysis { display: flex; flex-direction: column; gap: 28px; max-width: 72ch; }
|
||||
.analysis-head { display: flex; flex-direction: column; gap: 12px; }
|
||||
.analysis-head h2 { font-size: 34px; }
|
||||
.analysis-lead { font-size: 17px; line-height: 1.7; color: var(--ink-2); font-style: italic; }
|
||||
.analysis-section { display: flex; flex-direction: column; gap: 12px; }
|
||||
.analysis-section h3 { font-size: 24px; color: var(--gold); }
|
||||
.analysis-section p, .analysis-lists li { font-size: 16px; line-height: 1.75; color: var(--ink-2); }
|
||||
.analysis strong { color: var(--ink); font-weight: 600; }
|
||||
.analysis-lists { display: grid; grid-template-columns: repeat(auto-fit, minmax(260px, 1fr)); gap: 24px; }
|
||||
.analysis-lists h3 { font-size: 22px; margin-bottom: 8px; }
|
||||
.analysis-lists ul { margin: 0; padding-left: 20px; display: flex; flex-direction: column; gap: 8px; }
|
||||
.analysis-advice { border-top: 1px solid var(--line); padding-top: 24px; }
|
||||
|
||||
/* Chart page */
|
||||
.summary-card { gap: 10px; border-color: rgba(217, 180, 106, 0.35); }
|
||||
.eyebrow { font-size: 12px; font-weight: 600; letter-spacing: 1.2px; text-transform: uppercase; color: var(--gold); }
|
||||
.summary-title { font-size: 26px; }
|
||||
.summary-text { font-size: 16px; line-height: 1.65; color: var(--ink-2); }
|
||||
.summary-text strong { color: var(--ink); font-weight: 600; }
|
||||
.skeleton { display: flex; flex-direction: column; gap: 8px; }
|
||||
.skeleton span { height: 12px; border-radius: 6px; background: var(--line); animation: pulse 1.4s ease-in-out infinite; }
|
||||
.skeleton span:last-child { width: 60%; }
|
||||
@keyframes pulse { 50% { opacity: 0.45; } }
|
||||
@media (prefers-reduced-motion: reduce) { .skeleton span { animation: none; } }
|
||||
.chart-layout { display: grid; grid-template-columns: minmax(0, 1.35fr) minmax(280px, 1fr); gap: 24px; align-items: start; }
|
||||
.chart-wheel-card { padding: 16px; gap: 10px; }
|
||||
.chart-wheel { width: 100%; height: auto; display: block; max-width: 680px; margin: 0 auto; }
|
||||
.chart-layout .big3 { grid-template-columns: 1fr; }
|
||||
.wheel-legend { display: flex; flex-wrap: wrap; align-items: center; gap: 6px 10px; justify-content: center; }
|
||||
.legend-line { display: inline-block; width: 22px; height: 2px; border-radius: 1px; margin-left: 6px; }
|
||||
.legend-harmonic { background: var(--harmonic); }
|
||||
.legend-tense { background: var(--tense); }
|
||||
.aspect-tag { white-space: nowrap; }
|
||||
.aspect-harmonic { color: var(--harmonic); }
|
||||
.aspect-tense { color: var(--tense); }
|
||||
.aspect-neutral { color: var(--gold); }
|
||||
|
||||
.w-ring { fill: none; stroke: var(--line-2); stroke-width: 1.2; }
|
||||
.w-faint { stroke: var(--line); }
|
||||
.w-inner { fill: var(--panel-2); }
|
||||
.w-sign { stroke: var(--line-2); stroke-width: 1; }
|
||||
.w-fire { fill: rgba(227, 139, 106, 0.09); }
|
||||
.w-earth { fill: rgba(159, 216, 176, 0.07); }
|
||||
.w-air { fill: rgba(217, 180, 106, 0.08); }
|
||||
.w-water { fill: rgba(127, 176, 224, 0.09); }
|
||||
.w-sign-glyph { fill: var(--gold); font-family: var(--font-symbols); font-size: 22px; }
|
||||
.w-tick { stroke: var(--line-2); stroke-width: 1; }
|
||||
.w-cusp { stroke: var(--line-2); stroke-width: 1; }
|
||||
.w-axis { stroke: var(--gold); stroke-width: 1.8; }
|
||||
.w-axis-label { fill: var(--gold); font: 600 14px var(--font-body); letter-spacing: 0.5px; }
|
||||
.w-house-num { fill: var(--muted); font: 500 12px var(--font-body); }
|
||||
.w-aspect { stroke-linecap: round; }
|
||||
.w-harmonic { stroke: var(--harmonic); }
|
||||
.w-tense { stroke: var(--tense); }
|
||||
.w-neutral { stroke: var(--gold); }
|
||||
.w-point-tick { stroke: var(--ink); stroke-width: 1.6; }
|
||||
.w-leader { stroke: var(--muted); stroke-width: 0.7; stroke-opacity: 0.6; }
|
||||
.w-point-glyph { fill: var(--ink); font-family: var(--font-symbols); font-size: 22px; }
|
||||
.w-point-deg { fill: var(--muted); font: 500 10.5px var(--font-body); }
|
||||
.w-end { fill: var(--ink-2); }
|
||||
.w-point-glyph, .w-point-deg, .w-house-num, .w-axis-label { paint-order: stroke; stroke: var(--panel); stroke-width: 4px; stroke-linejoin: round; }
|
||||
.w-point:hover .w-point-glyph { fill: var(--gold); }
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.chart-layout { grid-template-columns: 1fr; }
|
||||
.chart-layout .big3 { grid-template-columns: repeat(3, 1fr); }
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
h1 { font-size: 32px; }
|
||||
.site-header { padding: 10px 16px; gap: 12px; }
|
||||
.nav { order: 3; flex-basis: 100%; }
|
||||
.card { padding: 18px; }
|
||||
.auth-aside { padding: 28px 20px; min-height: 0; }
|
||||
.wheel { width: 60%; }
|
||||
.big3, .chart-layout .big3 { grid-template-columns: 1fr; }
|
||||
.chart-wheel-card { padding: 8px; }
|
||||
}
|
||||
|
||||
.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
|
||||
@@ -0,0 +1,4 @@
|
||||
// Container health check.
|
||||
export function GET() {
|
||||
return Response.json({ status: "ok" });
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
import { redirect } from "next/navigation";
|
||||
|
||||
import { requireMe } from "@/lib/server";
|
||||
|
||||
// The user's own chart; without birth data the profile asks for it.
|
||||
export default async function MyChart() {
|
||||
const me = await requireMe("/keplet");
|
||||
redirect(me.primary_chart_id ? `/kepletek/${me.primary_chart_id}` : "/profil#birth");
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
import { notFound } from "next/navigation";
|
||||
|
||||
import { BigThree, ChartTables } from "@/components/ChartTables";
|
||||
import { ChartSummary } from "@/components/ChartSummary";
|
||||
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
|
||||
import { ChartWheel } from "@/components/ChartWheel";
|
||||
import { ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import type { Analysis, Chart } from "@/lib/types";
|
||||
|
||||
export const metadata: Metadata = { title: "Képlet" };
|
||||
|
||||
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
||||
|
||||
/** One saved chart: the wheel and the tables, read from the database (not recalculated). */
|
||||
export default async function ChartPage({ params }: { params: Promise<{ id: string }> }) {
|
||||
const { id } = await params;
|
||||
const me = await requireMe(`/kepletek/${id}`);
|
||||
if (!UUID.test(id)) notFound();
|
||||
const [chart, analyses] = await Promise.all([
|
||||
backendGet<Chart>(`/v1/charts/${id}`),
|
||||
backendGet<{ analyses: Analysis[] }>(`/v1/charts/${id}/analyses`),
|
||||
]);
|
||||
if (!chart) notFound();
|
||||
const list = analyses?.analyses ?? [];
|
||||
const summary = list.find((a) => a.kind === "summary" && a.status !== "failed") ?? null;
|
||||
const natal = list.filter((a) => a.kind === "natal");
|
||||
const detailed = natal.find((a) => a.status !== "failed") ?? natal[0] ?? null;
|
||||
|
||||
const result = chart.chart;
|
||||
const timeKnown = chart.highlights.time_known;
|
||||
const place = result.location.place;
|
||||
const country = place?.country_code ?? chart.birth_data.country;
|
||||
const elements = result.summary?.elements;
|
||||
const modalities = result.summary?.modalities;
|
||||
const phase = result.moon_phase;
|
||||
|
||||
return (
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
<div className="page-head">
|
||||
<h1>{chart.is_primary ? "Születési képletem" : chart.label}</h1>
|
||||
<p className="muted">
|
||||
{formatBirthDate(chart.birth_data.date)}
|
||||
{timeKnown ? `, ${result.time.local.slice(11, 16)} (UTC${result.time.utc_offset}${result.time.dst ? ", nyári idő" : ""})` : ", ismeretlen időpont"}
|
||||
{" · "}
|
||||
{place?.name ?? chart.birth_data.place ?? "–"}
|
||||
{country ? `, ${countryName(country)}` : ""}
|
||||
{chart.is_primary && (
|
||||
<>
|
||||
{" · "}
|
||||
<Link href="/profil#birth">adatok javítása</Link>
|
||||
</>
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<section className="chart-layout" aria-label="Képletrajz">
|
||||
<div className="card chart-wheel-card">
|
||||
<ChartWheel chart={result} timeKnown={timeKnown} />
|
||||
<p className="hint wheel-legend">
|
||||
<span className="legend-line legend-harmonic" aria-hidden="true" /> harmonikus (trigon, szextil)
|
||||
<span className="legend-line legend-tense" aria-hidden="true" /> feszült (kvadrát, szembenállás)
|
||||
</p>
|
||||
</div>
|
||||
<div className="field" style={{ gap: 16 }}>
|
||||
<ChartSummary chartId={chart.id} initial={summary} />
|
||||
<BigThree chart={chart} />
|
||||
{(elements || modalities || phase) && (
|
||||
<div className="card" style={{ gap: 12 }}>
|
||||
<dl className="facts">
|
||||
{elements && (
|
||||
<>
|
||||
<dt>Elemek</dt>
|
||||
<dd>
|
||||
{Object.entries(elements)
|
||||
.map(([k, v]) => `${ELEMENTS[k] ?? k} ${v.count}`)
|
||||
.join(" · ")}
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
{modalities && (
|
||||
<>
|
||||
<dt>Minőségek</dt>
|
||||
<dd>
|
||||
{Object.entries(modalities)
|
||||
.map(([k, v]) => `${MODALITIES[k] ?? k} ${v.count}`)
|
||||
.join(" · ")}
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
{phase && (
|
||||
<>
|
||||
<dt>Holdfázis</dt>
|
||||
<dd>
|
||||
{MOON_PHASES[phase.phase] ?? phase.phase}, {Math.round(phase.illumination * 100)}%
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
</dl>
|
||||
{elements && (
|
||||
<p className="hint">
|
||||
Az elemek és minőségek a tíz bolygóból számolva:{" "}
|
||||
{Object.entries(elements)
|
||||
.filter(([, v]) => v.count > 0)
|
||||
.map(([k, v]) => `${ELEMENTS[k] ?? k}: ${v.points.map(pointName).join(", ")}`)
|
||||
.join("; ")}
|
||||
.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<DetailedAnalysis chartId={chart.id} initial={detailed} left={me.analyses_left.natal} />
|
||||
|
||||
<section className="card" aria-labelledby="positions">
|
||||
<h2 id="positions">Pozíciók</h2>
|
||||
<ChartTables chart={chart} />
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
import type { Metadata } from "next";
|
||||
import { Cormorant_Garamond, Inter } from "next/font/google";
|
||||
|
||||
import { SiteHeader } from "@/components/SiteHeader";
|
||||
import { getMe } from "@/lib/server";
|
||||
|
||||
import "./globals.css";
|
||||
|
||||
const cormorant = Cormorant_Garamond({
|
||||
subsets: ["latin", "latin-ext"],
|
||||
weight: ["500", "600"],
|
||||
variable: "--font-cormorant",
|
||||
});
|
||||
const inter = Inter({ subsets: ["latin", "latin-ext"], variable: "--font-inter" });
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: { default: "Sorsfonalak", template: "%s · Sorsfonalak" },
|
||||
description: "Születési képlet, szinasztria és közösség – egy helyen.",
|
||||
};
|
||||
|
||||
export default async function RootLayout({ children }: { children: React.ReactNode }) {
|
||||
const me = await getMe();
|
||||
return (
|
||||
<html lang="hu" className={`${cormorant.variable} ${inter.variable}`}>
|
||||
<body>
|
||||
{me && <SiteHeader me={me} />}
|
||||
{children}
|
||||
</body>
|
||||
</html>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
import Link from "next/link";
|
||||
|
||||
export default function NotFound() {
|
||||
return (
|
||||
<main className="page" style={{ alignItems: "flex-start" }}>
|
||||
<h1>Nincs ilyen oldal</h1>
|
||||
<p className="muted">A keresett oldal nem létezik, vagy nincs hozzá jogosultságod.</p>
|
||||
<Link href="/" className="btn">
|
||||
Vissza a kezdőlapra
|
||||
</Link>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
import { redirect } from "next/navigation";
|
||||
|
||||
import { getMe } from "@/lib/server";
|
||||
|
||||
// No home page yet: logged-in users go to their chart (or to the profile to enter
|
||||
// their birth data), others to login.
|
||||
export default async function Home() {
|
||||
const me = await getMe();
|
||||
redirect(!me ? "/belepes" : me.primary_chart_id ? "/keplet" : "/profil");
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { AnalysisView } from "@/components/AnalysisView";
|
||||
import { ChartWheel } from "@/components/ChartWheel";
|
||||
import { Rich } from "@/components/Rich";
|
||||
import { Logo } from "@/components/SiteHeader";
|
||||
import example from "@/content/pelda.json";
|
||||
import { getMe } from "@/lib/server";
|
||||
import type { AnalysisContent, ChartResult } from "@/lib/types";
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Példaelemzés",
|
||||
description: "Így néz ki egy részletes Sorsfonalak-elemzés: egy kitalált születési képlet teljes értelmezése.",
|
||||
};
|
||||
|
||||
/** A full example analysis of a made-up chart, for visitors and free users. */
|
||||
export default async function ExamplePage() {
|
||||
const me = await getMe();
|
||||
const chart = example.chart as unknown as ChartResult;
|
||||
return (
|
||||
<>
|
||||
{!me && (
|
||||
<header className="site-header">
|
||||
<Logo />
|
||||
</header>
|
||||
)}
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
<div className="page-head">
|
||||
<span className="eyebrow">Példaelemzés</span>
|
||||
<h1>Így néz ki egy részletes elemzés</h1>
|
||||
<p className="muted">
|
||||
A képlet kitalált ({example.birth}). A saját képletednél ugyanígy készül: a rövid összefoglaló ingyenes, a
|
||||
részletes elemzés fizetős.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<section className="chart-layout" aria-label="A példa képlete">
|
||||
<div className="card chart-wheel-card">
|
||||
<ChartWheel chart={chart} timeKnown />
|
||||
</div>
|
||||
<div className="field" style={{ gap: 16 }}>
|
||||
<section className="card summary-card" aria-labelledby="example-summary">
|
||||
<span className="eyebrow">Röviden · ingyenes</span>
|
||||
<h2 id="example-summary" className="summary-title">
|
||||
{example.summary.title}
|
||||
</h2>
|
||||
<p className="summary-text">
|
||||
<Rich text={example.summary.summary} />
|
||||
</p>
|
||||
</section>
|
||||
<div className="card" style={{ gap: 12 }}>
|
||||
<p>
|
||||
{me ? "Nézd meg a saját képletedet és az ingyenes összefoglalódat." : "Lépj be Google-fiókkal, add meg a születési adataidat, és ingyen megkapod a saját rövid összefoglalódat."}
|
||||
</p>
|
||||
<div className="form-actions">
|
||||
<Link href={me ? "/keplet" : "/belepes?vissza=/keplet"} className="btn btn-primary">
|
||||
{me ? "A saját képletem" : "Belépés és saját képlet"}
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="card analysis-card" aria-label="Részletes példaelemzés">
|
||||
<span className="eyebrow">Részletes elemzés · fizetős</span>
|
||||
<AnalysisView content={example.analysis as AnalysisContent} />
|
||||
</section>
|
||||
</main>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
|
||||
import { countryName, formatBirthDate } from "@/lib/astro";
|
||||
import type { BirthData } from "@/lib/types";
|
||||
|
||||
import { BirthForm } from "./BirthForm";
|
||||
|
||||
export interface SavedBirth {
|
||||
birth: BirthData;
|
||||
placeName: string | null;
|
||||
region: string | null;
|
||||
countryCode: string | null;
|
||||
zone: string;
|
||||
utcOffset: string;
|
||||
dst: boolean;
|
||||
}
|
||||
|
||||
/** Shows the saved birth data, or the form to enter or correct it. Saving opens the chart page. */
|
||||
export function BirthEditor({ chart, chartId }: { chart: SavedBirth | null; chartId: string | null }) {
|
||||
const router = useRouter();
|
||||
const [editing, setEditing] = useState(chart === null);
|
||||
|
||||
if (editing || !chart) {
|
||||
return (
|
||||
<div className="field" style={{ gap: 16 }}>
|
||||
{chart ? (
|
||||
<p className="muted">
|
||||
A javított adatokból új képlet készül, és az lesz a saját képleted. A régit a meglévő összevetések miatt
|
||||
megtartjuk.
|
||||
</p>
|
||||
) : (
|
||||
<p className="muted">
|
||||
Add meg a születésed adatait. Ebből számoljuk a képletedet; a helyi időt és az akkori időzónát (nyári
|
||||
időszámítást) a születési hely alapján magunk határozzuk meg.
|
||||
</p>
|
||||
)}
|
||||
<BirthForm
|
||||
initial={chart ? { ...chart.birth, placeName: chart.placeName, region: chart.region } : null}
|
||||
onCancel={chart ? () => setEditing(false) : undefined}
|
||||
onSaved={(id) => router.push(`/kepletek/${id}`)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const { birth } = chart;
|
||||
const country = chart.countryCode ?? birth.country;
|
||||
return (
|
||||
<div className="field">
|
||||
<div className="card-head" style={{ alignItems: "flex-start" }}>
|
||||
<dl className="facts">
|
||||
<dt>Dátum</dt>
|
||||
<dd>{formatBirthDate(birth.date)}</dd>
|
||||
<dt>Időpont</dt>
|
||||
<dd>
|
||||
{birth.time ? (
|
||||
<>
|
||||
{birth.time.slice(0, 5)}{" "}
|
||||
<span className="muted">
|
||||
({chart.zone}, UTC{chart.utcOffset}
|
||||
{chart.dst ? ", nyári idő" : ""})
|
||||
</span>
|
||||
</>
|
||||
) : (
|
||||
<span className="muted">ismeretlen</span>
|
||||
)}
|
||||
</dd>
|
||||
<dt>Hely</dt>
|
||||
<dd>
|
||||
{chart.placeName ?? birth.place ?? "–"}
|
||||
{chart.region && <span className="muted">, {chart.region}</span>}
|
||||
{country && <span className="muted">, {countryName(country)}</span>}
|
||||
</dd>
|
||||
</dl>
|
||||
<div className="row">
|
||||
{chartId && (
|
||||
<Link href={`/kepletek/${chartId}`} className="btn btn-primary">
|
||||
Képlet megnyitása
|
||||
</Link>
|
||||
)}
|
||||
<button type="button" className="btn" onClick={() => setEditing(true)}>
|
||||
Adatok javítása
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,323 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useId, useMemo, useRef, useState } from "react";
|
||||
|
||||
import { ApiError, api, errorText } from "@/lib/api";
|
||||
import { countryName } from "@/lib/astro";
|
||||
import type { BirthData, Country, Place } from "@/lib/types";
|
||||
|
||||
type Initial = (BirthData & { placeName: string | null; region: string | null }) | null;
|
||||
type Ambiguity = "earlier" | "later";
|
||||
|
||||
const ERRORS: Record<string, string> = {
|
||||
place_not_found: "Nem találjuk ezt a települést. Válassz a listából.",
|
||||
nonexistent_local_time:
|
||||
"Ez az időpont az óraátállítás miatt nem létezett ezen a napon (az órát előreállították). Ellenőrizd a születési időt.",
|
||||
invalid_date: "Érvénytelen dátum.",
|
||||
};
|
||||
|
||||
export function BirthForm({
|
||||
initial,
|
||||
onCancel,
|
||||
onSaved,
|
||||
}: {
|
||||
initial: Initial;
|
||||
onCancel?: () => void;
|
||||
onSaved: (chartId: string) => void;
|
||||
}) {
|
||||
const [date, setDate] = useState(initial?.date ?? "");
|
||||
const [time, setTime] = useState(initial?.time?.slice(0, 5) ?? "");
|
||||
const [timeUnknown, setTimeUnknown] = useState(initial ? !initial.time : false);
|
||||
const [country, setCountry] = useState(initial?.country ?? "HU");
|
||||
const [place, setPlace] = useState<Place | null>(
|
||||
initial?.geonames_id && initial.placeName
|
||||
? {
|
||||
geonames_id: initial.geonames_id,
|
||||
name: initial.placeName,
|
||||
region: initial.region,
|
||||
population: null,
|
||||
country_code: initial.country ?? "HU",
|
||||
}
|
||||
: null,
|
||||
);
|
||||
const [ambiguous, setAmbiguous] = useState(false);
|
||||
const [ambiguity, setAmbiguity] = useState<Ambiguity>("earlier");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const today = useMemo(() => new Date().toISOString().slice(0, 10), []);
|
||||
|
||||
async function submit(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
setError(null);
|
||||
if (!date) return setError("Add meg a születési dátumot.");
|
||||
if (!timeUnknown && !time) return setError("Add meg a születési időt, vagy jelöld, hogy nem tudod.");
|
||||
if (!place) return setError("Válaszd ki a születési helyet a listából.");
|
||||
setBusy(true);
|
||||
try {
|
||||
const saved = await api<{ id: string }>("/charts", {
|
||||
body: {
|
||||
label: "Saját képlet",
|
||||
is_primary: true,
|
||||
birth: {
|
||||
date,
|
||||
...(timeUnknown ? {} : { time }),
|
||||
country,
|
||||
geonames_id: place.geonames_id,
|
||||
...(ambiguous ? { ambiguous_time: ambiguity } : {}),
|
||||
},
|
||||
},
|
||||
});
|
||||
onSaved(saved.id);
|
||||
} catch (err) {
|
||||
if (err instanceof ApiError && err.code === "ambiguous_local_time") {
|
||||
setAmbiguous(true);
|
||||
setError(
|
||||
"Ez az időpont az óraátállítás miatt kétszer is előfordult ezen a napon. Válaszd ki, melyikben születtél, és mentsd újra.",
|
||||
);
|
||||
} else {
|
||||
setError(err instanceof ApiError ? (ERRORS[err.code] ?? errorText(err)) : errorText(err));
|
||||
}
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<form onSubmit={submit} className="field" style={{ gap: 18 }} noValidate>
|
||||
<div className="grid-2">
|
||||
<div className="field">
|
||||
<label htmlFor="birth-date">Születési dátum</label>
|
||||
<input
|
||||
id="birth-date"
|
||||
type="date"
|
||||
className="inp"
|
||||
min="1000-01-01"
|
||||
max={today}
|
||||
value={date}
|
||||
onChange={(e) => setDate(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label htmlFor="birth-time">Születési idő (helyi idő)</label>
|
||||
<input
|
||||
id="birth-time"
|
||||
type="time"
|
||||
className="inp"
|
||||
value={timeUnknown ? "" : time}
|
||||
disabled={timeUnknown}
|
||||
onChange={(e) => {
|
||||
setTime(e.target.value);
|
||||
setAmbiguous(false);
|
||||
}}
|
||||
/>
|
||||
<label className="check">
|
||||
<input type="checkbox" checked={timeUnknown} onChange={(e) => setTimeUnknown(e.target.checked)} />
|
||||
Nem tudom a születési időt
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid-2">
|
||||
<CountrySelect
|
||||
value={country}
|
||||
onChange={(c) => {
|
||||
setCountry(c);
|
||||
setPlace(null);
|
||||
}}
|
||||
/>
|
||||
<PlaceSearch country={country} value={place} onChange={setPlace} />
|
||||
</div>
|
||||
|
||||
{ambiguous && (
|
||||
<fieldset className="field" style={{ border: 0, padding: 0, margin: 0 }}>
|
||||
<legend className="label" style={{ marginBottom: 8 }}>
|
||||
Melyik időpontban születtél?
|
||||
</legend>
|
||||
<label className="check">
|
||||
<input type="radio" name="ambiguity" checked={ambiguity === "earlier"} onChange={() => setAmbiguity("earlier")} />
|
||||
Az elsőben, még nyári időszámítás szerint
|
||||
</label>
|
||||
<label className="check">
|
||||
<input type="radio" name="ambiguity" checked={ambiguity === "later"} onChange={() => setAmbiguity("later")} />
|
||||
A másodikban, már téli időszámítás szerint
|
||||
</label>
|
||||
</fieldset>
|
||||
)}
|
||||
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
<div className="form-actions">
|
||||
<button type="submit" className="btn btn-primary" disabled={busy}>
|
||||
{busy ? "Számolás…" : "Mentés és képlet számítása"}
|
||||
</button>
|
||||
{onCancel && (
|
||||
<button type="button" className="btn btn-ghost" onClick={onCancel} disabled={busy}>
|
||||
Mégse
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
|
||||
function CountrySelect({ value, onChange }: { value: string; onChange: (iso2: string) => void }) {
|
||||
const [countries, setCountries] = useState<Country[]>([]);
|
||||
useEffect(() => {
|
||||
fetch("/api/geo/countries")
|
||||
.then((r) => (r.ok ? r.json() : { countries: [] }))
|
||||
.then((d: { countries: Country[] }) => {
|
||||
const named = d.countries.map((c) => ({ iso2: c.iso2, name: countryName(c.iso2, c.name) }));
|
||||
named.sort((a, b) => a.name.localeCompare(b.name, "hu"));
|
||||
setCountries(named);
|
||||
})
|
||||
.catch(() => setCountries([]));
|
||||
}, []);
|
||||
return (
|
||||
<div className="field">
|
||||
<label htmlFor="birth-country">Ország</label>
|
||||
<select id="birth-country" className="inp" value={value} onChange={(e) => onChange(e.target.value)}>
|
||||
{countries.length === 0 && <option value={value}>{countryName(value)}</option>}
|
||||
{countries.map((c) => (
|
||||
<option key={c.iso2} value={c.iso2}>
|
||||
{c.name}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function PlaceSearch({
|
||||
country,
|
||||
value,
|
||||
onChange,
|
||||
}: {
|
||||
country: string;
|
||||
value: Place | null;
|
||||
onChange: (p: Place | null) => void;
|
||||
}) {
|
||||
const listId = useId();
|
||||
const [query, setQuery] = useState(value?.name ?? "");
|
||||
const [results, setResults] = useState<Place[]>([]);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [active, setActive] = useState(0);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const seq = useRef(0);
|
||||
|
||||
// A new country starts a new search.
|
||||
const firstCountry = useRef(country);
|
||||
useEffect(() => {
|
||||
if (country === firstCountry.current) return;
|
||||
firstCountry.current = country;
|
||||
setQuery("");
|
||||
setResults([]);
|
||||
}, [country]);
|
||||
|
||||
useEffect(() => {
|
||||
const q = query.trim();
|
||||
if (q.length < 2 || (value && value.name === query)) {
|
||||
setResults([]);
|
||||
return;
|
||||
}
|
||||
const id = ++seq.current;
|
||||
setLoading(true);
|
||||
const timer = setTimeout(async () => {
|
||||
try {
|
||||
const res = await fetch(`/api/geo/places?country=${country}&q=${encodeURIComponent(q)}&limit=8`);
|
||||
const data = res.ok ? ((await res.json()) as { places: Place[] }) : { places: [] };
|
||||
if (id === seq.current) {
|
||||
setResults(data.places);
|
||||
setActive(0);
|
||||
setOpen(true);
|
||||
}
|
||||
} catch {
|
||||
if (id === seq.current) setResults([]);
|
||||
} finally {
|
||||
if (id === seq.current) setLoading(false);
|
||||
}
|
||||
}, 250);
|
||||
return () => clearTimeout(timer);
|
||||
}, [query, country, value]);
|
||||
|
||||
function choose(p: Place) {
|
||||
onChange(p);
|
||||
setQuery(p.name);
|
||||
setOpen(false);
|
||||
}
|
||||
|
||||
function onKey(e: React.KeyboardEvent) {
|
||||
if (!open || results.length === 0) return;
|
||||
if (e.key === "ArrowDown") {
|
||||
e.preventDefault();
|
||||
setActive((a) => (a + 1) % results.length);
|
||||
} else if (e.key === "ArrowUp") {
|
||||
e.preventDefault();
|
||||
setActive((a) => (a - 1 + results.length) % results.length);
|
||||
} else if (e.key === "Enter") {
|
||||
e.preventDefault();
|
||||
choose(results[active]);
|
||||
} else if (e.key === "Escape") {
|
||||
setOpen(false);
|
||||
}
|
||||
}
|
||||
|
||||
const showList = open && results.length > 0;
|
||||
return (
|
||||
<div className="field">
|
||||
<label htmlFor="birth-place">Település</label>
|
||||
<div className="combo">
|
||||
<input
|
||||
id="birth-place"
|
||||
className="inp"
|
||||
role="combobox"
|
||||
aria-expanded={showList}
|
||||
aria-controls={listId}
|
||||
aria-autocomplete="list"
|
||||
aria-activedescendant={showList ? `${listId}-${active}` : undefined}
|
||||
autoComplete="off"
|
||||
placeholder="Kezdd el gépelni, pl. Szeged"
|
||||
value={query}
|
||||
onChange={(e) => {
|
||||
setQuery(e.target.value);
|
||||
if (value) onChange(null);
|
||||
}}
|
||||
onKeyDown={onKey}
|
||||
onFocus={() => results.length > 0 && setOpen(true)}
|
||||
onBlur={() => setTimeout(() => setOpen(false), 150)}
|
||||
/>
|
||||
{showList && (
|
||||
<ul className="combo-list" id={listId} role="listbox">
|
||||
{results.map((p, i) => (
|
||||
<li key={p.geonames_id} role="presentation">
|
||||
<button
|
||||
type="button"
|
||||
id={`${listId}-${i}`}
|
||||
role="option"
|
||||
aria-selected={i === active}
|
||||
tabIndex={-1}
|
||||
onMouseDown={(e) => e.preventDefault()}
|
||||
onClick={() => choose(p)}
|
||||
>
|
||||
{p.name} {p.region && <small>· {p.region}</small>}
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</div>
|
||||
<span className="hint" aria-live="polite">
|
||||
{value
|
||||
? `Kiválasztva: ${value.name}${value.region ? `, ${value.region}` : ""}`
|
||||
: loading
|
||||
? "Keresés…"
|
||||
: query.trim().length >= 2 && results.length === 0
|
||||
? "Nincs találat ebben az országban."
|
||||
: "Válassz a listából."}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
"use client";
|
||||
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
|
||||
import { api, errorText } from "@/lib/api";
|
||||
|
||||
export function ProfileForm({ displayName, locale }: { displayName: string; locale: string }) {
|
||||
const router = useRouter();
|
||||
const [name, setName] = useState(displayName);
|
||||
const [lang, setLang] = useState(locale);
|
||||
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
async function save(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
setBusy(true);
|
||||
setStatus(null);
|
||||
try {
|
||||
await api("/me", { method: "PATCH", body: { display_name: name.trim(), locale: lang } });
|
||||
setStatus({ ok: true, text: "Elmentve." });
|
||||
router.refresh();
|
||||
} catch (err) {
|
||||
setStatus({ ok: false, text: errorText(err) });
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<form onSubmit={save} className="field" style={{ gap: 16 }}>
|
||||
<div className="field">
|
||||
<label htmlFor="display-name">Megjelenített név</label>
|
||||
<input
|
||||
id="display-name"
|
||||
className="inp"
|
||||
value={name}
|
||||
maxLength={80}
|
||||
autoComplete="name"
|
||||
onChange={(e) => setName(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label htmlFor="locale">Az elemzések nyelve</label>
|
||||
<select id="locale" className="inp" value={lang} onChange={(e) => setLang(e.target.value)}>
|
||||
<option value="hu">Magyar</option>
|
||||
<option value="en">English</option>
|
||||
</select>
|
||||
</div>
|
||||
<div className="form-actions">
|
||||
<button type="submit" className="btn btn-primary" disabled={busy}>
|
||||
Mentés
|
||||
</button>
|
||||
{status && (
|
||||
<span className={status.ok ? "msg msg-ok" : "msg msg-error"} role="status">
|
||||
{status.text}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
import type { Metadata } from "next";
|
||||
|
||||
import { ROLE_LABELS, formatDate } from "@/lib/astro";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import type { Chart } from "@/lib/types";
|
||||
|
||||
import { BirthEditor } from "./BirthEditor";
|
||||
import { ProfileForm } from "./ProfileForm";
|
||||
|
||||
export const metadata: Metadata = { title: "Profil" };
|
||||
|
||||
const PROVIDERS: Record<string, string> = { google: "Google", password: "E-mail és jelszó" };
|
||||
|
||||
export default async function ProfilePage() {
|
||||
const me = await requireMe("/profil");
|
||||
const chart = me.primary_chart_id ? await backendGet<Chart>(`/v1/charts/${me.primary_chart_id}`) : null;
|
||||
const { user } = me;
|
||||
|
||||
return (
|
||||
<main className="page">
|
||||
<div className="page-head">
|
||||
<h1>Profil</h1>
|
||||
<p className="muted">A fiókod és a születési adataid.</p>
|
||||
</div>
|
||||
|
||||
<section className="card" aria-labelledby="account">
|
||||
<div className="card-head">
|
||||
<h2 id="account">Fiók</h2>
|
||||
<div className="row" style={{ gap: 6 }}>
|
||||
{user.roles.map((r) => (
|
||||
<span key={r} className={r === "user" ? "badge" : "badge badge-gold"}>
|
||||
{ROLE_LABELS[r] ?? r}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div className="grid-2">
|
||||
<dl className="facts">
|
||||
<dt>E-mail</dt>
|
||||
<dd>
|
||||
{user.email} {user.email_verified && <span className="badge">megerősítve</span>}
|
||||
</dd>
|
||||
<dt>Belépés</dt>
|
||||
<dd>{me.providers.map((p) => PROVIDERS[p] ?? p).join(", ") || "–"}</dd>
|
||||
<dt>Részletes elemzések</dt>
|
||||
<dd>
|
||||
{me.analyses_left.natal} képlet, {me.analyses_left.synastry} szinasztria
|
||||
</dd>
|
||||
<dt>Tag óta</dt>
|
||||
<dd>{formatDate(user.created_at)}</dd>
|
||||
</dl>
|
||||
<ProfileForm displayName={user.display_name ?? ""} locale={user.locale} />
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="card" aria-labelledby="birth">
|
||||
<div className="card-head">
|
||||
<h2 id="birth">Születési adataim</h2>
|
||||
{chart && !chart.highlights.time_known && <span className="badge">ismeretlen születési idő</span>}
|
||||
</div>
|
||||
<BirthEditor
|
||||
chart={
|
||||
chart
|
||||
? {
|
||||
birth: chart.birth_data,
|
||||
placeName: chart.chart.location.place?.name ?? null,
|
||||
region: chart.chart.location.place?.region ?? null,
|
||||
countryCode: chart.chart.location.place?.country_code ?? chart.birth_data.country ?? null,
|
||||
zone: chart.chart.time.zone,
|
||||
utcOffset: chart.chart.time.utc_offset,
|
||||
dst: chart.chart.time.dst,
|
||||
}
|
||||
: null
|
||||
}
|
||||
chartId={chart?.id ?? null}
|
||||
/>
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
import type { AnalysisContent } from "@/lib/types";
|
||||
|
||||
import { Paragraphs, Rich } from "./Rich";
|
||||
|
||||
const NATAL_ORDER = ["personality", "emotions", "mind", "love", "work", "growth"];
|
||||
const SYNASTRY_ORDER = ["attraction", "communication", "emotional_bond", "friction", "long_term"];
|
||||
|
||||
/** A finished detailed analysis (natal or synastry). */
|
||||
export function AnalysisView({ content, kind = "natal" }: { content: AnalysisContent; kind?: "natal" | "synastry" }) {
|
||||
const order = kind === "synastry" ? SYNASTRY_ORDER : NATAL_ORDER;
|
||||
const sections = order.map((key) => content.sections?.[key]).filter((s) => s !== undefined);
|
||||
return (
|
||||
<article className="analysis">
|
||||
<header className="analysis-head">
|
||||
<h2>{content.title}</h2>
|
||||
{content.summary && (
|
||||
<p className="analysis-lead">
|
||||
<Rich text={content.summary} />
|
||||
</p>
|
||||
)}
|
||||
</header>
|
||||
{sections.map((s, i) => (
|
||||
<section key={i} className="analysis-section">
|
||||
<h3>{s.title}</h3>
|
||||
<Paragraphs text={s.body} />
|
||||
</section>
|
||||
))}
|
||||
<div className="analysis-lists">
|
||||
{content.strengths && content.strengths.length > 0 && (
|
||||
<section>
|
||||
<h3>Erősségek</h3>
|
||||
<ul>
|
||||
{content.strengths.map((t, i) => (
|
||||
<li key={i}>
|
||||
<Rich text={t} />
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</section>
|
||||
)}
|
||||
{content.challenges && content.challenges.length > 0 && (
|
||||
<section>
|
||||
<h3>Kihívások</h3>
|
||||
<ul>
|
||||
{content.challenges.map((t, i) => (
|
||||
<li key={i}>
|
||||
<Rich text={t} />
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</section>
|
||||
)}
|
||||
</div>
|
||||
{content.advice && (
|
||||
<section className="analysis-section analysis-advice">
|
||||
<h3>Útravaló</h3>
|
||||
<Paragraphs text={content.advice} />
|
||||
</section>
|
||||
)}
|
||||
</article>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
import { api } from "@/lib/api";
|
||||
import type { Analysis } from "@/lib/types";
|
||||
|
||||
import { Rich } from "./Rich";
|
||||
|
||||
const POLL_MS = 3000;
|
||||
const MAX_POLLS = 60;
|
||||
|
||||
/**
|
||||
* The free short summary of a chart. The backend queues it when the chart is
|
||||
* saved; this asks for it (queueing it again if it failed) and polls until the
|
||||
* worker has written it.
|
||||
*/
|
||||
export function ChartSummary({ chartId, initial }: { chartId: string; initial: Analysis | null }) {
|
||||
const [summary, setSummary] = useState<Analysis | null>(initial);
|
||||
const [gaveUp, setGaveUp] = useState(false);
|
||||
const done = summary?.status === "done";
|
||||
|
||||
useEffect(() => {
|
||||
if (done) return;
|
||||
let polls = 0;
|
||||
let stopped = false;
|
||||
let timer: ReturnType<typeof setTimeout> | undefined;
|
||||
const tick = async () => {
|
||||
try {
|
||||
const next = await api<Analysis>(`/charts/${chartId}/summary`, { method: "POST" });
|
||||
if (stopped) return;
|
||||
setSummary(next);
|
||||
if (next.status === "done") return;
|
||||
} catch {
|
||||
// try again on the next tick
|
||||
}
|
||||
if (++polls >= MAX_POLLS) return setGaveUp(true);
|
||||
timer = setTimeout(tick, POLL_MS);
|
||||
};
|
||||
tick();
|
||||
return () => {
|
||||
stopped = true;
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [chartId, done]);
|
||||
|
||||
const content = done ? summary?.content : null;
|
||||
return (
|
||||
<section className="card summary-card" aria-labelledby="summary-title" aria-busy={!done}>
|
||||
<span className="eyebrow">Röviden</span>
|
||||
{content ? (
|
||||
<>
|
||||
<h2 id="summary-title" className="summary-title">
|
||||
{content.title}
|
||||
</h2>
|
||||
<p className="summary-text">
|
||||
<Rich text={content.summary ?? ""} />
|
||||
</p>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<h2 id="summary-title" className="sr-only">
|
||||
Rövid összefoglaló
|
||||
</h2>
|
||||
<p className="muted" role="status">
|
||||
{gaveUp || summary?.status === "failed"
|
||||
? "Az összefoglaló most nem készült el. Töltsd újra az oldalt egy kicsit később."
|
||||
: "Az összefoglalód készül, ez néhány másodperc…"}
|
||||
</p>
|
||||
{!gaveUp && summary?.status !== "failed" && (
|
||||
<div className="skeleton" aria-hidden="true">
|
||||
<span />
|
||||
<span />
|
||||
<span />
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,195 @@
|
||||
import { ANGLES, ASPECTS, POINTS, SIGNS, dms, orbText, pointName, signName } from "@/lib/astro";
|
||||
import type { Chart, Position } from "@/lib/types";
|
||||
|
||||
function Pos({ p }: { p: Position }) {
|
||||
return (
|
||||
<>
|
||||
{dms(p.degree_in_sign_dms)} <span className="sym">{SIGNS[p.sign]?.glyph}</span> {signName(p.sign)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
/** Sun, Moon and Ascendant signs. */
|
||||
export function BigThree({ chart }: { chart: Chart }) {
|
||||
const result = chart.chart;
|
||||
const timeKnown = chart.highlights.time_known;
|
||||
const sun = result.points.find((p) => p.id === "sun");
|
||||
const moon = result.points.find((p) => p.id === "moon");
|
||||
const asc = result.angles?.ascendant;
|
||||
return (
|
||||
<div className="big3">
|
||||
<div>
|
||||
<span className="muted">Nap</span>
|
||||
<span className="glyph sym">{SIGNS[chart.highlights.sun ?? ""]?.glyph}</span>
|
||||
<strong>{signName(chart.highlights.sun)}</strong>
|
||||
{sun && <span className="muted num">{dms(sun.degree_in_sign_dms)}</span>}
|
||||
</div>
|
||||
<div>
|
||||
<span className="muted">Hold{!timeKnown && " (közelítő)"}</span>
|
||||
<span className="glyph sym">{SIGNS[chart.highlights.moon ?? ""]?.glyph}</span>
|
||||
<strong>{signName(chart.highlights.moon)}</strong>
|
||||
{moon && <span className="muted num">{dms(moon.degree_in_sign_dms)}</span>}
|
||||
</div>
|
||||
<div>
|
||||
<span className="muted">Aszcendens</span>
|
||||
{timeKnown ? (
|
||||
<>
|
||||
<span className="glyph sym">{SIGNS[chart.highlights.ascendant ?? ""]?.glyph}</span>
|
||||
<strong>{signName(chart.highlights.ascendant)}</strong>
|
||||
{typeof asc === "object" && asc && <span className="muted num">{dms(asc.degree_in_sign_dms)}</span>}
|
||||
</>
|
||||
) : (
|
||||
<strong className="muted">–</strong>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** Positions, angles, house cusps and aspects of a natal chart. */
|
||||
export function ChartTables({ chart }: { chart: Chart }) {
|
||||
const result = chart.chart;
|
||||
const timeKnown = chart.highlights.time_known;
|
||||
const angles = ANGLES.map(([key, label]) => [label, result.angles?.[key]] as const).filter(
|
||||
(a): a is readonly [string, Position] => typeof a[1] === "object" && a[1] !== null,
|
||||
);
|
||||
const fortune = result.lots?.fortune;
|
||||
const aspects = [...(result.aspects ?? [])].sort((a, b) => a.orb - b.orb);
|
||||
|
||||
return (
|
||||
<div className="field" style={{ gap: 24 }}>
|
||||
<div className="grid-2" style={{ alignItems: "start" }}>
|
||||
<div className="table-wrap">
|
||||
<h3 style={{ marginBottom: 8 }}>Bolygók és pontok</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Pont</th>
|
||||
<th scope="col">Pozíció</th>
|
||||
{timeKnown && <th scope="col">Ház</th>}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{result.points.map((p) => (
|
||||
<tr key={p.id}>
|
||||
<td>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{POINTS[p.id]?.glyph}
|
||||
</span>{" "}
|
||||
{POINTS[p.id]?.hu ?? p.id}
|
||||
{p.retrograde && (
|
||||
<abbr className="retro" title="retrográd">
|
||||
R
|
||||
</abbr>
|
||||
)}
|
||||
</td>
|
||||
<td className="num">
|
||||
<Pos p={p} />
|
||||
</td>
|
||||
{timeKnown && <td className="num">{p.house ? `${p.house}.` : "–"}</td>}
|
||||
</tr>
|
||||
))}
|
||||
{timeKnown && fortune && (
|
||||
<tr>
|
||||
<td>Szerencsepont</td>
|
||||
<td className="num">
|
||||
<Pos p={fortune} />
|
||||
</td>
|
||||
<td className="num">{fortune.house ? `${fortune.house}.` : "–"}</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{timeKnown && (
|
||||
<div className="field" style={{ gap: 24 }}>
|
||||
<div className="table-wrap">
|
||||
<h3 style={{ marginBottom: 8 }}>Tengelyek</h3>
|
||||
<table>
|
||||
<tbody>
|
||||
{angles.map(([label, p]) => (
|
||||
<tr key={label}>
|
||||
<td>{label}</td>
|
||||
<td className="num">
|
||||
<Pos p={p} />
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{result.houses && (
|
||||
<div className="table-wrap">
|
||||
<h3 style={{ marginBottom: 8 }}>Házcsúcsok (Placidus)</h3>
|
||||
<table>
|
||||
<tbody>
|
||||
{result.houses.cusps.map((c) => (
|
||||
<tr key={c.house}>
|
||||
<td>{c.house}. ház</td>
|
||||
<td className="num">
|
||||
<Pos p={c} />
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{aspects.length > 0 && (
|
||||
<div className="table-wrap">
|
||||
<h3 style={{ marginBottom: 8 }}>Fényszögek</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Fényszög</th>
|
||||
<th scope="col">Orbisz</th>
|
||||
<th scope="col">
|
||||
<span className="sr-only">Közeledő vagy távolodó</span>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{aspects.map((a) => {
|
||||
const info = ASPECTS[a.aspect];
|
||||
return (
|
||||
<tr key={`${a.point1}-${a.point2}-${a.aspect}`}>
|
||||
<td>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{POINTS[a.point1]?.glyph}
|
||||
</span>{" "}
|
||||
{pointName(a.point1)}{" "}
|
||||
<span className={`aspect-tag aspect-${info?.kind ?? "neutral"}`}>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{info?.glyph}
|
||||
</span>{" "}
|
||||
{info?.hu ?? a.aspect}
|
||||
</span>{" "}
|
||||
<span className="sym" aria-hidden="true">
|
||||
{POINTS[a.point2]?.glyph}
|
||||
</span>{" "}
|
||||
{pointName(a.point2)}
|
||||
</td>
|
||||
<td className="num">{orbText(a.orb)}</td>
|
||||
<td className="muted" style={{ fontSize: 13 }}>
|
||||
{a.applying === true ? "közeledő" : a.applying === false ? "távolodó" : ""}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
{!timeKnown && (
|
||||
<p className="hint">
|
||||
Születési idő nélkül a házak, a tengelyek és az Aszcendens nem számolhatók; a Hold helyzete a nap folyamán akár
|
||||
jegyet is válthat, ezért közelítő.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,240 @@
|
||||
import { ASPECTS, POINTS, SIGNS, dms, orbText, pointName, signName } from "@/lib/astro";
|
||||
import type { ChartResult, Position } from "@/lib/types";
|
||||
|
||||
// Radii of the rings (viewBox is SIZE × SIZE, centre C).
|
||||
const SIZE = 680;
|
||||
const C = SIZE / 2;
|
||||
const R_LABEL = 322; // ASC / MC labels
|
||||
const R_OUT = 300; // outer edge of the zodiac ring
|
||||
const R_ZOD = 254; // inner edge of the zodiac ring
|
||||
const R_GLYPH = 222; // planet glyphs
|
||||
const R_DEG = 188; // planet degrees
|
||||
const R_HOUSE = 172; // outer edge of the house-number ring
|
||||
const R_INNER = 146; // aspect circle
|
||||
|
||||
// Points drawn on the wheel; the asteroids and the south node are only in the tables.
|
||||
const WHEEL_POINTS = [
|
||||
"sun",
|
||||
"moon",
|
||||
"mercury",
|
||||
"venus",
|
||||
"mars",
|
||||
"jupiter",
|
||||
"saturn",
|
||||
"uranus",
|
||||
"neptune",
|
||||
"pluto",
|
||||
"north_node",
|
||||
"lilith",
|
||||
"chiron",
|
||||
];
|
||||
const SIGN_ORDER = Object.keys(SIGNS);
|
||||
const SIGN_ELEMENT = ["fire", "earth", "air", "water"];
|
||||
const ANGLE_LABELS: [string, string][] = [
|
||||
["ascendant", "ASC"],
|
||||
["midheaven", "MC"],
|
||||
["descendant", "DSC"],
|
||||
["imum_coeli", "IC"],
|
||||
];
|
||||
|
||||
/** Screen point of an ecliptic longitude: the ascendant (or 0° Aries) is on the left. */
|
||||
function xy(lon: number, r: number, start: number): [number, number] {
|
||||
const a = ((180 + lon - start) * Math.PI) / 180;
|
||||
return [C + r * Math.cos(a), C - r * Math.sin(a)];
|
||||
}
|
||||
|
||||
const f = (n: number) => n.toFixed(2);
|
||||
|
||||
/** Pushes glyphs apart so that neighbours are at least `min` degrees from each other. */
|
||||
function spread(lons: number[], min: number): number[] {
|
||||
const n = lons.length;
|
||||
const order = lons.map((_, i) => i).sort((a, b) => lons[a] - lons[b]);
|
||||
const pos = order.map((i) => lons[i]);
|
||||
for (let iter = 0; iter < 200 && n > 1; iter++) {
|
||||
let moved = false;
|
||||
for (let i = 0; i < n; i++) {
|
||||
const j = (i + 1) % n;
|
||||
const gap = pos[j] - pos[i] + (j === 0 ? 360 : 0);
|
||||
if (gap < min - 0.01) {
|
||||
const d = (min - gap) / 2;
|
||||
pos[i] -= d;
|
||||
pos[j] += d;
|
||||
moved = true;
|
||||
}
|
||||
}
|
||||
if (!moved) break;
|
||||
}
|
||||
const out = new Array<number>(n);
|
||||
order.forEach((orig, k) => (out[orig] = pos[k]));
|
||||
return out;
|
||||
}
|
||||
|
||||
function arcPath(r1: number, r2: number, from: number, to: number, start: number): string {
|
||||
const [x1, y1] = xy(from, r2, start);
|
||||
const [x2, y2] = xy(to, r2, start);
|
||||
const [x3, y3] = xy(to, r1, start);
|
||||
const [x4, y4] = xy(from, r1, start);
|
||||
// Increasing longitude runs counter-clockwise on screen (sweep flag 0).
|
||||
return `M${f(x1)} ${f(y1)} A${r2} ${r2} 0 0 0 ${f(x2)} ${f(y2)} L${f(x3)} ${f(y3)} A${r1} ${r1} 0 0 1 ${f(x4)} ${f(y4)} Z`;
|
||||
}
|
||||
|
||||
/** The natal chart as a wheel: zodiac, houses, planets and aspect lines. */
|
||||
export function ChartWheel({ chart, timeKnown }: { chart: ChartResult; timeKnown: boolean }) {
|
||||
const angle = (key: string): Position | null => {
|
||||
const a = chart.angles?.[key];
|
||||
return typeof a === "object" && a !== null ? a : null;
|
||||
};
|
||||
const asc = timeKnown ? angle("ascendant") : null;
|
||||
const start = asc?.longitude ?? 0;
|
||||
const cusps = timeKnown ? (chart.houses?.cusps ?? []) : [];
|
||||
|
||||
const points = WHEEL_POINTS.map((id) => chart.points.find((p) => p.id === id)).filter((p) => p !== undefined);
|
||||
const placed = spread(
|
||||
points.map((p) => p.longitude),
|
||||
9,
|
||||
);
|
||||
|
||||
// Longitudes for the aspect line ends (planets and, with a known time, the angles).
|
||||
const ends = new Map<string, number>(points.map((p) => [p.id, p.longitude]));
|
||||
if (timeKnown) {
|
||||
for (const [key] of ANGLE_LABELS) {
|
||||
const a = angle(key);
|
||||
if (a) ends.set(key, a.longitude);
|
||||
}
|
||||
}
|
||||
const aspects = (chart.aspects ?? []).filter(
|
||||
(a) => a.aspect !== "conjunction" && ends.has(a.point1) && ends.has(a.point2),
|
||||
);
|
||||
|
||||
const description = points
|
||||
.map((p) => `${pointName(p.id)} ${signName(p.sign)} ${dms(p.degree_in_sign_dms)}`)
|
||||
.join(", ");
|
||||
|
||||
return (
|
||||
<svg
|
||||
className="chart-wheel"
|
||||
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
||||
role="img"
|
||||
aria-labelledby="wheel-title wheel-desc"
|
||||
>
|
||||
<title id="wheel-title">Születési képlet</title>
|
||||
<desc id="wheel-desc">
|
||||
{timeKnown && asc ? `Aszcendens ${signName(asc.sign)}. ` : "Születési idő nélkül, házak nélkül. "}
|
||||
{description}
|
||||
</desc>
|
||||
|
||||
{/* Zodiac ring */}
|
||||
<circle cx={C} cy={C} r={R_OUT} className="w-ring" />
|
||||
{SIGN_ORDER.map((sign, i) => {
|
||||
const [gx, gy] = xy(i * 30 + 15, (R_OUT + R_ZOD) / 2, start);
|
||||
return (
|
||||
<g key={sign}>
|
||||
<path d={arcPath(R_ZOD, R_OUT, i * 30, i * 30 + 30, start)} className={`w-sign w-${SIGN_ELEMENT[i % 4]}`} />
|
||||
<text x={f(gx)} y={f(gy)} className="w-sign-glyph" dominantBaseline="central" textAnchor="middle">
|
||||
<title>{SIGNS[sign].hu}</title>
|
||||
{SIGNS[sign].glyph}
|
||||
</text>
|
||||
</g>
|
||||
);
|
||||
})}
|
||||
{Array.from({ length: 360 }, (_, d) => {
|
||||
const len = d % 10 === 0 ? 9 : d % 5 === 0 ? 6 : 3;
|
||||
const [x1, y1] = xy(d, R_ZOD, start);
|
||||
const [x2, y2] = xy(d, R_ZOD + len, start);
|
||||
return <line key={d} x1={f(x1)} y1={f(y1)} x2={f(x2)} y2={f(y2)} className="w-tick" />;
|
||||
})}
|
||||
<circle cx={C} cy={C} r={R_ZOD} className="w-ring" />
|
||||
|
||||
{/* Houses */}
|
||||
{cusps.length === 12 && (
|
||||
<g>
|
||||
<circle cx={C} cy={C} r={R_HOUSE} className="w-ring w-faint" />
|
||||
{cusps.map((c, i) => {
|
||||
const isAngle = i % 3 === 0;
|
||||
const [x1, y1] = xy(c.longitude, R_INNER, start);
|
||||
const [x2, y2] = xy(c.longitude, isAngle ? R_OUT : R_ZOD, start);
|
||||
const next = cusps[(i + 1) % 12].longitude;
|
||||
const mid = c.longitude + (((next - c.longitude + 360) % 360) / 2);
|
||||
const [nx, ny] = xy(mid, (R_HOUSE + R_INNER) / 2, start);
|
||||
return (
|
||||
<g key={c.house}>
|
||||
<line x1={f(x1)} y1={f(y1)} x2={f(x2)} y2={f(y2)} className={isAngle ? "w-axis" : "w-cusp"} />
|
||||
<text x={f(nx)} y={f(ny)} className="w-house-num" dominantBaseline="central" textAnchor="middle">
|
||||
{c.house}
|
||||
</text>
|
||||
</g>
|
||||
);
|
||||
})}
|
||||
{ANGLE_LABELS.map(([key, label]) => {
|
||||
const a = angle(key);
|
||||
if (!a) return null;
|
||||
const [x, y] = xy(a.longitude, R_LABEL, start);
|
||||
return (
|
||||
<text key={key} x={f(x)} y={f(y)} className="w-axis-label" dominantBaseline="central" textAnchor="middle">
|
||||
<title>
|
||||
{pointName(key)}: {dms(a.degree_in_sign_dms)} {signName(a.sign)}
|
||||
</title>
|
||||
{label}
|
||||
</text>
|
||||
);
|
||||
})}
|
||||
</g>
|
||||
)}
|
||||
|
||||
{/* Aspects */}
|
||||
<circle cx={C} cy={C} r={R_INNER} className="w-ring w-inner" />
|
||||
{aspects.map((a) => {
|
||||
const [x1, y1] = xy(ends.get(a.point1)!, R_INNER, start);
|
||||
const [x2, y2] = xy(ends.get(a.point2)!, R_INNER, start);
|
||||
const kind = ASPECTS[a.aspect]?.kind ?? "neutral";
|
||||
const strength = a.max_orb > 0 ? 1 - Math.min(a.orb / a.max_orb, 1) : 0.5;
|
||||
return (
|
||||
<line
|
||||
key={`${a.point1}-${a.point2}-${a.aspect}`}
|
||||
x1={f(x1)}
|
||||
y1={f(y1)}
|
||||
x2={f(x2)}
|
||||
y2={f(y2)}
|
||||
className={`w-aspect w-${kind}`}
|
||||
strokeOpacity={(0.3 + 0.7 * strength).toFixed(2)}
|
||||
strokeWidth={(0.8 + 1.4 * strength).toFixed(2)}
|
||||
>
|
||||
<title>
|
||||
{pointName(a.point1)} {ASPECTS[a.aspect]?.hu ?? a.aspect} {pointName(a.point2)} (orbis{" "}
|
||||
{orbText(a.orb)})
|
||||
</title>
|
||||
</line>
|
||||
);
|
||||
})}
|
||||
|
||||
{/* Planets */}
|
||||
{points.map((p, i) => {
|
||||
const [t1x, t1y] = xy(p.longitude, R_ZOD, start);
|
||||
const [t2x, t2y] = xy(p.longitude, R_ZOD - 8, start);
|
||||
const [lx, ly] = xy(placed[i], R_GLYPH + 14, start);
|
||||
const [gx, gy] = xy(placed[i], R_GLYPH, start);
|
||||
const [dx, dy] = xy(placed[i], R_DEG, start);
|
||||
const [ex, ey] = xy(p.longitude, R_INNER, start);
|
||||
const deg = Number.parseInt(p.degree_in_sign_dms, 10);
|
||||
return (
|
||||
<g key={p.id} className="w-point">
|
||||
<title>
|
||||
{pointName(p.id)}: {dms(p.degree_in_sign_dms)} {signName(p.sign)}
|
||||
{p.retrograde ? ", retrográd" : ""}
|
||||
{timeKnown && p.house ? `, ${p.house}. ház` : ""}
|
||||
</title>
|
||||
<line x1={f(t1x)} y1={f(t1y)} x2={f(t2x)} y2={f(t2y)} className="w-point-tick" />
|
||||
<line x1={f(t2x)} y1={f(t2y)} x2={f(lx)} y2={f(ly)} className="w-leader" />
|
||||
<text x={f(gx)} y={f(gy)} className="w-point-glyph" dominantBaseline="central" textAnchor="middle">
|
||||
{POINTS[p.id]?.glyph ?? p.id}
|
||||
</text>
|
||||
<text x={f(dx)} y={f(dy)} className="w-point-deg" dominantBaseline="central" textAnchor="middle">
|
||||
{deg}°{p.retrograde ? "℞" : ""}
|
||||
</text>
|
||||
<circle cx={f(ex)} cy={f(ey)} r={2.2} className="w-end" />
|
||||
</g>
|
||||
);
|
||||
})}
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,145 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
import { api, errorText } from "@/lib/api";
|
||||
import type { Analysis } from "@/lib/types";
|
||||
|
||||
import { AnalysisView } from "./AnalysisView";
|
||||
|
||||
const POLL_MS = 5000;
|
||||
const MAX_POLLS = 120; // 10 minutes
|
||||
|
||||
/**
|
||||
* The paid detailed analysis of a chart: offer (with the units left),
|
||||
* confirmation, progress while the worker writes it, and the finished text.
|
||||
*/
|
||||
export function DetailedAnalysis({
|
||||
chartId,
|
||||
initial,
|
||||
left,
|
||||
}: {
|
||||
chartId: string;
|
||||
initial: Analysis | null;
|
||||
left: number;
|
||||
}) {
|
||||
const [analysis, setAnalysis] = useState<Analysis | null>(initial);
|
||||
const [remaining, setRemaining] = useState(left);
|
||||
const [confirming, setConfirming] = useState(false);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const waiting = analysis?.status === "pending" || analysis?.status === "running";
|
||||
|
||||
useEffect(() => {
|
||||
if (!waiting || !analysis) return;
|
||||
let polls = 0;
|
||||
let stopped = false;
|
||||
let timer: ReturnType<typeof setTimeout> | undefined;
|
||||
const tick = async () => {
|
||||
try {
|
||||
const next = await api<Analysis>(`/analyses/${analysis.id}`);
|
||||
if (stopped) return;
|
||||
setAnalysis(next);
|
||||
if (next.status === "done" || next.status === "failed") return;
|
||||
} catch {
|
||||
// try again on the next tick
|
||||
}
|
||||
if (++polls < MAX_POLLS) timer = setTimeout(tick, POLL_MS);
|
||||
};
|
||||
timer = setTimeout(tick, POLL_MS);
|
||||
return () => {
|
||||
stopped = true;
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [waiting, analysis]);
|
||||
|
||||
async function request() {
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
try {
|
||||
const next = await api<Analysis>(`/charts/${chartId}/analyses`, { method: "POST" });
|
||||
setAnalysis(next);
|
||||
if (next.credits_charged > 0) setRemaining((n) => n - 1);
|
||||
setConfirming(false);
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (analysis?.status === "done" && analysis.content) {
|
||||
return (
|
||||
<section className="card analysis-card" aria-label="Részletes elemzés">
|
||||
<span className="eyebrow">Részletes elemzés</span>
|
||||
<AnalysisView content={analysis.content} />
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="card analysis-card" aria-labelledby="detailed-title" aria-busy={waiting}>
|
||||
<span className="eyebrow">Részletes elemzés</span>
|
||||
{waiting ? (
|
||||
<>
|
||||
<h2 id="detailed-title">Készül az elemzésed</h2>
|
||||
<p className="muted" role="status">
|
||||
A mesterséges intelligencia most írja meg a hat fejezetet a képleted alapján. Ez általában 1–2 perc; nyugodtan
|
||||
elhagyhatod az oldalt, az elemzés elkészül és itt vár.
|
||||
</p>
|
||||
<div className="skeleton" aria-hidden="true">
|
||||
<span />
|
||||
<span />
|
||||
<span />
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<h2 id="detailed-title">Az egész képleted, fejezetekre bontva</h2>
|
||||
<p className="muted">
|
||||
Kb. 1500 szó hat fejezetben: személyiség, érzelmek, gondolkodás, szerelem és kapcsolatok, hivatás, fejlődési
|
||||
út. A végén erősségek, kihívások és útravaló. Csak a képleted pozíciói alapján készül.
|
||||
</p>
|
||||
{analysis?.status === "failed" && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
Az előző kérés nem sikerült, az elemzést visszaadtuk a keretedbe. Próbáld újra.
|
||||
</p>
|
||||
)}
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
{remaining > 0 ? (
|
||||
confirming ? (
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={request} disabled={busy}>
|
||||
{busy ? "Indítás…" : "Igen, kérem az elemzést"}
|
||||
</button>
|
||||
<button type="button" className="btn btn-ghost" onClick={() => setConfirming(false)} disabled={busy}>
|
||||
Mégse
|
||||
</button>
|
||||
<span className="hint">Ez felhasznál 1-et a {remaining} képletelemzésedből.</span>
|
||||
</div>
|
||||
) : (
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={() => setConfirming(true)}>
|
||||
Részletes elemzés kérése
|
||||
</button>
|
||||
<span className="hint">Még {remaining} képletelemzésed van.</span>
|
||||
</div>
|
||||
)
|
||||
) : (
|
||||
<div className="form-actions">
|
||||
<Link href="/pelda" className="btn">
|
||||
Példa megtekintése
|
||||
</Link>
|
||||
<span className="hint">A részletes elemzés fizetős; a csomagok hamarosan elérhetők.</span>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
"use client";
|
||||
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
|
||||
import { api } from "@/lib/api";
|
||||
|
||||
export function LogoutButton() {
|
||||
const router = useRouter();
|
||||
const [busy, setBusy] = useState(false);
|
||||
async function logout() {
|
||||
setBusy(true);
|
||||
try {
|
||||
await api("/auth/logout", { method: "POST" });
|
||||
} catch {
|
||||
// The session may already be gone; go to the login page either way.
|
||||
}
|
||||
window.google?.accounts.id.disableAutoSelect();
|
||||
router.replace("/belepes");
|
||||
router.refresh();
|
||||
}
|
||||
return (
|
||||
<button type="button" className="btn btn-sm" onClick={logout} disabled={busy}>
|
||||
Kilépés
|
||||
</button>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { usePathname } from "next/navigation";
|
||||
|
||||
export function NavLinks({ links }: { links: { href: string; label: string }[] }) {
|
||||
const pathname = usePathname();
|
||||
return (
|
||||
<nav className="nav" aria-label="Fő navigáció">
|
||||
{links.map((l) => (
|
||||
<Link key={l.href} href={l.href} aria-current={pathname.startsWith(l.href) ? "page" : undefined}>
|
||||
{l.label}
|
||||
</Link>
|
||||
))}
|
||||
</nav>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
/** Model text: `**bold**` becomes <strong>, the rest stays plain text. */
|
||||
export function Rich({ text }: { text: string }) {
|
||||
return (
|
||||
<>
|
||||
{text.split(/(\*\*[^*]+\*\*)/g).map((part, i) =>
|
||||
part.startsWith("**") && part.endsWith("**") ? <strong key={i}>{part.slice(2, -2)}</strong> : part,
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
/** Paragraphs separated by blank lines. */
|
||||
export function Paragraphs({ text }: { text: string }) {
|
||||
return (
|
||||
<>
|
||||
{text
|
||||
.split(/\n\s*\n/)
|
||||
.map((p) => p.trim())
|
||||
.filter(Boolean)
|
||||
.map((p, i) => (
|
||||
<p key={i}>
|
||||
<Rich text={p} />
|
||||
</p>
|
||||
))}
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
import Link from "next/link";
|
||||
|
||||
import type { Me } from "@/lib/types";
|
||||
|
||||
import { LogoutButton } from "./LogoutButton";
|
||||
import { NavLinks } from "./NavLinks";
|
||||
|
||||
export function Logo() {
|
||||
return (
|
||||
<Link href="/" className="logo">
|
||||
sors<span>fonalak</span>
|
||||
</Link>
|
||||
);
|
||||
}
|
||||
|
||||
export function SiteHeader({ me }: { me: Me }) {
|
||||
const links = [
|
||||
{ href: "/keplet", label: "Képletem" },
|
||||
{ href: "/profil", label: "Profil" },
|
||||
];
|
||||
if (me.user.roles.includes("admin")) links.push({ href: "/admin", label: "Admin" });
|
||||
return (
|
||||
<header className="site-header">
|
||||
<Logo />
|
||||
<NavLinks links={links} />
|
||||
<div className="who">
|
||||
<span>{me.user.display_name || me.user.email}</span>
|
||||
<LogoutButton />
|
||||
</div>
|
||||
</header>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
// Decorative zodiac wheel for the login page (pure SVG, no data needed).
|
||||
|
||||
const GLYPHS = ["♈", "♉", "♊", "♋", "♌", "♍", "♎", "♏", "♐", "♑", "♒", "♓"];
|
||||
// A few planets of a sample sky, for the aspect lines in the middle.
|
||||
const SAMPLE = [12, 75, 131, 200, 247, 302, 338];
|
||||
|
||||
function point(deg: number, r: number) {
|
||||
const t = ((180 - deg) * Math.PI) / 180;
|
||||
return { x: 50 + r * Math.cos(t), y: 50 - r * Math.sin(t) };
|
||||
}
|
||||
|
||||
export function ZodiacWheel({ className }: { className?: string }) {
|
||||
const lines: { a: number; b: number; hard: boolean }[] = [];
|
||||
SAMPLE.forEach((a, i) =>
|
||||
SAMPLE.slice(i + 1).forEach((b) => {
|
||||
let d = Math.abs(a - b) % 360;
|
||||
if (d > 180) d = 360 - d;
|
||||
if (Math.abs(d - 120) < 8 || Math.abs(d - 60) < 6) lines.push({ a, b, hard: false });
|
||||
else if (Math.abs(d - 90) < 7 || Math.abs(d - 180) < 8) lines.push({ a, b, hard: true });
|
||||
}),
|
||||
);
|
||||
return (
|
||||
<svg className={className} viewBox="0 0 100 100" aria-hidden="true">
|
||||
<circle cx="50" cy="50" r="49" fill="none" stroke="#2c3654" strokeWidth="0.5" />
|
||||
<circle cx="50" cy="50" r="38" fill="none" stroke="#2c3654" strokeWidth="0.35" />
|
||||
<circle cx="50" cy="50" r="24" fill="#0f1426" stroke="#263049" strokeWidth="0.35" />
|
||||
{GLYPHS.map((_, i) => {
|
||||
const a = point(i * 30, 38);
|
||||
const b = point(i * 30, 49);
|
||||
return <line key={`d${i}`} x1={a.x} y1={a.y} x2={b.x} y2={b.y} stroke="#263049" strokeWidth="0.35" />;
|
||||
})}
|
||||
{GLYPHS.map((g, i) => {
|
||||
const p = point(i * 30 + 15, 43.5);
|
||||
return (
|
||||
<text
|
||||
key={g}
|
||||
x={p.x}
|
||||
y={p.y}
|
||||
textAnchor="middle"
|
||||
dominantBaseline="central"
|
||||
fontSize="5"
|
||||
fill={i % 3 === 0 ? "#d9b46a" : "#5a6790"}
|
||||
style={{ fontFamily: "var(--font-symbols)" }}
|
||||
>
|
||||
{g}
|
||||
{"︎"}
|
||||
</text>
|
||||
);
|
||||
})}
|
||||
{lines.map(({ a, b, hard }) => {
|
||||
const p = point(a, 24);
|
||||
const q = point(b, 24);
|
||||
return (
|
||||
<line
|
||||
key={`${a}-${b}`}
|
||||
x1={p.x}
|
||||
y1={p.y}
|
||||
x2={q.x}
|
||||
y2={q.y}
|
||||
stroke={hard ? "#f08a4b" : "#7fb0ff"}
|
||||
strokeWidth="0.4"
|
||||
strokeDasharray={hard ? undefined : "1.4 0.8"}
|
||||
opacity="0.8"
|
||||
/>
|
||||
);
|
||||
})}
|
||||
{SAMPLE.map((d) => {
|
||||
const p = point(d, 24);
|
||||
return <circle key={d} cx={p.x} cy={p.y} r="0.9" fill="#ece6d8" />;
|
||||
})}
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,598 @@
|
||||
{
|
||||
"birth": "1990. március 15., 14:30, Szeged",
|
||||
"summary": {
|
||||
"title": "Mély víz, ragyogó szív",
|
||||
"summary": "A Nap és a Merkúr a Halak jegyében, a 8. házban áll, és mivel a Nap a horoszkóp uralkodója is, az érzékenységed és a mély belső látásod adja az életed gerincét. Az Oroszlán Aszcendens kifelé ragyogást kér, a Skorpió Hold a 4. házban viszont titkos, intenzív érzelmi világot jelez, a Plútóval együtt. A legszembetűnőbb a Hold–Kiron trigon (0,1°): a régi sebeidből gyógyító empátia nőhet. A tűz hiánya miatt a kezdeményezés tudatos gyakorlást kíván, de Szaturnusz-szextiled stabil kereteket ad."
|
||||
},
|
||||
"analysis": {
|
||||
"advice": "A horoszkópod nem azt kéri, hogy válassz az Oroszlán arcod és a Halak–Skorpió mélységed között, hanem azt, hogy hidat építs közöttük. Kezdd a hétköznapokkal: a 6. ház erős hangsúlya miatt egy jól megválasztott napi ritmus a legjobb terápiád. Legyen benne mozgás, amely a hiányzó tűz elemet pótolja, legyen benne írás, amely a Halak Merkúr áramló gondolatait formába önti, és legyen benne rendszeres egyedüllét, amelyben kitisztíthatod a magadba szívott hangulatokat. Kapcsolataidban merd kimondani a mély kötődés iránti igényedet, és közben adj teret a másiknak is, ahogy a Vízöntő Vénuszod szeretné. Keresd azokat a közösségeket, csapatokat és munkákat, ahol a saját sebeidből fakadó érzékenységed valakinek konkrét segítséget jelent: az Észak-Holdcsomópontod ott vár rád, ahol nem a reflektorfényben állsz, hanem a többiekkel együtt építesz valamit. Amit rejtegetsz – a dühöd, a vágyaid, az erőd –, az nem ellenséged, hanem nyersanyag. **Minél kevésbé kontrollálod, annál inkább a tiéd.**",
|
||||
"challenges": [
|
||||
"A Skorpió Hold esése és a 4. házi Plútó–Lilith együttállás miatt hajlamos vagy elrejteni a sebezhetőségedet, és csak akkor beszélni az érzéseidről, amikor már túl nagy a nyomás.",
|
||||
"A Hold–Vénusz kvadrát a mély, kizárólagos kötődés vágya és a szabadságigény között hintáztathat, ami a kapcsolataidban közelítés és eltávolodás váltakozásaként jelenhet meg.",
|
||||
"A Plútó kvadrátja az Aszcendensre és a Holdcsomópont-tengelyre kontrollkényszert hozhat: nehezen engeded, hogy mások meglássák, mi zajlik benned.",
|
||||
"A Halak Merkúr száműzetésben és esésben nehézzé teheti a részletek, határidők és száraz tények kezelését, ha nincs körülötted külső struktúra.",
|
||||
"A túlhangsúlyos 6. ház és a Nap–Jupiter kvadrát miatt hajlamos lehetsz túlvállalni magad, és kötelességből többet adni, mint amennyit a tested és a lelked bír."
|
||||
],
|
||||
"sections": {
|
||||
"emotions": {
|
||||
"body": "A Holdad a Skorpió jegyében, a 4. házban áll, ahol esésben van: az érzelmeid nem könnyedek és nem felszínesek, hanem mindent vagy semmit jellegűek. Biztonságot nem a kényelem, hanem a mély, kipróbált bizalom ad neked. Az esés azt jelzi, hogy a sebezhetőségedet nehezen mutatod meg közvetlenül; inkább elrejted, megfigyelsz, és csak akkor nyílsz meg, ha biztos vagy a másikban. Ugyanebben a házban áll a saját jegyében uralkodó Plútó és a Lilith is: a gyökereid, a családi légkör hordozhatott ki nem mondott feszültségeket, hatalmi játszmákat vagy tabukat, és a belső világod emiatt egyfajta erődítmény lett.\n\nVan azonban egy ritka ajándékod: a Hold szinte pontos (0,1°-os) trigont alkot a Rák jegyében álló Chironnal. Ez azt jelenti, hogy a saját fájdalmaidból képes vagy valódi megértést kovácsolni mások számára. Az emberek ösztönösen megérzik, hogy nálad biztonságban lehetnek a sebeikkel. A Hold szextilje az Uránusszal és a Neptunusszal finom intuíciót és az érzelmi szabadság igényét adja: még a legmélyebb kötődésben is kell egy saját, érinthetetlen tér.\n\nA Hold szoros kvadrátja a Vénusszal és oppozíciója az MC-vel két feszültséget is jelez: amit érzelmileg igényelsz, és amit egy kapcsolattól vagy a nyilvános szerepedtől várnak, nem mindig fedi egymást. Az öt vízjegyű bolygó miatt szivacsként szívod magadba a hangulatokat, ezért rendszeres egyedüllétre és érzelmi „tisztálkodásra” van szükséged.",
|
||||
"title": "Erődítmény a mélyben, gyógyító kapukkal"
|
||||
},
|
||||
"growth": {
|
||||
"body": "A fejlődésed legfontosabb iránytűje a Holdcsomópont-tengely. A Dél-Holdcsomópont az Oroszlán jegyében, a 12. házban áll: ismerős terep számodra a visszahúzódás, a titokban dédelgetett különlegesség, az a vágy, hogy valaki magától vegye észre, mennyit érsz. Az Észak-Holdcsomópont a Vízöntőben, a 6. házban, az Aszcendenseddel szemben arra hív, hogy a személyes ragyogás helyett a konkrét, hétköznapi hozzájárulásban, a csapatmunkában, az „egy vagyok a sok közül” élményében találd meg önmagad.\n\nEzt az utat a Plútó kvadrátja feszíti meg, amely szorosan éri az Aszcendenst és a Holdcsomópont-tengelyt is. A 4. házból érkező családi és belső minták, a kontroll iránti igény újra és újra próbára tesznek: akkor haladsz, amikor elengeded azt, amit görcsösen irányítani akarsz. Az Észak-Holdcsomópont szoros kvadrátja a Lilithhez, valamint a Plútó–Lilith együttállás azt mutatja, hogy az elfojtott düh, a nyers ösztönök, a vágyak is a fejlődésed részei – nem elrejteni, hanem tudatosan beépíteni kell őket. A Neptunusz szinte pontos szextilje a Lilithhez ebben segít: a művészet, a spiritualitás vagy a testmunka biztonságos csatornát adhat ennek az erőnek.\n\nAz Uránusz szoros oppozíciója a Chironnal régi sebet jelez a valahová tartozás körül: lehet, hogy gyakran érezted magad másnak, kívülállónak a csoportokban. A gyógyulás a kreatív, egyedi önkifejezésen át vezet, és itt jön képbe a Hold–Chiron trigon: a sebből forrás lehet. A saját jegyében álló Szaturnusz pedig megtanít arra, hogy az érettség a türelmes, napi gyakorlásban születik.",
|
||||
"title": "A rejtekhelyről a közösség szolgálatába"
|
||||
},
|
||||
"love": {
|
||||
"body": "A Vénuszod és a Marsod együtt áll a Vízöntő jegyében, a 6. házban. Vonz az eredetiség, az intelligencia, a szellemi frissesség; számodra a szerelem jó esetben barátságból, közös munkából, közös ügyekből nő ki. A szeretetedet sokszor gyakorlati tettekkel fejezed ki – segítesz, megszervezel, ott vagy a hétköznapokban. A Descendensed szintén Vízöntő: olyan társat keresel, aki független, kicsit szokatlan, néha hűvösebb, és aki az Oroszlán Aszcendensed drámáját nyugodt, tárgyilagos jelenléttel ellensúlyozza. A 7. ház hagyományos uralkodója, a Szaturnusz a saját jegyében áll a 6. házban: a kötődést komolyan veszed, lassan építed, és felelősségként is megéled.\n\nA fő feszültséget a Hold és a Vénusz szoros kvadrátja adja, amelyet a Hold–Mars kvadrát is erősít. A Skorpió Hold kizárólagosságot, mély összeolvadást kíván, a Vízöntő Vénusz viszont teret és szabadságot. Ezért hintázhatsz a közelség és a távolság között, vagy olyan partnereket vonzhatsz, akik érzelmileg visszafogottak, miközben te mélységre vágysz. A 4. házi Skorpió Juno megerősíti: a hűség és a lelki elköteleződés számodra nem alku tárgya.\n\nAz 5. ház Nyilas csúcsán belül álló Bak Uránusz és Neptunusz a romantikát idealizmussal és váratlansággal fűszerezi: hirtelen fellángolások, ábrándok, szokatlan kapcsolódások jellemezhetik. Mivel kilenc bolygód a nyugati féltekén van, az életedet erősen formálják a kapcsolataid; a feladatod, hogy bennük önmagad maradj.",
|
||||
"title": "Szabadság és mély kötődés kettős vonzása"
|
||||
},
|
||||
"mind": {
|
||||
"body": "A Merkúrod a Halak jegyében áll, száműzetésben és esésben, a Nap mellett a 8. házban. Ez nem gyengeséget jelent, hanem egy másfajta gondolkodást: asszociatív, képekben és hangulatokban működő elmét, amely a ki nem mondottat is meghallja. A száraz, lineáris logika és az apró részletek kifáraszthatnak, de amit mások csak sejtenek, azt te gyakran már érted. A 8. ház miatt különösen vonz minden, ami a felszín alatt van: a lélektan, a titkok, az emberi motivációk, az élet nagy átmenetei.\n\nKét fontos támasza van ennek az áramló elmének. A Merkúr szextilje a Szaturnusszal fegyelmet és formaérzéket ad: képes vagy a megérzéseidet rendszerbe foglalni, végiggondolt szöveggé, tervvé alakítani. A Merkúr trigonja a Plútóval kutató, átható figyelmet jelez, amely nem elégszik meg a látszattal – ez a kutatásban, a pszichológiában, az írásban vagy bármilyen mélyre ásó munkában kiváló adottság.\n\nA 3. ház Mérleg csúcsa és annak uralkodója, a 6. házi Vízöntő Vénusz diplomatikus, kiegyensúlyozott kommunikációt sejtet, amely a hétköznapi, gyakorlati helyzetekben és egyenrangú partnerek között bontakozik ki a legjobban. A 9. ház Kos csúcsa és az ott álló Pallasz bátor, stratégiai világnézetet ad; uralkodója, a Vízöntő Mars szerint leginkább cselekvés közben, haladó eszméken keresztül tanulsz. Érdemes mindent leírnod: a Halak elme gondolatai papíron kapnak tartást.",
|
||||
"title": "Képekben és mélységekben gondolkodó elme"
|
||||
},
|
||||
"personality": {
|
||||
"body": "Az Oroszlán Aszcendens első benyomásra meleg, méltóságteljes, jelenlétével teret betöltő embert mutat, aki szeretné, ha látnák és elismernék. A horoszkóp uralkodója, a Nap azonban a Halak jegyében, a 8. házban áll, így a fényed nem kifelé, hanem befelé, a mélybe sugárzik. Önmagadat a nagy belső átalakulásokon, az intenzív kötődéseken, a válságokból való újjászületésen keresztül ismered meg. Mivel nappali horoszkópod van, a Nap a vezető fény: az identitásod kulcsa éppen ez a halaki érzékenység, nem pedig az a szerep, amelyet a külvilág elvár tőled.\n\nA Skorpió Hold a 4. házban, valamint a Plútó szoros kvadrátja az Aszcendensre feszültséget teremt aközött, amit mutatsz, és amit valójában érzel. Az emberek megérzik benned az intenzitást, néha erősebbnek, sőt félelmetesebbnek látnak, mint amilyennek gondolod magad. Ösztönösen ellenőrzöd, mit engedsz látni magadból.\n\nA Nap–Merkúr együttállás és a Nap szoros szextilje a saját jegyében álló Szaturnuszhoz szerencsés ellensúlyt ad: a Halak folyékonyságát formába tudod önteni, az álmaidból kézzelfogható eredmény születhet. A tűz elem szinte teljesen hiányzik a bolygóid közül – egyedül az Aszcendens hordozza –, ezért a lelkesedést, a lendületet tudatosan kell táplálnod. A 8. házi Kos Szerencsepont azt sugallja, hogy akkor találsz rá a saját szerencsédre, amikor a mélységben is mersz bátran kezdeményezni.",
|
||||
"title": "Oroszlánarc, óceáni lélek"
|
||||
},
|
||||
"work": {
|
||||
"body": "A Medium Coeli a Bika jegyében áll: hivatásod a kézzelfogható értékek, a szépség, a stabilitás és a tartós eredmények felé mutat. Az MC uralkodója, a Vénusz a 6. házban, a Vízöntőben áll, vagyis a karriered elsősorban a napi munkából, a szolgálatból, az újító szellemű csapatokból épül fel, nem pedig a látványos címekből. A Vénusz és a Mars kvadrátja az MC-re jelzi, hogy ami örömet okoz, és amit a státusz vagy a környezet elvár, nem mindig esik egybe – ezt a feszültséget alkotó energiává alakíthatod. Az Uránusz szoros és a Neptunusz tágabb trigonja az MC-re szokatlan, kreatív, intuitív pályákat támogat, a Chiron szextilje pedig a segítő, gyógyító munkát. A Hold–MC oppozíció miatt a magánéleted és a belső igényeid nem szorulhatnak háttérbe a karrier mögött.\n\nA 6. ház a horoszkópod egyik súlypontja: itt áll a saját jegyében erős Szaturnusz, a Vénusz, a Mars és az Észak-Holdcsomópont. Megbízható, alapos munkaerő vagy, akinek értelmes, jól szervezett rutinra van szüksége. A Nap–Szaturnusz szextil kitartást ad, de figyelj a túlhajszoltságra.\n\nAz anyagiakat a 2. ház Szűz csúcsa és annak uralkodója, a 8. házi Halak Merkúr mutatja: jövedelmed közös erőforrásokon, együttműködéseken, illetve intuíciót és mélylélektani érzéket igénylő munkán keresztül is érkezhet. A 11. házban álló, exaltált és határon túli Jupiter a közösségeken, hálózatokon keresztül nyit lehetőségeket, a Nap–Jupiter kvadrát viszont arra int, hogy ne vállalj túl sokat egyszerre.",
|
||||
"title": "Hivatás a hétköznapi szolgálatból"
|
||||
}
|
||||
},
|
||||
"strengths": [
|
||||
"A Hold és a Chiron szinte pontos trigonja révén a saját sebeidből valódi gyógyító megértést tudsz adni másoknak.",
|
||||
"A Merkúr–Plútó trigon és a 8. házi hangsúly átható, kutató figyelmet ad, amely a felszín alatti igazságokat is megtalálja.",
|
||||
"A Nap és a Merkúr szextilje a saját jegyében álló Szaturnuszhoz segít, hogy az intuícióidat fegyelmezetten, kézzelfogható formába öntsd.",
|
||||
"A 6. házi Szaturnusz, Vénusz és Mars megbízható, elkötelezett és újító szellemű munkamorált jelez.",
|
||||
"Az Uránusz és a Neptunusz trigonja az MC-re eredeti, kreatív és intuitív hivatási utakat nyit meg előtted."
|
||||
],
|
||||
"summary": "A horoszkópod kettősségre épül: az Oroszlán Aszcendens kifelé meleg, magabiztos jelenlétet mutat, miközben a horoszkóp uralkodója, a 8. házi Halak Nap a lélek rejtett mélységei felé húz. Az öt vízjegyű bolygó és a tűz szinte teljes hiánya azt jelzi, hogy elsősorban érzelmeken, megérzéseken át éled meg a világot, a lendületet pedig tudatosan kell táplálnod. A 6. ház Vízöntő bolygói és a saját jegyében álló Bak Szaturnusz a szolgálatra és rendszerekre épülő munkát emelik ki. A Holdcsomópontok tengelye arra hív, hogy a rejtett különlegesség helyett a közösségért végzett, konkrét munkában találd meg önmagad.",
|
||||
"title": "Oroszlánarc, óceáni mélység"
|
||||
},
|
||||
"source": {
|
||||
"analysis_model": "anthropic/claude-opus-5.5",
|
||||
"summary_model": "anthropic/claude-sonnet-5.5",
|
||||
"prompt_version": "v2",
|
||||
"generated": "2026-11-16"
|
||||
},
|
||||
"chart": {
|
||||
"points": [
|
||||
{
|
||||
"id": "sun",
|
||||
"kind": "luminary",
|
||||
"longitude": 354.7020205265418,
|
||||
"sign": "pisces",
|
||||
"degree_in_sign_dms": "24°42'07\"",
|
||||
"retrograde": false,
|
||||
"house": 8
|
||||
},
|
||||
{
|
||||
"id": "moon",
|
||||
"kind": "luminary",
|
||||
"longitude": 220.49114909682726,
|
||||
"sign": "scorpio",
|
||||
"degree_in_sign_dms": "10°29'28\"",
|
||||
"retrograde": false,
|
||||
"house": 4
|
||||
},
|
||||
{
|
||||
"id": "mercury",
|
||||
"kind": "planet",
|
||||
"longitude": 351.33722192486994,
|
||||
"sign": "pisces",
|
||||
"degree_in_sign_dms": "21°20'14\"",
|
||||
"retrograde": false,
|
||||
"house": 8
|
||||
},
|
||||
{
|
||||
"id": "venus",
|
||||
"kind": "planet",
|
||||
"longitude": 309.19074190449606,
|
||||
"sign": "aquarius",
|
||||
"degree_in_sign_dms": "9°11'27\"",
|
||||
"retrograde": false,
|
||||
"house": 6
|
||||
},
|
||||
{
|
||||
"id": "mars",
|
||||
"kind": "planet",
|
||||
"longitude": 302.88767438529624,
|
||||
"sign": "aquarius",
|
||||
"degree_in_sign_dms": "2°53'16\"",
|
||||
"retrograde": false,
|
||||
"house": 6
|
||||
},
|
||||
{
|
||||
"id": "jupiter",
|
||||
"kind": "planet",
|
||||
"longitude": 91.38301888050613,
|
||||
"sign": "cancer",
|
||||
"degree_in_sign_dms": "1°22'59\"",
|
||||
"retrograde": false,
|
||||
"house": 11
|
||||
},
|
||||
{
|
||||
"id": "saturn",
|
||||
"kind": "planet",
|
||||
"longitude": 293.34036487171517,
|
||||
"sign": "capricorn",
|
||||
"degree_in_sign_dms": "23°20'25\"",
|
||||
"retrograde": false,
|
||||
"house": 6
|
||||
},
|
||||
{
|
||||
"id": "uranus",
|
||||
"kind": "planet",
|
||||
"longitude": 279.22113659703035,
|
||||
"sign": "capricorn",
|
||||
"degree_in_sign_dms": "9°13'16\"",
|
||||
"retrograde": false,
|
||||
"house": 5
|
||||
},
|
||||
{
|
||||
"id": "neptune",
|
||||
"kind": "planet",
|
||||
"longitude": 284.2942723082604,
|
||||
"sign": "capricorn",
|
||||
"degree_in_sign_dms": "14°17'39\"",
|
||||
"retrograde": false,
|
||||
"house": 5
|
||||
},
|
||||
{
|
||||
"id": "pluto",
|
||||
"kind": "planet",
|
||||
"longitude": 227.6165096130519,
|
||||
"sign": "scorpio",
|
||||
"degree_in_sign_dms": "17°36'59\"",
|
||||
"retrograde": true,
|
||||
"house": 4
|
||||
},
|
||||
{
|
||||
"id": "north_node",
|
||||
"kind": "lunar_node",
|
||||
"longitude": 315.7509954251126,
|
||||
"sign": "aquarius",
|
||||
"degree_in_sign_dms": "15°45'04\"",
|
||||
"retrograde": true,
|
||||
"house": 6
|
||||
},
|
||||
{
|
||||
"id": "south_node",
|
||||
"kind": "lunar_node",
|
||||
"longitude": 135.7509954251126,
|
||||
"sign": "leo",
|
||||
"degree_in_sign_dms": "15°45'04\"",
|
||||
"retrograde": true,
|
||||
"house": 12
|
||||
},
|
||||
{
|
||||
"id": "lilith",
|
||||
"kind": "lunar_apogee",
|
||||
"longitude": 224.6507126308452,
|
||||
"sign": "scorpio",
|
||||
"degree_in_sign_dms": "14°39'03\"",
|
||||
"retrograde": false,
|
||||
"house": 4
|
||||
},
|
||||
{
|
||||
"id": "chiron",
|
||||
"kind": "centaur",
|
||||
"longitude": 100.56746556817768,
|
||||
"sign": "cancer",
|
||||
"degree_in_sign_dms": "10°34'03\"",
|
||||
"retrograde": false,
|
||||
"house": 11
|
||||
},
|
||||
{
|
||||
"id": "ceres",
|
||||
"kind": "asteroid",
|
||||
"longitude": 85.72026820145419,
|
||||
"sign": "gemini",
|
||||
"degree_in_sign_dms": "25°43'13\"",
|
||||
"retrograde": false,
|
||||
"house": 11
|
||||
},
|
||||
{
|
||||
"id": "pallas",
|
||||
"kind": "asteroid",
|
||||
"longitude": 27.633977112274877,
|
||||
"sign": "aries",
|
||||
"degree_in_sign_dms": "27°38'02\"",
|
||||
"retrograde": false,
|
||||
"house": 9
|
||||
},
|
||||
{
|
||||
"id": "juno",
|
||||
"kind": "asteroid",
|
||||
"longitude": 235.08263282322608,
|
||||
"sign": "scorpio",
|
||||
"degree_in_sign_dms": "25°04'57\"",
|
||||
"retrograde": true,
|
||||
"house": 4
|
||||
},
|
||||
{
|
||||
"id": "vesta",
|
||||
"kind": "asteroid",
|
||||
"longitude": 353.17798727870365,
|
||||
"sign": "pisces",
|
||||
"degree_in_sign_dms": "23°10'41\"",
|
||||
"retrograde": false,
|
||||
"house": 8
|
||||
}
|
||||
],
|
||||
"angles": {
|
||||
"ascendant": {
|
||||
"longitude": 139.38757367564722,
|
||||
"sign": "leo",
|
||||
"degree_in_sign_dms": "19°23'15\""
|
||||
},
|
||||
"midheaven": {
|
||||
"longitude": 37.906526331496515,
|
||||
"sign": "taurus",
|
||||
"degree_in_sign_dms": "7°54'23\""
|
||||
},
|
||||
"descendant": {
|
||||
"longitude": 319.3875736756472,
|
||||
"sign": "aquarius",
|
||||
"degree_in_sign_dms": "19°23'15\""
|
||||
},
|
||||
"imum_coeli": {
|
||||
"longitude": 217.9065263314965,
|
||||
"sign": "scorpio",
|
||||
"degree_in_sign_dms": "7°54'23\""
|
||||
},
|
||||
"vertex": {
|
||||
"longitude": 280.6161822700242,
|
||||
"sign": "capricorn",
|
||||
"degree_in_sign_dms": "10°36'58\""
|
||||
},
|
||||
"antivertex": {
|
||||
"longitude": 100.61618227002418,
|
||||
"sign": "cancer",
|
||||
"degree_in_sign_dms": "10°36'58\""
|
||||
},
|
||||
"east_point": {
|
||||
"longitude": 123.24182588104142,
|
||||
"sign": "leo",
|
||||
"degree_in_sign_dms": "3°14'31\""
|
||||
}
|
||||
},
|
||||
"houses": {
|
||||
"cusps": [
|
||||
{
|
||||
"house": 1,
|
||||
"longitude": 139.38757367564722,
|
||||
"sign": "leo",
|
||||
"degree_in_sign_dms": "19°23'15\""
|
||||
},
|
||||
{
|
||||
"house": 2,
|
||||
"longitude": 159.59104073098746,
|
||||
"sign": "virgo",
|
||||
"degree_in_sign_dms": "9°35'28\""
|
||||
},
|
||||
{
|
||||
"house": 3,
|
||||
"longitude": 185.2461132274011,
|
||||
"sign": "libra",
|
||||
"degree_in_sign_dms": "5°14'46\""
|
||||
},
|
||||
{
|
||||
"house": 4,
|
||||
"longitude": 217.9065263314965,
|
||||
"sign": "scorpio",
|
||||
"degree_in_sign_dms": "7°54'23\""
|
||||
},
|
||||
{
|
||||
"house": 5,
|
||||
"longitude": 255.40343836126232,
|
||||
"sign": "sagittarius",
|
||||
"degree_in_sign_dms": "15°24'12\""
|
||||
},
|
||||
{
|
||||
"house": 6,
|
||||
"longitude": 290.4213326265583,
|
||||
"sign": "capricorn",
|
||||
"degree_in_sign_dms": "20°25'17\""
|
||||
},
|
||||
{
|
||||
"house": 7,
|
||||
"longitude": 319.3875736756472,
|
||||
"sign": "aquarius",
|
||||
"degree_in_sign_dms": "19°23'15\""
|
||||
},
|
||||
{
|
||||
"house": 8,
|
||||
"longitude": 339.59104073098746,
|
||||
"sign": "pisces",
|
||||
"degree_in_sign_dms": "9°35'28\""
|
||||
},
|
||||
{
|
||||
"house": 9,
|
||||
"longitude": 5.246113227401111,
|
||||
"sign": "aries",
|
||||
"degree_in_sign_dms": "5°14'46\""
|
||||
},
|
||||
{
|
||||
"house": 10,
|
||||
"longitude": 37.906526331496515,
|
||||
"sign": "taurus",
|
||||
"degree_in_sign_dms": "7°54'23\""
|
||||
},
|
||||
{
|
||||
"house": 11,
|
||||
"longitude": 75.4034383612623,
|
||||
"sign": "gemini",
|
||||
"degree_in_sign_dms": "15°24'12\""
|
||||
},
|
||||
{
|
||||
"house": 12,
|
||||
"longitude": 110.42133262655831,
|
||||
"sign": "cancer",
|
||||
"degree_in_sign_dms": "20°25'17\""
|
||||
}
|
||||
]
|
||||
},
|
||||
"aspects": [
|
||||
{
|
||||
"point1": "moon",
|
||||
"point2": "chiron",
|
||||
"aspect": "trine",
|
||||
"orb": 0.07631647135042385,
|
||||
"max_orb": 4.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "neptune",
|
||||
"point2": "lilith",
|
||||
"aspect": "sextile",
|
||||
"orb": 0.3564403225847741,
|
||||
"max_orb": 4.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "north_node",
|
||||
"point2": "lilith",
|
||||
"aspect": "square",
|
||||
"orb": 1.1002827942674003,
|
||||
"max_orb": 4.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "moon",
|
||||
"point2": "uranus",
|
||||
"aspect": "sextile",
|
||||
"orb": 1.2700124997969056,
|
||||
"max_orb": 7.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "venus",
|
||||
"point2": "midheaven",
|
||||
"aspect": "square",
|
||||
"orb": 1.2842155729995284,
|
||||
"max_orb": 7.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "moon",
|
||||
"point2": "venus",
|
||||
"aspect": "square",
|
||||
"orb": 1.3004071923311926,
|
||||
"max_orb": 9.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "uranus",
|
||||
"point2": "midheaven",
|
||||
"aspect": "trine",
|
||||
"orb": 1.3146102655338439,
|
||||
"max_orb": 7.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "uranus",
|
||||
"point2": "chiron",
|
||||
"aspect": "opposition",
|
||||
"orb": 1.3463289711473294,
|
||||
"max_orb": 4.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "sun",
|
||||
"point2": "saturn",
|
||||
"aspect": "sextile",
|
||||
"orb": 1.3616556548266203,
|
||||
"max_orb": 7.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "pluto",
|
||||
"point2": "ascendant",
|
||||
"aspect": "square",
|
||||
"orb": 1.7710640625953147,
|
||||
"max_orb": 7.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "pluto",
|
||||
"point2": "north_node",
|
||||
"aspect": "square",
|
||||
"orb": 1.8655141879393113,
|
||||
"max_orb": 4.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "mercury",
|
||||
"point2": "saturn",
|
||||
"aspect": "sextile",
|
||||
"orb": 2.00314294684523,
|
||||
"max_orb": 5.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "moon",
|
||||
"point2": "midheaven",
|
||||
"aspect": "opposition",
|
||||
"orb": 2.5846227653307494,
|
||||
"max_orb": 10.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "chiron",
|
||||
"point2": "midheaven",
|
||||
"aspect": "sextile",
|
||||
"orb": 2.660939236681166,
|
||||
"max_orb": 4.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "pluto",
|
||||
"point2": "lilith",
|
||||
"aspect": "conjunction",
|
||||
"orb": 2.9657969822067116,
|
||||
"max_orb": 4.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "neptune",
|
||||
"point2": "pluto",
|
||||
"aspect": "sextile",
|
||||
"orb": 3.3222373047914857,
|
||||
"max_orb": 5.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "sun",
|
||||
"point2": "mercury",
|
||||
"aspect": "conjunction",
|
||||
"orb": 3.3647986016718505,
|
||||
"max_orb": 10.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "north_node",
|
||||
"point2": "ascendant",
|
||||
"aspect": "opposition",
|
||||
"orb": 3.636578250534626,
|
||||
"max_orb": 4.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "mercury",
|
||||
"point2": "pluto",
|
||||
"aspect": "trine",
|
||||
"orb": 3.7207123118180334,
|
||||
"max_orb": 7.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "neptune",
|
||||
"point2": "chiron",
|
||||
"aspect": "opposition",
|
||||
"orb": 3.7268067400827363,
|
||||
"max_orb": 4.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "moon",
|
||||
"point2": "neptune",
|
||||
"aspect": "sextile",
|
||||
"orb": 3.80312321143316,
|
||||
"max_orb": 7.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "mars",
|
||||
"point2": "midheaven",
|
||||
"aspect": "square",
|
||||
"orb": 5.0188519462003,
|
||||
"max_orb": 7.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "uranus",
|
||||
"point2": "neptune",
|
||||
"aspect": "conjunction",
|
||||
"orb": 5.073135711230066,
|
||||
"max_orb": 8.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "venus",
|
||||
"point2": "mars",
|
||||
"aspect": "conjunction",
|
||||
"orb": 6.303067519199828,
|
||||
"max_orb": 8.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "neptune",
|
||||
"point2": "midheaven",
|
||||
"aspect": "trine",
|
||||
"orb": 6.3877459767639095,
|
||||
"max_orb": 7.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "sun",
|
||||
"point2": "jupiter",
|
||||
"aspect": "square",
|
||||
"orb": 6.680998353964355,
|
||||
"max_orb": 9.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "sun",
|
||||
"point2": "pluto",
|
||||
"aspect": "trine",
|
||||
"orb": 7.085510913489884,
|
||||
"max_orb": 9.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "moon",
|
||||
"point2": "pluto",
|
||||
"aspect": "conjunction",
|
||||
"orb": 7.125360516224646,
|
||||
"max_orb": 10.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "moon",
|
||||
"point2": "mars",
|
||||
"aspect": "square",
|
||||
"orb": 7.603474711531021,
|
||||
"max_orb": 9.0,
|
||||
"applying": false
|
||||
},
|
||||
{
|
||||
"point1": "jupiter",
|
||||
"point2": "uranus",
|
||||
"aspect": "opposition",
|
||||
"orb": 7.838117716524209,
|
||||
"max_orb": 8.0,
|
||||
"applying": true
|
||||
},
|
||||
{
|
||||
"point1": "moon",
|
||||
"point2": "ascendant",
|
||||
"aspect": "square",
|
||||
"orb": 8.89642457881996,
|
||||
"max_orb": 9.0,
|
||||
"applying": false
|
||||
}
|
||||
],
|
||||
"time": {
|
||||
"time_known": true,
|
||||
"local": "1990-03-15T14:30:00",
|
||||
"zone": "Europe/Budapest",
|
||||
"utc_offset": "+01:00",
|
||||
"dst": false
|
||||
},
|
||||
"location": {
|
||||
"latitude": 46.253,
|
||||
"longitude": 20.14824
|
||||
}
|
||||
}
|
||||
}
|
||||
Vendored
+33
@@ -0,0 +1,33 @@
|
||||
// The part of Google Identity Services (accounts.google.com/gsi/client) we use.
|
||||
interface GoogleCredentialResponse {
|
||||
credential: string;
|
||||
}
|
||||
|
||||
interface Window {
|
||||
google?: {
|
||||
accounts: {
|
||||
id: {
|
||||
initialize(options: {
|
||||
client_id: string;
|
||||
callback: (response: GoogleCredentialResponse) => void;
|
||||
ux_mode?: "popup" | "redirect";
|
||||
auto_select?: boolean;
|
||||
itp_support?: boolean;
|
||||
}): void;
|
||||
renderButton(
|
||||
parent: HTMLElement,
|
||||
options: {
|
||||
type?: "standard" | "icon";
|
||||
theme?: "outline" | "filled_blue" | "filled_black";
|
||||
size?: "large" | "medium" | "small";
|
||||
text?: "signin_with" | "signup_with" | "continue_with" | "signin";
|
||||
shape?: "rectangular" | "pill";
|
||||
locale?: string;
|
||||
width?: number;
|
||||
},
|
||||
): void;
|
||||
disableAutoSelect(): void;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
// Backend calls from the browser, through the frontend's /api/v1 proxy.
|
||||
|
||||
export class ApiError extends Error {
|
||||
constructor(
|
||||
public status: number,
|
||||
public code: string,
|
||||
message: string,
|
||||
public details?: unknown,
|
||||
) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
|
||||
export async function api<T = unknown>(path: string, init: { method?: string; body?: unknown } = {}): Promise<T> {
|
||||
const res = await fetch(`/api/v1${path}`, {
|
||||
method: init.method ?? (init.body === undefined ? "GET" : "POST"),
|
||||
headers: init.body === undefined ? undefined : { "content-type": "application/json" },
|
||||
body: init.body === undefined ? undefined : JSON.stringify(init.body),
|
||||
credentials: "same-origin",
|
||||
});
|
||||
const text = await res.text();
|
||||
const data = text ? JSON.parse(text) : null;
|
||||
if (!res.ok) {
|
||||
const err = data?.error ?? {};
|
||||
throw new ApiError(res.status, err.code ?? "error", err.message ?? `HTTP ${res.status}`, err);
|
||||
}
|
||||
return data as T;
|
||||
}
|
||||
|
||||
/** A readable Hungarian message for an API error. */
|
||||
export function errorText(e: unknown): string {
|
||||
if (e instanceof ApiError) {
|
||||
switch (e.code) {
|
||||
case "unauthorized":
|
||||
return "Lejárt a munkamenet, lépj be újra.";
|
||||
case "forbidden":
|
||||
return "Ehhez nincs jogosultságod.";
|
||||
case "insufficient_credits":
|
||||
return "Nincs több részletes elemzésed ebből a fajtából.";
|
||||
default:
|
||||
return e.message;
|
||||
}
|
||||
}
|
||||
return "Nem sikerült kapcsolódni a szerverhez. Próbáld újra.";
|
||||
}
|
||||
@@ -0,0 +1,133 @@
|
||||
// Hungarian names and glyphs for the chart pages.
|
||||
// Glyphs end in U+FE0E so phones show them as text, not as emoji.
|
||||
|
||||
export const SIGNS: Record<string, { hu: string; glyph: string }> = {
|
||||
aries: { hu: "Kos", glyph: "♈\uFE0E" },
|
||||
taurus: { hu: "Bika", glyph: "♉\uFE0E" },
|
||||
gemini: { hu: "Ikrek", glyph: "♊\uFE0E" },
|
||||
cancer: { hu: "Rák", glyph: "♋\uFE0E" },
|
||||
leo: { hu: "Oroszlán", glyph: "♌\uFE0E" },
|
||||
virgo: { hu: "Szűz", glyph: "♍\uFE0E" },
|
||||
libra: { hu: "Mérleg", glyph: "♎\uFE0E" },
|
||||
scorpio: { hu: "Skorpió", glyph: "♏\uFE0E" },
|
||||
sagittarius: { hu: "Nyilas", glyph: "♐\uFE0E" },
|
||||
capricorn: { hu: "Bak", glyph: "♑\uFE0E" },
|
||||
aquarius: { hu: "Vízöntő", glyph: "♒\uFE0E" },
|
||||
pisces: { hu: "Halak", glyph: "♓\uFE0E" },
|
||||
};
|
||||
|
||||
export const POINTS: Record<string, { hu: string; glyph: string }> = {
|
||||
sun: { hu: "Nap", glyph: "☉\uFE0E" },
|
||||
moon: { hu: "Hold", glyph: "☽\uFE0E" },
|
||||
mercury: { hu: "Merkúr", glyph: "☿\uFE0E" },
|
||||
venus: { hu: "Vénusz", glyph: "♀\uFE0E" },
|
||||
mars: { hu: "Mars", glyph: "♂\uFE0E" },
|
||||
jupiter: { hu: "Jupiter", glyph: "♃\uFE0E" },
|
||||
saturn: { hu: "Szaturnusz", glyph: "♄\uFE0E" },
|
||||
uranus: { hu: "Uránusz", glyph: "♅\uFE0E" },
|
||||
neptune: { hu: "Neptunusz", glyph: "♆\uFE0E" },
|
||||
pluto: { hu: "Plútó", glyph: "♇\uFE0E" },
|
||||
north_node: { hu: "Észak-Holdcsomópont", glyph: "☊\uFE0E" },
|
||||
south_node: { hu: "Dél-Holdcsomópont", glyph: "☋\uFE0E" },
|
||||
lilith: { hu: "Lilith", glyph: "⚸\uFE0E" },
|
||||
chiron: { hu: "Kiron", glyph: "⚷\uFE0E" },
|
||||
ceres: { hu: "Ceres", glyph: "⚳\uFE0E" },
|
||||
pallas: { hu: "Pallas", glyph: "⚴\uFE0E" },
|
||||
juno: { hu: "Juno", glyph: "⚵\uFE0E" },
|
||||
vesta: { hu: "Vesta", glyph: "⚶\uFE0E" },
|
||||
};
|
||||
|
||||
export const ANGLES: [string, string][] = [
|
||||
["ascendant", "Aszcendens"],
|
||||
["midheaven", "MC"],
|
||||
["descendant", "Descendens"],
|
||||
["imum_coeli", "IC"],
|
||||
];
|
||||
|
||||
export function signName(sign: string | null | undefined): string {
|
||||
return sign ? (SIGNS[sign]?.hu ?? sign) : "–";
|
||||
}
|
||||
|
||||
/** `12°20'50"` → `12°20′50″` (typographic prime marks). */
|
||||
export function dms(text: string): string {
|
||||
return text.replace(/'/g, "′").replace(/"/g, "″");
|
||||
}
|
||||
|
||||
export const ROLE_LABELS: Record<string, string> = {
|
||||
user: "Felhasználó",
|
||||
premium: "Prémium",
|
||||
vip: "VIP",
|
||||
creator: "Szerző",
|
||||
admin: "Admin",
|
||||
};
|
||||
|
||||
const regionNames = new Intl.DisplayNames(["hu"], { type: "region" });
|
||||
|
||||
/** Hungarian country name from an ISO code (falls back to the given name). */
|
||||
export function countryName(iso2: string, fallback?: string): string {
|
||||
try {
|
||||
return regionNames.of(iso2) ?? fallback ?? iso2;
|
||||
} catch {
|
||||
return fallback ?? iso2;
|
||||
}
|
||||
}
|
||||
|
||||
export function formatDate(iso: string | null | undefined, withTime = false): string {
|
||||
if (!iso) return "–";
|
||||
const d = new Date(iso);
|
||||
return new Intl.DateTimeFormat("hu-HU", {
|
||||
year: "numeric",
|
||||
month: "long",
|
||||
day: "numeric",
|
||||
...(withTime ? { hour: "2-digit", minute: "2-digit" } : {}),
|
||||
timeZone: "Europe/Budapest",
|
||||
}).format(d);
|
||||
}
|
||||
|
||||
/** `1990-03-15` → `1990. március 15.` without time zone shifts. */
|
||||
export function formatBirthDate(date: string): string {
|
||||
const [y, m, d] = date.split("-").map(Number);
|
||||
return new Intl.DateTimeFormat("hu-HU", { year: "numeric", month: "long", day: "numeric", timeZone: "UTC" }).format(
|
||||
new Date(Date.UTC(y, m - 1, d)),
|
||||
);
|
||||
}
|
||||
|
||||
export const ASPECTS: Record<string, { hu: string; glyph: string; kind: "harmonic" | "tense" | "neutral" }> = {
|
||||
conjunction: { hu: "együttállás", glyph: "☌", kind: "neutral" },
|
||||
opposition: { hu: "szembenállás", glyph: "☍", kind: "tense" },
|
||||
trine: { hu: "trigon", glyph: "△", kind: "harmonic" },
|
||||
square: { hu: "kvadrát", glyph: "□", kind: "tense" },
|
||||
sextile: { hu: "szextil", glyph: "⚹", kind: "harmonic" },
|
||||
quincunx: { hu: "kvinkunx", glyph: "⚻", kind: "tense" },
|
||||
semisextile: { hu: "félszextil", glyph: "⚺", kind: "harmonic" },
|
||||
semisquare: { hu: "félkvadrát", glyph: "∠", kind: "tense" },
|
||||
sesquiquadrate: { hu: "másfélkvadrát", glyph: "⚼", kind: "tense" },
|
||||
quintile: { hu: "kvintil", glyph: "Q", kind: "harmonic" },
|
||||
biquintile: { hu: "bikvintil", glyph: "bQ", kind: "harmonic" },
|
||||
};
|
||||
|
||||
export const ELEMENTS: Record<string, string> = { fire: "Tűz", earth: "Föld", air: "Levegő", water: "Víz" };
|
||||
export const MODALITIES: Record<string, string> = { cardinal: "Kardinális", fixed: "Fix", mutable: "Változó" };
|
||||
|
||||
export const MOON_PHASES: Record<string, string> = {
|
||||
new_moon: "Újhold",
|
||||
waxing_crescent: "Növő holdsarló",
|
||||
first_quarter: "Első negyed",
|
||||
waxing_gibbous: "Növő hold",
|
||||
full_moon: "Telihold",
|
||||
waning_gibbous: "Fogyó hold",
|
||||
last_quarter: "Utolsó negyed",
|
||||
waning_crescent: "Fogyó holdsarló",
|
||||
};
|
||||
|
||||
/** Name of a point or angle for labels (`midheaven` → `MC`). */
|
||||
export function pointName(id: string): string {
|
||||
return POINTS[id]?.hu ?? ANGLES.find(([k]) => k === id)?.[1] ?? id;
|
||||
}
|
||||
|
||||
/** Orb in degrees and minutes: `2.25` → `2°15′`. */
|
||||
export function orbText(orb: number): string {
|
||||
const d = Math.floor(orb);
|
||||
const m = Math.round((orb - d) * 60);
|
||||
return m === 60 ? `${d + 1}°00′` : `${d}°${String(m).padStart(2, "0")}′`;
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
// Backend calls from server components, with the visitor's session.
|
||||
import "server-only";
|
||||
|
||||
import { cookies } from "next/headers";
|
||||
import { redirect } from "next/navigation";
|
||||
|
||||
import type { Me } from "./types";
|
||||
|
||||
export const BACKEND_URL = (process.env.BACKEND_URL ?? "http://localhost:8081").replace(/\/$/, "");
|
||||
export const SESSION_COOKIE = "sf_session";
|
||||
|
||||
export class BackendError extends Error {
|
||||
constructor(
|
||||
public status: number,
|
||||
message: string,
|
||||
) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
|
||||
/** GET from the backend as the logged-in visitor; `null` on 401/404. */
|
||||
export async function backendGet<T>(path: string): Promise<T | null> {
|
||||
const token = (await cookies()).get(SESSION_COOKIE)?.value;
|
||||
const headers: HeadersInit = token ? { authorization: `Bearer ${token}` } : {};
|
||||
const res = await fetch(`${BACKEND_URL}${path}`, { headers, cache: "no-store" });
|
||||
if (res.status === 401 || res.status === 404) return null;
|
||||
if (!res.ok) throw new BackendError(res.status, `${path}: HTTP ${res.status}`);
|
||||
return (await res.json()) as T;
|
||||
}
|
||||
|
||||
/** The logged-in user, or `null`. */
|
||||
export async function getMe(): Promise<Me | null> {
|
||||
const token = (await cookies()).get(SESSION_COOKIE)?.value;
|
||||
if (!token) return null;
|
||||
return backendGet<Me>("/v1/me");
|
||||
}
|
||||
|
||||
/** The logged-in user; sends visitors to the login page. */
|
||||
export async function requireMe(from: string): Promise<Me> {
|
||||
const me = await getMe();
|
||||
if (!me) redirect(`/belepes?vissza=${encodeURIComponent(from)}`);
|
||||
return me;
|
||||
}
|
||||
@@ -0,0 +1,136 @@
|
||||
// Shapes of the backend responses the frontend uses.
|
||||
|
||||
export type Role = "admin" | "creator" | "premium" | "vip" | "user";
|
||||
|
||||
export interface User {
|
||||
id: string;
|
||||
email: string;
|
||||
email_verified: boolean;
|
||||
display_name: string | null;
|
||||
locale: string;
|
||||
roles: Role[];
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface Me {
|
||||
user: User;
|
||||
providers: string[];
|
||||
primary_chart_id: string | null;
|
||||
analyses_left: UnitBalance;
|
||||
}
|
||||
|
||||
/** Detailed analyses left, per kind. */
|
||||
export interface UnitBalance {
|
||||
natal: number;
|
||||
synastry: number;
|
||||
}
|
||||
|
||||
export interface PublicConfig {
|
||||
google_login: { enabled: boolean; client_id: string | null };
|
||||
locales: string[];
|
||||
analysis_model: string;
|
||||
summary_model: string;
|
||||
password_login: boolean;
|
||||
password_min_length: number;
|
||||
}
|
||||
|
||||
export interface Position {
|
||||
longitude: number;
|
||||
sign: string;
|
||||
degree_in_sign_dms: string;
|
||||
house?: number | null;
|
||||
retrograde?: boolean;
|
||||
}
|
||||
|
||||
export interface ChartPoint extends Position {
|
||||
id: string;
|
||||
kind?: string;
|
||||
}
|
||||
|
||||
export interface Aspect {
|
||||
point1: string;
|
||||
point2: string;
|
||||
aspect: string;
|
||||
orb: number;
|
||||
max_orb: number;
|
||||
applying?: boolean | null;
|
||||
}
|
||||
|
||||
type Groups = Record<string, { count: number; points: string[] }>;
|
||||
|
||||
export interface ChartResult {
|
||||
points: ChartPoint[];
|
||||
angles: Record<string, Position | number> | null;
|
||||
houses?: { cusps: (Position & { house: number })[] } | null;
|
||||
lots?: Record<string, Position> | null;
|
||||
aspects?: Aspect[];
|
||||
summary?: { elements?: Groups; modalities?: Groups } | null;
|
||||
moon_phase?: { phase: string; illumination: number; waxing: boolean } | null;
|
||||
time: { time_known: boolean; local: string; zone: string; utc_offset: string; dst: boolean };
|
||||
location: { place?: { name: string; region?: string | null; country_code: string } | null; latitude: number; longitude: number };
|
||||
}
|
||||
|
||||
export interface BirthData {
|
||||
date: string;
|
||||
time?: string | null;
|
||||
country?: string | null;
|
||||
place?: string | null;
|
||||
geonames_id?: number | null;
|
||||
}
|
||||
|
||||
export interface Chart {
|
||||
id: string;
|
||||
label: string;
|
||||
is_primary: boolean;
|
||||
birth_data: BirthData;
|
||||
highlights: { sun: string | null; moon: string | null; ascendant: string | null; time_known: boolean };
|
||||
chart: ChartResult;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface Analysis {
|
||||
id: string;
|
||||
kind: "natal" | "synastry" | "summary";
|
||||
status: "pending" | "running" | "done" | "failed";
|
||||
model: string;
|
||||
language: string;
|
||||
content: AnalysisContent | null;
|
||||
error?: string | null;
|
||||
credits_charged: number;
|
||||
created_at: string;
|
||||
completed_at: string | null;
|
||||
}
|
||||
|
||||
export interface AdminUser {
|
||||
id: string;
|
||||
email: string;
|
||||
display_name: string | null;
|
||||
roles: Role[];
|
||||
email_verified: boolean;
|
||||
created_at: string;
|
||||
last_login_at: string | null;
|
||||
charts: number;
|
||||
analyses_left: UnitBalance;
|
||||
}
|
||||
|
||||
export interface AnalysisContent {
|
||||
title?: string;
|
||||
summary?: string;
|
||||
sections?: Record<string, { title: string; body: string }>;
|
||||
strengths?: string[];
|
||||
challenges?: string[];
|
||||
advice?: string;
|
||||
}
|
||||
|
||||
export interface Place {
|
||||
geonames_id: number;
|
||||
name: string;
|
||||
region: string | null;
|
||||
population: number | null;
|
||||
country_code: string;
|
||||
}
|
||||
|
||||
export interface Country {
|
||||
iso2: string;
|
||||
name: string;
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ES2022",
|
||||
"lib": [
|
||||
"dom",
|
||||
"dom.iterable",
|
||||
"esnext"
|
||||
],
|
||||
"allowJs": false,
|
||||
"skipLibCheck": true,
|
||||
"strict": true,
|
||||
"noEmit": true,
|
||||
"esModuleInterop": true,
|
||||
"module": "esnext",
|
||||
"moduleResolution": "bundler",
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"jsx": "react-jsx",
|
||||
"incremental": true,
|
||||
"plugins": [
|
||||
{
|
||||
"name": "next"
|
||||
}
|
||||
],
|
||||
"paths": {
|
||||
"@/*": [
|
||||
"./src/*"
|
||||
]
|
||||
}
|
||||
},
|
||||
"include": [
|
||||
"next-env.d.ts",
|
||||
"**/*.ts",
|
||||
"**/*.tsx",
|
||||
".next/types/**/*.ts",
|
||||
".next/dev/types/**/*.ts"
|
||||
],
|
||||
"exclude": [
|
||||
"node_modules"
|
||||
]
|
||||
}
|
||||
@@ -12,6 +12,9 @@ service-kit.workspace = true
|
||||
anyhow.workspace = true
|
||||
axum.workspace = true
|
||||
lettre.workspace = true
|
||||
rand.workspace = true
|
||||
reqwest.workspace = true
|
||||
serde.workspace = true
|
||||
serde_json.workspace = true
|
||||
sqlx.workspace = true
|
||||
time.workspace = true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# worker
|
||||
|
||||
Háttérmunkák a közös PostgreSQL-adatbázis fölött. Nincs nyilvános API-ja, csak egy `/healthz` végpontja (8082) a Docker healthcheckhez. Induláskor lefuttatja a migrációkat, ugyanúgy, mint a backend.
|
||||
Háttérmunkák a közös PostgreSQL-adatbázis fölött: e-mail-küldés, szöveges elemzések (LLM), takarítás. Nincs nyilvános API-ja, csak egy `/healthz` végpontja (8082) a Docker healthcheckhez. Induláskor lefuttatja a migrációkat, ugyanúgy, mint a backend.
|
||||
|
||||
## Munkák
|
||||
|
||||
@@ -17,7 +17,42 @@ Háttérmunkák a közös PostgreSQL-adatbázis fölött. Nincs nyilvános API-j
|
||||
- elküldött e-mailek 7 nap után (tokenes linkek vannak bennük), sikertelenek 30 nap után;
|
||||
- el nem fogadott meghívók 30 nappal a lejáratuk után.
|
||||
|
||||
**Később:** az elemzések megírása (OpenRouter), kredit-visszatérítés hibánál.
|
||||
**Szöveges elemzések** (`analyses`, `pending` → `running` → `done`/`failed`)
|
||||
- A backend létrehozza a `pending` sort, és levon egy elemzési egységet. Egy trigger (`NOTIFY analyses`) felébreszti a workert; egyszerre `ANALYSIS_CONCURRENCY` elemzés készül.
|
||||
- A prompt a tárolt képletből készül (`src/analysis/compact.rs`). Ez egy tömör szöveg, amely csak a pozíciókat tartalmazza: jegyek, fokok, házak, fényszögek, elemek. **Név, születési dátum, idő, hely és koordináta nem megy ki.** Ismeretlen születési időnél nincsenek házak, Aszcendens és MC.
|
||||
- A modell OpenRouteren keresztül válaszol, azzal a modellel, amely a sor `model` mezőjében áll. A válasznak kötött JSON-sémát kell követnie (`src/analysis/prompt.rs`, `PROMPT_VERSION = v2`):
|
||||
- `title`, `summary`;
|
||||
- `sections`, radixnál: `personality`, `emotions`, `mind`, `love`, `work`, `growth`; szinasztriánál: `attraction`, `communication`, `emotional_bond`, `friction`, `long_term`;
|
||||
- `strengths`, `challenges`, `advice`;
|
||||
- a rövid összefoglalónál (`summary`) csak `title` és egy 3–4 mondatos `summary`.
|
||||
|
||||
A worker a választ maga is ellenőrzi a sémán. Magyar szövegben az egyenes idézőjelpárokat („…”) alakra cseréli.
|
||||
- Eltárolja a ténylegesen válaszoló modellt (`model_used`; az `openrouter/auto` mögött ez más lehet), a tokenszámot és a költséget (`cost_usd`).
|
||||
- **Átmeneti hiba** (hálózat, 429, 5xx, elfogyott OpenRouter-egyenleg, hibás vagy csonka válasz): újrapróbálja 30 mp, 2 perc, majd 8 perc múlva.
|
||||
- **Végleges hiba** (például ismeretlen modell), vagy ha elfogyott a `MAX_ANALYSIS_ATTEMPTS` próbálkozás: az elemzés `failed` lesz, és az egység visszajár (`refund`, elemzésenként legfeljebb egyszer).
|
||||
- Ha a worker elemzés közben leáll, a félkész elemzést visszateszi a sorba. Ha összeomlik, az elemzés 15 perc múlva magától visszakerül.
|
||||
- Szinasztriánál a modell a két félnek együtt szól; ha meg kell különböztetnie őket, „első fél” és „második fél” néven említi.
|
||||
|
||||
**Később:** streaming a frontend felé.
|
||||
|
||||
## Modellek összevetése
|
||||
|
||||
A 2026-11-15-i összevetésen két képletet hét modell írt meg; az egyiket a tulajdonos, a másikat egy hivatásos asztrológus pontozta. Részletes elemzésenként: Claude Haiku 5.5 kb. 0,006 dollár, GPT-5.6 Terra kb. 0,05, Claude Opus 5.5 kb. 0,16 (szinasztria kb. 0,21). Az asztrológus szerint egyértelműen az Opus a legjobb, ezért a fizetős elemzés vele készül (`ANALYSIS_MODEL`, backend).
|
||||
|
||||
A MiniMax M3 olcsó, de az asztrológus szerint többször felcserélt dolgokat.
|
||||
|
||||
Az ingyenes rövid összefoglalót (2026-11-16) a Haiku és a Sonnet négy képleten írta meg. Mindkettő tényszerűen helyes volt, de a Sonnet jobban válogat és fogalmaz, ezért ez az alapértelmezett (`SUMMARY_MODEL`, kb. 0,009 dollár, a Haiku kb. 0,001). A fizetős részletes elemzés az Opus 5.5-tel készül.
|
||||
|
||||
```bash
|
||||
OPENROUTER_API_KEY=... worker compare-models --chart natal.json \
|
||||
--models minimax/minimax-m3,anthropic/claude-sonnet-5.5 --language hu --out exports/model-compare
|
||||
```
|
||||
|
||||
Ugyanazt a radix-elemzést több modellel is megírja, véletlenszerű betűkkel (`A.md`, `B.md`, …).
|
||||
- A `key.json` mondja meg, melyik betű melyik modell, a tokenszámmal, a költséggel és az idővel együtt.
|
||||
- A `prompt.md` a teljes promptot tartalmazza.
|
||||
- A `--chart` a horoscope-api `/v1/natal` válasza; `--summary` mellett a rövid összefoglalót írja meg.
|
||||
- A `--synastry FILE` (a `--chart` helyett) a horoscope-api `/v1/synastry` válasza, és szinasztria-elemzést ír.
|
||||
|
||||
## Konfiguráció
|
||||
|
||||
@@ -28,6 +63,11 @@ Háttérmunkák a közös PostgreSQL-adatbázis fölött. Nincs nyilvános API-j
|
||||
| `MAIL_FROM` | `Sorsfonalak <noreply@sorsfonalak.local>` | feladó |
|
||||
| `POLL_INTERVAL_SECS` | `30` | tartalék lekérdezési időköz |
|
||||
| `MAX_EMAIL_ATTEMPTS` | `8` | ennyi próbálkozás után sikertelen a levél |
|
||||
| `OPENROUTER_API_KEY` | – | OpenRouter-kulcs (compose-ban a `.env.secrets` fájlból); nélküle az elemzések várnak |
|
||||
| `OPENROUTER_BASE_URL` | `https://openrouter.ai/api/v1` | |
|
||||
| `PUBLIC_BASE_URL` | – | `HTTP-Referer` fejléc az OpenRouter felé |
|
||||
| `ANALYSIS_CONCURRENCY` | `4` | egyszerre írt elemzések |
|
||||
| `MAX_ANALYSIS_ATTEMPTS` | `3` | ennyi próbálkozás után sikertelen az elemzés (az egység visszajár) |
|
||||
| `BIND_ADDR`, `LOG_FORMAT`, `RUST_LOG` | `0.0.0.0:8082`, `text`, `info` | |
|
||||
|
||||
## Fejlesztés: Mailpit
|
||||
|
||||
@@ -0,0 +1,384 @@
|
||||
//! Compact text views of charts for the language model.
|
||||
//!
|
||||
//! Only astrological positions go in: no names, birth date, time, place or
|
||||
//! coordinates. Plain text is shorter than the JSON and easier for models.
|
||||
|
||||
use std::fmt::Write;
|
||||
|
||||
use serde_json::Value;
|
||||
|
||||
/// Points listed one per line; asteroids go on a shorter line.
|
||||
const MAIN_POINTS: [&str; 14] = [
|
||||
"sun",
|
||||
"moon",
|
||||
"mercury",
|
||||
"venus",
|
||||
"mars",
|
||||
"jupiter",
|
||||
"saturn",
|
||||
"uranus",
|
||||
"neptune",
|
||||
"pluto",
|
||||
"chiron",
|
||||
"north_node",
|
||||
"south_node",
|
||||
"lilith",
|
||||
];
|
||||
const ASTEROIDS: [&str; 4] = ["ceres", "pallas", "juno", "vesta"];
|
||||
const ANGLES: [&str; 4] = ["ascendant", "midheaven", "descendant", "imum_coeli"];
|
||||
const MAX_SYNASTRY_ASPECTS: usize = 45;
|
||||
|
||||
fn point_name(id: &str) -> String {
|
||||
match id {
|
||||
"north_node" => "North Node".into(),
|
||||
"south_node" => "South Node".into(),
|
||||
"lilith" => "Lilith (Black Moon)".into(),
|
||||
"midheaven" => "Midheaven (MC)".into(),
|
||||
"imum_coeli" => "Imum Coeli (IC)".into(),
|
||||
"ascendant" => "Ascendant".into(),
|
||||
"descendant" => "Descendant".into(),
|
||||
other => capitalize(other),
|
||||
}
|
||||
}
|
||||
|
||||
fn capitalize(s: &str) -> String {
|
||||
let mut chars = s.chars();
|
||||
chars.next().map(|c| c.to_uppercase().chain(chars).collect()).unwrap_or_default()
|
||||
}
|
||||
|
||||
fn words(s: &str) -> String {
|
||||
s.replace('_', " ")
|
||||
}
|
||||
|
||||
/// "Cancer 0°24'" from a position object (sign + degree_in_sign).
|
||||
fn position(p: &Value) -> String {
|
||||
let degree = p["degree_in_sign"].as_f64().unwrap_or(0.0);
|
||||
// Rounded to the second first, as in the `degree_in_sign_dms` field; never 30°.
|
||||
let secs = ((degree * 3600.0).round() as i64).clamp(0, 30 * 3600 - 1);
|
||||
let (d, m) = (secs / 3600, secs % 3600 / 60);
|
||||
format!("{} {d}°{m:02}'", capitalize(p["sign"].as_str().unwrap_or("?")))
|
||||
}
|
||||
|
||||
fn time_known(chart: &Value) -> bool {
|
||||
chart["time"]["time_known"].as_bool().unwrap_or(false)
|
||||
}
|
||||
|
||||
fn is_main(id: &str) -> bool {
|
||||
MAIN_POINTS.contains(&id) || ANGLES.contains(&id)
|
||||
}
|
||||
|
||||
fn points(chart: &Value) -> impl Iterator<Item = &Value> {
|
||||
chart["points"].as_array().into_iter().flatten()
|
||||
}
|
||||
|
||||
fn names(list: &Value) -> String {
|
||||
list.as_array().into_iter().flatten().filter_map(Value::as_str).map(point_name).collect::<Vec<_>>().join(", ")
|
||||
}
|
||||
|
||||
/// One line per point: "Sun: Cancer 0°24', house 3, retrograde, domicile".
|
||||
fn point_lines(out: &mut String, chart: &Value, prefix: &str, houses: bool) {
|
||||
for p in points(chart).filter(|p| MAIN_POINTS.contains(&p["id"].as_str().unwrap_or(""))) {
|
||||
let mut line = format!("{prefix}- {}: {}", point_name(p["id"].as_str().unwrap_or("?")), position(p));
|
||||
if houses && let Some(h) = p["house"].as_i64() {
|
||||
let _ = write!(line, ", house {h}");
|
||||
}
|
||||
if p["retrograde"].as_bool() == Some(true) {
|
||||
line.push_str(", retrograde");
|
||||
}
|
||||
for dignity in p["dignities"].as_array().into_iter().flatten().filter_map(Value::as_str) {
|
||||
let _ = write!(line, ", {}", words(dignity));
|
||||
}
|
||||
if p["out_of_bounds"].as_bool() == Some(true) {
|
||||
line.push_str(", out of bounds");
|
||||
}
|
||||
let _ = writeln!(out, "{line}");
|
||||
}
|
||||
let minor: Vec<String> = points(chart)
|
||||
.filter(|p| ASTEROIDS.contains(&p["id"].as_str().unwrap_or("")))
|
||||
.map(|p| {
|
||||
let house = if houses {
|
||||
p["house"].as_i64().map(|h| format!(" (house {h})")).unwrap_or_default()
|
||||
} else {
|
||||
String::new()
|
||||
};
|
||||
format!("{} {}{house}", point_name(p["id"].as_str().unwrap_or("?")), position(p))
|
||||
})
|
||||
.collect();
|
||||
if !minor.is_empty() {
|
||||
let _ = writeln!(out, "{prefix}- Asteroids: {}", minor.join("; "));
|
||||
}
|
||||
}
|
||||
|
||||
fn angle_lines(out: &mut String, chart: &Value, prefix: &str) {
|
||||
let angles = &chart["angles"];
|
||||
for (id, label) in [("ascendant", "Ascendant"), ("midheaven", "Midheaven (MC)")] {
|
||||
if angles[id].is_object() {
|
||||
let _ = writeln!(out, "{prefix}- {label}: {}", position(&angles[id]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const BIRTH_TIME_UNKNOWN: &str = "Birth time: UNKNOWN. The chart is cast for noon, so there are no houses, \
|
||||
no Ascendant and no Midheaven, and the Moon may be up to about 7° off (its sign is uncertain near a sign boundary).";
|
||||
|
||||
/// A natal chart (the horoscope-api `/v1/natal` result).
|
||||
pub fn natal(chart: &Value) -> String {
|
||||
let mut out = String::new();
|
||||
let settings = &chart["settings"];
|
||||
let known = time_known(chart);
|
||||
let _ = writeln!(
|
||||
out,
|
||||
"NATAL CHART ({} zodiac, {} houses)",
|
||||
settings["zodiac"].as_str().unwrap_or("tropical"),
|
||||
capitalize(&words(
|
||||
chart["houses"]["system"].as_str().or(settings["house_system"].as_str()).unwrap_or("placidus")
|
||||
))
|
||||
);
|
||||
let _ = writeln!(out, "{}", if known { "Birth time: known." } else { BIRTH_TIME_UNKNOWN });
|
||||
let summary = &chart["summary"];
|
||||
if let Some(sect) = summary["sect"].as_str() {
|
||||
let _ = writeln!(out, "Sect: {sect} chart.");
|
||||
}
|
||||
let phase = &chart["moon_phase"];
|
||||
if let Some(name) = phase["phase"].as_str() {
|
||||
let illumination = phase["illumination"].as_f64().map(|i| format!(" ({:.0}% illuminated)", i * 100.0));
|
||||
let _ = writeln!(out, "Moon phase: {}{}.", words(name), illumination.unwrap_or_default());
|
||||
}
|
||||
|
||||
if known {
|
||||
out.push_str("\nAngles:\n");
|
||||
angle_lines(&mut out, chart, "");
|
||||
let ruler = &summary["chart_ruler"];
|
||||
for kind in ["traditional", "modern"] {
|
||||
let r = &ruler[kind];
|
||||
if let Some(planet) = r["planet"].as_str() {
|
||||
if kind == "modern" && ruler["traditional"]["planet"] == r["planet"] {
|
||||
continue;
|
||||
}
|
||||
let _ = writeln!(
|
||||
out,
|
||||
"- Chart ruler ({kind}): {} in {}, house {}",
|
||||
point_name(planet),
|
||||
capitalize(r["sign"].as_str().unwrap_or("?")),
|
||||
r["house"]
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
out.push_str("\nPlanets and points:\n");
|
||||
point_lines(&mut out, chart, "", known);
|
||||
|
||||
if known && let Some(cusps) = chart["houses"]["cusps"].as_array() {
|
||||
let list: Vec<String> = cusps.iter().map(|c| format!("{} {}", c["house"], position(c))).collect();
|
||||
let _ = writeln!(out, "\nHouse cusps: {}", list.join(" | "));
|
||||
}
|
||||
|
||||
aspect_lines(&mut out, &chart["aspects"], "\nAspects (tightest first; orb in degrees):", usize::MAX);
|
||||
|
||||
out.push_str("\nBalance (main planets):\n");
|
||||
for (title, key) in [("Elements", "elements"), ("Modalities", "modalities")] {
|
||||
if let Some(groups) = summary[key].as_object() {
|
||||
let list: Vec<String> = groups
|
||||
.iter()
|
||||
.map(|(name, g)| {
|
||||
let members = names(&g["points"]);
|
||||
if members.is_empty() { format!("{name} 0") } else { format!("{name} {} ({members})", g["count"]) }
|
||||
})
|
||||
.collect();
|
||||
let _ = writeln!(out, "- {title}: {}", list.join("; "));
|
||||
}
|
||||
}
|
||||
if known && let Some(h) = summary["hemispheres"].as_object() {
|
||||
let list: Vec<String> = h.iter().map(|(name, g)| format!("{} {}", words(name), g["count"])).collect();
|
||||
let _ = writeln!(out, "- Hemispheres: {}", list.join(", "));
|
||||
}
|
||||
let retro = names(&summary["retrograde"]);
|
||||
if !retro.is_empty() {
|
||||
let _ = writeln!(out, "- Retrograde: {retro}");
|
||||
}
|
||||
if known && let Some(fortune) = chart["lots"]["fortune"].as_object() {
|
||||
let fortune = Value::Object(fortune.clone());
|
||||
let _ = writeln!(out, "- Part of Fortune: {}, house {}", position(&fortune), fortune["house"]);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// A synastry: both natal charts plus the synastry result (inter-aspects,
|
||||
/// house overlays, composite) as stored by the backend.
|
||||
pub fn synastry(chart1: &Value, chart2: &Value, result: &Value) -> String {
|
||||
let mut out = String::from("SYNASTRY: two natal charts compared (Person 1 and Person 2), tropical zodiac.\n");
|
||||
for (label, chart) in [("Person 1", chart1), ("Person 2", chart2)] {
|
||||
let _ = writeln!(out, "\n{label}:");
|
||||
if time_known(chart) {
|
||||
let _ = writeln!(out, " Birth time: known.");
|
||||
angle_lines(&mut out, chart, " ");
|
||||
} else {
|
||||
let _ = writeln!(out, " {BIRTH_TIME_UNKNOWN}");
|
||||
}
|
||||
point_lines(&mut out, chart, " ", time_known(chart));
|
||||
}
|
||||
|
||||
let mut aspects: Vec<&Value> = result["aspects"]
|
||||
.as_array()
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.filter(|a| is_main(a["person1"].as_str().unwrap_or("")) && is_main(a["person2"].as_str().unwrap_or("")))
|
||||
.collect();
|
||||
aspects.sort_by(|a, b| a["orb"].as_f64().unwrap_or(99.0).total_cmp(&b["orb"].as_f64().unwrap_or(99.0)));
|
||||
if !aspects.is_empty() {
|
||||
let _ = writeln!(
|
||||
out,
|
||||
"\nInter-chart aspects (Person 1's point first; tightest {} of {}):",
|
||||
aspects.len().min(MAX_SYNASTRY_ASPECTS),
|
||||
aspects.len()
|
||||
);
|
||||
for a in aspects.iter().take(MAX_SYNASTRY_ASPECTS) {
|
||||
let _ = writeln!(
|
||||
out,
|
||||
"- {} {} {} (orb {:.1}°, {})",
|
||||
point_name(a["person1"].as_str().unwrap_or("?")),
|
||||
words(a["aspect"].as_str().unwrap_or("?")),
|
||||
point_name(a["person2"].as_str().unwrap_or("?")),
|
||||
a["orb"].as_f64().unwrap_or(0.0),
|
||||
a["nature"].as_str().unwrap_or("neutral")
|
||||
);
|
||||
}
|
||||
}
|
||||
if let Some(by_nature) = result["summary"]["by_nature"].as_object() {
|
||||
let list: Vec<String> = by_nature.iter().map(|(k, v)| format!("{k} {v}")).collect();
|
||||
let _ = writeln!(out, "All aspects by nature: {}", list.join(", "));
|
||||
}
|
||||
|
||||
let overlays = &result["house_overlays"];
|
||||
for (key, label) in [
|
||||
("person1_in_person2", "Person 1's planets in Person 2's houses"),
|
||||
("person2_in_person1", "Person 2's planets in Person 1's houses"),
|
||||
] {
|
||||
let list: Vec<String> = overlays[key]
|
||||
.as_array()
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.filter(|o| MAIN_POINTS.contains(&o["point"].as_str().unwrap_or("")))
|
||||
.filter_map(|o| Some(format!("{} {}", point_name(o["point"].as_str()?), o["house"].as_i64()?)))
|
||||
.collect();
|
||||
if !list.is_empty() {
|
||||
let _ = writeln!(out, "\n{label}: {}", list.join(", "));
|
||||
}
|
||||
}
|
||||
|
||||
let composite = &result["composite"];
|
||||
if composite["points"].is_array() {
|
||||
let both_known = time_known(chart1) && time_known(chart2);
|
||||
let _ = writeln!(out, "\nComposite chart ({} method):", composite["method"].as_str().unwrap_or("midpoint"));
|
||||
if both_known {
|
||||
angle_lines(&mut out, composite, "");
|
||||
}
|
||||
point_lines(&mut out, composite, "", both_known);
|
||||
aspect_lines(&mut out, &composite["aspects"], "Composite aspects (tightest first):", 12);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// Aspects between main points and angles, tightest first.
|
||||
fn aspect_lines(out: &mut String, aspects: &Value, heading: &str, limit: usize) {
|
||||
let mut list: Vec<&Value> = aspects
|
||||
.as_array()
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.filter(|a| is_main(a["point1"].as_str().unwrap_or("")) && is_main(a["point2"].as_str().unwrap_or("")))
|
||||
.collect();
|
||||
if list.is_empty() {
|
||||
return;
|
||||
}
|
||||
list.sort_by(|a, b| a["orb"].as_f64().unwrap_or(99.0).total_cmp(&b["orb"].as_f64().unwrap_or(99.0)));
|
||||
let _ = writeln!(out, "{heading}");
|
||||
for a in list.into_iter().take(limit) {
|
||||
let motion = match a["applying"].as_bool() {
|
||||
Some(true) => ", applying",
|
||||
Some(false) => ", separating",
|
||||
None => "",
|
||||
};
|
||||
let _ = writeln!(
|
||||
out,
|
||||
"- {} {} {} (orb {:.1}°{motion})",
|
||||
point_name(a["point1"].as_str().unwrap_or("?")),
|
||||
words(a["aspect"].as_str().unwrap_or("?")),
|
||||
point_name(a["point2"].as_str().unwrap_or("?")),
|
||||
a["orb"].as_f64().unwrap_or(0.0)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn fixture(name: &str) -> Value {
|
||||
let path = format!("{}/testdata/{name}", env!("CARGO_MANIFEST_DIR"));
|
||||
serde_json::from_str(&std::fs::read_to_string(path).unwrap()).unwrap()
|
||||
}
|
||||
|
||||
/// Birth data that must never reach the model.
|
||||
fn assert_private(text: &str) {
|
||||
for secret in ["1990", "1988", "14:30", "08:10", "Szeged", "Pécs", "Hungary", "HU", "46.", "20.1", "Budapest"]
|
||||
{
|
||||
assert!(!text.contains(secret), "'{secret}' leaked into:\n{text}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn natal_with_birth_time() {
|
||||
let text = natal(&fixture("natal-1990-03-15.json"));
|
||||
assert_private(&text);
|
||||
for expected in [
|
||||
"Birth time: known.",
|
||||
"- Ascendant: Leo 19°23'",
|
||||
"- Chart ruler (traditional): Sun in Pisces, house 8",
|
||||
"- Sun: Pisces 24°42', house 8",
|
||||
"- Pluto: Scorpio 17°36', house 4, retrograde, domicile",
|
||||
"- Asteroids: Ceres Gemini 25°43' (house 11);",
|
||||
"House cusps: 1 Leo 19°23' | 2 Virgo 9°35'",
|
||||
"- Moon trine Chiron (orb 0.1°, applying)",
|
||||
"- Elements: air 2 (Venus, Mars); earth 3 (Saturn, Uranus, Neptune); fire 0;",
|
||||
"- Part of Fortune: Aries 5°10', house 8",
|
||||
] {
|
||||
assert!(text.contains(expected), "missing '{expected}' in:\n{text}");
|
||||
}
|
||||
// Tightest aspect first.
|
||||
assert!(text.find("Moon trine Chiron").unwrap() < text.find("Moon square Ascendant").unwrap());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn natal_without_birth_time_has_no_houses() {
|
||||
let text = natal(&fixture("natal-1988-11-02-notime.json"));
|
||||
assert_private(&text);
|
||||
assert!(text.contains("Birth time: UNKNOWN"));
|
||||
for absent in
|
||||
["house ", "House cusps", "Ascendant:", "Midheaven (MC):", "Chart ruler", "Hemispheres", "Fortune"]
|
||||
{
|
||||
assert!(!text.contains(absent), "'{absent}' in:\n{text}");
|
||||
}
|
||||
assert!(text.contains("- Venus: Libra 4°12', domicile"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn synastry_view() {
|
||||
// The full horoscope-api response, with both persons' birth data in it.
|
||||
let response = fixture("synastry-response.json");
|
||||
let text = synastry(&response["person1"], &response["person2"], &response);
|
||||
assert_private(&text);
|
||||
for expected in [
|
||||
"Person 1:\n Birth time: known.",
|
||||
" - Sun: Pisces 24°42', house 8",
|
||||
"Inter-chart aspects (Person 1's point first; tightest 45 of",
|
||||
"(orb 0.0°, harmonious)",
|
||||
"All aspects by nature: ",
|
||||
"Person 1's planets in Person 2's houses: Sun 4, Moon 12",
|
||||
"Composite chart (midpoint method):\n- Ascendant: Libra 8°39'",
|
||||
"Composite aspects (tightest first):\n- Saturn conjunction Neptune (orb 0.1°)",
|
||||
] {
|
||||
assert!(text.contains(expected), "missing '{expected}' in:\n{text}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,277 @@
|
||||
//! Writes the requested text analyses (`analyses` rows in `pending` state).
|
||||
//!
|
||||
//! The backend inserts the row and charges the credits; this job claims it
|
||||
//! (`running`), builds the prompt from the stored chart data, asks the model
|
||||
//! through OpenRouter and stores the structured answer (`done`). Temporary
|
||||
//! failures are retried with backoff; after the last attempt, or on a
|
||||
//! permanent error, the analysis is `failed` and the unit is refunded.
|
||||
|
||||
pub mod compact;
|
||||
pub mod openrouter;
|
||||
pub mod prompt;
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use serde_json::Value;
|
||||
use sqlx::PgPool;
|
||||
use tokio::sync::{Semaphore, watch};
|
||||
use uuid::Uuid;
|
||||
|
||||
use self::openrouter::{Completion, LlmError, OpenRouter};
|
||||
use self::prompt::{Kind, PROMPT_VERSION, Prompt};
|
||||
|
||||
/// A `running` analysis older than this was left behind by a stopped worker.
|
||||
const STUCK_AFTER_MINUTES: i32 = 15;
|
||||
|
||||
#[derive(Debug, sqlx::FromRow)]
|
||||
pub struct Job {
|
||||
pub id: Uuid,
|
||||
pub kind: String,
|
||||
pub chart_id: Option<Uuid>,
|
||||
pub synastry_id: Option<Uuid>,
|
||||
pub language: String,
|
||||
pub model: String,
|
||||
pub prompt_version: String,
|
||||
pub attempts: i32,
|
||||
}
|
||||
|
||||
pub struct Analyzer {
|
||||
pub db: PgPool,
|
||||
pub llm: OpenRouter,
|
||||
pub max_attempts: i32,
|
||||
pub concurrency: usize,
|
||||
/// Analyses being written right now (put back to `pending` on shutdown).
|
||||
running: Mutex<HashSet<Uuid>>,
|
||||
}
|
||||
|
||||
/// Wait before the next attempt: 30 s, 2 min, 8 min, ... at most 1 hour.
|
||||
pub fn backoff(attempts: i32) -> Duration {
|
||||
let exp = attempts.clamp(1, 6).saturating_sub(1) as u32;
|
||||
Duration::from_secs((30 * 4u64.pow(exp)).min(3600))
|
||||
}
|
||||
|
||||
impl Analyzer {
|
||||
pub fn new(db: PgPool, llm: OpenRouter, max_attempts: i32, concurrency: usize) -> Self {
|
||||
Self { db, llm, max_attempts, concurrency: concurrency.max(1), running: Mutex::default() }
|
||||
}
|
||||
|
||||
/// Takes the next due analysis, if any.
|
||||
pub async fn claim(&self) -> Result<Option<Job>, sqlx::Error> {
|
||||
let job: Option<Job> = sqlx::query_as(
|
||||
"UPDATE analyses SET status = 'running', started_at = now(), attempts = attempts + 1 \
|
||||
WHERE id = (SELECT id FROM analyses WHERE status = 'pending' AND next_attempt_at <= now() \
|
||||
ORDER BY next_attempt_at LIMIT 1 FOR UPDATE SKIP LOCKED) \
|
||||
RETURNING id, kind, chart_id, synastry_id, language, model, prompt_version, attempts",
|
||||
)
|
||||
.fetch_optional(&self.db)
|
||||
.await?;
|
||||
if let Some(job) = &job {
|
||||
self.running.lock().unwrap().insert(job.id);
|
||||
}
|
||||
Ok(job)
|
||||
}
|
||||
|
||||
/// Builds the prompt from the stored chart or synastry.
|
||||
pub async fn prompt_for(&self, job: &Job) -> Result<Prompt, LlmError> {
|
||||
let kind = Kind::parse(&job.kind).ok_or_else(|| LlmError::Permanent(format!("unknown kind '{}'", job.kind)))?;
|
||||
let db_err = |e: sqlx::Error| LlmError::Transient(format!("database: {e}"));
|
||||
let gone = || LlmError::Permanent("the chart was deleted".into());
|
||||
let text = match kind {
|
||||
Kind::Natal | Kind::Summary => {
|
||||
let (chart,): (Value,) = sqlx::query_as("SELECT result FROM charts WHERE id = $1")
|
||||
.bind(job.chart_id)
|
||||
.fetch_optional(&self.db)
|
||||
.await
|
||||
.map_err(db_err)?
|
||||
.ok_or_else(gone)?;
|
||||
compact::natal(&chart)
|
||||
}
|
||||
Kind::Synastry => {
|
||||
let (result, chart1, chart2): (Value, Value, Value) = sqlx::query_as(
|
||||
"SELECT s.result, c1.result, c2.result FROM synastries s \
|
||||
JOIN charts c1 ON c1.id = s.chart1_id JOIN charts c2 ON c2.id = s.chart2_id WHERE s.id = $1",
|
||||
)
|
||||
.bind(job.synastry_id)
|
||||
.fetch_optional(&self.db)
|
||||
.await
|
||||
.map_err(db_err)?
|
||||
.ok_or_else(gone)?;
|
||||
compact::synastry(&chart1, &chart2, &result)
|
||||
}
|
||||
};
|
||||
if job.prompt_version != PROMPT_VERSION {
|
||||
tracing::warn!(id = %job.id, requested = %job.prompt_version, current = PROMPT_VERSION, "prompt version differs");
|
||||
}
|
||||
Ok(prompt::build(kind, &job.language, &text))
|
||||
}
|
||||
|
||||
/// Writes one claimed analysis and records the outcome.
|
||||
pub async fn handle(&self, job: Job) {
|
||||
let started = Instant::now();
|
||||
let result = match self.prompt_for(&job).await {
|
||||
Ok(prompt) => self.llm.complete(&job.model, &prompt).await.map(|mut c| {
|
||||
prompt::polish(&job.language, &mut c.content);
|
||||
c
|
||||
}),
|
||||
Err(e) => Err(e),
|
||||
};
|
||||
if let Err(e) = self.finish(&job, result, started.elapsed()).await {
|
||||
tracing::error!(id = %job.id, error = %e, "saving the analysis result failed");
|
||||
}
|
||||
self.running.lock().unwrap().remove(&job.id);
|
||||
}
|
||||
|
||||
async fn finish(&self, job: &Job, result: Result<Completion, LlmError>, took: Duration) -> Result<(), sqlx::Error> {
|
||||
match result {
|
||||
Ok(c) => {
|
||||
sqlx::query(
|
||||
"UPDATE analyses SET status = 'done', content = $2, model_used = $3, input_tokens = $4, \
|
||||
output_tokens = $5, cost_usd = $6, error = NULL, completed_at = now() \
|
||||
WHERE id = $1 AND status = 'running'",
|
||||
)
|
||||
.bind(job.id)
|
||||
.bind(&c.content)
|
||||
.bind(&c.model)
|
||||
.bind(c.input_tokens)
|
||||
.bind(c.output_tokens)
|
||||
.bind(c.cost_usd)
|
||||
.execute(&self.db)
|
||||
.await?;
|
||||
tracing::info!(
|
||||
id = %job.id, model = %c.model, input_tokens = c.input_tokens, output_tokens = c.output_tokens,
|
||||
cost_usd = c.cost_usd, secs = took.as_secs(), "analysis done"
|
||||
);
|
||||
}
|
||||
Err(LlmError::Transient(message)) if job.attempts < self.max_attempts => {
|
||||
let wait = backoff(job.attempts);
|
||||
sqlx::query(
|
||||
"UPDATE analyses SET status = 'pending', error = $2, \
|
||||
next_attempt_at = now() + make_interval(secs => $3) WHERE id = $1 AND status = 'running'",
|
||||
)
|
||||
.bind(job.id)
|
||||
.bind(&message)
|
||||
.bind(wait.as_secs_f64())
|
||||
.execute(&self.db)
|
||||
.await?;
|
||||
tracing::warn!(id = %job.id, attempts = job.attempts, retry_in_secs = wait.as_secs(), error = %message, "analysis will be retried");
|
||||
}
|
||||
Err(e) => {
|
||||
self.fail(job.id, e.message()).await?;
|
||||
tracing::error!(id = %job.id, attempts = job.attempts, error = %e.message(), "analysis failed");
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Marks the analysis failed and gives its unit back (once).
|
||||
async fn fail(&self, id: Uuid, message: &str) -> Result<(), sqlx::Error> {
|
||||
let mut tx = self.db.begin().await?;
|
||||
let row: Option<(Option<Uuid>, i32, String)> = sqlx::query_as(
|
||||
"UPDATE analyses SET status = 'failed', error = $2, completed_at = now() \
|
||||
WHERE id = $1 AND status = 'running' RETURNING requested_by, credits_charged, kind",
|
||||
)
|
||||
.bind(id)
|
||||
.bind(message)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?;
|
||||
if let Some((Some(user), units, kind)) = row
|
||||
&& units > 0
|
||||
{
|
||||
let unit = if kind == "synastry" { "synastry" } else { "natal" };
|
||||
sqlx::query(
|
||||
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, analysis_id, note) \
|
||||
VALUES ($1, $2, $3, $4, 'refund', $5, 'analysis failed') ON CONFLICT DO NOTHING",
|
||||
)
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(user)
|
||||
.bind(unit)
|
||||
.bind(units)
|
||||
.bind(id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
}
|
||||
tx.commit().await
|
||||
}
|
||||
|
||||
/// Puts analyses left `running` by a stopped worker back in the queue.
|
||||
pub async fn requeue_stuck(&self) -> Result<u64, sqlx::Error> {
|
||||
let result = sqlx::query(
|
||||
"UPDATE analyses SET status = 'pending', error = 'interrupted', next_attempt_at = now() \
|
||||
WHERE status = 'running' AND started_at < now() - make_interval(mins => $1)",
|
||||
)
|
||||
.bind(STUCK_AFTER_MINUTES)
|
||||
.execute(&self.db)
|
||||
.await?;
|
||||
Ok(result.rows_affected())
|
||||
}
|
||||
|
||||
/// On shutdown: analyses still being written go back to `pending` at once.
|
||||
async fn release_running(&self) {
|
||||
let ids: Vec<Uuid> = self.running.lock().unwrap().drain().collect();
|
||||
if ids.is_empty() {
|
||||
return;
|
||||
}
|
||||
let result = sqlx::query(
|
||||
"UPDATE analyses SET status = 'pending', error = 'interrupted', next_attempt_at = now(), \
|
||||
attempts = greatest(attempts - 1, 0) WHERE id = ANY($1) AND status = 'running'",
|
||||
)
|
||||
.bind(&ids)
|
||||
.execute(&self.db)
|
||||
.await;
|
||||
match result {
|
||||
Ok(r) => tracing::info!(released = r.rows_affected(), "unfinished analyses put back in the queue"),
|
||||
Err(e) => tracing::error!(error = %e, "releasing unfinished analyses"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn run(analyzer: Arc<Analyzer>, poll: Duration, stop: watch::Receiver<bool>) {
|
||||
let slots = Arc::new(Semaphore::new(analyzer.concurrency));
|
||||
let mut tasks = tokio::task::JoinSet::new();
|
||||
let mut listener = crate::listen(&analyzer.db, "analyses").await;
|
||||
let mut last_requeue: Option<Instant> = None;
|
||||
loop {
|
||||
if *stop.borrow() {
|
||||
break;
|
||||
}
|
||||
if last_requeue.is_none_or(|t| t.elapsed() > Duration::from_secs(60)) {
|
||||
last_requeue = Some(Instant::now());
|
||||
match analyzer.requeue_stuck().await {
|
||||
Ok(0) => {}
|
||||
Ok(n) => tracing::warn!(requeued = n, "interrupted analyses requeued"),
|
||||
Err(e) => tracing::error!(error = %e, "requeueing analyses"),
|
||||
}
|
||||
}
|
||||
// Fill the free slots.
|
||||
while let Ok(permit) = slots.clone().try_acquire_owned() {
|
||||
match analyzer.claim().await {
|
||||
Ok(Some(job)) => {
|
||||
let analyzer = analyzer.clone();
|
||||
tasks.spawn(async move {
|
||||
analyzer.handle(job).await;
|
||||
drop(permit);
|
||||
});
|
||||
}
|
||||
Ok(None) => break,
|
||||
Err(e) => {
|
||||
tracing::error!(error = %e, "claiming an analysis");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
while tasks.try_join_next().is_some() {}
|
||||
|
||||
tokio::select! {
|
||||
() = crate::notified(listener.as_mut()) => {}
|
||||
() = tokio::time::sleep(poll) => {}
|
||||
Some(_) = tasks.join_next(), if !tasks.is_empty() => {}
|
||||
() = crate::stopped(stop.clone()) => break,
|
||||
}
|
||||
}
|
||||
// Give running analyses a moment, then hand the rest back to the queue.
|
||||
let _ = tokio::time::timeout(Duration::from_secs(10), async { while tasks.join_next().await.is_some() {} }).await;
|
||||
tasks.abort_all();
|
||||
analyzer.release_running().await;
|
||||
}
|
||||
@@ -0,0 +1,243 @@
|
||||
//! OpenRouter chat completions with structured (JSON schema) output.
|
||||
|
||||
use std::time::Duration;
|
||||
|
||||
use serde::ser::{Serialize, SerializeMap, Serializer};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use super::prompt::{Prompt, validate};
|
||||
|
||||
pub const DEFAULT_BASE_URL: &str = "https://openrouter.ai/api/v1";
|
||||
/// Room for reasoning tokens as well as the answer.
|
||||
const MAX_TOKENS: u32 = 16_000;
|
||||
|
||||
pub struct OpenRouter {
|
||||
http: reqwest::Client,
|
||||
base_url: String,
|
||||
api_key: String,
|
||||
/// Sent as `HTTP-Referer` (app attribution on openrouter.ai).
|
||||
referer: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Completion {
|
||||
pub content: Value,
|
||||
/// The model that answered (differs from the requested one for routers like `openrouter/auto`).
|
||||
pub model: String,
|
||||
pub input_tokens: Option<i32>,
|
||||
pub output_tokens: Option<i32>,
|
||||
pub cost_usd: Option<f64>,
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum LlmError {
|
||||
/// Worth retrying later (network, rate limit, provider outage, malformed answer).
|
||||
Transient(String),
|
||||
/// Retrying will not help (bad request, unknown model, rejected key).
|
||||
Permanent(String),
|
||||
}
|
||||
|
||||
impl LlmError {
|
||||
pub fn message(&self) -> &str {
|
||||
match self {
|
||||
LlmError::Transient(m) | LlmError::Permanent(m) => m,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A JSON schema serialized with every `properties` object in the order of
|
||||
/// its sibling `required` list. `serde_json` sorts object keys, and models
|
||||
/// write strict structured output in schema order: sorted, the title came
|
||||
/// after 9000 tokens of text and was sometimes left empty.
|
||||
pub struct Ordered<'a>(pub &'a Value);
|
||||
|
||||
impl Serialize for Ordered<'_> {
|
||||
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
|
||||
match self.0 {
|
||||
Value::Object(map) => {
|
||||
let order: Vec<&str> =
|
||||
map.get("required").and_then(Value::as_array).into_iter().flatten().filter_map(Value::as_str).collect();
|
||||
let mut out = serializer.serialize_map(Some(map.len()))?;
|
||||
for (key, value) in map {
|
||||
match (key.as_str(), value) {
|
||||
("properties", Value::Object(props)) => out.serialize_entry(key, &Properties(props, &order))?,
|
||||
_ => out.serialize_entry(key, &Ordered(value))?,
|
||||
}
|
||||
}
|
||||
out.end()
|
||||
}
|
||||
Value::Array(items) => serializer.collect_seq(items.iter().map(Ordered)),
|
||||
other => other.serialize(serializer),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The request body; a struct (not `json!`) so the schema keeps its order.
|
||||
#[derive(serde::Serialize)]
|
||||
struct Request<'a> {
|
||||
model: &'a str,
|
||||
messages: Value,
|
||||
response_format: ResponseFormat<'a>,
|
||||
provider: Value,
|
||||
max_tokens: u32,
|
||||
usage: Value,
|
||||
}
|
||||
|
||||
#[derive(serde::Serialize)]
|
||||
struct ResponseFormat<'a> {
|
||||
#[serde(rename = "type")]
|
||||
kind: &'static str,
|
||||
json_schema: JsonSchema<'a>,
|
||||
}
|
||||
|
||||
#[derive(serde::Serialize)]
|
||||
struct JsonSchema<'a> {
|
||||
name: &'static str,
|
||||
strict: bool,
|
||||
schema: Ordered<'a>,
|
||||
}
|
||||
|
||||
/// `properties` in `required` order (any others after them).
|
||||
struct Properties<'a>(&'a serde_json::Map<String, Value>, &'a [&'a str]);
|
||||
|
||||
impl Serialize for Properties<'_> {
|
||||
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
|
||||
let (props, order) = (self.0, self.1);
|
||||
let mut out = serializer.serialize_map(Some(props.len()))?;
|
||||
for key in order {
|
||||
if let Some(value) = props.get(*key) {
|
||||
out.serialize_entry(key, &Ordered(value))?;
|
||||
}
|
||||
}
|
||||
for (key, value) in props.iter().filter(|(k, _)| !order.contains(&k.as_str())) {
|
||||
out.serialize_entry(key, &Ordered(value))?;
|
||||
}
|
||||
out.end()
|
||||
}
|
||||
}
|
||||
|
||||
/// The JSON object in a reply, also when wrapped in a ``` fence or prose.
|
||||
fn extract_json(text: &str) -> Option<Value> {
|
||||
let trimmed = text.trim();
|
||||
if let Ok(v) = serde_json::from_str(trimmed) {
|
||||
return Some(v);
|
||||
}
|
||||
let (start, end) = (trimmed.find('{')?, trimmed.rfind('}')?);
|
||||
serde_json::from_str(trimmed.get(start..=end)?).ok()
|
||||
}
|
||||
|
||||
fn error_message(body: &Value, fallback: &str) -> String {
|
||||
let e = &body["error"];
|
||||
let message = e["message"].as_str().unwrap_or(fallback);
|
||||
match e["metadata"]["raw"].as_str() {
|
||||
Some(raw) => format!("{message}: {}", raw.chars().take(300).collect::<String>()),
|
||||
None => message.to_owned(),
|
||||
}
|
||||
}
|
||||
|
||||
impl OpenRouter {
|
||||
pub fn new(base_url: &str, api_key: &str, referer: Option<String>) -> Self {
|
||||
let http = reqwest::Client::builder()
|
||||
.timeout(Duration::from_secs(300))
|
||||
.connect_timeout(Duration::from_secs(10))
|
||||
.build()
|
||||
.expect("HTTP client");
|
||||
Self { http, base_url: base_url.trim_end_matches('/').to_owned(), api_key: api_key.to_owned(), referer }
|
||||
}
|
||||
|
||||
pub async fn complete(&self, model: &str, prompt: &Prompt) -> Result<Completion, LlmError> {
|
||||
let body = Request {
|
||||
model,
|
||||
messages: json!([
|
||||
{"role": "system", "content": prompt.system},
|
||||
{"role": "user", "content": prompt.user},
|
||||
]),
|
||||
response_format: ResponseFormat {
|
||||
kind: "json_schema",
|
||||
json_schema: JsonSchema { name: prompt.schema_name, strict: true, schema: Ordered(&prompt.schema) },
|
||||
},
|
||||
// Only route to providers that honour the schema.
|
||||
provider: json!({"require_parameters": true}),
|
||||
max_tokens: MAX_TOKENS,
|
||||
usage: json!({"include": true}),
|
||||
};
|
||||
let mut request = self
|
||||
.http
|
||||
.post(format!("{}/chat/completions", self.base_url))
|
||||
.bearer_auth(&self.api_key)
|
||||
.header("X-Title", "Sorsfonalak")
|
||||
.json(&body);
|
||||
if let Some(referer) = &self.referer {
|
||||
request = request.header("HTTP-Referer", referer);
|
||||
}
|
||||
let response = request.send().await.map_err(|e| LlmError::Transient(format!("request failed: {e}")))?;
|
||||
let status = response.status();
|
||||
let text = response.text().await.map_err(|e| LlmError::Transient(format!("reading response: {e}")))?;
|
||||
let reply: Value = serde_json::from_str(&text).unwrap_or(Value::Null);
|
||||
|
||||
if !status.is_success() {
|
||||
let message = format!(
|
||||
"HTTP {}: {}",
|
||||
status.as_u16(),
|
||||
error_message(&reply, &text.chars().take(300).collect::<String>())
|
||||
);
|
||||
// 402: our OpenRouter balance ran out; 408/429/5xx: try again later.
|
||||
return Err(match status.as_u16() {
|
||||
402 | 408 | 429 | 500..=599 => LlmError::Transient(message),
|
||||
_ => LlmError::Permanent(message),
|
||||
});
|
||||
}
|
||||
if reply["error"].is_object() {
|
||||
return Err(LlmError::Transient(format!("provider error: {}", error_message(&reply, "unknown"))));
|
||||
}
|
||||
let choice = &reply["choices"][0];
|
||||
if choice["finish_reason"] == "length" {
|
||||
return Err(LlmError::Transient("answer cut off at the token limit".into()));
|
||||
}
|
||||
let raw = choice["message"]["content"].as_str().unwrap_or_default();
|
||||
let content = extract_json(raw).ok_or_else(|| {
|
||||
LlmError::Transient(format!("answer is not JSON: {}", raw.chars().take(200).collect::<String>()))
|
||||
})?;
|
||||
validate(&prompt.schema, &content)
|
||||
.map_err(|e| LlmError::Transient(format!("answer does not match the schema: {e}")))?;
|
||||
|
||||
let usage = &reply["usage"];
|
||||
let tokens = |key: &str| usage[key].as_i64().and_then(|n| i32::try_from(n).ok());
|
||||
Ok(Completion {
|
||||
content,
|
||||
model: reply["model"].as_str().unwrap_or(model).to_owned(),
|
||||
input_tokens: tokens("prompt_tokens"),
|
||||
output_tokens: tokens("completion_tokens"),
|
||||
cost_usd: usage["cost"].as_f64(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn schema_properties_follow_required_order() {
|
||||
let schema = super::super::prompt::schema(super::super::prompt::Kind::Natal);
|
||||
let text = serde_json::to_string(&Ordered(&schema)).unwrap();
|
||||
let pos = |needle: &str| text.find(needle).unwrap();
|
||||
assert!(pos("\"title\":{") < pos("\"summary\":{"));
|
||||
assert!(pos("\"summary\":{") < pos("\"sections\":{"));
|
||||
assert!(pos("\"personality\":{") < pos("\"growth\":{"));
|
||||
assert!(pos("\"strengths\":{") < pos("\"advice\":{"));
|
||||
// inside a section the title comes before the body
|
||||
let section = &text[pos("\"personality\":{")..];
|
||||
assert!(section.find("\"title\":{").unwrap() < section.find("\"body\":{").unwrap());
|
||||
// the content is unchanged
|
||||
assert_eq!(serde_json::from_str::<Value>(&text).unwrap(), schema);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn extracts_json_from_fences_and_prose() {
|
||||
assert_eq!(extract_json(r#"{"a":1}"#), Some(json!({"a": 1})));
|
||||
assert_eq!(extract_json("```json\n{\"a\": 1}\n```"), Some(json!({"a": 1})));
|
||||
assert_eq!(extract_json("Here you go: {\"a\": {\"b\": 2}} Enjoy!"), Some(json!({"a": {"b": 2}})));
|
||||
assert_eq!(extract_json("no json here"), None);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,338 @@
|
||||
//! Prompts and output schemas of the analyses (prompt version [`PROMPT_VERSION`]).
|
||||
//!
|
||||
//! The model answers with one JSON object (OpenRouter structured output);
|
||||
//! [`validate`] checks it against the same schema before it is stored.
|
||||
|
||||
use serde_json::{Value, json};
|
||||
|
||||
/// Matches the backend's `ANALYSIS_PROMPT_VERSION` (part of the cache key).
|
||||
pub const PROMPT_VERSION: &str = "v2";
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum Kind {
|
||||
Natal,
|
||||
Synastry,
|
||||
/// A free teaser of a natal chart: a title and a few sentences.
|
||||
Summary,
|
||||
}
|
||||
|
||||
impl Kind {
|
||||
pub fn parse(s: &str) -> Option<Kind> {
|
||||
match s {
|
||||
"natal" => Some(Kind::Natal),
|
||||
"synastry" => Some(Kind::Synastry),
|
||||
"summary" => Some(Kind::Summary),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Prompt {
|
||||
pub system: String,
|
||||
pub user: String,
|
||||
pub schema_name: &'static str,
|
||||
pub schema: Value,
|
||||
}
|
||||
|
||||
/// (key, what the section covers) in reading order.
|
||||
const NATAL_SECTIONS: [(&str, &str); 6] = [
|
||||
("personality", "Core identity: the Sun, Moon, Ascendant and chart ruler read together"),
|
||||
("emotions", "Emotional needs, security and inner life (Moon, 4th house, water emphasis)"),
|
||||
("mind", "Thinking, communication and learning (Mercury, 3rd and 9th houses)"),
|
||||
("love", "Love, attraction and relationships (Venus, Mars, 5th and 7th houses, Descendant)"),
|
||||
("work", "Calling, career, money and daily work (MC, 10th, 2nd and 6th houses, Saturn, Jupiter)"),
|
||||
(
|
||||
"growth",
|
||||
"Main inner tensions, life lessons and the path of growth (tight squares and oppositions, Saturn, Chiron, Nodes)",
|
||||
),
|
||||
];
|
||||
|
||||
const SYNASTRY_SECTIONS: [(&str, &str); 5] = [
|
||||
("attraction", "What draws them together: Sun, Moon, Venus, Mars and Ascendant contacts"),
|
||||
("communication", "How they think and talk together (Mercury contacts, air emphasis, 3rd house overlays)"),
|
||||
("emotional_bond", "Emotional closeness, safety and care (Moon contacts, 4th and 8th house overlays)"),
|
||||
("friction", "Where they rub against each other and how to handle it (challenging aspects, Saturn, Pluto, Mars)"),
|
||||
("long_term", "Long-term potential and shared purpose, including the composite chart"),
|
||||
];
|
||||
|
||||
fn sections(kind: Kind) -> &'static [(&'static str, &'static str)] {
|
||||
match kind {
|
||||
Kind::Natal => &NATAL_SECTIONS,
|
||||
Kind::Synastry => &SYNASTRY_SECTIONS,
|
||||
Kind::Summary => &[],
|
||||
}
|
||||
}
|
||||
|
||||
/// The JSON schema of the answer (strict mode: every property required).
|
||||
pub fn schema(kind: Kind) -> Value {
|
||||
if kind == Kind::Summary {
|
||||
return json!({
|
||||
"type": "object",
|
||||
"additionalProperties": false,
|
||||
"required": ["title", "summary"],
|
||||
"properties": {
|
||||
"title": {"type": "string", "description": "Short, evocative title for this chart (at most 6 words)"},
|
||||
"summary": {"type": "string", "description": "3-4 sentences, 60-100 words, one paragraph"}
|
||||
}
|
||||
});
|
||||
}
|
||||
let mut props = serde_json::Map::new();
|
||||
for (key, about) in sections(kind) {
|
||||
props.insert(
|
||||
(*key).into(),
|
||||
json!({
|
||||
"type": "object",
|
||||
"description": about,
|
||||
"additionalProperties": false,
|
||||
"required": ["title", "body"],
|
||||
"properties": {
|
||||
"title": {"type": "string", "description": "Short, specific section title (not just the topic name)"},
|
||||
"body": {"type": "string", "description": "2-4 paragraphs separated by a blank line"}
|
||||
}
|
||||
}),
|
||||
);
|
||||
}
|
||||
let keys: Vec<&str> = sections(kind).iter().map(|(k, _)| *k).collect();
|
||||
json!({
|
||||
"type": "object",
|
||||
"additionalProperties": false,
|
||||
"required": ["title", "summary", "sections", "strengths", "challenges", "advice"],
|
||||
"properties": {
|
||||
"title": {"type": "string", "description": "Short, evocative title for this analysis (at most 8 words)"},
|
||||
"summary": {"type": "string", "description": "3-4 sentence overview"},
|
||||
"sections": {"type": "object", "additionalProperties": false, "required": keys, "properties": props},
|
||||
"strengths": {"type": "array", "items": {"type": "string"}, "description": "3-5 key strengths, one sentence each"},
|
||||
"challenges": {"type": "array", "items": {"type": "string"}, "description": "3-5 key challenges, one sentence each"},
|
||||
"advice": {"type": "string", "description": "A closing, encouraging paragraph with concrete guidance"}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const HUNGARIAN_STYLE: &str = "\
|
||||
Write natural, idiomatic Hungarian, as a native Hungarian author would; it must not read like a translation from English. \
|
||||
Use correct Hungarian suffixes and vowel harmony, Hungarian quotation marks („…”) and the en dash (–). \
|
||||
Use the usual Hungarian astrological terms:
|
||||
- signs: Kos, Bika, Ikrek, Rák, Oroszlán, Szűz, Mérleg, Skorpió, Nyilas, Bak, Vízöntő, Halak (\"a Nap a Rák jegyében\", \"Kos Aszcendens\");
|
||||
- planets and points: Nap, Hold, Merkúr, Vénusz, Mars, Jupiter, Szaturnusz, Uránusz, Neptunusz, Plútó, Chiron (Kiron), \
|
||||
Észak-Holdcsomópont, Dél-Holdcsomópont, Lilith (Fekete Hold), Aszcendens, Descendens, Medium Coeli (MC), Imum Coeli (IC), Szerencsepont;
|
||||
- aspects: együttállás (konjunkció), szextil, kvadrát (négyzet), trigon, szembenállás (oppozíció);
|
||||
- elements and modalities: tűz, föld, levegő, víz (\"tűz elem\", \"a föld hiánya\"); kardinális, fix, változó;
|
||||
Never leave English words (e.g. fire, earth, air, water) in the Hungarian text.
|
||||
- other: \"a 3. házban\", \"a horoszkóp uralkodója\", retrográd, uralom (domicilium), száműzetés, exaltáció, esés, nappali/éjszakai horoszkóp.";
|
||||
|
||||
fn language_name(language: &str) -> &'static str {
|
||||
match language {
|
||||
"hu" => "Hungarian",
|
||||
_ => "English",
|
||||
}
|
||||
}
|
||||
|
||||
fn rules(kind: Kind, language: &str) -> String {
|
||||
let (role, reader) = match kind {
|
||||
Kind::Natal => (
|
||||
"a personal natal chart interpretation",
|
||||
"Speak to the owner of the chart directly, in the informal second person singular (in Hungarian: tegező forma, \"te\").",
|
||||
),
|
||||
Kind::Summary => (
|
||||
"a short free summary of a natal chart (a teaser shown before the detailed, paid analysis)",
|
||||
"Speak to the owner of the chart directly, in the informal second person singular (in Hungarian: tegező forma, \"te\").",
|
||||
),
|
||||
Kind::Synastry => (
|
||||
"a relationship (synastry) interpretation for two people",
|
||||
"Write for both people at once, in the informal second person plural (in Hungarian: \"ti\", \"kettőtök\"). \
|
||||
When you must tell them apart, call them Person 1 and Person 2 (in Hungarian: \"az első fél\" and \"a második fél\"). \
|
||||
Do not assume their genders or the type of relationship.",
|
||||
),
|
||||
};
|
||||
let mut text = format!(
|
||||
"You are an experienced, warm and psychologically minded astrologer. You write {role} for the Sorsfonalak app.
|
||||
|
||||
Write in {lang}.
|
||||
|
||||
Rules:
|
||||
- Base every statement on the chart data given. Never invent positions, aspects or houses that are not listed.
|
||||
- When you interpret a placement, name its astrological basis in a short clause, but keep the focus on the person, not on jargon.
|
||||
- Synthesize: weave signs, houses, aspects and rulers into one coherent portrait; show how tensions can be integrated. \
|
||||
Give the most weight to the Sun, Moon, Ascendant, chart ruler, tight aspects (orb under 3°) and strong emphases or gaps in elements and modalities.
|
||||
- If a birth time is unknown, do not mention houses, the Ascendant or the Midheaven for that chart, and be careful with the Moon's sign.
|
||||
- {reader}
|
||||
- Tone: warm, honest, empowering and concrete. Not fatalistic: no predictions of illness, death, accidents or specific events, \
|
||||
and no medical, legal or financial advice.
|
||||
- Avoid generic horoscope clichés and filler: every paragraph must say something specific to this chart.
|
||||
- Texts are plain paragraphs separated by a blank line, without headings or lists inside; **bold** may be used sparingly.
|
||||
- {length}
|
||||
- Answer with a single JSON object that matches the given schema, and nothing else.",
|
||||
lang = language_name(language),
|
||||
length = match kind {
|
||||
Kind::Summary => "Length: one paragraph of 3-4 sentences (60-100 words). Pick the Sun, Moon and Ascendant \
|
||||
(if the birth time is known) and the single most striking feature of the chart (a very tight aspect, \
|
||||
a stellium, a strong element emphasis or gap). It must be complete in itself and specific to this chart: \
|
||||
no sales talk, and do not mention a longer analysis.",
|
||||
_ => "Length: each section 2-4 paragraphs (about 150-250 words); the whole analysis about 1300-1800 words.",
|
||||
},
|
||||
);
|
||||
if language == "hu" {
|
||||
text.push_str("\n\n");
|
||||
text.push_str(HUNGARIAN_STYLE);
|
||||
}
|
||||
text
|
||||
}
|
||||
|
||||
pub fn build(kind: Kind, language: &str, chart_text: &str) -> Prompt {
|
||||
let mut user = String::from("Chart data:\n\n");
|
||||
user.push_str(chart_text);
|
||||
if kind == Kind::Summary {
|
||||
user.push_str("\nWrite the short summary now.");
|
||||
} else {
|
||||
user.push_str("\nSections to write, in this order:\n");
|
||||
for (key, about) in sections(kind) {
|
||||
user.push_str(&format!("- {key}: {about}\n"));
|
||||
}
|
||||
user.push_str("\nWrite the analysis now.");
|
||||
}
|
||||
Prompt {
|
||||
system: rules(kind, language),
|
||||
user,
|
||||
schema_name: match kind {
|
||||
Kind::Natal => "natal_analysis",
|
||||
Kind::Synastry => "synastry_analysis",
|
||||
Kind::Summary => "chart_summary",
|
||||
},
|
||||
schema: schema(kind),
|
||||
}
|
||||
}
|
||||
|
||||
/// Checks an answer against our schema subset (objects with required
|
||||
/// properties, strings with at least three letters, string arrays with at
|
||||
/// least two items). A placeholder such as "x" counts as missing.
|
||||
pub fn validate(schema: &Value, value: &Value) -> Result<(), String> {
|
||||
fn walk(schema: &Value, value: &Value, path: &str) -> Result<(), String> {
|
||||
match schema["type"].as_str() {
|
||||
Some("object") => {
|
||||
let obj = value.as_object().ok_or_else(|| format!("{path}: expected an object"))?;
|
||||
for key in schema["required"].as_array().into_iter().flatten().filter_map(Value::as_str) {
|
||||
let child = obj.get(key).ok_or_else(|| format!("{path}.{key}: missing"))?;
|
||||
walk(&schema["properties"][key], child, &format!("{path}.{key}"))?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
Some("array") => {
|
||||
let items = value.as_array().ok_or_else(|| format!("{path}: expected an array"))?;
|
||||
if items.len() < 2 {
|
||||
return Err(format!("{path}: too few items"));
|
||||
}
|
||||
items.iter().enumerate().try_for_each(|(i, v)| walk(&schema["items"], v, &format!("{path}[{i}]")))
|
||||
}
|
||||
Some("string") => match value.as_str() {
|
||||
Some(s) if s.chars().filter(|c| c.is_alphabetic()).nth(2).is_some() => Ok(()),
|
||||
_ => Err(format!("{path}: expected a non-empty string")),
|
||||
},
|
||||
_ => Ok(()),
|
||||
}
|
||||
}
|
||||
walk(schema, value, "$")
|
||||
}
|
||||
|
||||
/// Fixes typography the models often get wrong. In Hungarian, pairs of
|
||||
/// straight double quotes become „…” (only when they pair up evenly).
|
||||
pub fn polish(language: &str, content: &mut Value) {
|
||||
fn hungarian_quotes(text: &str) -> Option<String> {
|
||||
if !text.contains('"') || !text.matches('"').count().is_multiple_of(2) {
|
||||
return None;
|
||||
}
|
||||
let mut open = true;
|
||||
Some(
|
||||
text.chars()
|
||||
.map(|c| match c {
|
||||
'"' => {
|
||||
let q = if open { '„' } else { '”' };
|
||||
open = !open;
|
||||
q
|
||||
}
|
||||
c => c,
|
||||
})
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
match content {
|
||||
Value::String(s) if language == "hu" => {
|
||||
if let Some(fixed) = hungarian_quotes(s) {
|
||||
*s = fixed;
|
||||
}
|
||||
}
|
||||
Value::Array(items) => items.iter_mut().for_each(|v| polish(language, v)),
|
||||
Value::Object(map) => map.values_mut().for_each(|v| polish(language, v)),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
/// The analysis as Markdown (for reading and comparing outputs).
|
||||
pub fn to_markdown(kind: Kind, language: &str, content: &Value) -> String {
|
||||
let (strengths, challenges, advice) = if language == "hu" {
|
||||
("Erősségek", "Kihívások", "Útravaló")
|
||||
} else {
|
||||
("Strengths", "Challenges", "Advice")
|
||||
};
|
||||
let mut md =
|
||||
format!("# {}\n\n_{}_\n\n", content["title"].as_str().unwrap_or(""), content["summary"].as_str().unwrap_or(""));
|
||||
if kind == Kind::Summary {
|
||||
return md;
|
||||
}
|
||||
for (key, _) in sections(kind) {
|
||||
let s = &content["sections"][*key];
|
||||
md.push_str(&format!("## {}\n\n{}\n\n", s["title"].as_str().unwrap_or(key), s["body"].as_str().unwrap_or("")));
|
||||
}
|
||||
for (title, key) in [(strengths, "strengths"), (challenges, "challenges")] {
|
||||
md.push_str(&format!("## {title}\n\n"));
|
||||
for item in content[key].as_array().into_iter().flatten().filter_map(Value::as_str) {
|
||||
md.push_str(&format!("- {item}\n"));
|
||||
}
|
||||
md.push('\n');
|
||||
}
|
||||
md.push_str(&format!("## {advice}\n\n{}\n", content["advice"].as_str().unwrap_or("")));
|
||||
md
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn summary_prompt_is_short() {
|
||||
let p = build(Kind::Summary, "hu", "SUN: Cancer");
|
||||
assert_eq!(p.schema_name, "chart_summary");
|
||||
assert!(p.system.contains("3-4 sentences") && p.system.contains("tegező"));
|
||||
assert!(!p.user.contains("Sections to write"));
|
||||
assert_eq!(validate(&p.schema, &json!({"title": "Érzékeny mag", "summary": "Rövid szöveg."})), Ok(()));
|
||||
assert!(validate(&p.schema, &json!({"title": "Érzékeny mag"})).is_err());
|
||||
let md = to_markdown(Kind::Summary, "hu", &json!({"title": "Cím", "summary": "Szöveg."}));
|
||||
assert_eq!(md, "# Cím\n\n_Szöveg._\n\n");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn validate_rejects_placeholder_titles() {
|
||||
let schema = schema(Kind::Synastry);
|
||||
let section = json!({"title": "Rák-szívek", "body": "Két bekezdés szöveg."});
|
||||
let mut answer = json!({
|
||||
"title": "Két Rák-szív", "summary": "Összefoglaló.", "advice": "Útravaló.",
|
||||
"strengths": ["Egyik erősség.", "Másik erősség."], "challenges": ["Egy kihívás.", "Még egy."],
|
||||
"sections": {"attraction": section, "communication": section, "emotional_bond": section,
|
||||
"friction": section, "long_term": section},
|
||||
});
|
||||
assert_eq!(validate(&schema, &answer), Ok(()));
|
||||
answer["sections"]["attraction"]["title"] = json!("x");
|
||||
assert_eq!(validate(&schema, &answer), Err("$.sections.attraction.title: expected a non-empty string".into()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn polish_turns_straight_quotes_hungarian() {
|
||||
let mut v = json!({"a": "a \"hazai pálya\" és a \"sorok\"", "b": ["egy \" pár nélkül"], "c": {"d": "nincs"}});
|
||||
polish("hu", &mut v);
|
||||
assert_eq!(v["a"], "a „hazai pálya” és a „sorok”");
|
||||
assert_eq!(v["b"][0], "egy \" pár nélkül");
|
||||
assert_eq!(v["c"]["d"], "nincs");
|
||||
let mut en = json!({"a": "the \"home\" ground"});
|
||||
polish("en", &mut en);
|
||||
assert_eq!(en["a"], "the \"home\" ground");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,147 @@
|
||||
//! `worker compare-models`: writes the same natal (or synastry) analysis with
|
||||
//! several models for a blind comparison.
|
||||
//!
|
||||
//! ```text
|
||||
//! OPENROUTER_API_KEY=... worker compare-models --chart natal.json \
|
||||
//! --models minimax/minimax-m3,anthropic/claude-sonnet-5.5 [--language hu] [--out DIR]
|
||||
//! ```
|
||||
//!
|
||||
//! `--chart` is a horoscope-api `/v1/natal` response; `--synastry FILE` (instead
|
||||
//! of `--chart`) takes a `/v1/synastry` response for a relationship analysis;
|
||||
//! `--summary` with `--chart` writes the short free summary instead. The models get shuffled
|
||||
//! letters: `A.md`, `B.md`, ... hold the analyses, `key.json` tells which
|
||||
//! letter is which model (with tokens, cost and time). The output on the
|
||||
//! console does not reveal the mapping.
|
||||
|
||||
use std::path::PathBuf;
|
||||
use std::time::Instant;
|
||||
|
||||
use anyhow::{Context, bail};
|
||||
use rand::seq::SliceRandom;
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use crate::analysis::openrouter::{DEFAULT_BASE_URL, OpenRouter};
|
||||
use crate::analysis::{compact, prompt};
|
||||
|
||||
struct Args {
|
||||
input: PathBuf,
|
||||
kind: prompt::Kind,
|
||||
models: Vec<String>,
|
||||
language: String,
|
||||
out: PathBuf,
|
||||
}
|
||||
|
||||
fn parse(args: Vec<String>) -> anyhow::Result<Args> {
|
||||
let (mut chart, mut synastry, mut models, mut language, mut out) = (None, None, Vec::new(), "hu".to_owned(), None);
|
||||
let mut summary = false;
|
||||
let mut it = args.into_iter();
|
||||
while let Some(flag) = it.next() {
|
||||
let mut value = || it.next().with_context(|| format!("{flag} needs a value"));
|
||||
match flag.as_str() {
|
||||
"--chart" => chart = Some(PathBuf::from(value()?)),
|
||||
"--synastry" => synastry = Some(PathBuf::from(value()?)),
|
||||
"--summary" => summary = true,
|
||||
"--models" => models = value()?.split(',').map(|m| m.trim().to_owned()).filter(|m| !m.is_empty()).collect(),
|
||||
"--language" => language = value()?,
|
||||
"--out" => out = Some(PathBuf::from(value()?)),
|
||||
other => bail!("unknown argument '{other}'"),
|
||||
}
|
||||
}
|
||||
let (input, kind) = match (chart, synastry) {
|
||||
(Some(c), None) if summary => (c, prompt::Kind::Summary),
|
||||
(Some(c), None) => (c, prompt::Kind::Natal),
|
||||
(None, Some(s)) => (s, prompt::Kind::Synastry),
|
||||
_ => bail!("give either --chart or --synastry"),
|
||||
};
|
||||
if models.is_empty() {
|
||||
bail!("--models is required (comma separated OpenRouter model ids)");
|
||||
}
|
||||
if models.len() > 26 {
|
||||
bail!("at most 26 models");
|
||||
}
|
||||
let out = out.unwrap_or_else(|| {
|
||||
let stamp = time::OffsetDateTime::now_utc().unix_timestamp();
|
||||
PathBuf::from(format!("model-compare-{stamp}"))
|
||||
});
|
||||
Ok(Args { input, kind, models, language, out })
|
||||
}
|
||||
|
||||
pub async fn main(args: Vec<String>) -> anyhow::Result<()> {
|
||||
let args = parse(args)?;
|
||||
let key = std::env::var("OPENROUTER_API_KEY")
|
||||
.ok()
|
||||
.filter(|k| !k.trim().is_empty())
|
||||
.context("OPENROUTER_API_KEY is not set")?;
|
||||
let base_url = std::env::var("OPENROUTER_BASE_URL").unwrap_or_else(|_| DEFAULT_BASE_URL.into());
|
||||
|
||||
let raw = std::fs::read_to_string(&args.input).with_context(|| format!("reading {}", args.input.display()))?;
|
||||
let mut input: Value = serde_json::from_str(&raw).context("the input file is not JSON")?;
|
||||
if input["result"].is_object() {
|
||||
input = input["result"].take();
|
||||
}
|
||||
let data = match args.kind {
|
||||
prompt::Kind::Synastry => compact::synastry(&input["person1"], &input["person2"], &input),
|
||||
_ => compact::natal(&input),
|
||||
};
|
||||
let built = prompt::build(args.kind, &args.language, &data);
|
||||
|
||||
std::fs::create_dir_all(&args.out)?;
|
||||
std::fs::write(
|
||||
args.out.join("prompt.md"),
|
||||
format!(
|
||||
"# System\n\n{}\n\n# User\n\n{}\n\n# Schema\n\n```json\n{:#}\n```\n",
|
||||
built.system, built.user, built.schema
|
||||
),
|
||||
)?;
|
||||
|
||||
let kind = args.kind;
|
||||
let mut models = args.models.clone();
|
||||
models.shuffle(&mut rand::rng());
|
||||
let llm = std::sync::Arc::new(OpenRouter::new(&base_url, &key, None));
|
||||
let built = std::sync::Arc::new(built);
|
||||
println!("Writing {} analyses in parallel (this takes a minute or two)...", models.len());
|
||||
|
||||
let mut tasks = tokio::task::JoinSet::new();
|
||||
for (i, model) in models.iter().enumerate() {
|
||||
let (llm, built, model) = (llm.clone(), built.clone(), model.clone());
|
||||
let letter = char::from(b'A' + i as u8);
|
||||
tasks.spawn(async move {
|
||||
let started = Instant::now();
|
||||
let result = llm.complete(&model, &built).await;
|
||||
(letter, model, result, started.elapsed().as_secs_f64())
|
||||
});
|
||||
}
|
||||
|
||||
let mut key_entries = Vec::new();
|
||||
let mut total_cost = 0.0;
|
||||
while let Some(joined) = tasks.join_next().await {
|
||||
let (letter, model, result, secs) = joined?;
|
||||
match result {
|
||||
Ok(mut c) => {
|
||||
prompt::polish(&args.language, &mut c.content);
|
||||
let md = prompt::to_markdown(kind, &args.language, &c.content);
|
||||
let words = md.split_whitespace().count();
|
||||
std::fs::write(args.out.join(format!("{letter}.md")), &md)?;
|
||||
std::fs::write(args.out.join(format!("{letter}.json")), serde_json::to_string_pretty(&c.content)?)?;
|
||||
total_cost += c.cost_usd.unwrap_or(0.0);
|
||||
println!("{letter}: ok, {words} words");
|
||||
key_entries.push(json!({
|
||||
"letter": letter.to_string(), "model": model, "model_used": c.model, "ok": true, "words": words,
|
||||
"input_tokens": c.input_tokens, "output_tokens": c.output_tokens, "cost_usd": c.cost_usd,
|
||||
"seconds": (secs * 10.0).round() / 10.0,
|
||||
}));
|
||||
}
|
||||
Err(e) => {
|
||||
println!("{letter}: failed (details in key.json)");
|
||||
key_entries.push(json!({
|
||||
"letter": letter.to_string(), "model": model, "ok": false, "error": e.message(),
|
||||
"seconds": (secs * 10.0).round() / 10.0,
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
key_entries.sort_by(|a, b| a["letter"].as_str().cmp(&b["letter"].as_str()));
|
||||
std::fs::write(args.out.join("key.json"), serde_json::to_string_pretty(&key_entries)?)?;
|
||||
println!("Total cost: ${total_cost:.4}. Output: {}", args.out.display());
|
||||
Ok(())
|
||||
}
|
||||
@@ -16,6 +16,15 @@ pub struct Config {
|
||||
pub poll_interval: Duration,
|
||||
/// After this many failed attempts an e-mail is marked as failed.
|
||||
pub max_email_attempts: i32,
|
||||
/// Unset: analyses stay pending.
|
||||
pub openrouter_api_key: Option<String>,
|
||||
pub openrouter_base_url: String,
|
||||
/// Frontend address, sent to OpenRouter as `HTTP-Referer`.
|
||||
pub public_base_url: Option<String>,
|
||||
/// Analyses written at the same time.
|
||||
pub analysis_concurrency: usize,
|
||||
/// After this many failed attempts an analysis fails and is refunded.
|
||||
pub max_analysis_attempts: i32,
|
||||
}
|
||||
|
||||
fn var(name: &str) -> Option<String> {
|
||||
@@ -41,6 +50,13 @@ impl Config {
|
||||
mail_from: mail_from.parse().with_context(|| format!("invalid MAIL_FROM '{mail_from}'"))?,
|
||||
poll_interval: Duration::from_secs(parsed("POLL_INTERVAL_SECS", 30)?),
|
||||
max_email_attempts: parsed("MAX_EMAIL_ATTEMPTS", 8)?,
|
||||
// The lower-case name is accepted too (as written in some secrets files).
|
||||
openrouter_api_key: var("OPENROUTER_API_KEY").or_else(|| var("openrouter_api_key")),
|
||||
openrouter_base_url: var("OPENROUTER_BASE_URL")
|
||||
.unwrap_or_else(|| crate::analysis::openrouter::DEFAULT_BASE_URL.into()),
|
||||
public_base_url: var("PUBLIC_BASE_URL"),
|
||||
analysis_concurrency: parsed("ANALYSIS_CONCURRENCY", 4)?,
|
||||
max_analysis_attempts: parsed("MAX_ANALYSIS_ATTEMPTS", 3)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ use lettre::message::{Mailbox, MultiPart};
|
||||
use lettre::{AsyncSmtpTransport, AsyncTransport, Message, Tokio1Executor};
|
||||
use serde_json::Value;
|
||||
use sqlx::PgPool;
|
||||
use sqlx::postgres::PgListener;
|
||||
use tokio::sync::watch;
|
||||
use uuid::Uuid;
|
||||
|
||||
@@ -174,18 +173,8 @@ impl Delivery {
|
||||
}
|
||||
}
|
||||
|
||||
async fn listen(db: &PgPool) -> Option<PgListener> {
|
||||
let result = async {
|
||||
let mut listener = PgListener::connect_with(db).await?;
|
||||
listener.listen(CHANNEL).await?;
|
||||
Ok::<_, sqlx::Error>(listener)
|
||||
}
|
||||
.await;
|
||||
result.map_err(|e| tracing::warn!(error = %e, "LISTEN failed; polling only")).ok()
|
||||
}
|
||||
|
||||
pub async fn run(delivery: Delivery, poll: Duration, stop: watch::Receiver<bool>) {
|
||||
let mut listener = listen(&delivery.db).await;
|
||||
let mut listener = crate::listen(&delivery.db, CHANNEL).await;
|
||||
loop {
|
||||
if *stop.borrow() {
|
||||
break;
|
||||
@@ -195,20 +184,8 @@ pub async fn run(delivery: Delivery, poll: Duration, stop: watch::Receiver<bool>
|
||||
Ok(_) => {}
|
||||
Err(e) => tracing::error!(error = %e, "e-mail delivery"),
|
||||
}
|
||||
let notified = async {
|
||||
match listener.as_mut() {
|
||||
// Reconnects by itself; an error means the connection was lost for now.
|
||||
Some(l) => {
|
||||
if let Err(e) = l.recv().await {
|
||||
tracing::warn!(error = %e, "LISTEN connection lost");
|
||||
tokio::time::sleep(Duration::from_secs(5)).await;
|
||||
}
|
||||
}
|
||||
None => std::future::pending().await,
|
||||
}
|
||||
};
|
||||
tokio::select! {
|
||||
() = notified => {}
|
||||
() = crate::notified(listener.as_mut()) => {}
|
||||
() = tokio::time::sleep(poll) => {}
|
||||
() = crate::stopped(stop.clone()) => break,
|
||||
}
|
||||
|
||||
@@ -3,17 +3,21 @@
|
||||
//!
|
||||
//! * e-mail delivery from `email_outbox` over SMTP (Mailpit in development)
|
||||
//! * hourly cleanup of expired sessions, tokens, invites and old e-mails
|
||||
//! * later: writing the text analyses (LLM)
|
||||
//! * writing the requested text analyses with an LLM (OpenRouter)
|
||||
//!
|
||||
//! Configuration: see [`config::Config`]; plus `BIND_ADDR` (default
|
||||
//! `0.0.0.0:8082`, only `/healthz`), `LOG_FORMAT` and `RUST_LOG`.
|
||||
//! `worker healthcheck` performs a local health check (for Docker).
|
||||
//! `worker healthcheck` performs a local health check (for Docker);
|
||||
//! `worker compare-models ...` writes one analysis with several models (see [`compare`]).
|
||||
|
||||
mod analysis;
|
||||
mod cleanup;
|
||||
mod compare;
|
||||
mod config;
|
||||
mod email;
|
||||
mod templates;
|
||||
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use anyhow::Context;
|
||||
@@ -22,6 +26,7 @@ use axum::extract::State;
|
||||
use axum::http::StatusCode;
|
||||
use axum::routing::get;
|
||||
use sqlx::PgPool;
|
||||
use sqlx::postgres::PgListener;
|
||||
use tokio::sync::watch;
|
||||
|
||||
use crate::config::Config;
|
||||
@@ -33,6 +38,31 @@ pub async fn stopped(mut stop: watch::Receiver<bool>) {
|
||||
let _ = stop.wait_for(|s| *s).await;
|
||||
}
|
||||
|
||||
/// Subscribes to a NOTIFY channel; `None` (polling only) if that fails.
|
||||
pub async fn listen(db: &PgPool, channel: &str) -> Option<PgListener> {
|
||||
let result = async {
|
||||
let mut listener = PgListener::connect_with(db).await?;
|
||||
listener.listen(channel).await?;
|
||||
Ok::<_, sqlx::Error>(listener)
|
||||
}
|
||||
.await;
|
||||
result.map_err(|e| tracing::warn!(channel, error = %e, "LISTEN failed; polling only")).ok()
|
||||
}
|
||||
|
||||
/// Resolves on the next notification; never without a listener.
|
||||
pub async fn notified(listener: Option<&mut PgListener>) {
|
||||
match listener {
|
||||
// Reconnects by itself; an error means the connection is down for now.
|
||||
Some(l) => {
|
||||
if let Err(e) = l.recv().await {
|
||||
tracing::warn!(error = %e, "LISTEN connection lost");
|
||||
tokio::time::sleep(Duration::from_secs(5)).await;
|
||||
}
|
||||
}
|
||||
None => std::future::pending().await,
|
||||
}
|
||||
}
|
||||
|
||||
async fn healthz(State(db): State<PgPool>) -> StatusCode {
|
||||
match sqlx::query("SELECT 1").execute(&db).await {
|
||||
Ok(_) => StatusCode::OK,
|
||||
@@ -43,13 +73,18 @@ async fn healthz(State(db): State<PgPool>) -> StatusCode {
|
||||
#[tokio::main]
|
||||
async fn main() -> anyhow::Result<()> {
|
||||
let addr = service_kit::bind_addr(DEFAULT_BIND_ADDR)?;
|
||||
if std::env::args().nth(1).as_deref() == Some("healthcheck") {
|
||||
return service_kit::healthcheck(addr);
|
||||
match std::env::args().nth(1).as_deref() {
|
||||
Some("healthcheck") => return service_kit::healthcheck(addr),
|
||||
Some("compare-models") => {
|
||||
service_kit::init_logging();
|
||||
return compare::main(std::env::args().skip(2).collect()).await;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
service_kit::init_logging();
|
||||
let config = Config::from_env()?;
|
||||
let pool = db::connect(&config.database_url).await.context("connecting to the database")?;
|
||||
db::MIGRATOR.run(&pool).await.context("running database migrations")?;
|
||||
db::migrate(&pool).await.context("running database migrations")?;
|
||||
|
||||
let (stop_tx, stop) = watch::channel(false);
|
||||
let mut jobs = tokio::task::JoinSet::new();
|
||||
@@ -61,6 +96,17 @@ async fn main() -> anyhow::Result<()> {
|
||||
}
|
||||
None => tracing::warn!("SMTP_URL is not set: e-mails stay in the outbox"),
|
||||
}
|
||||
match &config.openrouter_api_key {
|
||||
Some(key) => {
|
||||
let llm =
|
||||
analysis::openrouter::OpenRouter::new(&config.openrouter_base_url, key, config.public_base_url.clone());
|
||||
let analyzer =
|
||||
analysis::Analyzer::new(pool.clone(), llm, config.max_analysis_attempts, config.analysis_concurrency);
|
||||
tracing::info!(concurrency = analyzer.concurrency, "analyses enabled");
|
||||
jobs.spawn(analysis::run(Arc::new(analyzer), config.poll_interval, stop.clone()));
|
||||
}
|
||||
None => tracing::warn!("OPENROUTER_API_KEY is not set: analyses stay pending"),
|
||||
}
|
||||
jobs.spawn(cleanup::run(pool.clone(), stop.clone()));
|
||||
|
||||
let app = Router::new().route("/healthz", get(healthz)).with_state(pool);
|
||||
|
||||
@@ -180,3 +180,306 @@ async fn cleanup_removes_only_expired_data(db: PgPool) {
|
||||
sqlx::query_as("SELECT array_agg(id ORDER BY id) FROM email_outbox").fetch_one(&db).await.unwrap();
|
||||
assert_eq!(left, vec![recent, unsent]);
|
||||
}
|
||||
|
||||
// --- analyses ----------------------------------------------------------------------------
|
||||
|
||||
mod analyses {
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use axum::Json;
|
||||
use axum::extract::State;
|
||||
use axum::http::StatusCode;
|
||||
use serde_json::{Value, json};
|
||||
use sqlx::PgPool;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::analysis::openrouter::OpenRouter;
|
||||
use crate::analysis::prompt::{Kind, schema, validate};
|
||||
use crate::analysis::{Analyzer, backoff};
|
||||
|
||||
/// Scripted replies (then the last one forever) and the requests received.
|
||||
#[derive(Clone, Default)]
|
||||
struct Fake {
|
||||
replies: Arc<Mutex<Vec<(u16, Value)>>>,
|
||||
requests: Arc<Mutex<Vec<Value>>>,
|
||||
}
|
||||
|
||||
async fn completions(State(fake): State<Fake>, Json(body): Json<Value>) -> (StatusCode, Json<Value>) {
|
||||
fake.requests.lock().unwrap().push(body);
|
||||
let mut replies = fake.replies.lock().unwrap();
|
||||
let (status, reply) = if replies.len() > 1 { replies.remove(0) } else { replies[0].clone() };
|
||||
(StatusCode::from_u16(status).unwrap(), Json(reply))
|
||||
}
|
||||
|
||||
async fn fake_openrouter(replies: Vec<(u16, Value)>) -> (Fake, String) {
|
||||
let fake = Fake { replies: Arc::new(Mutex::new(replies)), ..Default::default() };
|
||||
let app =
|
||||
axum::Router::new().route("/chat/completions", axum::routing::post(completions)).with_state(fake.clone());
|
||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||
let addr = listener.local_addr().unwrap();
|
||||
tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
|
||||
(fake, format!("http://{addr}"))
|
||||
}
|
||||
|
||||
fn content(kind: Kind) -> Value {
|
||||
let schema = schema(kind);
|
||||
let keys: Vec<&str> = schema["properties"]["sections"]["required"]
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.iter()
|
||||
.map(|k| k.as_str().unwrap())
|
||||
.collect();
|
||||
let sections: serde_json::Map<String, Value> = keys
|
||||
.iter()
|
||||
.map(|k| ((*k).to_owned(), json!({"title": format!("Cím {k}"), "body": "Első bekezdés.\n\nMásodik."})))
|
||||
.collect();
|
||||
json!({
|
||||
"title": "Csendes erő", "summary": "Összefoglaló.", "sections": sections,
|
||||
"strengths": ["Kitartás.", "Empátia."], "challenges": ["Túlgondolás.", "Visszahúzódás."],
|
||||
"advice": "Bízz magadban."
|
||||
})
|
||||
}
|
||||
|
||||
fn reply(content: &Value) -> (u16, Value) {
|
||||
(
|
||||
200,
|
||||
json!({
|
||||
"model": "test/model-2026",
|
||||
"choices": [{"finish_reason": "stop", "message": {"role": "assistant", "content": content.to_string()}}],
|
||||
"usage": {"prompt_tokens": 2100, "completion_tokens": 4800, "cost": 0.0123}
|
||||
}),
|
||||
)
|
||||
}
|
||||
|
||||
fn fixture(name: &str) -> Value {
|
||||
let path = format!("{}/testdata/{name}", env!("CARGO_MANIFEST_DIR"));
|
||||
serde_json::from_str(&std::fs::read_to_string(path).unwrap()).unwrap()
|
||||
}
|
||||
|
||||
struct Setup {
|
||||
user: Uuid,
|
||||
chart: Uuid,
|
||||
}
|
||||
|
||||
async fn setup(db: &PgPool) -> Setup {
|
||||
let (user, chart) = (Uuid::now_v7(), Uuid::now_v7());
|
||||
sqlx::query("INSERT INTO users (id, email) VALUES ($1, 'anna@example.com')")
|
||||
.bind(user)
|
||||
.execute(db)
|
||||
.await
|
||||
.unwrap();
|
||||
sqlx::query(
|
||||
"INSERT INTO charts (id, owner_id, label, is_primary, birth_data, result, chart_hash) \
|
||||
VALUES ($1, $2, 'Saját', true, '{}', $3, 'hash1')",
|
||||
)
|
||||
.bind(chart)
|
||||
.bind(user)
|
||||
.bind(fixture("natal-1990-03-15.json"))
|
||||
.execute(db)
|
||||
.await
|
||||
.unwrap();
|
||||
Setup { user, chart }
|
||||
}
|
||||
|
||||
async fn request_analysis(db: &PgPool, s: &Setup) -> Uuid {
|
||||
let id = Uuid::now_v7();
|
||||
sqlx::query(
|
||||
"INSERT INTO analyses (id, kind, chart_id, requested_by, language, model, prompt_version, cache_key, credits_charged) \
|
||||
VALUES ($1, 'natal', $2, $3, 'hu', 'test/model', 'v1', 'key', 1)",
|
||||
)
|
||||
.bind(id)
|
||||
.bind(s.chart)
|
||||
.bind(s.user)
|
||||
.execute(db)
|
||||
.await
|
||||
.unwrap();
|
||||
id
|
||||
}
|
||||
|
||||
fn analyzer(db: &PgPool, base_url: &str) -> Analyzer {
|
||||
Analyzer::new(db.clone(), OpenRouter::new(base_url, "test-key", None), 3, 2)
|
||||
}
|
||||
|
||||
async fn run_once(a: &Analyzer) -> bool {
|
||||
match a.claim().await.unwrap() {
|
||||
Some(job) => {
|
||||
a.handle(job).await;
|
||||
true
|
||||
}
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
type Row = (String, i32, Option<String>, Option<String>, Option<i32>, Option<f64>, bool);
|
||||
|
||||
async fn row(db: &PgPool, id: Uuid) -> Row {
|
||||
sqlx::query_as(
|
||||
"SELECT status, attempts, error, model_used, output_tokens, cost_usd, next_attempt_at > now() \
|
||||
FROM analyses WHERE id = $1",
|
||||
)
|
||||
.bind(id)
|
||||
.fetch_one(db)
|
||||
.await
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
async fn refunds(db: &PgPool, user: Uuid) -> Vec<i32> {
|
||||
sqlx::query_scalar(
|
||||
"SELECT delta FROM credit_ledger WHERE user_id = $1 AND reason = 'refund' AND unit = 'natal'",
|
||||
)
|
||||
.bind(user)
|
||||
.fetch_all(db)
|
||||
.await
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
async fn make_due(db: &PgPool, id: Uuid) {
|
||||
sqlx::query("UPDATE analyses SET next_attempt_at = now() WHERE id = $1").bind(id).execute(db).await.unwrap();
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn writes_the_analysis(db: PgPool) {
|
||||
let s = setup(&db).await;
|
||||
let id = request_analysis(&db, &s).await;
|
||||
let (fake, url) = fake_openrouter(vec![reply(&content(Kind::Natal))]).await;
|
||||
let a = analyzer(&db, &url);
|
||||
|
||||
assert!(run_once(&a).await);
|
||||
assert!(!run_once(&a).await, "nothing else is due");
|
||||
assert_eq!(
|
||||
row(&db, id).await,
|
||||
("done".into(), 1, None, Some("test/model-2026".into()), Some(4800), Some(0.0123), false)
|
||||
);
|
||||
let (stored,): (Value,) =
|
||||
sqlx::query_as("SELECT content FROM analyses WHERE id = $1").bind(id).fetch_one(&db).await.unwrap();
|
||||
assert_eq!(stored["title"], "Csendes erő");
|
||||
|
||||
let requests = fake.requests.lock().unwrap();
|
||||
let body = &requests[0];
|
||||
assert_eq!(body["model"], "test/model");
|
||||
assert_eq!(body["response_format"]["json_schema"]["strict"], true);
|
||||
assert_eq!(body["provider"]["require_parameters"], true);
|
||||
let system = body["messages"][0]["content"].as_str().unwrap();
|
||||
let user = body["messages"][1]["content"].as_str().unwrap();
|
||||
assert!(system.contains("Write in Hungarian.") && system.contains("Szaturnusz"));
|
||||
assert!(user.contains("- Sun: Pisces 24°42', house 8") && user.contains("- personality: "));
|
||||
// No birth data in the prompt.
|
||||
for secret in ["1990", "14:30", "Szeged", "Hungary"] {
|
||||
assert!(!user.contains(secret) && !system.contains(secret), "{secret} leaked");
|
||||
}
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn retries_bad_answers_then_fails_and_refunds(db: PgPool) {
|
||||
let s = setup(&db).await;
|
||||
let id = request_analysis(&db, &s).await;
|
||||
let broken = json!({"title": "Csak cím"});
|
||||
let (_, url) = fake_openrouter(vec![reply(&broken)]).await;
|
||||
let a = analyzer(&db, &url);
|
||||
|
||||
assert!(run_once(&a).await);
|
||||
let (status, attempts, error, _, _, _, later) = row(&db, id).await;
|
||||
assert_eq!((status.as_str(), attempts, later), ("pending", 1, true));
|
||||
assert!(error.unwrap().contains("does not match the schema"));
|
||||
assert!(!run_once(&a).await, "the retry waits");
|
||||
assert!(refunds(&db, s.user).await.is_empty());
|
||||
|
||||
for _ in 0..2 {
|
||||
make_due(&db, id).await;
|
||||
assert!(run_once(&a).await);
|
||||
}
|
||||
let (status, attempts, ..) = row(&db, id).await;
|
||||
assert_eq!((status.as_str(), attempts), ("failed", 3));
|
||||
assert_eq!(refunds(&db, s.user).await, vec![1]);
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn permanent_errors_fail_at_once_and_retry_after_outage(db: PgPool) {
|
||||
let s = setup(&db).await;
|
||||
let bad_model = request_analysis(&db, &s).await;
|
||||
let (_, url) = fake_openrouter(vec![(400, json!({"error": {"message": "unknown model"}}))]).await;
|
||||
assert!(run_once(&analyzer(&db, &url)).await);
|
||||
let (status, attempts, error, ..) = row(&db, bad_model).await;
|
||||
assert_eq!((status.as_str(), attempts), ("failed", 1));
|
||||
assert_eq!(error.as_deref(), Some("HTTP 400: unknown model"));
|
||||
assert_eq!(refunds(&db, s.user).await, vec![1]);
|
||||
|
||||
// A provider outage (5xx) is retried and then succeeds.
|
||||
let outage = request_analysis(&db, &s).await;
|
||||
let (_, url) =
|
||||
fake_openrouter(vec![(503, json!({"error": {"message": "overloaded"}})), reply(&content(Kind::Natal))])
|
||||
.await;
|
||||
let a = analyzer(&db, &url);
|
||||
assert!(run_once(&a).await);
|
||||
assert_eq!(row(&db, outage).await.0, "pending");
|
||||
make_due(&db, outage).await;
|
||||
assert!(run_once(&a).await);
|
||||
assert_eq!(row(&db, outage).await.0, "done");
|
||||
assert_eq!(refunds(&db, s.user).await, vec![1], "no refund for the successful one");
|
||||
}
|
||||
|
||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||
async fn synastry_prompt_and_stuck_jobs(db: PgPool) {
|
||||
let s = setup(&db).await;
|
||||
let response = fixture("synastry-response.json");
|
||||
let (chart2, synastry) = (Uuid::now_v7(), Uuid::now_v7());
|
||||
sqlx::query(
|
||||
"INSERT INTO charts (id, owner_id, label, is_primary, birth_data, result, chart_hash) \
|
||||
VALUES ($1, $2, 'Partner', false, '{}', $3, 'hash2')",
|
||||
)
|
||||
.bind(chart2)
|
||||
.bind(s.user)
|
||||
.bind(&response["person2"])
|
||||
.execute(&db)
|
||||
.await
|
||||
.unwrap();
|
||||
sqlx::query(
|
||||
"INSERT INTO synastries (id, owner_id, chart1_id, chart2_id, result, synastry_hash) VALUES ($1, $2, $3, $4, $5, 'sh')",
|
||||
)
|
||||
.bind(synastry)
|
||||
.bind(s.user)
|
||||
.bind(s.chart)
|
||||
.bind(chart2)
|
||||
.bind(&response)
|
||||
.execute(&db)
|
||||
.await
|
||||
.unwrap();
|
||||
let id = Uuid::now_v7();
|
||||
sqlx::query(
|
||||
"INSERT INTO analyses (id, kind, synastry_id, requested_by, language, model, prompt_version, cache_key, \
|
||||
status, started_at) VALUES ($1, 'synastry', $2, $3, 'en', 'test/model', 'v1', 'k2', 'running', now() - interval '20 minutes')",
|
||||
)
|
||||
.bind(id)
|
||||
.bind(synastry)
|
||||
.bind(s.user)
|
||||
.execute(&db)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let (fake, url) = fake_openrouter(vec![reply(&content(Kind::Synastry))]).await;
|
||||
let a = analyzer(&db, &url);
|
||||
assert!(!run_once(&a).await, "running jobs are not claimed");
|
||||
assert_eq!(a.requeue_stuck().await.unwrap(), 1);
|
||||
assert!(run_once(&a).await);
|
||||
assert_eq!(row(&db, id).await.0, "done");
|
||||
|
||||
let requests = fake.requests.lock().unwrap();
|
||||
let user = requests[0]["messages"][1]["content"].as_str().unwrap();
|
||||
assert!(user.starts_with("Chart data:\n\nSYNASTRY") && user.contains("- attraction: "));
|
||||
assert!(requests[0]["messages"][0]["content"].as_str().unwrap().contains("Write in English."));
|
||||
assert!(!user.contains("Szeged") && !user.contains("Pécs"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn schema_validation_and_backoff() {
|
||||
let schema = schema(Kind::Natal);
|
||||
assert_eq!(validate(&schema, &content(Kind::Natal)), Ok(()));
|
||||
let mut c = content(Kind::Natal);
|
||||
c["sections"]["love"]["body"] = json!(" ");
|
||||
assert_eq!(validate(&schema, &c), Err("$.sections.love.body: expected a non-empty string".into()));
|
||||
c["sections"]["love"]["body"] = json!("Szöveg.");
|
||||
c["sections"].as_object_mut().unwrap().remove("work");
|
||||
assert!(validate(&schema, &c).unwrap_err().contains("work: missing"));
|
||||
assert_eq!([1, 2, 3, 9].map(|n| backoff(n).as_secs()), [30, 120, 480, 3600]);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user