the-apprentice

Running

App Files Files Community

AndrewRqy commited on Jun 15

Commit

f9490c0

1 Parent(s): fd741cf

Clean-Space pass: drop self-test, legacy unused handler, BISECT_MINIMAL branch, duplicate banner PNG, stale comments

Browse files

Files changed (4) hide show

.env.example +14 -5
app.py +2 -241
assets/sprites/banner_near.png +0 -3
run.sh +0 -1

.env.example CHANGED Viewed

@@ -1,16 +1,25 @@
 # Copy to .env.local and fill in. Without these, the app runs in mock mode.
-# Modal-hosted OpenAI-compatible endpoint (vLLM serving Qwen2.5-32B or similar).
 # Leave empty to force mock mode for the LLM calls.
 MODAL_URL=
-# Modal proxy auth (optional, only if the endpoint requires headers).
 MODAL_KEY=
 MODAL_SECRET=
 # Force mock mode for the LLM even if MODAL_URL is set.
 ORACLES_FORCE_MOCK=0
-# Klein-4B image generation endpoint (separate from the LLM URL).
-# Leave empty to disable live image gen; mock SVG cards are used.
-KLEIN_URL=

 # Copy to .env.local and fill in. Without these, the app runs in mock mode.
+# Modal-hosted OpenAI-compatible endpoint (vLLM serving Qwen2.5-14B + LoRA).
 # Leave empty to force mock mode for the LLM calls.
 MODAL_URL=
+# Modal proxy auth (Modal-Key and Modal-Secret headers).
 MODAL_KEY=
 MODAL_SECRET=
 # Force mock mode for the LLM even if MODAL_URL is set.
 ORACLES_FORCE_MOCK=0
+# Override the served-model alias. Defaults to "oracle-wizard-lora" which
+# the deployed vLLM serves as Qwen2.5-14B + the custom humor LoRA. Set
+# to "llm" to request the bare base model.
+# ORACLES_LLM_MODEL=oracle-wizard-lora
+# Disable LLM-call trace recording. Tracing is default-on; remove or set
+# to 0 to keep it on. Set to 1 to opt out.
+# ORACLES_TRACE_DISABLE=0
+# Visual mode: "lean" (default; minimal PNGs for fast load) or "full"
+# (parallax banner, scene landscapes, all decorative assets).
+# ORACLES_VISUAL_MODE=lean

app.py CHANGED Viewed

@@ -8,8 +8,7 @@ State machine:
     inscribe → send_off → trial (1..5) → epilogue → done
 Run:
-    python app.py                  # launches Gradio
-    python app.py --self-test      # scripted walkthrough; exits 0 on pass
 """
 from __future__ import annotations
@@ -4098,52 +4097,6 @@ def handle_grimoire_lang(state: GameState, language_label: str,
     return _ui_bundle(state)
-def _legacy_handle_grimoire_lang_unused(state, language_label, theme_label="", narration_label=""):
-    """Kept only to satisfy any stale call sites; identical to the refactor.
-    DO NOT USE — call _apply_spread0_choices via handle_grimoire_lang instead."""
-    if state.mode != "inscribe" or state.inscribe_step != 0:
-        return _ui_bundle(state)
-    state.lang = _label_to_lang_code(language_label)
-    # Resolve theme label back to its key; default to fantasy on miss.
-    from oracles.themes import THEMES, DEFAULT_THEME
-    chosen_key = DEFAULT_THEME
-    for key, theme in THEMES.items():
-        if theme.display_name == theme_label:
-            chosen_key = key
-            break
-    state.theme = chosen_key
-    # Resolve narration-length label back to its key; default to medium.
-    # Label is now a `{"en": ..., "zh": ...}` dict — match against either
-    # language so the lookup is robust to whichever tongue the dropdown
-    # was rendered in when the click happened.
-    from oracles.state import NARRATION_LENGTHS as _NL
-    chosen_nl = "medium"
-    for key, (label, *_rest) in _NL.items():
-        if isinstance(label, dict):
-            if narration_label in label.values():
-                chosen_nl = key
-                break
-        elif label == narration_label:
-            chosen_nl = key
-            break
-    state.narration_length = chosen_nl
-    # Refresh hero/village defaults to the theme's archetypes, if the user
-    # hasn't customized them yet (so the next spread's prompt shows themed
-    # defaults like "Wren" / "Bunker 7" instead of "Tobin" / "the Hollow").
-    theme_obj = THEMES[chosen_key]
-    if state.hero_name in ("", "Tobin"):
-        state.hero_name = theme_obj.hero_default
-    if state.village_name in ("", "the Hollow"):
-        state.village_name = theme_obj.village_default
-    state.grimoire_error = ""
-    state.inscribe_step = 1
-    return _ui_bundle(state)
 def handle_grimoire_name(state: GameState, hero_name: str):
     """Step 1 → 2: inscribe the hero's name."""
     if state.mode != "inscribe" or state.inscribe_step != 1:
