fcode 2.2.0__cp312-cp312-win_amd64.whl

fcode/commands/starter.py

@@ -0,0 +1,119 @@
+import importlib.resources
+from pathlib import Path
+
+import click
+from rich.console import Console
+from rich.prompt import Confirm
+
+from fcode.config import CONFIG_FILENAME
+
+console = Console()
+
+DEFAULT_CONFIG = """\
+# fcode.toml - Florent Code League project config
+
+bots_dir = "bots"
+maps_dir = "maps"
+replay = "replay.replay26"
+seed = 1
+"""
+
+GITIGNORE = """\
+# Replays (regenerated with fcode run)
+*.replay26
+
+# Python
+__pycache__/
+*.pyc
+
+# Virtual environments
+.venv/
+venv/
+"""
+
+STARTER_BOT = importlib.resources.files("fcode.data") / "starter_bot.py"
+
+
+def _get_maps_source():
+    """Resolve maps: repo root `maps/` in development, bundled package data when pip-installed."""
+    # In the monorepo: commands/ → fcode/ → python/ → cli/ → repo root
+    repo_maps = Path(__file__).resolve().parent.parent.parent.parent.parent / "maps"
+    if repo_maps.is_dir() and any(repo_maps.glob("*.map26")):
+        return repo_maps
+    return importlib.resources.files("fcode.data.maps")
+
+
+@click.command()
+def starter():
+    """Scaffold a new Florent Code League project."""
+    project_root = Path.cwd()
+    config_path = project_root / CONFIG_FILENAME
+
+    console.print("[bold]Florent Code League — project setup[/bold]\n")
+
+    # 1. Config file (always created)
+    if config_path.exists():
+        console.print(f"  [dim]{CONFIG_FILENAME} already exists, skipping.[/dim]")
+    else:
+        config_path.write_text(DEFAULT_CONFIG, encoding="utf-8")
+        console.print(f"  [green]+[/green] Created {CONFIG_FILENAME}")
+
+    # 2. .gitignore
+    gitignore_path = project_root / ".gitignore"
+    if gitignore_path.exists():
+        console.print("  [dim].gitignore already exists, skipping.[/dim]")
+    else:
+        gitignore_path.write_text(GITIGNORE, encoding="utf-8")
+        console.print("  [green]+[/green] Created .gitignore")
+
+    # 3. Always create bots/ and maps/ directories (config references them)
+    bots_dir = project_root / "bots"
+    maps_dir = project_root / "maps"
+    bots_dir.mkdir(exist_ok=True)
+    maps_dir.mkdir(exist_ok=True)
+
+    # 4. Maps
+    include_maps = Confirm.ask("\n  Include default maps?", default=True)
+    if include_maps:
+        count = 0
+        available = 0
+        maps_source = _get_maps_source()
+        for item in maps_source.iterdir():
+            if item.name.endswith(".map26"):
+                available += 1
+                dest = maps_dir / item.name
+                if dest.exists():
+                    continue
+                dest.write_bytes(item.read_bytes())
+                count += 1
+        if count > 0:
+            console.print(f"  [green]+[/green] Copied {count} maps to maps/")
+        elif available > 0:
+            console.print("  [dim]All maps already present, skipping.[/dim]")
+        else:
+            console.print("  [yellow]No default maps found. Download maps from the platform.[/yellow]")
+
+    # 5. Starter bot
+    include_bot = Confirm.ask("\n  Create a starter bot?", default=True)
+    if include_bot:
+        bot_dir = bots_dir / "starter"
+        bot_dir.mkdir(parents=True, exist_ok=True)
+        main_py = bot_dir / "main.py"
+        if main_py.exists():
+            console.print("  [dim]bots/starter/main.py already exists, skipping.[/dim]")
+        else:
+            main_py.write_text(STARTER_BOT.read_text())
+            console.print("  [green]+[/green] Created bots/starter/main.py")
+
+    # Done — show the full dev loop
+    console.print("\n[bold green]Ready![/bold green] Get started:\n")
+    if include_bot and include_maps:
+        run_cmd = "fcode run starter starter"
+    elif include_bot:
+        run_cmd = "fcode run starter starter <map_path>"
+    else:
+        run_cmd = "fcode run <bot_a> <bot_b> <map_path>"
+    console.print(f"  1. Run a match:    {run_cmd}")
+    console.print("  2. Watch replay:   fcode watch replay.replay26")
+    console.print("  3. Edit your bot:  bots/starter/main.py" if include_bot else "  3. Write your bot: bots/<name>/main.py")
+    console.print("  4. Submit:         fcode submit bots/starter" if include_bot else "  4. Submit:         fcode submit bots/<name>")

