A bundle had one list and a forked adventure has two stories, so export was emitting every branch's turns interleaved by index — a mangled story rather than lost data, and unreachable only because forking has no UI yet. `ai-dnd-adventure-v2` carries the branches, the depth each one left its parent at, which attempt at every turn is the story, and what each node left behind. That last one is not decoration: the after-snapshots are what a branch switch puts back, and a bundle without them imports a tree nobody can switch inside. `app/bundle.py` owns both formats and nothing else knows either. The v1 reader stays — those files are already on people's disks — and it is now the only place a `variants` array exists anywhere. The rule the module is built on is that a bundle carries what was chosen and never what is derived. The head branch, the fork points, the live flags and the anchors are decisions somebody made. The lineage, the head depth, the legacy `index` and the variant ordinals are computed from those and are rebuilt on the way in, because a bundle is a text file anybody can edit and a derived field shipped beside its source is a chance for the file to disagree with itself where no read would report it. `index` is the one that stops being academic here. It agreed with `depth` until SP5, and this is the first writer that has to fill it for a forked story, where two branches both hold a node at depth 4. It is allocated one per turn instead: siblings share it, no two coordinates do. Everything a hand-edited file can get wrong about the shape of a tree is a 400 raised before the adventure row exists, because a half-applied import is exactly the failure this phase exists to end — a story that goes quiet. A file wrong about which attempt is live is corrected rather than refused; that is an invariant of the database, not of the format. Measured on the 600-action fixture: 587 kB to 911 kB, and all of the increase is the outcomes at 489 B a node — the coordinates themselves save 57.5 B a node against the old turn-and-variants shape. Twenty forks add 660 B. 4.3% of the import body cap. 381 tests green, 16 of them new in test_bundle_v2.py. No migration, no vacuum owed. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015H5qiyiR7gtFQaoDphHZ3g
508 lines
18 KiB
Python
508 lines
18 KiB
Python
"""Phase 14 SP0 — the regression contract for the story tree.
|
|
|
|
This file exists to answer one question, over and over, as the storage model is
|
|
replaced underneath the app: **do existing adventures still behave exactly as
|
|
they did?**
|
|
|
|
So it drives the product the way a player does — over HTTP, asserting only on
|
|
API responses — and never reaches into the ORM to check how something is
|
|
stored. Everything it asserts is true of the linear implementation today and
|
|
must stay true of the tree, because a linear story is a tree with one branch.
|
|
|
|
python -m pytest tests/test_story_tree_baseline.py -v
|
|
|
|
**It must pass UNMODIFIED through SP1 (schema), SP2 (branch clause) and SP3
|
|
(memories on nodes).** If a change here looks necessary in one of those
|
|
subphases, the change is wrong, not the test. SP4 is the first subphase allowed
|
|
to move it, and only for the variant-count semantics called out in plan/14.
|
|
"""
|
|
import os
|
|
import tempfile
|
|
|
|
_tmp = tempfile.NamedTemporaryFile(suffix=".db", delete=False)
|
|
_tmp.close()
|
|
os.environ["AIDND_DB_PATH"] = _tmp.name
|
|
os.environ.pop("AIDND_DATABASE_URL", None)
|
|
os.environ.pop("DATABASE_URL", None)
|
|
|
|
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.providers import PromptParts
|
|
from app.routers import adventures
|
|
|
|
# A world-state schema, so the RPG layer is exercised rather than skipped.
|
|
SCHEMA = {"player": {"hp": {"min": 0, "max": 100, "initial": 100}}}
|
|
|
|
# Ten gold a turn. A turn that double-applies its hooks, or one that fails to
|
|
# roll back on retry, shows up here as a wrong total rather than as nothing.
|
|
GOLD_SCRIPT = """
|
|
const modifier = (text) => {
|
|
state.gold = (state.gold || 0) + 10;
|
|
return { text };
|
|
};
|
|
modifier(text);
|
|
"""
|
|
|
|
OPENING = "You enter a cave."
|
|
|
|
|
|
class ScriptedProvider:
|
|
"""Streams the next canned reply each call, so successive turns differ."""
|
|
|
|
replies: list = []
|
|
calls = 0
|
|
prompts: list = [] # every assembled (system, story) pair
|
|
|
|
def __init__(self, *a, **k):
|
|
pass
|
|
|
|
async def generate(self, parts: PromptParts, *, temperature, max_tokens):
|
|
index = min(ScriptedProvider.calls, len(ScriptedProvider.replies) - 1)
|
|
ScriptedProvider.calls += 1
|
|
ScriptedProvider.prompts.append((parts.system, parts.story))
|
|
reply = ScriptedProvider.replies[index]
|
|
if isinstance(reply, Exception):
|
|
raise reply
|
|
yield ("text", reply)
|
|
|
|
|
|
def _make_world(monkeypatch, *, seeded_actions: int = 0):
|
|
"""A user + scenario + adventure, with `seeded_actions` extra story actions
|
|
written straight to the database (paging wants more turns than it is worth
|
|
playing one at a time)."""
|
|
Base.metadata.create_all(bind=engine)
|
|
setup = SessionLocal()
|
|
user = models.User(is_guest=False, email="baseline@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", stat_schema=SCHEMA)
|
|
setup.add(scenario)
|
|
setup.flush()
|
|
adv = models.Adventure(
|
|
user_id=user.id, title="Cave", scenario_id=scenario.id,
|
|
script_state={}, world_state={"player": {"hp": 100}},
|
|
)
|
|
setup.add(adv)
|
|
setup.flush()
|
|
setup.add(models.Action(adventure_id=adv.id, index=0, type="start", text=OPENING))
|
|
for i in range(seeded_actions):
|
|
setup.add(models.Action(
|
|
adventure_id=adv.id, index=i + 1,
|
|
type="ai" if i % 2 else "do",
|
|
text=f"Seeded turn {i}.",
|
|
))
|
|
setup.add(models.AdventureScript(
|
|
adventure_id=adv.id, position=0, enabled=True, name="Gold", output_js=GOLD_SCRIPT,
|
|
))
|
|
setup.commit()
|
|
adv_id, user_id = adv.id, user.id
|
|
setup.close()
|
|
|
|
ScriptedProvider.replies = ["A reply."]
|
|
ScriptedProvider.calls = 0
|
|
ScriptedProvider.prompts = []
|
|
monkeypatch.setattr(adventures, "OpenAICompatibleProvider", ScriptedProvider)
|
|
monkeypatch.setattr(auth, "resolve_provider_config", lambda s: auth.ProviderConfig(
|
|
"http://fake", "k", "test-model", False))
|
|
monkeypatch.setattr(limits, "rate_limit", lambda *a, **k: None)
|
|
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
|
|
return c
|
|
|
|
|
|
@pytest.fixture()
|
|
def client(monkeypatch):
|
|
c = _make_world(monkeypatch)
|
|
try:
|
|
yield c
|
|
finally:
|
|
app.dependency_overrides.clear()
|
|
adventures._active_turns.clear()
|
|
Base.metadata.drop_all(bind=engine)
|
|
|
|
|
|
@pytest.fixture()
|
|
def long_client(monkeypatch):
|
|
"""An adventure longer than one window, so paging is real."""
|
|
c = _make_world(monkeypatch, seeded_actions=adventures.ACTION_PAGE + 10)
|
|
try:
|
|
yield c
|
|
finally:
|
|
app.dependency_overrides.clear()
|
|
adventures._active_turns.clear()
|
|
Base.metadata.drop_all(bind=engine)
|
|
|
|
|
|
# ------------------------------------------------------------------ helpers
|
|
|
|
def _open(client):
|
|
r = client.get(f"/api/adventures/{client.adv_id}")
|
|
assert r.status_code == 200, r.text
|
|
return r.json()
|
|
|
|
|
|
def _actions(client):
|
|
return _open(client)["actions"]
|
|
|
|
|
|
def _texts(client):
|
|
return [a["text"] for a in _actions(client)]
|
|
|
|
|
|
def _play(client, text="look around", type="do"):
|
|
r = client.post(f"/api/adventures/{client.adv_id}/actions",
|
|
json={"type": type, "text": text})
|
|
assert r.status_code == 200, r.text
|
|
return r
|
|
|
|
|
|
def _state(adv_id):
|
|
db = SessionLocal()
|
|
try:
|
|
adv = db.get(models.Adventure, adv_id)
|
|
return adv.script_state, adv.world_state
|
|
finally:
|
|
db.close()
|
|
|
|
|
|
# ------------------------------------------------------- opening the story
|
|
|
|
def test_adventure_opens_on_a_window_with_a_total(long_client):
|
|
"""The payload is the newest window plus the whole story's length — that is
|
|
how the client knows there is more above."""
|
|
payload = _open(long_client)
|
|
seeded = adventures.ACTION_PAGE + 11 # + the start action
|
|
assert payload["action_count"] == seeded
|
|
assert len(payload["actions"]) == adventures.ACTION_PAGE
|
|
# The newest window, so it ends at the newest action.
|
|
assert payload["actions"][-1]["text"] == f"Seeded turn {seeded - 2}."
|
|
|
|
|
|
def test_short_adventure_returns_everything(client):
|
|
payload = _open(client)
|
|
assert payload["action_count"] == 1
|
|
assert [a["text"] for a in payload["actions"]] == [OPENING]
|
|
|
|
|
|
# --------------------------------------------------------------- the turn
|
|
|
|
def test_a_turn_appends_the_player_action_then_the_ai_action(client):
|
|
ScriptedProvider.replies = ["The dark presses in."]
|
|
_play(client, "light a torch")
|
|
actions = _actions(client)
|
|
assert [a["type"] for a in actions] == ["start", "do", "ai"]
|
|
assert actions[1]["text"] == "> You light a torch."
|
|
assert actions[2]["text"] == "The dark presses in."
|
|
|
|
|
|
def test_say_and_story_and_continue_all_work(client):
|
|
ScriptedProvider.replies = ["One.", "Two.", "Three."]
|
|
_play(client, "hello", type="say")
|
|
_play(client, "The wind rises.", type="story")
|
|
_play(client, "", type="continue")
|
|
types = [a["type"] for a in _actions(client)]
|
|
assert types == ["start", "say", "ai", "story", "ai", "ai"]
|
|
|
|
|
|
def test_the_story_so_far_is_replayed_into_the_prompt(client):
|
|
ScriptedProvider.replies = ["First.", "Second."]
|
|
_play(client, "go north")
|
|
_play(client, "go south")
|
|
story = ScriptedProvider.prompts[-1][1]
|
|
assert OPENING in story
|
|
assert "First." in story
|
|
assert "go north" in story
|
|
|
|
|
|
def test_scripts_run_once_per_turn(client):
|
|
"""The gold script adds ten a turn. Two turns is twenty — not forty."""
|
|
ScriptedProvider.replies = ["One.", "Two."]
|
|
_play(client)
|
|
_play(client)
|
|
script_state, _ = _state(client.adv_id)
|
|
assert script_state["gold"] == 20
|
|
|
|
|
|
# ------------------------------------------------------------------ retry
|
|
|
|
def test_retry_replaces_the_text_and_keeps_the_attempt(client):
|
|
ScriptedProvider.replies = ["Attempt one.", "Attempt two."]
|
|
_play(client)
|
|
assert _texts(client)[-1] == "Attempt one."
|
|
|
|
r = client.post(f"/api/adventures/{client.adv_id}/retry")
|
|
assert r.status_code == 200, r.text
|
|
|
|
actions = _actions(client)
|
|
# Still one AI action for this turn — a retry is a new take, not a new turn.
|
|
assert [a["type"] for a in actions] == ["start", "do", "ai"]
|
|
assert actions[-1]["text"] == "Attempt two."
|
|
|
|
r = client.get(
|
|
f"/api/adventures/{client.adv_id}/actions/{actions[-1]['id']}/variants")
|
|
assert r.status_code == 200, r.text
|
|
assert [v["text"] for v in r.json()] == ["Attempt one.", "Attempt two."]
|
|
assert [v["active"] for v in r.json()] == [False, True]
|
|
|
|
|
|
def test_retry_does_not_stack_script_effects(client):
|
|
"""The discarded attempt's ten gold is rolled back, so one turn plus one
|
|
retry is still ten, not twenty."""
|
|
ScriptedProvider.replies = ["Attempt one.", "Attempt two."]
|
|
_play(client)
|
|
client.post(f"/api/adventures/{client.adv_id}/retry")
|
|
script_state, _ = _state(client.adv_id)
|
|
assert script_state["gold"] == 10
|
|
|
|
|
|
def test_switching_back_to_an_earlier_attempt_restores_it(client):
|
|
ScriptedProvider.replies = ["Attempt one.", "Attempt two."]
|
|
_play(client)
|
|
client.post(f"/api/adventures/{client.adv_id}/retry")
|
|
action_id = _actions(client)[-1]["id"]
|
|
|
|
r = client.post(
|
|
f"/api/adventures/{client.adv_id}/actions/{action_id}/variant",
|
|
json={"index": 0})
|
|
assert r.status_code == 200, r.text
|
|
assert _texts(client)[-1] == "Attempt one."
|
|
# And the script state that attempt produced comes back with it.
|
|
script_state, _ = _state(client.adv_id)
|
|
assert script_state["gold"] == 10
|
|
|
|
|
|
def test_only_the_newest_turn_can_be_switched(client):
|
|
"""An older turn's alternatives stay readable but not selectable — the
|
|
story after it was written as a continuation of what is live."""
|
|
ScriptedProvider.replies = ["One.", "Again.", "Two."]
|
|
_play(client)
|
|
client.post(f"/api/adventures/{client.adv_id}/retry")
|
|
older_id = _actions(client)[-1]["id"]
|
|
_play(client) # the story moves on
|
|
|
|
r = client.post(
|
|
f"/api/adventures/{client.adv_id}/actions/{older_id}/variant",
|
|
json={"index": 0})
|
|
assert r.status_code == 400
|
|
|
|
|
|
# ------------------------------------------------------------------- undo
|
|
|
|
def test_undo_removes_the_whole_turn_and_rolls_state_back(client):
|
|
ScriptedProvider.replies = ["One.", "Two."]
|
|
_play(client, "go north")
|
|
_play(client, "go south")
|
|
assert len(_actions(client)) == 5
|
|
|
|
r = client.post(f"/api/adventures/{client.adv_id}/undo")
|
|
assert r.status_code == 200, r.text
|
|
page = r.json()
|
|
# Both the AI action and the player action that prompted it are gone.
|
|
assert [a["type"] for a in page["actions"]] == ["start", "do", "ai"]
|
|
assert page["total"] == 3
|
|
# ...and the second turn's ten gold went with them.
|
|
script_state, _ = _state(client.adv_id)
|
|
assert script_state["gold"] == 10
|
|
|
|
|
|
def test_undo_returns_a_window_not_the_whole_story(long_client):
|
|
before = _open(long_client)["action_count"]
|
|
r = long_client.post(f"/api/adventures/{long_client.adv_id}/undo")
|
|
assert r.status_code == 200, r.text
|
|
page = r.json()
|
|
assert len(page["actions"]) == adventures.ACTION_PAGE
|
|
# The seeded story ends on an `ai` preceded by a `do`, so a turn is two
|
|
# actions and undo takes both.
|
|
assert page["total"] == before - 2
|
|
assert page["has_more"] is True
|
|
|
|
|
|
def test_the_opening_cannot_be_undone(client):
|
|
r = client.post(f"/api/adventures/{client.adv_id}/undo")
|
|
assert r.status_code == 400
|
|
|
|
|
|
# ------------------------------------------------------------------ paging
|
|
|
|
def test_paging_walks_back_to_the_start_without_gaps_or_repeats(long_client):
|
|
"""The property that matters: page all the way up and you have seen every
|
|
action exactly once, in order. This is the invariant a tree must preserve —
|
|
the anchor is an action, never a position."""
|
|
payload = _open(long_client)
|
|
total = payload["action_count"]
|
|
seen = [a["id"] for a in payload["actions"]]
|
|
|
|
has_more = len(seen) < total
|
|
while has_more:
|
|
r = long_client.get(
|
|
f"/api/adventures/{long_client.adv_id}/actions",
|
|
params={"before_id": seen[0]})
|
|
assert r.status_code == 200, r.text
|
|
page = r.json()
|
|
ids = [a["id"] for a in page["actions"]]
|
|
assert ids, "a page claiming more must return some"
|
|
seen = ids + seen
|
|
has_more = page["has_more"]
|
|
|
|
assert len(seen) == total
|
|
assert len(set(seen)) == total, "an action was served twice"
|
|
assert seen == sorted(seen), "pages came back out of order"
|
|
|
|
|
|
def test_a_page_is_bounded_by_the_requested_limit(long_client):
|
|
r = long_client.get(f"/api/adventures/{long_client.adv_id}/actions",
|
|
params={"limit": 5})
|
|
assert r.status_code == 200, r.text
|
|
page = r.json()
|
|
assert len(page["actions"]) == 5
|
|
assert page["has_more"] is True
|
|
assert page["total"] == adventures.ACTION_PAGE + 11
|
|
|
|
|
|
def test_paging_past_the_start_reports_the_end(long_client):
|
|
r = long_client.get(f"/api/adventures/{long_client.adv_id}/actions",
|
|
params={"limit": 5})
|
|
oldest = r.json()["actions"][0]["id"]
|
|
# Walk right off the front.
|
|
seen_all = False
|
|
cursor = oldest
|
|
for _ in range(100):
|
|
page = long_client.get(
|
|
f"/api/adventures/{long_client.adv_id}/actions",
|
|
params={"before_id": cursor, "limit": 20}).json()
|
|
if not page["has_more"]:
|
|
seen_all = True
|
|
break
|
|
cursor = page["actions"][0]["id"]
|
|
assert seen_all
|
|
|
|
|
|
# ------------------------------------------------------- editing and deleting
|
|
|
|
def test_editing_an_action_sticks(client):
|
|
ScriptedProvider.replies = ["Original."]
|
|
_play(client)
|
|
action_id = _actions(client)[-1]["id"]
|
|
r = client.patch(f"/api/adventures/{client.adv_id}/actions/{action_id}",
|
|
json={"text": "Edited."})
|
|
assert r.status_code == 200, r.text
|
|
# Re-read rather than trusting the response: an edit that only lives in the
|
|
# response has silently reverted for anyone who reloads.
|
|
assert _texts(client)[-1] == "Edited."
|
|
|
|
|
|
def test_editing_a_retried_action_survives_a_reload(client):
|
|
"""The edit has to reach the live attempt too, or paging away and back
|
|
reverts it."""
|
|
ScriptedProvider.replies = ["One.", "Two."]
|
|
_play(client)
|
|
client.post(f"/api/adventures/{client.adv_id}/retry")
|
|
action_id = _actions(client)[-1]["id"]
|
|
client.patch(f"/api/adventures/{client.adv_id}/actions/{action_id}",
|
|
json={"text": "Edited."})
|
|
assert _texts(client)[-1] == "Edited."
|
|
|
|
|
|
def test_deleting_an_action_removes_it(client):
|
|
ScriptedProvider.replies = ["One."]
|
|
_play(client)
|
|
action_id = _actions(client)[-1]["id"]
|
|
r = client.delete(f"/api/adventures/{client.adv_id}/actions/{action_id}")
|
|
assert r.status_code == 204, r.text
|
|
assert len(_actions(client)) == 2
|
|
|
|
|
|
# ---------------------------------------------------------------- memories
|
|
|
|
def test_memories_are_created_listed_and_deleted(client):
|
|
r = client.post(f"/api/adventures/{client.adv_id}/memories",
|
|
json={"text": "The torch went out."})
|
|
assert r.status_code == 201, r.text
|
|
memory_id = r.json()["id"]
|
|
|
|
listed = client.get(f"/api/adventures/{client.adv_id}/memories").json()
|
|
assert [m["text"] for m in listed] == ["The torch went out."]
|
|
|
|
r = client.patch(
|
|
f"/api/adventures/{client.adv_id}/memories/{memory_id}",
|
|
json={"pinned": True})
|
|
assert r.status_code == 200, r.text
|
|
assert r.json()["pinned"] is True
|
|
|
|
r = client.delete(f"/api/adventures/{client.adv_id}/memories/{memory_id}")
|
|
assert r.status_code == 204, r.text
|
|
assert client.get(f"/api/adventures/{client.adv_id}/memories").json() == []
|
|
|
|
|
|
# ------------------------------------------------------------------ export
|
|
|
|
def test_export_carries_the_whole_story(client):
|
|
"""A bundle is a backup: every action, not the window.
|
|
|
|
SP6 changed the format assertion below, as this note said it would. It also
|
|
changed one more line in this file than the note allowed for — the
|
|
`variants` array in `test_export_keeps_retry_attempts`, which is the same
|
|
fact seen from the other side: a bundle that has coordinates has no use for
|
|
a repeating group. Everything else here still passes unmodified.
|
|
"""
|
|
ScriptedProvider.replies = ["One.", "Two."]
|
|
_play(client, "go north")
|
|
_play(client, "go south")
|
|
|
|
r = client.get(f"/api/adventures/{client.adv_id}/export")
|
|
assert r.status_code == 200, r.text
|
|
bundle = r.json()
|
|
assert bundle["format"] == "ai-dnd-adventure-v2"
|
|
assert bundle["title"] == "Cave"
|
|
assert [a["text"] for a in bundle["actions"]] == [
|
|
OPENING, "> You go north.", "One.", "> You go south.", "Two.",
|
|
]
|
|
|
|
|
|
def test_export_round_trips_through_import(client):
|
|
ScriptedProvider.replies = ["One."]
|
|
_play(client, "go north")
|
|
bundle = client.get(f"/api/adventures/{client.adv_id}/export").json()
|
|
|
|
r = client.post("/api/adventures/import", json=bundle)
|
|
assert r.status_code == 201, r.text
|
|
imported = r.json()
|
|
assert imported["id"] != client.adv_id
|
|
assert imported["title"] == "Cave"
|
|
assert [a["text"] for a in imported["actions"]] == [
|
|
OPENING, "> You go north.", "One.",
|
|
]
|
|
|
|
|
|
def test_export_keeps_retry_attempts(client):
|
|
ScriptedProvider.replies = ["Attempt one.", "Attempt two."]
|
|
_play(client)
|
|
client.post(f"/api/adventures/{client.adv_id}/retry")
|
|
|
|
bundle = client.get(f"/api/adventures/{client.adv_id}/export").json()
|
|
ai = [a for a in bundle["actions"] if a["type"] == "ai"]
|
|
assert [a["text"] for a in ai] == ["Attempt one.", "Attempt two."]
|
|
assert [a["live"] for a in ai] == [False, True]
|
|
|
|
|
|
# -------------------------------------------------------------- world state
|
|
|
|
def test_world_state_is_readable_and_survives_a_turn(client):
|
|
ScriptedProvider.replies = ["Nothing changes."]
|
|
_play(client)
|
|
r = client.get(f"/api/adventures/{client.adv_id}/world-state")
|
|
assert r.status_code == 200, r.text
|
|
assert r.json()["state"]["player"]["hp"] == 100
|