@@ -4234,43 +4187,6 @@ def handle_grimoire_begin(state: GameState):
     yield _ui_bundle(state, trial_substate=TRIAL_STATE_AWAIT)
-# Back-compat shim for the e2e test and self-test that still call the
-# original "seal everything in one shot" function.
-def handle_seal_oracles(
-    state: GameState,
-    hero_name: str,
-    village_name: str,
-    language_label: str,
-    o1: str,
-    o2: str,
-    o3: str,
-    o4: str,
-    o5: str,
-):
-    if state.mode != "inscribe":
-        return _ui_bundle(state)
-    texts = [o1 or "", o2 or "", o3 or "", o4 or "", o5 or ""]
-    missing = [i + 1 for i, t in enumerate(texts) if not t.strip()]
-    if missing:
-        roman = ", ".join(_ROMAN.get(i, str(i)) for i in missing)
-        err = (
-            f"The parchment is blank — Oracle{'s' if len(missing) > 1 else ''} "
-            f"{roman} must hold at least one word."
-        )
-        # Surface error in the legacy slot AND on the grimoire so tests can find it.
-        state.grimoire_error = err
-        return _ui_bundle(state, inscribe_error=err)
-    state.hero_name = (hero_name or "Tobin").strip() or "Tobin"
-    state.village_name = (village_name or "the Hollow").strip() or "the Hollow"
-    state.lang = _label_to_lang_code(language_label)
-    for o, text in zip(state.oracles, texts):
-        o.text = text
-    state.inscribe_step = 8     # consider all spreads "passed"
-    state.mode = "send_off"
-    state.grimoire_error = ""
-    return _ui_bundle(state, inscribe_error="")
 def handle_send_off(state: GameState):
     """send_off → trial 1. Generates the 5 obstacles AND kicks off the
     background precompute so trial reveals are instant in live mode."""
@@ -5032,140 +4948,6 @@ def build_app() -> gr.Blocks:
     return demo