fcode/commands/status.py

@@ -0,0 +1,112 @@
+"""fcode status — show current team, latest submission, and ladder rank."""
+
+import click
+from rich.console import Console
+
+from fcode.api import api_get
+from fcode.auth import load_credentials
+
+console = Console()
+
+
+def _get_rank_tier(rating: float, matches_played: int) -> str:
+    """Return rank tier name based on rating and matches played.
+
+    Keep in sync with shared/src/ranks.ts.
+    """
+    if matches_played < 100:
+        return "Unranked"
+    tiers = [
+        (3000, "Legendary Grandmaster"),
+        (2500, "Grandmaster"),
+        (2300, "Master"),
+        (2100, "Candidate Master"),
+        (1900, "Diamond"),
+        (1700, "Emerald"),
+        (1500, "Gold"),
+        (1300, "Silver"),
+    ]
+    for threshold, name in tiers:
+        if rating >= threshold:
+            return name
+    return "Bronze"
+
+
+@click.command()
+def status():
+    """Show your team, latest submission, and ladder rank."""
+    creds = load_credentials()
+    if not creds:
+        console.print("[red]Not logged in. Run: fcode login[/red]")
+        raise SystemExit(1)
+
+    user = creds.get("user", {})
+    team = creds.get("team")
+
+    console.print(f"\n[bold]{user.get('name', '?')}[/bold] ({user.get('email', '?')})")
+
+    if not team:
+        console.print("  Team: [dim]none[/dim]")
+        console.print()
+        return
+
+    try:
+        data = api_get(f"/api/teams/{team['id']}")
+    except SystemExit:
+        console.print(f"  Team: [bold]{team.get('name', '?')}[/bold]")
+        console.print(f"  [dim](Could not fetch live data)[/dim]")
+        console.print()
+        return
+
+    team_info = data.get("team", {})
+    rating = data.get("rating")
+    members = data.get("members", [])
+
+    console.print(f"  Team: [bold]{team_info.get('name', '?')}[/bold] ({team_info.get('category', '?')})")
+
+    if rating:
+        r = rating.get("rating", 0)
+        mp = rating.get("matchesPlayed", 0)
+        tier = _get_rank_tier(r, mp)
+        console.print(f"  Rating: {r:.0f} ({tier}) — {mp} matches played")
+    else:
+        console.print("  Rating: [dim]unrated[/dim]")
+
+    # Show ladder rank position
+    try:
+        ladder_data = api_get("/api/ladder")
+        rankings = ladder_data if isinstance(ladder_data, list) else ladder_data.get("rankings", [])
+        my_rank = next((i + 1 for i, r in enumerate(rankings) if r.get("teamId") == team["id"]), None)
+        if my_rank:
+            console.print(f"  Rank: #{my_rank} of {len(rankings)}")
+    except SystemExit:
+        pass
+
+    # Show active submission
+    try:
+        sub_data = api_get("/api/submissions")
+        subs = sub_data.get("submissions", [])
+        active = next((s for s in subs if s.get("isActive")), None)
+        if active:
+            name_part = f" ({active['name']})" if active.get("name") else ""
+            console.print(f"  Active bot: v{active.get('version', '?')}{name_part}")
+        elif subs:
+            console.print("  Active bot: [dim]none (no ready submission)[/dim]")
+        else:
+            console.print("  Active bot: [dim]no submissions yet[/dim]")
+    except SystemExit:
+        pass
+
+    # Show recent match record
+    try:
+        match_data = api_get("/api/matches", {"teamIds": team["id"], "limit": "10"})
+        recent = match_data.get("matches", [])
+        if recent:
+            wins = sum(1 for m in recent if m.get("winnerId") == team["id"])
+            losses = sum(1 for m in recent if m.get("winnerId") and m.get("winnerId") != team["id"])
+            console.print(f"  Last 10: {wins}W {losses}L")
+    except SystemExit:
+        pass
+
+    console.print(f"  Members: {', '.join(m.get('userName', '?') for m in members)}")
+    console.print()

