94 files, +1,395 -6,578. Three files are new; twenty-four are gone. The milestone is subtraction, and what is left is the single-user local storyteller the specification describes. Removed in full: campaign scripting and its QuickJS sandbox; multi-user accounts, guest sessions, login, registration and the shared demo key; the visitor-analytics tables, dashboard and page beacon; the access log of sign-ins, addresses and devices; per-IP and per-user rate limiting and quotas; Render deployment config; Postgres and psycopg; cloud inference providers, the API-key field and the key encryption that existed to store it; session-cookie signing. None of it was hidden behind a flag — the routes are gone and answer 404. Two things were kept that the brief allowed keeping. The `users` table and its foreign keys stay as an internal ownership detail, because rewriting them out means a migration across most of the schema to delete a column that costs nothing; nothing creates a second user and no request carries an identity. Five inert tables and four inert columns stay for the same reason, so an M1 campaign database opens unchanged. The one addition is app/endpoints.py, which decides where a story may be sent. Loopback, RFC1918, link-local, unique-local and CGNAT — an explicit allowlist of networks, not a guess at what `ipaddress` means by "private", which calls the documentation ranges private and IPv6 loopback reserved. Every address a hostname resolves to must be in it, so a split answer does not squeak through, and the rule runs both when the endpoint is saved and before every outbound request, because a name that resolved to the LAN this morning can resolve elsewhere this afternoon. Known cloud hosts are named in the refusal so the error says why rather than looking like broken DNS. TLS is never traded against it: M1's shared trust context is intact on all four clients and there is no way to skip verification. The hardcoded 120-second model timeout is now a setting. That was not theoretical — on this GPU-less four-core host a cold load of qwen2.5:3b-instruct took 648.9 seconds to produce the first turn, while turns 2 to 5 of the same campaign took 3.6 to 13.1. Connect stays short at 10s so a wrong address still fails fast; the read timeout defaults to 300s and is bounded at 3600, because "wait longer" must stay a number. Two defects found while testing and fixed here. An unknown /api path fell through the SPA catch-all and came back as HTML with status 200, so a client asking for JSON parsed a web page instead of learning the route was gone. And AIDND_CORS_ORIGINS accepted "*", which on an unauthenticated loopback API would hand every page on the Internet a write handle on the campaign database; it now refuses to start. Verified rather than assumed. Offline, on a network with no route out and no DNS: five turns, retry with both takes retained, restart with an identical transcript digest, a failed model call leaving the accepted AI-turn count untouched, and a capture with zero non-loopback unicast packets. Against a real second machine on the LAN over HTTPS with a private CA: four turns, restart, and a capture showing 289 packets to the approved host, 344 loopback, zero anywhere else, zero DNS queries. Cloud and public endpoints refused with their reasons; no API key settable; every removed route 404. 604 backend tests pass, down from 648 by the fifteen retired with the subsystems they tested and up by the twenty-nine added for the endpoint policy and the removed surface. The scripting tests were not deleted: eight files used a JavaScript counter as instrumentation for the state snapshot and rollback machinery, which M2 does not touch, so the counter moved to the world-state engine and those tests still assert what they always did. Frontend lint and build are clean; the image builds, and its wheel-building stage is gone with quickjs. No M3 work. Undo is still destructive and there is still no Redo.
178 lines
6.4 KiB
Python
178 lines
6.4 KiB
Python
"""Phase 14 SP9: editing the take you are actually reading.
|
|
|
|
The pager can display a turn on take 2 of 4. The transcript row for that
|
|
turn stays keyed by the live take, because that is the row the transcript
|
|
reports and the one the window carries. The take currently displayed is
|
|
known only to the client, by its own node id.
|
|
|
|
So "edit this" has two ids to choose from, and the page shipped with the
|
|
wrong one. It opened the editor on the live take's text and saved over it,
|
|
even from a row that was displaying take 2. This is a client bug, and it
|
|
is fixed in Play.jsx. The fix depends on a guarantee only the server can
|
|
make:
|
|
|
|
A take is an ordinary row to the edit endpoint, addressed by its own id,
|
|
whether or not it is the one the path runs through.
|
|
|
|
The fix also depends on the group listing reporting this correctly
|
|
afterward. This file asserts both guarantees, so the client's fix cannot
|
|
be silently broken.
|
|
|
|
python -m pytest tests/test_take_edit.py -v
|
|
"""
|
|
import pytest
|
|
from fastapi import Depends
|
|
from fastapi.testclient import TestClient
|
|
|
|
from app import auth, limits, models
|
|
from app.database import Base, SessionLocal, engine, get_db
|
|
from app.main import app
|
|
from app.routers import adventures
|
|
|
|
from fakes import ScriptedProvider
|
|
|
|
|
|
@pytest.fixture()
|
|
def client(monkeypatch):
|
|
Base.metadata.create_all(bind=engine)
|
|
setup = SessionLocal()
|
|
user = models.User(is_guest=False, email="takeedit@example.com")
|
|
setup.add(user)
|
|
setup.flush()
|
|
setup.add(models.Settings(user_id=user.id, api_key="enc:dummy", model="test-model"))
|
|
scenario = models.Scenario(user_id=user.id, title="S")
|
|
setup.add(scenario)
|
|
setup.flush()
|
|
adv = models.Adventure(
|
|
user_id=user.id, title="Vault", scenario_id=scenario.id,
|
|
script_state={}, world_state={},
|
|
)
|
|
setup.add(adv)
|
|
setup.flush()
|
|
setup.add(models.Action(adventure_id=adv.id, type="start", text="You begin."))
|
|
setup.commit()
|
|
adv_id, user_id = adv.id, user.id
|
|
setup.close()
|
|
|
|
ScriptedProvider.replies = [f"Take {n}." for n in range(1, 40)]
|
|
ScriptedProvider.calls = 0
|
|
monkeypatch.setattr(adventures.turns, "OpenAICompatibleProvider", ScriptedProvider)
|
|
monkeypatch.setattr(limits, "check_row_cap", lambda *a, **k: None)
|
|
|
|
def _current_user(db=Depends(get_db)):
|
|
return db.get(models.User, user_id)
|
|
|
|
app.dependency_overrides[auth.get_current_user] = _current_user
|
|
c = TestClient(app)
|
|
c.adv_id = adv_id
|
|
try:
|
|
yield c
|
|
finally:
|
|
app.dependency_overrides.clear()
|
|
adventures.turns._active_turns.clear()
|
|
Base.metadata.drop_all(bind=engine)
|
|
|
|
|
|
def _play(client, text="look around"):
|
|
r = client.post(f"/api/adventures/{client.adv_id}/actions",
|
|
json={"type": "do", "text": text})
|
|
assert r.status_code == 200, r.text
|
|
|
|
|
|
def _retry(client):
|
|
r = client.post(f"/api/adventures/{client.adv_id}/retry")
|
|
assert r.status_code == 200, r.text
|
|
|
|
|
|
def _takes(client, action_id):
|
|
r = client.get(f"/api/adventures/{client.adv_id}/actions/{action_id}/variants")
|
|
assert r.status_code == 200, r.text
|
|
return r.json()
|
|
|
|
|
|
def _edit(client, action_id, text):
|
|
return client.patch(f"/api/adventures/{client.adv_id}/actions/{action_id}",
|
|
json={"text": text})
|
|
|
|
|
|
def _live_ai(client):
|
|
"""The AI row the transcript currently reports as live."""
|
|
adv = client.get(f"/api/adventures/{client.adv_id}").json()
|
|
return [a for a in adv["actions"] if a["type"] == "ai"][-1]
|
|
|
|
|
|
def _four_takes(client):
|
|
"""One turn, played four times. Returns (row the page holds, take list)."""
|
|
_play(client)
|
|
for _ in range(3):
|
|
_retry(client)
|
|
row = _live_ai(client)
|
|
assert row["take_count"] == 4
|
|
return row, _takes(client, row["id"])
|
|
|
|
|
|
def test_the_pager_reads_four_distinct_takes(client):
|
|
"""The premise: 2/4 and 4/4 are different rows with different words."""
|
|
row, takes = _four_takes(client)
|
|
assert [t["text"] for t in takes] == ["Take 1.", "Take 2.", "Take 3.", "Take 4."]
|
|
assert takes[3]["id"] == row["id"], "the newest take is the one the story tells"
|
|
assert takes[1]["id"] != row["id"], "2/4 is not the row the transcript is keyed by"
|
|
|
|
|
|
def test_editing_a_take_that_is_not_live_edits_that_take(client):
|
|
"""The bug, at the level the client's fix depends on.
|
|
|
|
Saving against take 2's own id must land on take 2. The request must
|
|
not be refused for being off the path, and must not be redirected onto
|
|
the live row.
|
|
"""
|
|
row, takes = _four_takes(client)
|
|
second = takes[1]
|
|
|
|
r = _edit(client, second["id"], "Take 2, rewritten.")
|
|
assert r.status_code == 200, r.text
|
|
assert r.json()["text"] == "Take 2, rewritten."
|
|
|
|
after = _takes(client, row["id"])
|
|
assert [t["text"] for t in after] == [
|
|
"Take 1.", "Take 2, rewritten.", "Take 3.", "Take 4.",
|
|
], "one take changed, and only the one addressed"
|
|
|
|
|
|
def test_editing_a_take_leaves_the_live_one_alone(client):
|
|
"""What the page did instead: the reader saw 2/4 and 4/4 was overwritten."""
|
|
row, takes = _four_takes(client)
|
|
|
|
_edit(client, takes[1]["id"], "Take 2, rewritten.")
|
|
|
|
assert _live_ai(client)["text"] == "Take 4.", "the story still tells what it told"
|
|
|
|
|
|
def test_a_take_edit_survives_paging_away_and_back(client):
|
|
"""The listing is the pager's only source, so the edit must appear in it.
|
|
|
|
The client caches this list per message, and the fix drops that cache
|
|
after an edit. If the server ever started answering from a stale copy
|
|
of its own, stepping away and back would show the text before the
|
|
edit, and this test would not catch it. That is why this test makes
|
|
the round trip.
|
|
"""
|
|
row, takes = _four_takes(client)
|
|
_edit(client, takes[1]["id"], "Take 2, rewritten.")
|
|
|
|
# Addressed by the live row, as the pager does, and by the edited take
|
|
# itself, as a client holding that id would.
|
|
assert _takes(client, row["id"])[1]["text"] == "Take 2, rewritten."
|
|
assert _takes(client, takes[1]["id"])[1]["text"] == "Take 2, rewritten."
|
|
|
|
|
|
def test_an_edited_take_is_still_the_take_it_was(client):
|
|
"""Editing text is not switching, forking, or reordering."""
|
|
row, takes = _four_takes(client)
|
|
_edit(client, takes[1]["id"], "Take 2, rewritten.")
|
|
|
|
after = _takes(client, row["id"])
|
|
assert [t["id"] for t in after] == [t["id"] for t in takes], "same rows, same order"
|
|
assert [t["active"] for t in after] == [False, False, False, True]
|
|
assert _live_ai(client)["take_index"] == 3, "still 4/4 on screen"
|