A hosted demo raises a question a local app never does: is anyone using it, and do they reach the part that matters? `/analytics` answers it — visitors, pages, referrers, countries, devices, which shared scenarios get played, turns and demo-key spend, API and turn errors, and a funnel from visited to played a turn to signed up. Not a third-party script, for reasons specific to this one. The CSP allows `script-src 'self'`, so a tracker means loosening it; adblockers eat the popular ones, which silently biases exactly the technical audience this project gets shown to; and none of them can see the measurement that actually matters here, which is a turn, not a pageview. **A visit is a write and never a read.** After the 189x egress fix it would be perverse to add a feature that reads rows per request, so counts accumulate in a process-local dict and flush every 60s as UPSERTs. Storage is a generic `(day, metric, label) -> hits` counter, so measuring something new later costs a constant rather than a migration, plus one row per visitor per day for the funnel flags. Every dashboard query is a GROUP BY returning tens of rows however much traffic sits behind it; a month reads back in a few kilobytes. The buffer's cost is that a hard restart can lose up to a minute — the flusher also runs on shutdown, and a tier that sleeps when idle sleeps on an empty buffer anyway. **The counters are anonymous; the access log beside them is not, on purpose.** A visitor is `HMAC(secret, "visitor:<user id>")` truncated to 32 chars — one-way, so `analytics_daily` and `analytics_visitor_days` cannot be joined back to `users`, and keyed, so no client can compute one. Story content never reaches that module, and the only content it ever names is a seeded public scenario's title; a player's own titles are theirs. `accesslog.py` is the identifying half and is a separate module writing a separate table so that separation is a property of the code rather than a convention: `access_events` records sessions, sign-ins, registrations and failed attempts with address, email and device, read on a second tab of the same page behind the same gate. Both halves are gated on `AIDND_ANALYTICS_EMAILS`, not `POWER_USERS`. An unmetered tester is not automatically someone who should see the traffic. The route 404s and the nav link is absent for everyone else, the same treatment AI Chat gets; unset in a hosted deploy means nobody sees it, including me. Three things came out of building it that a test would not have suggested. **A failed turn is an HTTP 200 with a bad ending.** The status-code middleware cannot see one, so a demo whose model had started refusing every request would look perfectly healthy from outside. All five SSE error paths in `_generate_turn` now go through a `turn_error()` helper that counts on the way out. Error buckets elsewhere are labelled by the matched route template rather than the requested path — one bucket per endpoint instead of one per adventure id, and, the reason it isn't merely tidier, an unmatched path is entirely attacker-chosen, so labelling by it would let anyone mint rows. **The funnel counts people, not clicks.** A player who starts six adventures is one person who started an adventure. That is the whole reason the per-visitor-day table exists; its flags only ever turn on, and `is_new` is settled by the first write of a visitor's first day. **The tests run on SQLite and production is Neon.** A flush that raises is caught and logged, so a dialect mistake in the UPSERTs would have stayed invisible until the dashboard quietly never filled. `test_the_upserts_compile_for_postgres` compiles both statements against the Postgres dialect without connecting to one. Two things this leans on elsewhere. `limits._client_ip` is now public `client_ip`: the access log needs the same answer, and two functions both deciding which hop is the caller's is how one of them ends up trusting a header it shouldn't. And the cleanup sweeper now starts if *either* job has work — a deployment can keep every guest forever and still want its visitor-day rows aged out. No migration. Both tables are new and `bootstrap()` calls `create_all` on existing databases too, the route `branches` took in Phase 14, so `LATEST_VERSION` is still 64. 497 tests green, frontend lint and build clean, driven by hand against a synthetic 90-day fixture at 1568px. The narrow-screen layout follows the existing 720px block but is unverified: `resize_window` is ignored on a maximized Chrome and `frame-ancestors 'none'` rules out checking it in a sized iframe. Also repaired here: a rename in test_ratelimit_hardening.py had run through the test names themselves, leaving `testclient_ip_*` — still collected by pytest, which is why it passed unnoticed. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DfMCsN1KBLsTqMkj5hSgrY
270 lines
9.7 KiB
Python
270 lines
9.7 KiB
Python
from fastapi import APIRouter, Body, Depends, HTTPException, Request
|
|
from fastapi.responses import Response
|
|
from sqlalchemy import or_
|
|
from sqlalchemy.orm import Session
|
|
|
|
from .. import analytics, auth, images, limits, models, schemas
|
|
from ..database import get_db
|
|
|
|
router = APIRouter(prefix="/api/scenarios", tags=["scenarios"])
|
|
|
|
|
|
def get_scenario_or_404(
|
|
scenario_id: int, db: Session, user: models.User, *, edit: bool = False
|
|
) -> models.Scenario:
|
|
"""Visible = owned or public; editable = owned only."""
|
|
scenario = db.get(models.Scenario, scenario_id)
|
|
if scenario is None or (scenario.user_id != user.id and not scenario.is_public):
|
|
raise HTTPException(404, "Scenario not found")
|
|
if edit and scenario.user_id != user.id:
|
|
raise HTTPException(403, "This is a shared demo scenario — it can't be edited. Start an adventure from it, or duplicate it.")
|
|
return scenario
|
|
|
|
|
|
@router.get("", response_model=list[schemas.ScenarioListItem])
|
|
def list_scenarios(
|
|
db: Session = Depends(get_db),
|
|
user: models.User = Depends(auth.get_current_user),
|
|
):
|
|
return (
|
|
db.query(models.Scenario)
|
|
.filter(or_(models.Scenario.user_id == user.id, models.Scenario.is_public))
|
|
.order_by(models.Scenario.updated_at.desc())
|
|
.all()
|
|
)
|
|
|
|
|
|
@router.post("", response_model=schemas.ScenarioOut, status_code=201)
|
|
def create_scenario(
|
|
payload: schemas.ScenarioCreate,
|
|
db: Session = Depends(get_db),
|
|
user: models.User = Depends(auth.get_current_user),
|
|
):
|
|
limits.check_row_cap("scenarios", db, user)
|
|
scenario = models.Scenario(**payload.model_dump(), user_id=user.id)
|
|
db.add(scenario)
|
|
db.commit()
|
|
return scenario
|
|
|
|
|
|
@router.get("/{scenario_id}", response_model=schemas.ScenarioOut)
|
|
def get_scenario(
|
|
scenario_id: int,
|
|
db: Session = Depends(get_db),
|
|
user: models.User = Depends(auth.get_current_user),
|
|
):
|
|
scenario = get_scenario_or_404(scenario_id, db, user)
|
|
# Funnel step. Only for shared scenarios: opening one is the first sign a
|
|
# visitor is interested, whereas someone editing their own is already past
|
|
# this point — and their titles are theirs, not a statistic.
|
|
if scenario.is_public:
|
|
analytics.record_event(analytics.EV_SCENARIO_OPEN, user)
|
|
return scenario
|
|
|
|
|
|
@router.get("/{scenario_id}/image")
|
|
def get_scenario_image(
|
|
scenario_id: int,
|
|
db: Session = Depends(get_db),
|
|
user: models.User = Depends(auth.get_current_user),
|
|
):
|
|
"""Serve an uploaded cover image as real bytes.
|
|
|
|
Lists point here instead of inlining the data URI. The response is marked
|
|
immutable and the URL carries a `?v=<updated_at>` stamp, so browsers cache
|
|
it indefinitely but pick up a new picture the moment the author saves one.
|
|
"""
|
|
scenario = get_scenario_or_404(scenario_id, db, user)
|
|
decoded = images.decode(scenario.image)
|
|
if decoded is None:
|
|
raise HTTPException(404, "This scenario has no uploaded image")
|
|
data, content_type = decoded
|
|
return Response(
|
|
content=data,
|
|
media_type=content_type,
|
|
headers={"Cache-Control": "private, max-age=31536000, immutable"},
|
|
)
|
|
|
|
|
|
@router.patch("/{scenario_id}", response_model=schemas.ScenarioOut)
|
|
def update_scenario(
|
|
scenario_id: int,
|
|
payload: schemas.ScenarioUpdate,
|
|
db: Session = Depends(get_db),
|
|
user: models.User = Depends(auth.get_current_user),
|
|
):
|
|
scenario = get_scenario_or_404(scenario_id, db, user, edit=True)
|
|
data = payload.model_dump(exclude_unset=True)
|
|
script_ids = data.pop("script_ids", None)
|
|
for field, value in data.items():
|
|
setattr(scenario, field, value)
|
|
if script_ids is not None:
|
|
scripts = (
|
|
db.query(models.Script)
|
|
.filter(models.Script.id.in_(script_ids), models.Script.user_id == user.id)
|
|
.all()
|
|
)
|
|
if len(scripts) != len(set(script_ids)):
|
|
raise HTTPException(404, "One or more scripts not found")
|
|
scenario.scripts = sorted(scripts, key=lambda s: script_ids.index(s.id))
|
|
db.commit()
|
|
return scenario
|
|
|
|
|
|
@router.delete("/{scenario_id}", status_code=204)
|
|
def delete_scenario(
|
|
scenario_id: int,
|
|
db: Session = Depends(get_db),
|
|
user: models.User = Depends(auth.get_current_user),
|
|
):
|
|
scenario = get_scenario_or_404(scenario_id, db, user, edit=True)
|
|
db.delete(scenario)
|
|
db.commit()
|
|
|
|
|
|
# ---------- Import / Export ----------
|
|
|
|
@router.get("/{scenario_id}/export")
|
|
def export_scenario(
|
|
scenario_id: int,
|
|
db: Session = Depends(get_db),
|
|
user: models.User = Depends(auth.get_current_user),
|
|
):
|
|
s = get_scenario_or_404(scenario_id, db, user)
|
|
return {
|
|
"format": "ai-dnd-scenario-v1",
|
|
"title": s.title,
|
|
"description": s.description,
|
|
"prompt": s.prompt,
|
|
"memory": s.memory,
|
|
"authorsNote": s.authors_note,
|
|
"aiInstructions": s.ai_instructions,
|
|
"tags": s.tags,
|
|
"image": s.image,
|
|
"icon": s.icon,
|
|
"statSchema": s.stat_schema,
|
|
"storyCards": [
|
|
{"type": c.type, "name": c.name, "keys": c.keys, "entry": c.entry, "notes": c.notes}
|
|
for c in s.story_cards
|
|
],
|
|
"scripts": [
|
|
{
|
|
"name": sc.name, "description": sc.description, "library": sc.library_js,
|
|
"input": sc.input_js, "context": sc.context_js, "output": sc.output_js,
|
|
}
|
|
for sc in s.scripts
|
|
],
|
|
}
|
|
|
|
|
|
# Key aliases seen in AI Dungeon scenario exports, mapped best-effort.
|
|
_SCENARIO_KEYS = {
|
|
"title": "title",
|
|
"description": "description",
|
|
"prompt": "prompt",
|
|
"memory": "memory",
|
|
"authorsNote": "authors_note",
|
|
"authors_note": "authors_note",
|
|
"authorsNoteText": "authors_note",
|
|
"aiInstructions": "ai_instructions",
|
|
"ai_instructions": "ai_instructions",
|
|
"instructions": "ai_instructions",
|
|
}
|
|
_IGNORED_KEYS = {"format", "storyCards", "worldInfo", "worldInformation", "scripts", "tags",
|
|
"statSchema", "stat_schema", "image", "icon",
|
|
"createdAt", "updatedAt", "id", "publicId", "nsfw", "type", "options"}
|
|
|
|
|
|
@router.post("/import", status_code=201)
|
|
def import_scenario(
|
|
request: Request,
|
|
bundle: dict = Body(...),
|
|
db: Session = Depends(get_db),
|
|
user: models.User = Depends(auth.get_current_user),
|
|
):
|
|
"""Accepts our export format and AI Dungeon scenario exports best-effort;
|
|
reports any keys it didn't understand."""
|
|
limits.rate_limit("import", request, user)
|
|
limits.check_row_cap("scenarios", db, user)
|
|
fields: dict = {}
|
|
unmapped: list[str] = []
|
|
for key, value in bundle.items():
|
|
if key in _SCENARIO_KEYS and isinstance(value, str):
|
|
fields[_SCENARIO_KEYS[key]] = value
|
|
elif key not in _IGNORED_KEYS:
|
|
unmapped.append(key)
|
|
|
|
tags = bundle.get("tags")
|
|
if isinstance(tags, list):
|
|
fields["tags"] = ", ".join(str(t) for t in tags)
|
|
elif isinstance(tags, str):
|
|
fields["tags"] = tags
|
|
|
|
schema = bundle.get("statSchema") or bundle.get("stat_schema")
|
|
if isinstance(schema, dict):
|
|
fields["stat_schema"] = schema
|
|
|
|
# AI Dungeon bundles carry an `image` too, so this is worth honouring — but
|
|
# it's untrusted input, hence sanitize() rather than a straight assignment.
|
|
image = images.sanitize(bundle.get("image"), schemas.IMAGE_MAX)
|
|
if image:
|
|
fields["image"] = image
|
|
icon = bundle.get("icon")
|
|
if isinstance(icon, str) and icon:
|
|
fields["icon"] = icon[:schemas.ICON_MAX]
|
|
|
|
scenario = models.Scenario(**fields, user_id=user.id)
|
|
if not scenario.title:
|
|
scenario.title = "Imported Scenario"
|
|
# Raw-dict import bypasses the schemas — clamp to VARCHAR widths
|
|
# (Postgres enforces them; see schemas.py). Column defaults haven't been
|
|
# applied yet at this point (that happens at flush), so a bundle with no
|
|
# `tags` key leaves the attribute None — hence the `or ""`.
|
|
scenario.title = scenario.title[:schemas.NAME_MAX]
|
|
scenario.tags = (scenario.tags or "")[:schemas.TAGS_MAX]
|
|
db.add(scenario)
|
|
db.flush()
|
|
|
|
# AI Dungeon exports have used all three names for the same list.
|
|
cards = (
|
|
bundle.get("storyCards")
|
|
or bundle.get("worldInfo")
|
|
or bundle.get("worldInformation")
|
|
or []
|
|
)
|
|
limits.check_bundle_lists(story_cards=cards)
|
|
for card in cards:
|
|
if not isinstance(card, dict):
|
|
continue
|
|
db.add(
|
|
models.StoryCard(
|
|
scenario_id=scenario.id,
|
|
type=str(card.get("type") or "")[:schemas.CARD_TYPE_MAX],
|
|
name=str(card.get("name") or card.get("title") or "")[:schemas.NAME_MAX],
|
|
keys=str(card.get("keys") or ""),
|
|
# AI Dungeon world info uses "value"; story cards use "entry".
|
|
entry=str(card.get("entry") or card.get("value") or ""),
|
|
notes=str(card.get("notes") or card.get("description") or ""),
|
|
)
|
|
)
|
|
|
|
for item in bundle.get("scripts") or []:
|
|
if not isinstance(item, dict):
|
|
continue
|
|
script = models.Script(
|
|
user_id=user.id,
|
|
name=str(item.get("name") or "Imported Script")[:schemas.NAME_MAX],
|
|
description=str(item.get("description") or ""),
|
|
library_js=str(item.get("library") or item.get("sharedLibrary") or ""),
|
|
input_js=str(item.get("input") or item.get("onInput") or ""),
|
|
context_js=str(item.get("context") or item.get("onModelContext") or ""),
|
|
output_js=str(item.get("output") or item.get("onOutput") or ""),
|
|
)
|
|
db.add(script)
|
|
db.flush()
|
|
scenario.scripts.append(script)
|
|
|
|
db.commit()
|
|
out = schemas.ScenarioOut.model_validate(scenario).model_dump(mode="json")
|
|
return {"scenario": out, "unmapped_keys": unmapped}
|