fcode/commands/submission.py

@@ -0,0 +1,260 @@
+"""fcode submission — manage bot submissions (upload, list, activate, rename)."""
+
+import io
+import os
+import zipfile
+from pathlib import Path
+
+import click
+from rich.console import Console
+from rich.table import Table
+
+from fcode.api import api_get, api_post, api_post_multipart
+
+console = Console()
+
+
+_JUNK_DIRS = {
+    "__pycache__",
+    ".git",
+    ".svn",
+    ".hg",
+    ".idea",
+    ".vscode",
+    ".mypy_cache",
+    ".pytest_cache",
+    ".ruff_cache",
+    "__MACOSX",
+    ".tox",
+    ".eggs",
+    ".nox",
+}
+
+_JUNK_FILES = {
+    ".DS_Store",
+    "Thumbs.db",
+    "desktop.ini",
+    ".thumbs",
+    "ehthumbs.db",
+    "ehthumbs_vista.db",
+    ".Spotlight-V100",
+    ".Trashes",
+    ".directory",
+}
+
+_JUNK_EXTENSIONS = {".pyc", ".pyo"}
+
+
+def _is_junk(path: Path) -> bool:
+    if path.name in _JUNK_FILES or path.name.startswith("._"):
+        return True
+    if path.suffix in _JUNK_EXTENSIONS:
+        return True
+    return any(part in _JUNK_DIRS for part in path.parts)
+
+
+def _make_zip(bot_path: Path) -> bytes:
+    """Create a zip from a directory or single file."""
+    if bot_path.is_dir():
+        main_py = bot_path / "main.py"
+        if not main_py.is_file():
+            raise click.BadParameter(f"Directory '{bot_path}' does not contain main.py")
+        buf = io.BytesIO()
+        with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as zf:
+            for root, dirs, files in os.walk(bot_path):
+                dirs[:] = [d for d in dirs if d not in _JUNK_DIRS]
+                for f in files:
+                    full = Path(root) / f
+                    if _is_junk(full.relative_to(bot_path)):
+                        continue
+                    arcname = str(full.relative_to(bot_path))
+                    zf.write(full, arcname)
+        return buf.getvalue()
+
+    if bot_path.suffix == ".zip":
+        return bot_path.read_bytes()
+
+    if bot_path.suffix == ".py":
+        buf = io.BytesIO()
+        with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as zf:
+            zf.write(bot_path, "main.py")
+        return buf.getvalue()
+
+    raise click.BadParameter(f"Expected a directory, .py file, or .zip: '{bot_path}'")
+
+
+@click.group()
+def submission():
+    """Manage bot submissions (upload, list, activate, rename)."""
+    pass
+
+
+@submission.command()
+@click.argument("path", type=click.Path(exists=True))
+@click.option("--name", "-n", default=None, help="Optional name for this submission")
+def upload(path: str, name: str | None):
+    """Upload a bot to the platform.
+
+    PATH can be a directory (containing main.py), a single .py file,
+    or a .zip archive.
+    """
+    bot_path = Path(path).resolve()
+    console.print(f"[bold]Packaging {bot_path.name}...[/bold]")
+
+    try:
+        zip_bytes = _make_zip(bot_path)
+    except click.BadParameter as e:
+        console.print(f"[red]{e.format_message()}[/red]")
+        raise SystemExit(1)
+
+    size_kb = len(zip_bytes) / 1024
+    console.print(f"  Zip size: {size_kb:.1f} KB")
+    console.print("[bold]Uploading...[/bold]")
+
+    text_fields: dict[str, str] = {}
+    if name:
+        text_fields["name"] = name
+
+    data = api_post_multipart(
+        "/api/submissions/upload",
+        files={"file": ("bot.zip", zip_bytes, "application/zip")},
+        text_fields=text_fields if text_fields else None,
+    )
+
+    sub = data.get("submission", {})
+    msg = f"[green]Submitted![/green] Version {sub.get('version', '?')} (ID: {sub.get('id', '?')})"
+    if name:
+        msg += f" — {name}"
+    console.print(msg)
+
+
+@submission.command("list")
+def list_submissions():
+    """List all submissions for your team."""
+    data = api_get("/api/submissions")
+    subs = data.get("submissions", [])
+
+    if not subs:
+        console.print("[dim]No submissions yet.[/dim]")
+        return
+
+    table = Table(show_header=True, header_style="bold")
+    table.add_column("Version", justify="right")
+    table.add_column("Name")
+    table.add_column("Status")
+    table.add_column("Active", justify="center")
+    table.add_column("Uploaded By")
+    table.add_column("Date", style="dim")
+
+    for s in subs:
+        version = f"v{s.get('version', '?')}"
+        name_display = s.get("name") or "[dim]—[/dim]"
+        status = s.get("status", "?")
+        if status == "ready":
+            status = f"[green]{status}[/green]"
+        elif status == "error":
+            status = f"[red]{status}[/red]"
+
+        active = "[green]Yes[/green]" if s.get("isActive") else "[dim]—[/dim]"
+        uploaded_by = s.get("submittedByName") or "[dim]—[/dim]"
+
+        date = ""
+        raw = s.get("uploadedAt")
+        if raw:
+            date = raw[:16].replace("T", " ")
+
+        table.add_row(version, name_display, status, active, uploaded_by, date)
+
+    console.print(table)
+
+
+@submission.command()
+@click.argument("version", type=int)
+def activate(version: int):
+    """Set a submission as the active one used for ladder matches.
+
+    VERSION is the submission version number (e.g. 3).
+    """
+    # First, list submissions to find the ID for this version
+    data = api_get("/api/submissions")
+    subs = data.get("submissions", [])
+
+    target = next((s for s in subs if s.get("version") == version), None)
+    if not target:
+        console.print(f"[red]No submission found with version {version}.[/red]")
+        raise SystemExit(1)
+
+    if target.get("status") != "ready":
+        console.print(f"[red]Version {version} has status '{target.get('status')}' — only ready submissions can be activated.[/red]")
+        raise SystemExit(1)
+
+    if target.get("isActive"):
+        console.print(f"[dim]Version {version} is already active.[/dim]")
+        return
+
+    api_post("/api/submissions/activate", {"submissionId": target["id"]})
+    console.print(f"[green]Version {version} is now the active submission.[/green]")
+
+
+@submission.command()
+@click.argument("version", type=int)
+@click.argument("name")
+def rename(version: int, name: str):
+    """Rename a submission.
+
+    VERSION is the submission version number (e.g. 3).
+    NAME is the new name for the submission.
+    """
+    data = api_get("/api/submissions")
+    subs = data.get("submissions", [])
+
+    target = next((s for s in subs if s.get("version") == version), None)
+    if not target:
+        console.print(f"[red]No submission found with version {version}.[/red]")
+        raise SystemExit(1)
+
+    api_post("/api/submissions/rename", {"submissionId": target["id"], "name": name})
+    console.print(f"[green]Version {version} renamed to '{name}'.[/green]")
+
+
+@submission.command()
+@click.argument("version", required=False, default=None, type=int)
+@click.option("--output", "-o", default=None, help="Output file path (default: v<VERSION>.zip)")
+def download(version: int | None, output: str | None):
+    """Download a submission zip file.
+
+    VERSION is the submission version number. Defaults to the active submission.
+    """
+    import urllib.request
+
+    data = api_get("/api/submissions")
+    subs = data.get("submissions", [])
+
+    if not subs:
+        console.print("[red]No submissions found.[/red]")
+        raise SystemExit(1)
+
+    if version is not None:
+        target = next((s for s in subs if s.get("version") == version), None)
+        if not target:
+            console.print(f"[red]No submission found with version {version}.[/red]")
+            raise SystemExit(1)
+    else:
+        target = next((s for s in subs if s.get("isActive")), None)
+        if not target:
+            target = next((s for s in subs if s.get("status") == "ready"), None)
+        if not target:
+            console.print("[red]No ready submission to download.[/red]")
+            raise SystemExit(1)
+        version = target.get("version", 0)
+
+    dl_data = api_get("/api/submissions/download", {"submissionId": target["id"]})
+    url = dl_data.get("url")
+    if not url:
+        console.print("[red]Could not get download URL.[/red]")
+        raise SystemExit(1)
+
+    out_path = output or f"v{version}.zip"
+    urllib.request.urlretrieve(url, out_path)
+    name_part = f" ({target['name']})" if target.get("name") else ""
+    console.print(f"[green]Downloaded v{version}{name_part} to {out_path}[/green]")