-# ---------------------------------------------------------------------------
-# Self-test
-# ---------------------------------------------------------------------------
-def _drain(gen_or_value):
-    """Drain a generator handler to its final yielded bundle.
-    Several click handlers (handle_open_oracle, handle_continue,
-    handle_grimoire_begin, handle_send_off) are generators that yield
-    intermediate "walking-hero" UI states then a terminal bundle. The
-    self-test only cares about the terminal bundle. Pass-through any
-    non-generator return value untouched so the helper works for
-    regular handlers too.
-    """
-    import inspect as _inspect
-    if _inspect.isgenerator(gen_or_value):
-        last = None
-        for b in gen_or_value:
-            last = b
-        return last
-    return gen_or_value
-def run_self_test() -> int:
-    """Scripted walkthrough that doesn't launch the server.
-    Returns 0 on success, non-zero on failure.
-    """
-    # Force mock mode then rebuild the module-level CLIENT.
-    os.environ["ORACLES_FORCE_MOCK"] = "1"
-    global CLIENT
-    CLIENT = LLMClient()
-    assert CLIENT.using_mock, "self-test requires mock mode"
-    # Fresh state — and seed the inputs as scripted.
-    state = fresh_state()
-    oracle_texts = [
-        "be patient",
-        "pizza is square",
-        "🍕",
-        "wooden spoon",
-        "42",
-    ]
-    # --- inscribe → send_off ---
-    bundle = handle_seal_oracles(
-        state,
-        "Tobin",
-        "the Hollow",
-        LANG_LABELS["en"],
-        *oracle_texts,
-    )
-    state = bundle[0]
-    assert state.mode == "send_off", f"expected send_off, got {state.mode!r}"
-    assert all(state.oracles[i].text == oracle_texts[i] for i in range(NUM_ORACLES)), \
-        "oracle texts not persisted"
-    # --- send_off → trial 1 (also generates obstacles) ---
-    bundle = _drain(handle_send_off(state))
-    state = bundle[0]
-    assert state.mode == "trial", f"expected trial, got {state.mode!r}"
-    assert state.current_trial == 1, f"expected current_trial=1, got {state.current_trial}"
-    assert len(state.obstacles) == NUM_TRIALS, (
-        f"expected {NUM_TRIALS} obstacles, got {len(state.obstacles)}"
-    )
-    assert state.obstacles[-1].is_dragon, "trial 5 should be dragon"
-    # --- trials 1..5 ---
-    for trial_n in range(1, NUM_TRIALS + 1):
-        assert state.mode == "trial", f"trial {trial_n}: bad mode {state.mode!r}"
-        assert state.current_trial == trial_n, (
-            f"trial {trial_n}: bad current_trial {state.current_trial}"
-        )
-        # Open oracle (await -> reveal).
-        bundle = _drain(handle_open_oracle(state, TRIAL_STATE_AWAIT))
-        state = bundle[0]
-        substate = bundle[1]
-        assert substate == TRIAL_STATE_REVEAL, (
-            f"trial {trial_n}: expected reveal substate, got {substate!r}"
-        )
-        res = state.resolutions[-1]
-        assert res.trial_index == trial_n, (
-            f"trial {trial_n}: resolution.trial_index mismatch"
-        )
-        assert res.narration and len(res.narration.strip()) > 0, (
-            f"trial {trial_n}: empty narration"
-        )
-        assert res.tactic and len(res.tactic.strip()) > 0, (
-            f"trial {trial_n}: empty tactic"
-        )
-        # Image file should exist on disk and have non-zero size (mock SVG/PNG).
-        assert res.image_path, f"trial {trial_n}: empty image_path"
-        assert os.path.exists(res.image_path), (
-            f"trial {trial_n}: image_path {res.image_path!r} not on disk"
-        )
-        assert os.path.getsize(res.image_path) > 0, (
-            f"trial {trial_n}: image_path {res.image_path!r} is empty"
-        )
-        # Continue.
-        bundle = _drain(handle_continue(state, TRIAL_STATE_REVEAL))
-        state = bundle[0]
-    # After trial 5 continue: epilogue.
-    assert state.mode == "epilogue", (
-        f"expected epilogue after trial {NUM_TRIALS}, got {state.mode!r}"
-    )
-    assert state.epilogue and state.epilogue.strip(), "epilogue empty"
-    # Restart should land us back in inscribe with a fresh state, names preserved.
-    bundle = handle_restart(state)
-    new_state = bundle[0]
-    assert new_state.mode == "inscribe", (
-        f"after restart expected inscribe, got {new_state.mode!r}"
-    )
-    assert new_state.hero_name == "Tobin", "hero name should be preserved"
-    assert new_state.village_name == "the Hollow", "village name should be preserved"
-    assert all(o.text == "" for o in new_state.oracles), (
-        "oracles should be blank after restart"
-    )
-    assert new_state.resolutions == [], "resolutions should be cleared"
-    # Also exercise build_app() once.
-    demo = build_app()
-    assert demo is not None, "build_app returned None"
-    print("SELF TEST PASSED")
-    return 0
 # ---------------------------------------------------------------------------
 # Entry point
 # ---------------------------------------------------------------------------
@@ -5175,10 +4957,6 @@ def run_self_test() -> int:
 # to its own ``.launch()`` with DEFAULT settings — which means everything we
 # pass to ``demo.launch(...)`` below would be ignored (no theme, no css, no
 # ssr_mode=False, no allowed_paths). So we build the demo at module scope.
