Merge feature/bar-launch into dev

Author: rlafurud

.github/workflows/ci.yml

@@ -37,8 +37,10 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
-      - run: pip install -r requirements.txt
+      - run: pip install -r requirements-dev.txt
       - name: Compile all modules
         run: python -m compileall -q .
       - name: Import API app
         run: python -c "import app; print('app import OK')"
+      - name: Run unit tests
+        run: python -m pytest -q

.gitignore

@@ -26,3 +26,8 @@ dist/
 
 # backend runtime logs
 backend/log/
+
+# Bundled BAR launcher reference project — NOT part of this repo.
+# Contains a real API key (.env), a venv, game data and demos. The /launch
+# endpoint uses it locally if present and degrades gracefully if absent.
+minigame_generator_v4/

backend/app.py

@@ -8,8 +8,21 @@
 """
 
 import json
+import os
+import sys
+import subprocess
 from pathlib import Path
 
+# Windows consoles default to cp949 in a Korean locale; the pipeline's progress
+# logs contain emoji (🔎, ⚠️, …). Without this, the first such print() raises
+# UnicodeEncodeError and bubbles up as a /generate failure. Force UTF-8 so logs
+# never crash a request.
+for _stream in (sys.stdout, sys.stderr):
+    try:
+        _stream.reconfigure(encoding="utf-8")
+    except Exception:
+        pass
+
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
@@ -19,6 +32,15 @@
 CURRENT_DIR = Path(__file__).resolve().parent
 DB_DIR = CURRENT_DIR / "db"
 INFO_DIR = CURRENT_DIR / "info"
+RULE_CODES_DIR = DB_DIR / "rule" / "codes"
+
+# The full BAR launcher lives in the bundled v4 project. Its game_simulator
+# converts a config (same JSON shape this backend emits) into a Spring start
+# script and launches spring.exe. It reads its own .env (SPRING_DATADIR,
+# BAR_ENGINE_PATH, GAME_VERSION) via load_dotenv inside main.py.
+V4_DIR = CURRENT_DIR.parent / "minigame_generator_v4"
+SIM_DIR = V4_DIR / "game_simulator"
+SIM_MAIN = SIM_DIR / "main.py"
 
 app = FastAPI(title="RTSGame Minigame Generator", version="0.1.0")
 
@@ -79,6 +101,77 @@ def generate(req: GenerateRequest):
         return {"error": str(e), "config": None}
 
 
+class LaunchRequest(BaseModel):
+    config: dict
+    # "gadget" = run the scenario's own gadgets only (no movement/vlm AI);
+    # "movement"/"vlm" enable the v4 experiment gadgets.
+    mode: str = "gadget"
+
+
+def _resolve_gadgets(config: dict) -> list:
+    """Each customize key corresponds to a rule gadget whose Lua lives at
+    db/rule/codes/<key>.lua. The launcher copies these into the engine and
+    enables them; the per-key config is delivered via the scenariooptions blob.
+    Missing files are skipped (the scenario still launches without them)."""
+    gadgets = []
+    for key in (config.get("customize") or {}):
+        lua = RULE_CODES_DIR / f"{key}.lua"
+        if lua.exists():
+            gadgets.append(str(lua))
+    return gadgets
+
+
+@app.post("/launch")
+def launch(req: LaunchRequest):
+    """Launch the generated config in the actual BAR client via the bundled
+    v4 game_simulator. Fire-and-forget: spring.exe opens its own window and the
+    request returns as soon as the process is spawned."""
+    if not SIM_MAIN.exists():
+        return {"launched": False, "error": f"BAR launcher not found at {SIM_MAIN}"}
+
+    config = req.config or {}
+    if not config.get("information", {}).get("map_name"):
+        return {"launched": False, "error": "config has no information.map_name"}
+
+    # Prefer the v4 venv interpreter — it has the deps (PIL/numpy/dotenv) that
+    # game_simulator/utils import; fall back to whatever `python` is on PATH.
+    venv_py = V4_DIR / ".venv" / "Scripts" / "python.exe"
+    python_exe = str(venv_py) if venv_py.exists() else "python"
+
+    gen_dir = SIM_DIR / "_generated"
+    gen_dir.mkdir(exist_ok=True)
+    cfg_path = gen_dir / "launch_config.json"
+    with open(cfg_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, ensure_ascii=False, indent=2)
+
+    gadgets = _resolve_gadgets(config)
+
+    cmd = [python_exe, str(SIM_MAIN), "--config", str(cfg_path), "--mode", req.mode]
+    if gadgets:
+        cmd += ["--gadgets"] + gadgets
+
+    log_dir = CURRENT_DIR / "log"
+    log_dir.mkdir(exist_ok=True)
+    try:
+        log_fh = open(log_dir / "launch.log", "a", encoding="utf-8")
+        # New process group so the game survives a uvicorn reload/restart.
+        creationflags = subprocess.CREATE_NEW_PROCESS_GROUP if os.name == "nt" else 0
+        subprocess.Popen(
+            cmd, cwd=str(SIM_DIR),
+            stdout=log_fh, stderr=subprocess.STDOUT,
+            creationflags=creationflags,
+        )
+    except Exception as e:
+        return {"launched": False, "error": str(e)}
+
+    return {
+        "launched": True,
+        "mode": req.mode,
+        "map": config["information"]["map_name"],
+        "gadgets": [Path(g).stem for g in gadgets],
+    }
+
+
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run("app:app", host="0.0.0.0", port=8000, reload=True)

backend/requirements-dev.txt

@@ -0,0 +1,2 @@
+-r requirements.txt
+pytest>=8

backend/tests/conftest.py

@@ -0,0 +1,6 @@
+import os
+import sys
+
+# Make backend modules (app, pipeline, ...) importable regardless of the cwd
+# pytest is launched from.
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))

backend/tests/test_app.py

@@ -0,0 +1,33 @@
+"""Unit tests for the pure helpers in app.py (no subprocess / engine launch)."""
+from pathlib import Path
+
+import app
+
+
+def test_resolve_gadgets_maps_customize_keys_to_existing_lua():
+    # 'prioritize_target' ships as db/rule/codes/prioritize_target.lua;
+    # the bogus key must be silently skipped, not raise.
+    cfg = {"customize": {"prioritize_target": {}, "nonexistent_gadget": {}}}
+    names = [Path(g).name for g in app._resolve_gadgets(cfg)]
+    assert "prioritize_target.lua" in names
+    assert all("nonexistent_gadget" not in n for n in names)
+
+
+def test_resolve_gadgets_handles_empty_or_missing_customize():
+    assert app._resolve_gadgets({}) == []
+    assert app._resolve_gadgets({"customize": {}}) == []
+    assert app._resolve_gadgets({"customize": None}) == []
+
+
+def test_resolve_gadgets_returns_absolute_existing_paths():
+    for path in app._resolve_gadgets({"customize": {"prioritize_target": {}}}):
+        assert Path(path).is_file()
+
+
+def test_launch_request_defaults_to_gadget_mode():
+    req = app.LaunchRequest(config={"information": {"map_name": "BarR 1.1"}})
+    assert req.mode == "gadget"
+
+
+def test_load_json_returns_default_on_missing_file(tmp_path):
+    assert app._load_json(tmp_path / "missing.json", {"fallback": True}) == {"fallback": True}

backend/tests/test_pipeline.py

@@ -0,0 +1,42 @@
+"""Unit tests for the pure (no LLM, no engine) helpers in pipeline.py.
+
+These guard the resilient scenario-matching fallback chain
+(LLM match -> keyword overlap -> default) that runs when the DB/LLM layer
+returns nothing useful.
+"""
+import pipeline
+
+
+def test_normalize_name_strips_parens_and_collapses_separators():
+    assert pipeline._normalize_name("Multi-Front Defense") == "multi_front_defense"
+    assert pipeline._normalize_name("Siege Planning (v2)") == "siege_planning"
+    assert pipeline._normalize_name("time__phased  production") == "time_phased_production"
+
+
+def test_resolve_db_name_exact_match_wins():
+    candidates = ["Multi-Front Defense", "Siege Planning"]
+    assert pipeline._resolve_db_name("Multi-Front Defense", candidates) == "Multi-Front Defense"
+
+
+def test_resolve_db_name_fuzzy_match_on_casing_and_separators():
+    candidates = ["Multi-Front Defense", "Siege Planning"]
+    # LLM may return a differently-cased / spaced variant of the DB key.
+    assert pipeline._resolve_db_name("multi front defense", candidates) == "Multi-Front Defense"
+
+
+def test_resolve_db_name_unknown_returns_input_unchanged():
+    candidates = ["Multi-Front Defense"]
+    assert pipeline._resolve_db_name("Totally Unknown Mode", candidates) == "Totally Unknown Mode"
+
+
+def test_keyword_fallback_picks_highest_overlap():
+    details = {
+        "Multi-Front Defense": {"description": "defend multiple fronts against waves"},
+        "Siege Planning": {"description": "plan a siege on a fixed base"},
+    }
+    assert pipeline._keyword_fallback("defend against waves", details) == "Multi-Front Defense"
+
+
+def test_keyword_fallback_no_overlap_returns_none():
+    details = {"Siege Planning": {"description": "plan a siege"}}
+    assert pipeline._keyword_fallback("xyzzy qwerty", details) is None

frontend/src/App.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { getCatalog, generate } from './api'
+import { getCatalog, generate, launch } from './api'
 import PromptInput from './components/PromptInput'
 import ConfigSummary from './components/ConfigSummary'
 import MiniMap from './components/MiniMap'
@@ -25,18 +25,40 @@ export default function App() {
   const [error, setError] = useState(null)
   const [result, setResult] = useState(null)
   const [lastQuery, setLastQuery] = useState('')
+  const [launching, setLaunching] = useState(false)
+  const [launchMsg, setLaunchMsg] = useState(null)
 
   useEffect(() => {
     getCatalog()
       .then(setCatalog)
       .catch((e) => console.warn('catalog load failed', e))
   }, [])
 
+  async function handleLaunch() {
+    if (!config) return
+    setLaunching(true)
+    setLaunchMsg(null)
+    try {
+      const res = await launch(config)
+      if (res.launched) {
+        const g = res.gadgets?.length ? ` · 룰: ${res.gadgets.join(', ')}` : ''
+        setLaunchMsg({ ok: true, text: `BAR 실행 요청됨 (맵: ${res.map}${g}). 게임 창이 곧 뜹니다.` })
+      } else {
+        setLaunchMsg({ ok: false, text: `실행 실패: ${res.error || '알 수 없는 오류'}` })
+      }
+    } catch (e) {
+      setLaunchMsg({ ok: false, text: `백엔드에 연결하지 못했어요 (${e.message}).` })
+    } finally {
+      setLaunching(false)
+    }
+  }
+
   async function handleGenerate(query) {
     setLastQuery(query)
     setLoading(true)
     setError(null)
     setResult(null)
+    setLaunchMsg(null)
     try {
       const res = await generate(query)
       if (res.error || !res.config) {
@@ -95,6 +117,19 @@ export default function App() {
             <ConfigSummary config={config} scenario={result.scenario} />
             <MiniMap config={config} mapMeta={mapMeta} />
           </div>
+
+          <div className="launch-bar">
+            <button className="btn primary" onClick={handleLaunch} disabled={launching}>
+              {launching ? '⏳ 실행 중…' : '🎮 BAR에서 실행'}
+            </button>
+            <span className="muted">실제 Beyond All Reason 엔진으로 이 시나리오를 띄웁니다.</span>
+            {launchMsg && (
+              <span className={launchMsg.ok ? 'launch-ok' : 'launch-err'}>
+                {launchMsg.ok ? '✅ ' : '⚠️ '}{launchMsg.text}
+              </span>
+            )}
+          </div>
+
           <SimPlayback config={config} mapMeta={mapMeta} />
           <JsonView config={config} scenario={result.scenario} />
         </div>

frontend/src/api.js

@@ -16,3 +16,14 @@ export async function generate(query, seed) {
   if (!res.ok) throw new Error(`generate failed: ${res.status}`)
   return res.json()
 }
+
+// Launch the generated config in the actual BAR client (via the v4 simulator).
+export async function launch(config, mode = 'gadget') {
+  const res = await fetch(`${BASE}/launch`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ config, mode }),
+  })
+  if (!res.ok) throw new Error(`launch failed: ${res.status}`)
+  return res.json()
+}

frontend/src/styles.css

@@ -166,6 +166,15 @@ body {
 .btn:hover { border-color: var(--accent); }
 .btn.primary { background: var(--accent); border-color: var(--accent); color: #fff; }
 .btn.primary:hover { background: var(--accent-hover); }
+.btn:disabled { opacity: 0.6; cursor: default; }
+.launch-bar {
+  display: flex; align-items: center; flex-wrap: wrap; gap: 10px 14px;
+  margin: 16px 0; padding: 14px 16px;
+  background: var(--panel-2); border: 1px solid var(--border); border-radius: 10px;
+}
+.launch-bar .muted { color: var(--muted); font-size: 13px; }
+.launch-ok { color: #22c55e; font-size: 13px; }
+.launch-err { color: #ef4444; font-size: 13px; }
 .json-pre {
   margin: 14px 0 0; max-height: 420px; overflow: auto;
   background: #0a0f1d; border: 1px solid var(--border); border-radius: 10px;