fcode/commands/team_group.py

@@ -0,0 +1,73 @@
+"""fcode team — search teams and view team profiles (replaces `teams`)."""
+
+import click
+from rich.console import Console
+from rich.table import Table
+
+from fcode.api import api_get
+
+console = Console()
+
+
+@click.group()
+def team():
+    """Search teams and view team profiles."""
+    pass
+
+
+@team.command()
+@click.argument("query")
+def search(query: str):
+    """Search for teams by name."""
+    from urllib.parse import urlencode
+    data = api_get(f"/api/teams/search?{urlencode({'q': query})}")
+
+    results = data.get("teams", [])
+    if not results:
+        console.print(f"[dim]No teams matching '{query}'.[/dim]")
+        return
+
+    table = Table(show_header=True, header_style="bold")
+    table.add_column("Team ID", style="dim")
+    table.add_column("Name")
+    table.add_column("Rating", justify="right")
+    table.add_column("Matches", justify="right")
+
+    for t in results:
+        rating = f"{t.get('rating', 0):.0f}"
+        table.add_row(
+            t.get("teamId", "?"),
+            t.get("teamName", "?"),
+            rating,
+            str(t.get("matchesPlayed", 0)),
+        )
+
+    console.print(table)
+
+
+@team.command()
+@click.argument("team_id")
+def info(team_id: str):
+    """View detailed info for a team by ID."""
+    data = api_get(f"/api/teams/{team_id}")
+
+    team_data = data.get("team", {})
+    members = data.get("members", [])
+    rating = data.get("rating")
+
+    console.print(f"\n[bold]{team_data.get('name', '?')}[/bold]  [dim]({team_data.get('id', '?')})[/dim]")
+
+
+    if rating:
+        console.print(f"  Rating:   {rating.get('rating', 0):.0f}")
+        console.print(f"  Matches:  {rating.get('matchesPlayed', 0)}")
+    else:
+        console.print("  Rating:   unrated")
+
+    if members:
+        console.print("\n  Members:")
+        for m in members:
+            role_badge = " [dim](owner)[/dim]" if m.get("role") == "owner" else ""
+            console.print(f"    - {m.get('userName', '?')}{role_badge}")
+
+    console.print()

