Fix CI: pre-commit (exclude logs/, ruff) + pytest (route integration test through codeclash CLI)

Author: john-b-yang

.pre-commit-config.yaml

@@ -1,7 +1,8 @@
 ci:
   autoupdate_commit_msg: "chore: update pre-commit hooks"
 
-exclude: '\.ipynb\.py$'
+# Skip notebooks-as-py and committed sample logs (raw game data + imported bot source).
+exclude: '\.ipynb\.py$|^logs/'
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks

codeclash/cli/app.py

@@ -12,7 +12,6 @@
 import time
 import uuid
 from pathlib import Path
-from typing import Optional
 
 import typer
 import yaml
@@ -39,9 +38,7 @@
 def run(
     config_path: Path = typer.Argument(..., help="Path to the tournament config file."),
     cleanup: bool = typer.Option(False, "--cleanup", "-c", help="Clean up the game environment after running."),
-    output_dir: Optional[Path] = typer.Option(
-        None, "--output-dir", "-o", help="Output directory (default: logs/<user>)."
-    ),
+    output_dir: Path | None = typer.Option(None, "--output-dir", "-o", help="Output directory (default: logs/<user>)."),
     suffix: str = typer.Option("", "--suffix", "-s", help="Suffix for the output folder name (no leading dot)."),
     keep_containers: bool = typer.Option(
         False, "--keep-containers", "-k", help="Do not remove containers after games/agent finish."

codeclash/cli/ladder.py

@@ -3,7 +3,6 @@
 import getpass
 import time
 from pathlib import Path
-from typing import Optional
 
 import typer
 import yaml
@@ -53,9 +52,7 @@ def make(
 def run(
     config_path: Path = typer.Argument(..., help="Path to the ladder config (with `player` + `ladder`)."),
     cleanup: bool = typer.Option(False, "--cleanup", "-c", help="Clean up the game environment after running."),
-    output_dir: Optional[Path] = typer.Option(
-        None, "--output-dir", "-o", help="Output directory (default: logs/<user>)."
-    ),
+    output_dir: Path | None = typer.Option(None, "--output-dir", "-o", help="Output directory (default: logs/<user>)."),
     suffix: str = typer.Option("", "--suffix", "-s", help="Suffix for the output folder name (no leading dot)."),
     keep_containers: bool = typer.Option(
         False, "--keep-containers", "-k", help="Do not remove containers after games/agent finish."

scripts/replay_battlesnake.py

@@ -13,6 +13,7 @@
 The jsonl format: one metadata line, per-turn v1 state frames ({game,turn,board,you}),
 and a final result line ({winnerName,isDraw}).
 """
+
 import argparse
 import json
 import sys
@@ -48,19 +49,28 @@ def load(path):
     frames = []
     for t in turns:
         b = by_turn[t]
-        frames.append({
-            "turn": t,
-            "food": [[c["x"], c["y"]] for c in b.get("food", [])],
-            "hazards": [[c["x"], c["y"]] for c in b.get("hazards", [])],
-            "snakes": [{
-                "name": s["name"],
-                "health": s.get("health", 0),
-                "body": [[c["x"], c["y"]] for c in s["body"]],
-            } for s in b["snakes"]],
-        })
+        frames.append(
+            {
+                "turn": t,
+                "food": [[c["x"], c["y"]] for c in b.get("food", [])],
+                "hazards": [[c["x"], c["y"]] for c in b.get("hazards", [])],
+                "snakes": [
+                    {
+                        "name": s["name"],
+                        "health": s.get("health", 0),
+                        "body": [[c["x"], c["y"]] for c in s["body"]],
+                    }
+                    for s in b["snakes"]
+                ],
+            }
+        )
     return {
-        "w": b0["width"], "h": b0["height"], "frames": frames, "colors": colors,
-        "winner": result.get("winnerName"), "draw": result.get("isDraw", False),
+        "w": b0["width"],
+        "h": b0["height"],
+        "frames": frames,
+        "colors": colors,
+        "winner": result.get("winnerName"),
+        "draw": result.get("isDraw", False),
     }
 
 
@@ -69,7 +79,7 @@ def to_ascii(g):
         grid = [["." for _ in range(g["w"])] for _ in range(g["h"])]
         for fx, fy in f["food"]:
             grid[fy][fx] = "*"
-        for i, s in enumerate(f["snakes"]):
+        for s in f["snakes"]:
             ch = s["name"][0].upper()
             for j, (x, y) in enumerate(s["body"]):
                 grid[y][x] = ch if j else ch.lower()  # head lowercase-ish marker

scripts/replay_robotrumble.py

@@ -18,6 +18,7 @@
 (unit id -> {"Ok": {"type":"Move"|"Attack","direction":...}} or {"Ok":"None"}).
 Blue is the first (blue) bot, Red is the second.
 """
+
 import argparse
 import json
 import sys
@@ -55,14 +56,16 @@ def load(path, blue_name=None, red_name=None):
                 ok = act["Ok"]
                 if isinstance(ok, dict):
                     atype, adir = ok.get("type"), ok.get("direction")
-            units.append({
-                "team": o.get("team"),
-                "hp": o.get("health", 0),
-                "x": o["coords"][0],
-                "y": o["coords"][1],
-                "act": atype,
-                "dir": adir,
-            })
+            units.append(
+                {
+                    "team": o.get("team"),
+                    "hp": o.get("health", 0),
+                    "x": o["coords"][0],
+                    "y": o["coords"][1],
+                    "act": atype,
+                    "dir": adir,
+                }
+            )
         frames.append({"turn": t["state"].get("turn"), "units": units})
 
     winner_raw = data.get("winner")
@@ -97,9 +100,11 @@ def to_ascii(g):
         for u in f["units"]:
             counts[u["team"]] += 1
             hp[u["team"]] += u["hp"]
-        print(f"\n--- turn {f['turn']} ---  "
-              f"{g['names']['Blue']}(B): {counts['Blue']} units / {hp['Blue']} hp   "
-              f"{g['names']['Red']}(R): {counts['Red']} units / {hp['Red']} hp")
+        print(
+            f"\n--- turn {f['turn']} ---  "
+            f"{g['names']['Blue']}(B): {counts['Blue']} units / {hp['Blue']} hp   "
+            f"{g['names']['Red']}(R): {counts['Red']} units / {hp['Red']} hp"
+        )
         for row in grid:
             print(" ".join(row))
     print(f"\nWinner: {'TIE' if g['draw'] else g['winner']}")

tests/test_integration.py

@@ -9,10 +9,13 @@
 
 
 def test_pvp_battlesnake():
-    from main import main_cli
+    from typer.testing import CliRunner
+
+    from codeclash.cli.app import app
 
     config_path = CONFIG_DIR / "test" / "battlesnake_pvp_test.yaml"
-    main_cli(["-c", str(config_path)])
+    result = CliRunner().invoke(app, ["run", "-c", str(config_path)])
+    assert result.exit_code == 0, result.output
 
 
 def test_single_player_battlesnake():