-#
-# To keep --self-test fast (it doesn't need a Blocks instance, and building
-# one base64-encodes ~30 sprites), we skip the eager build when the flag is
-# present.
 # Register the assets directory with Gradio's static file router so
 # /gradio_api/file=<absolute-path> URLs served at runtime resolve to actual
@@ -5192,27 +4970,10 @@ except Exception:
     pass
-if "--self-test" in sys.argv:
-    demo = None
-elif os.environ.get("BISECT_MINIMAL") == "1":
-    # Diagnostic bisect: if the App tab shows this minimal page, then the
-    # full build_app() Blocks tree is what breaks iframe rendering. If it
-    # ALSO shows nothing, the problem is outside build_app (Docker, port
-    # routing, allowed_paths, etc).
-    with gr.Blocks(title="The Apprentice — bisect probe") as demo:
-        gr.Markdown("# BISECT PROBE")
-        gr.Markdown(
-            "If you can read this, the Docker + Gradio + iframe layers work. "
-            "The full build_app() Blocks tree is what's breaking rendering."
-        )
-        gr.Button("Click me").click(lambda: "ok", outputs=gr.Textbox())
-else:
-    demo = build_app()
 def main() -> int:
-    if "--self-test" in sys.argv:
-        return run_self_test()
     # Local entry point — uses the module-level ``demo`` so the local run
     # matches the HF Space behavior exactly.
     # ssr_mode is Gradio 5+ only. The local dev env may still be on

     inscribe → send_off → trial (1..5) → epilogue → done
 Run:
+    python app.py                  # launches Gradio (uses ./run.sh for full setup)
 """
 from __future__ import annotations
     return _ui_bundle(state)
 def handle_grimoire_name(state: GameState, hero_name: str):
     """Step 1 → 2: inscribe the hero's name."""
     if state.mode != "inscribe" or state.inscribe_step != 1:
     yield _ui_bundle(state, trial_substate=TRIAL_STATE_AWAIT)
 def handle_send_off(state: GameState):
     """send_off → trial 1. Generates the 5 obstacles AND kicks off the
     background precompute so trial reveals are instant in live mode."""
     return demo
 # ---------------------------------------------------------------------------
 # Entry point
 # ---------------------------------------------------------------------------
 # to its own ``.launch()`` with DEFAULT settings — which means everything we
 # pass to ``demo.launch(...)`` below would be ignored (no theme, no css, no
 # ssr_mode=False, no allowed_paths). So we build the demo at module scope.
 # Register the assets directory with Gradio's static file router so
 # /gradio_api/file=<absolute-path> URLs served at runtime resolve to actual
     pass
+demo = build_app()
 def main() -> int:
     # Local entry point — uses the module-level ``demo`` so the local run
     # matches the HF Space behavior exactly.
     # ssr_mode is Gradio 5+ only. The local dev env may still be on

assets/sprites/banner_near.png DELETED Viewed

Git LFS Details

SHA256: 5cafce547a9e222b8216396bdebc2b496cc3dc6526dd9e0aaf4840c62d0456c2
Pointer size: 132 Bytes
Size of remote file: 1.22 MB

run.sh CHANGED Viewed

@@ -25,7 +25,6 @@
 #                       Sharing-is-Caring badge.
 #   --no-trace          Disable trace writing for this run (sets
 #                       ORACLES_TRACE_DISABLE=1).
-#   --self-test         Pass-through to app.py for the scripted walkthrough.
 #   --full              Enable ALL decorative PNGs (parallax banner,
 #                       parchment, phase backdrops, scene landscapes,
 #                       wizard-desk, open-book, demo-card backdrop).

 #                       Sharing-is-Caring badge.
 #   --no-trace          Disable trace writing for this run (sets
 #                       ORACLES_TRACE_DISABLE=1).
 #   --full              Enable ALL decorative PNGs (parallax banner,
 #                       parchment, phase backdrops, scene landscapes,
 #                       wizard-desk, open-book, demo-card backdrop).