fcode/commands/teams.py

@@ -0,0 +1,73 @@
+"""fcode teams — search teams and view team info."""
+
+import click
+from rich.console import Console
+from rich.table import Table
+
+from fcode.api import api_get
+
+console = Console()
+
+
+@click.group()
+def teams():
+    """Search teams and view team profiles."""
+    pass
+
+
+@teams.command()
+@click.argument("query")
+def search(query: str):
+    """Search for teams by name."""
+    from urllib.parse import urlencode
+    data = api_get(f"/api/teams/search?{urlencode({'q': query})}")
+
+    results = data.get("teams", [])
+    if not results:
+        console.print(f"[dim]No teams matching '{query}'.[/dim]")
+        return
+
+    table = Table(show_header=True, header_style="bold")
+    table.add_column("Team ID", style="dim")
+    table.add_column("Name")
+    table.add_column("Rating", justify="right")
+    table.add_column("Matches", justify="right")
+
+    for t in results:
+        rating = f"{t.get('rating', 0):.0f}"
+        table.add_row(
+            t.get("teamId", "?"),
+            t.get("teamName", "?"),
+            rating,
+            str(t.get("matchesPlayed", 0)),
+        )
+
+    console.print(table)
+
+
+@teams.command()
+@click.argument("team_id")
+def info(team_id: str):
+    """View detailed info for a team by ID."""
+    data = api_get(f"/api/teams/{team_id}")
+
+    team = data.get("team", {})
+    members = data.get("members", [])
+    rating = data.get("rating")
+
+    console.print(f"\n[bold]{team.get('name', '?')}[/bold]  [dim]({team.get('id', '?')})[/dim]")
+
+
+    if rating:
+        console.print(f"  Rating:   {rating.get('rating', 0):.0f}")
+        console.print(f"  Matches:  {rating.get('matchesPlayed', 0)}")
+    else:
+        console.print("  Rating:   unrated")
+
+    if members:
+        console.print("\n  Members:")
+        for m in members:
+            role_badge = " [dim](owner)[/dim]" if m.get("role") == "owner" else ""
+            console.print(f"    - {m.get('userName', '?')}{role_badge}")
+
+    console.print()

fcode/commands/test.py

@@ -0,0 +1,51 @@
+"""fcode unrated — request an unrated match against another team."""
+
+import click
+from rich.console import Console
+
+from fcode.api import api_post
+
+console = Console()
+
+
+def _show_unrated(opponent_id: str, source_match: str | None, maps: tuple[str, ...] | None):
+    """Core implementation for requesting an unrated match."""
+    body: dict = {"opponentTeamId": opponent_id}
+    if source_match:
+        body["sourceMatchId"] = source_match
+    if maps:
+        body["mapNames"] = list(maps[:5])
+
+    data = api_post("/api/matches/unrated", body)
+
+    match_id = data.get("matchId")
+    if not match_id:
+        console.print("[red]Unexpected response from server.[/red]")
+        raise SystemExit(1)
+
+    from fcode.auth import get_api_url
+    msg = f"[green]Unrated match queued![/green] Match ID: {match_id}"
+    if source_match:
+        msg += f"\n  Opponent version from match: {source_match}"
+    if maps:
+        msg += f"\n  Maps: {', '.join(maps[:5])}"
+    console.print(msg)
+    console.print(f"  View at: {get_api_url()}/match/{match_id}")
+
+
+@click.command("unrated")
+@click.argument("opponent_id")
+@click.option("--match", "source_match", default=None, help="Use opponent's submission from this match ID")
+@click.option("--map", "maps", multiple=True, help="Map name (repeatable, up to 5). Omit for random.")
+def unrated(opponent_id: str, source_match: str | None, maps: tuple[str, ...]):
+    """Request an unrated match against OPPONENT_ID (your team vs theirs).
+
+    Use `fcode team search` to find team IDs.
+
+    With --match, the opponent uses whichever submission version they had
+    in that match, instead of their latest.
+
+    With --map, specify which maps to play (up to 5). Omit for random selection.
+    Example: fcode unrated <id> --map arena --map fortress --map galaxy
+    """
+    _show_unrated(opponent_id, source_match, maps or None)