cogames 0.3.59.post1.dev2__py3-none-any.whl → 0.3.64__py3-none-any.whl

cogames/cli/client.py

@@ -51,6 +51,8 @@ class PoolInfo(BaseModel):
 
 class SeasonInfo(BaseModel):
     name: str
+    version: int
+    canonical: bool
     summary: str
     entry_pool: str | None = None
     leaderboard_pool: str | None = None
@@ -58,6 +60,13 @@ class SeasonInfo(BaseModel):
     pools: list[PoolInfo]
 
 
+class SeasonVersionInfo(BaseModel):
+    version: int
+    canonical: bool
+    disabled_at: str | None
+    created_at: str
+
+
 class LeaderboardEntry(BaseModel):
     rank: int
     policy: PolicyVersionSummary
@@ -174,6 +183,9 @@ class TournamentServerClient:
     def get_config(self, config_id: str) -> dict[str, Any]:
         return self._get(f"/tournament/configs/{config_id}")
 
+    def get_season_versions(self, season_name: str) -> list[SeasonVersionInfo]:
+        return self._get(f"/tournament/seasons/{season_name}/versions", list[SeasonVersionInfo])
+
     def get_leaderboard(self, season_name: str, include_hidden_seasons: bool = False) -> list[LeaderboardEntry]:
         return self._get(
             f"/tournament/seasons/{season_name}/leaderboard",

cogames/cli/leaderboard.py

@@ -36,6 +36,22 @@ def parse_policy_identifier(identifier: str) -> tuple[str, int | None]:
     return identifier, None
 
 
+def parse_season_ref(season_ref: str) -> tuple[str, int | None]:
+    if ":v" in season_ref:
+        name, version_str = season_ref.rsplit(":v", 1)
+        try:
+            return name, int(version_str)
+        except ValueError:
+            return season_ref, None
+    if ":" in season_ref:
+        name, version_str = season_ref.rsplit(":", 1)
+        try:
+            return name, int(version_str)
+        except ValueError:
+            return season_ref, None
+    return season_ref, None
+
+
 def _format_timestamp(value: Optional[str]) -> str:
     """Format ISO timestamps for CLI output."""
     if not value:
@@ -321,6 +337,8 @@ def leaderboard_cmd(
 
 
 def seasons_cmd(
+    season_name: Optional[str] = typer.Argument(None, help="Show versions of a specific season"),
+    versions: bool = typer.Option(False, "--versions", "-v", help="List all versions of the season"),
     login_server: str = typer.Option(
         DEFAULT_COGAMES_SERVER,
         "--login-server",
@@ -358,6 +376,28 @@ def seasons_cmd(
 
     try:
         with client:
+            if season_name and versions:
+                season_versions = client.get_season_versions(season_name)
+                if json_output:
+                    console.print(json.dumps([v.model_dump() for v in season_versions], indent=2))
+                    return
+
+                if not season_versions:
+                    console.print(f"[yellow]No versions found for season '{season_name}'.[/yellow]")
+                    return
+
+                table = Table(title=f"Versions: {season_name}", box=box.SIMPLE_HEAVY, show_lines=False, pad_edge=False)
+                table.add_column("Version", style="bold cyan")
+                table.add_column("Status", style="white")
+                table.add_column("Created", style="dim")
+
+                for v in season_versions:
+                    status = "[green]canonical[/green]" if v.canonical else "[dim]historical[/dim]"
+                    table.add_row(f"v{v.version}", status, _format_timestamp(v.created_at))
+
+                console.print(table)
+                return
+
             seasons = client.get_seasons()
     except httpx.HTTPError as exc:
         console.print(f"[red]Failed to reach server:[/red] {exc}")

cogames/cli/mission.py

@@ -39,12 +39,14 @@ def _get_legacy_missions() -> list[Mission]:
 
 
 @lru_cache(maxsize=1)
-def _get_eval_missions_all() -> list[Mission]:
+def _get_eval_missions_all() -> list[AnyMission]:
+    from cogames.cogs_vs_clips.evals.cogsguard_evals import COGSGUARD_EVAL_MISSIONS
     from cogames.cogs_vs_clips.evals.diagnostic_evals import DIAGNOSTIC_EVALS
     from cogames.cogs_vs_clips.evals.integrated_evals import EVAL_MISSIONS as INTEGRATED_EVAL_MISSIONS
     from cogames.cogs_vs_clips.evals.spanning_evals import EVAL_MISSIONS as SPANNING_EVAL_MISSIONS
 
-    missions: list[Mission] = []
+    missions: list[AnyMission] = []
+    missions.extend(COGSGUARD_EVAL_MISSIONS)
     missions.extend(INTEGRATED_EVAL_MISSIONS)
     missions.extend(SPANNING_EVAL_MISSIONS)
     missions.extend(mission_cls() for mission_cls in DIAGNOSTIC_EVALS)  # type: ignore[call-arg]
@@ -56,6 +58,7 @@ def load_mission_set(mission_set: str) -> list[AnyMission]:
 
     Args:
         mission_set: Name of mission set to load. Options:
+            - "cogsguard_evals": CogsGuard evaluation missions (map-based)
             - "integrated_evals": Integrated evaluation missions
             - "spanning_evals": Spanning evaluation missions
             - "diagnostic_evals": Diagnostic evaluation missions
@@ -82,6 +85,10 @@ def load_mission_set(mission_set: str) -> list[AnyMission]:
         from cogames.cogs_vs_clips.evals.diagnostic_evals import DIAGNOSTIC_EVALS
 
         missions_list = [mission_cls() for mission_cls in DIAGNOSTIC_EVALS]  # type: ignore[call-arg]
+    elif mission_set == "cogsguard_evals":
+        from cogames.cogs_vs_clips.evals.cogsguard_evals import COGSGUARD_EVAL_MISSIONS
+
+        missions_list = list(COGSGUARD_EVAL_MISSIONS)
     elif mission_set == "integrated_evals":
         from cogames.cogs_vs_clips.evals.integrated_evals import EVAL_MISSIONS as INTEGRATED_EVAL_MISSIONS
 
@@ -91,7 +98,7 @@ def load_mission_set(mission_set: str) -> list[AnyMission]:
 
         missions_list = list(SPANNING_EVAL_MISSIONS)
     else:
-        available = "integrated_evals, spanning_evals, diagnostic_evals, all"
+        available = "cogsguard_evals, integrated_evals, spanning_evals, diagnostic_evals, all"
         raise ValueError(f"Unknown mission set: {mission_set}\nAvailable sets: {available}")
 
     return missions_list
@@ -447,7 +454,7 @@ def list_evals() -> None:
         return
 
     # Group missions by site
-    missions_by_site: dict[str, list[Mission]] = {}
+    missions_by_site: dict[str, list[AnyMission]] = {}
     for m in evals:
         missions_by_site.setdefault(m.site.name, []).append(m)
 

cogames/cogs_vs_clips/cogsguard_reward_variants.py

@@ -13,9 +13,15 @@ from mettagrid.config.game_value import stat
 from mettagrid.config.mettagrid_config import MettaGridConfig
 from mettagrid.config.reward_config import AgentReward, reward
 
-CogsGuardRewardVariant = Literal["credit", "milestones", "no_objective", "objective"]
+CogsGuardRewardVariant = Literal["credit", "milestones", "no_objective", "penalize_vibe_change", "objective"]
 
-AVAILABLE_REWARD_VARIANTS: tuple[CogsGuardRewardVariant, ...] = ("objective", "no_objective", "milestones", "credit")
+AVAILABLE_REWARD_VARIANTS: tuple[CogsGuardRewardVariant, ...] = (
+    "objective",
+    "no_objective",
+    "milestones",
+    "credit",
+    "penalize_vibe_change",
+)
 
 _OBJECTIVE_STAT_KEY = "aligned_junction_held"
 
@@ -55,6 +61,12 @@ def _apply_milestones(rewards: dict[str, AgentReward], *, max_junctions: int = 1
     )
 
 
+def _apply_penalize_vibe_change(rewards: dict[str, AgentReward]) -> None:
+    """Add penalty for vibe changes to discourage spamming."""
+    w_vibe_change = -0.01
+    rewards["vibe_change_penalty"] = reward(stat("action.change_vibe.success"), weight=w_vibe_change)
+
+
 def _apply_credit(rewards: dict[str, AgentReward]) -> None:
     """Add dense precursor shaping rewards onto an existing baseline."""
     w_heart = 0.05
@@ -98,6 +110,7 @@ def apply_reward_variants(env: MettaGridConfig, *, variants: str | Sequence[str]
     - `no_objective`: disables the objective stat reward (`junction.held`).
     - `milestones`: adds shaped rewards for aligning/scrambling junctions and holding more junctions.
     - `credit`: adds additional dense shaping for precursor behaviors (resources/gear/deposits).
+    - `penalize_vibe_change`: adds a penalty for vibe changes to discourage spamming.
     """
     if not variants:
         return
@@ -127,6 +140,8 @@ def apply_reward_variants(env: MettaGridConfig, *, variants: str | Sequence[str]
         _apply_milestones(rewards)
     if "credit" in enabled:
         _apply_credit(rewards)
+    if "penalize_vibe_change" in enabled:
+        _apply_penalize_vibe_change(rewards)
 
     env.game.agent.rewards = rewards
 

cogames/cogs_vs_clips/evals/cogsguard_evals.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from cogames.cogs_vs_clips.mission import CogsGuardMission, Site
+from cogames.cogs_vs_clips.mission_utils import get_map
+
+MAPS_DIR = Path(__file__).resolve().parent.parent.parent / "maps"
+
+COGSGUARD_EVALS_BASE = Site(
+    name="cogsguard_evals",
+    description="CogsGuard evaluation arenas.",
+    map_builder=get_map("evals/eval_balanced_spread.map"),
+    min_cogs=1,
+    max_cogs=20,
+)
+
+
+def _count_spawn_pads(map_path: Path) -> int:
+    text = map_path.read_text()
+    if "map_data:" not in text:
+        raise ValueError(f"Missing map_data block in {map_path}")
+    map_section = text.split("map_data:", 1)[1].split("char_to_map_name:", 1)[0]
+    count = map_section.count("@")
+    if count <= 0:
+        raise ValueError(f"No spawn pads found in {map_path}")
+    return count
+
+
+def _make_eval_site(map_name: str, num_cogs: int) -> Site:
+    site = COGSGUARD_EVALS_BASE.model_copy(
+        update={
+            "map_builder": get_map(map_name),
+            "min_cogs": num_cogs,
+            "max_cogs": num_cogs,
+        }
+    )
+    return site
+
+
+def _description_from_stem(stem: str) -> str:
+    display = stem
+    if display.startswith("eval_"):
+        display = display[len("eval_") :]
+    display = display.replace("_", " ")
+    return f"CogsGuard eval: {display}."
+
+
+COGSGUARD_EVAL_MAPS: list[str] = [
+    "evals/eval_balanced_spread.map",
+    "evals/eval_clip_oxygen.map",
+    "evals/eval_collect_resources.map",
+    "evals/eval_collect_resources_medium.map",
+    "evals/eval_collect_resources_hard.map",
+    "evals/eval_divide_and_conquer.map",
+    "evals/eval_energy_starved.map",
+    "evals/eval_multi_coordinated_collect_hard.map",
+    "evals/eval_oxygen_bottleneck.map",
+    "evals/eval_single_use_world.map",
+    "evals/extractor_hub_30x30.map",
+    "evals/extractor_hub_50x50.map",
+    "evals/extractor_hub_70x70.map",
+    "evals/extractor_hub_80x80.map",
+    "evals/extractor_hub_100x100.map",
+]
+
+COGSGUARD_EVAL_COGS = {map_name: _count_spawn_pads(MAPS_DIR / map_name) for map_name in COGSGUARD_EVAL_MAPS}
+
+COGSGUARD_EVAL_MISSIONS: list[CogsGuardMission] = []
+for map_name in COGSGUARD_EVAL_MAPS:
+    stem = Path(map_name).stem
+    num_cogs = COGSGUARD_EVAL_COGS[map_name]
+    site = _make_eval_site(map_name, num_cogs)
+    COGSGUARD_EVAL_MISSIONS.append(
+        CogsGuardMission(
+            name=stem,
+            description=_description_from_stem(stem),
+            site=site,
+            num_cogs=num_cogs,
+        )
+    )

cogames/cogs_vs_clips/missions.py

@@ -57,10 +57,12 @@ def get_legacy_missions() -> list[Mission]:
     return []
 
 
-def _build_eval_missions() -> list[Mission]:
+def _build_eval_missions() -> list[AnyMission]:
+    from cogames.cogs_vs_clips.evals.cogsguard_evals import COGSGUARD_EVAL_MISSIONS
     from cogames.cogs_vs_clips.evals.integrated_evals import EVAL_MISSIONS as INTEGRATED_EVAL_MISSIONS
 
     return [
+        *COGSGUARD_EVAL_MISSIONS,
         *INTEGRATED_EVAL_MISSIONS,
     ]
 

cogames/main.py

@@ -109,13 +109,17 @@ def _register_policies() -> None:
     discover_and_register_policies()
 
 
+def _register_policies_callback() -> None:
+    _register_policies()
+
+
 app = typer.Typer(
     help="CoGames - Multi-agent cooperative and competitive games",
     context_settings={"help_option_names": ["-h", "--help"]},
     no_args_is_help=True,
     rich_markup_mode="rich",
     pretty_exceptions_show_locals=False,
-    callback=_register_policies,
+    callback=_register_policies_callback,
 )
 
 tutorial_app = typer.Typer(

cogames/maps/evals/eval_balanced_spread.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.C....O......................#
     #C.......#.......................G.....#
     #......C.#.....###.....###.............#
-    #........#.....#O.......G#...........O.#
-    #.....#........#....=....#......#......#
-    #.....#.....G...................##.....#
+    #........#.....#O...m...G#...........O.#
+    #.....#........#...a=r...#......#......#
+    #.....#.....G.......t...........##.....#
     #....C#.............&....S.......##....#
     #.....#.............@@@@@@@@......#....#
     #.....#....C...........................#
@@ -51,3 +51,7 @@ char_to_map_name:
   "@": agent.agent
   "&": hub
   "=": chest
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_clip_oxygen.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#O.......G#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#O...m...G#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#........S.......................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_collect_resources.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####...........C.................#
     #....S...#........................O....#
     #........#.....###.....###.............#
-    #........#.....#O.......G#.............#
-    #.....#........#.@..=..@.#......#......#
-    #.....#................@........##.....#
+    #........#.....#O...m...G#.............#
+    #.....#........#.@.a=r.@.#......#......#
+    #.....#.............t..@........##.....#
     #.....#...C......@..&............##....#
     #.....#.............@..@..........#....#
     #.....#..........@.......@.............#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_collect_resources_hard.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_collect_resources_medium.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###...........G.#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#......C..................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#......C......t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_divide_and_conquer.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -51,3 +51,7 @@ char_to_map_name:
   "@": agent.agent
   "&": hub
   "=": chest
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_energy_starved.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #...S....#........................S....#
     #........#.....###.....###.............#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#...O.........&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -51,3 +51,7 @@ char_to_map_name:
   "@": agent.agent
   "&": hub
   "=": chest
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_multi_coordinated_collect_hard.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&....@.......##....#
     #.....#.............@.............#....#
     #.....#.........@.......@..............#
@@ -54,3 +54,7 @@ char_to_map_name:
 
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_oxygen_bottleneck.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#........G#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m...G#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_single_use_world.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.C....O......................#
     #C.......#.......................G.....#
     #......C.#.....###.....###.............#
-    #........#.....#O.......G#...........O.#
-    #.....#........#....=....#......#......#
-    #.....#.....G...................##.....#
+    #........#.....#O...m...G#...........O.#
+    #.....#........#...a=r...#......#......#
+    #.....#.....G.......t...........##.....#
     #....C#.............&....S.......##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/extractor_hub_100x100.map

@@ -55,10 +55,10 @@ map_data: |-
   #####............###............#...###.....#.........@.........#...#.......#.....#..###...##...#.##...#######
   ########..#..###.##.#.#.....#.S....#.##..##.......................#.#....#..#.G.......##.#####.###.....#######
   ######........##......#..#..#......#.#.....#........@.&.@........##...##.#.##.........##....#..##.#....#######
-  #####....##.C.#........###..#.#...##.###..#......................#...#......##......C.####...#.#..#.....######
+  #####....##.C.#........###..#.#...##.###..#...........m..........#...#......##......C.####...#.#..#.....######
   ######...#........#...........#.......#..####.........@.........#.#..#..####.#........####.....##.......######
-  #######.........#..##.G.#...#.####....#.....#.........=.........#..##..#####......+.#...#.##..##....S...######
-  ########.#.##..#...##.....###.###.......##..#...................#.......#....#............#.............######
+  #######.........#..##.G.#...#.####....#.....#........a=r........#..##..#####......+.#...#.##..##....S...######
+  ########.#.##..#...##.....###.###.......##..#.........t.........#.......#....#............#.............######
   #######.#######....##..#.######.....##..##..#...................####..G.##.....##...###..#..###....#..########
   ######......#....#..#.####.###..###....####.#...................#####...##.##.##...##.....#######.#..#########
   #####.....O...O.....#.###...##.##.....#..####...................#...#...#####...#..##.##....#..####..##..#####
@@ -121,3 +121,7 @@ char_to_map_name:
   "S": silicon_extractor
   "O": oxygen_extractor
   "C": carbon_extractor
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/extractor_hub_30x30.map

@@ -20,10 +20,10 @@ map_data: |-
   ########.#......@..@....@....#....######
   ########........................+..#####
   ######...........@.&.@.............#####
-  ######..#..........................#####
+  ######..#..........m...............#####
   #####..###......@..@.@.......###..######
-  #####..###.........=.........##..#######
-  #####..###...................#..########
+  #####..###........a=r........##..#######
+  #####..###.........t.........#..########
   #####...##...................#..########
   ######..##...................#.#########
   #######..#...................#.....#####
@@ -51,3 +51,7 @@ char_to_map_name:
   "S": silicon_extractor
   "O": oxygen_extractor
   "C": carbon_extractor
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/extractor_hub_50x50.map

@@ -30,10 +30,10 @@ map_data: |-
   #####...#....#.....#..@......@.....@...#.#..#.......########
   #####.....#.............................##..##.....#########
   #####..........#...........@.&.@..............##.###########
-  ######..##.G..###........................C....##.###########
+  ######..##.G..###............m...........C....##.###########
   ######.###.....##..#.....@...@.........#..........#...######
-  #####..##....G.....#.........=.........#........##.....#####
-  #####..#...........#...................#........##.....#####
+  #####..##....G.....#........a=r........#........##.....#####
+  #####..#...........#.........t.........#........##.....#####
   #####...#.....#....#...................#......#..#.O..######
   #####....####.##...#...................#..............######
   #####....##........#...................#..............######
@@ -71,3 +71,7 @@ char_to_map_name:
   "S": silicon_extractor
   "O": oxygen_extractor
   "C": carbon_extractor
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/extractor_hub_70x70.map

@@ -40,10 +40,10 @@ map_data: |-
   ##########..............#....#....@....@.....@...##.#...#....#....#.......######
   ##########..............#.............................##..........#.##.....#####
   #########.############..#............@.&.@...........####.#....#...##.#....#####
-  ########...................##........................########....#.##.....######
+  ########...................##..........m.............########....#.##.....######
   #######.............S......###.........@.........#.....######...........+.######
-  ######..#...#######...###..###.........=.........#.....#...#.....#...#....######
-  #######.##..#.....#.....#..###...................#..#......#.......#.....#######
+  ######..#...#######...###..###........a=r........#.....#...#.....#...#....######
+  #######.##..#.....#.....#..###.........t.........#..#......#.......#.....#######
   #######.##..#.....#.....#....#.....@........@....#....##.#.##...........########
   ######..#...#.+...####..#...G#...................##.....##..##.#.....#.#########
   ######...............#.......#...................###....######.###...###########
@@ -91,3 +91,7 @@ char_to_map_name:
   "S": silicon_extractor
   "O": oxygen_extractor
   "C": carbon_extractor
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/extractor_hub_80x80.map

@@ -45,10 +45,10 @@ map_data: |-
   #########.#####..........#.......##.........@.........###.#.....#.#.C......##...##########
   #######......##.##....#......#..........................#......#..............#####.######
   #######......#.####.G.##..##.#............@.&.@.........###..#...........##.O.###....#####
-  #######.........###....#.##.............................#.###..##.............###....#####
+  #######.........###....#.##.................m...........#.###..##.............###....#####
   #######.S...#.....##.....#####.#..#.........@.........#.#.###.#.#...#.C...G.#####...######
-  ######....##......#.........####.##.........=.........#.............#...#...####.....#####
-  #####...#.#.....#.##.####.###.....#...................##........+..##...#####........#####
+  ######....##......#.........####.##........a=r........#.............#...#...####.....#####
+  #####...#.#.....#.##.####.###.....#.........t.........##........+..##...#####........#####
   #####..##....######.###...###.....#...................#....#........#..#.##..#.......#####
   #########.C.###...#.###..##.......#...................#....####.+.G............##...######
   #########...###.....###.........#.#...................#.#######..............#.##...######
@@ -101,3 +101,7 @@ char_to_map_name:
   "S": silicon_extractor
   "O": oxygen_extractor
   "C": carbon_extractor
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

{cogames-0.3.59.post1.dev2.dist-info → cogames-0.3.64.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: cogames
-Version: 0.3.59.post1.dev2
+Version: 0.3.64
 Summary: Multi-agent cooperative games
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mettagrid==0.2.0.67
+Requires-Dist: mettagrid==0.2.0.74
 Requires-Dist: packaging>=24.0.0
 Requires-Dist: pufferlib-core
 Requires-Dist: pydantic>=2.11.5
@@ -1306,7 +1306,7 @@ cogames [COMMAND] --help
 
 
 <pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="font-weight: bold">                                                                                                                   </span>
-<span style="font-weight: bold"> </span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">Usage: </span><span style="font-weight: bold">cogames seasons [OPTIONS]                                                                                  </span>
+<span style="font-weight: bold"> </span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">Usage: </span><span style="font-weight: bold">cogames seasons [OPTIONS] [SEASON_NAME]                                                                    </span>
 <span style="font-weight: bold">                                                                                                                   </span>
 </pre>
 
@@ -1320,6 +1320,22 @@ cogames [COMMAND] --help
 
 
 
+<pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Arguments ─────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>   season_name      <span style="color: #bfbf7f; text-decoration-color: #bfbf7f; font-weight: bold">[</span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">SEASON_NAME</span><span style="color: #bfbf7f; text-decoration-color: #bfbf7f; font-weight: bold">]</span>  Show versions of a specific season                                            <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>
+</pre>
+
+
+
+
+<pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Options ───────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--versions</span>  <span style="color: #008000; text-decoration-color: #008000; font-weight: bold">-v</span>        List all versions of the season                                                           <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>
+</pre>
+
+
+
+
 <pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Server ────────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
 <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--login-server</span>          <span style="color: #808000; text-decoration-color: #808000; font-weight: bold">URL</span>  Authentication server URL <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">[default: https://softmax.com/api]</span>                       <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
 <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--server</span>        <span style="color: #008000; text-decoration-color: #008000; font-weight: bold">-s</span>      <span style="color: #808000; text-decoration-color: #808000; font-weight: bold">URL</span>  Tournament server URL <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">[default: https://api.observatory.softmax-research.net]</span>      <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>

{cogames-0.3.59.post1.dev2.dist-info → cogames-0.3.64.dist-info}/RECORD

@@ -4,17 +4,17 @@ cogames/curricula.py,sha256=a7Nd-av4epAjmoqlefyU4q5eAitpYjCEGDCF_tS_iaY,825
 cogames/device.py,sha256=GVC7g4tNVySn_rSbHJB0jGKvpYBL8-VmeYEQXWXtvy0,1680
 cogames/evaluate.py,sha256=xm4dCLAXZFhfygDeC_617QXRa5DQYB_6EENEeeDAiWQ,9287
 cogames/game.py,sha256=Qpyd4UOv97S-PCcEb422XFVbuXk46qhEx7_FlAr8ayA,3331
-cogames/main.py,sha256=Sm-FD_lmmzWR1YVP5ldbhDEJLVO-dYmhYVb_jCUEjcQ,79288
+cogames/main.py,sha256=zYiY_cB0kiRproN4-Xa6MSwlff3-9hpFZLOZ-YfSwEg,79367
 cogames/pickup.py,sha256=gCm-BLMSKN4iflyn2EdsxE7ywKYzMgjozep5o_306yE,6545
 cogames/play.py,sha256=SV_gKg5kNj68m7bavmEYomLmmWxVGbc50ZhwAEMDy5E,8014
 cogames/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cogames/train.py,sha256=C4ZP00fxHspiQK-p00EPXyfcwiFKNIBUF1iBe2EE0GE,17894
 cogames/verbose.py,sha256=WcbVMpB43YpNJxZcwEkFtIqiIIxPLMZMu_3XQmeY59w,2916
 cogames/cli/base.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
-cogames/cli/client.py,sha256=gaCzGaMvgzokY0pcphraiIu6-GG4EUPXDGz2y6ErOSE,8687
-cogames/cli/leaderboard.py,sha256=sEZh1xsD8j11UNqDjLDJ5u-K9P8g_yxV0fwCHb4vlCI,12210
+cogames/cli/client.py,sha256=UFWn6Kjbp6nCYjeC5wMwIJAM5o_hngNdZ_yv24aeiOI,9025
+cogames/cli/leaderboard.py,sha256=eIbiSBOkvoi5IL2weiKBOJAjWGHquDk1PWoHKA8uu3g,13941
 cogames/cli/login.py,sha256=_i1Hdbp_wAMsX0NLbCTSr7GmOFbzSqwyNP79OqLOg40,1237
-cogames/cli/mission.py,sha256=5ub81vg-0wNjz1StAwL7Gj8yL4U63Y4FW4HibHRUjDQ,21258
+cogames/cli/mission.py,sha256=Shd7wivVdRbWTZ02yH334QZfwAqNy6mvRzLvU01iJrA,21674
 cogames/cli/policy.py,sha256=JI_aX0lcY-kaZWl-RhUfFu0vknF2mXHS8y0CQRRhpao,8743
 cogames/cli/submit.py,sha256=vB8EhB1z-SOUIdRhIkMEm_sbjFXbarVUn5BuiPa7SMI,20927
 cogames/cli/utils.py,sha256=K4eb-RL73HtavNGxZjn_SVDLAwfFamLCEQNTCNVdmPU,895
@@ -28,17 +28,18 @@ cogames/cli/docsync/docsync.py,sha256=dtGG91Co89VdiwRwKk57kYd-qnHiFIgIkS1OI12AYy
 cogames/cogs_vs_clips/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cogames/cogs_vs_clips/cog.py,sha256=P6T9y6iZ4aAXATqmQ3ooRLvP5K60r3o-viX4eoiaZq4,3201
 cogames/cogs_vs_clips/cogs_vs_clips_mapgen.md,sha256=Tof8NFILYAj4nTYXFXgbGlLaryHj0Zvjdm-lBGKP5dE,13378
-cogames/cogs_vs_clips/cogsguard_reward_variants.py,sha256=EkfwbpPZlh36-sTu7fdNQEMRFgaiBjitzUXfw4_qn18,5308
+cogames/cogs_vs_clips/cogsguard_reward_variants.py,sha256=V54Ly7T84cRfBoHv7Am7tv2OpL43Ksm95Fqkwy_TWAk,5819
 cogames/cogs_vs_clips/cogsguard_tutorial.py,sha256=_J4yCpf4783Cp4Z0dV6aRY0DCWDxQ4P4PBVhePRMQIw,1623
 cogames/cogs_vs_clips/mission.py,sha256=KTpfBPiwzAxobmnQ-WqPn0dLiAR4goFeHUAeyO4ahgA,12480
 cogames/cogs_vs_clips/mission_utils.py,sha256=-tB8JclTaq8Zfh8V5DPor1A3Ncuq8ndsTjgVnIxUV7s,671
-cogames/cogs_vs_clips/missions.py,sha256=07dVsdOQoQ9I8bNWJIwS5p4-pgLETwnbrteYw-mUt6A,2309
+cogames/cogs_vs_clips/missions.py,sha256=ZAmS7qYViKwF4XazyqE7BE5HEhgBhwWhWCCYBfUCU7Y,2430
 cogames/cogs_vs_clips/procedural.py,sha256=M_a6uRsHzatVSW8PrVTAupv2u1M_ehOgM6XnEB3_Gbk,25947
 cogames/cogs_vs_clips/sites.py,sha256=Mq10ammCu49-xngQtJy8UwfRR6d78FN2dzxxi7HZy04,4916
 cogames/cogs_vs_clips/stations.py,sha256=HxTPQnY2Y8kqK42OnaSAg8S69yO7g2pr-WkGiaL967I,9174
 cogames/cogs_vs_clips/tutorial_missions.py,sha256=p2ds5t_cfD9xyFLSq8A9xw-zO4-OHi9LSGdocl4JDC4,712
 cogames/cogs_vs_clips/variants.py,sha256=zU32g8Hy2GEBgOMjf6VU6Phn4X7wVvfV4_shjtddOc0,11783
 cogames/cogs_vs_clips/evals/README.md,sha256=aglXp04_1AXwxk-zfYsqOi3qbVpSRvOVJY3j5I_yCSA,7048
+cogames/cogs_vs_clips/evals/cogsguard_evals.py,sha256=OgIFjQIUbEbjyWxalr4_eRPYoi3bkgvFNsZfW9kKu7I,2510
 cogames/cogs_vs_clips/evals/diagnostic_evals.py,sha256=RakNmoy8I5lgYqlUT38sctIszaLWLQmnekaNjg---Ck,13626
 cogames/cogs_vs_clips/evals/difficulty_variants.py,sha256=SCUAbbOCCYuK2gEcuJMWA-qAlQfme9AjEOIESFj6DBY,4319
 cogames/cogs_vs_clips/evals/integrated_evals.py,sha256=wTq2JOeF4pxU59TFn0VLs7atNiVG4VFfmF-z8sFuERY,2784
@@ -98,21 +99,21 @@ cogames/maps/diagnostic_evals/diagnostic_radial.map,sha256=RxVoYmm6U_qUwmmgXZqB2
 cogames/maps/diagnostic_evals/diagnostic_radial_hard.map,sha256=PPAxa97Eb5LQaDlKaPhJoWxnw31ADLh_soXhOTJ-zlA,24525
 cogames/maps/diagnostic_evals/diagnostic_resource_lab.map,sha256=CEZlD1OGnOP9VEksGbxnfSWAZ-JV1hrGF16FtDJTRY0,1798
 cogames/maps/diagnostic_evals/diagnostic_unclip.map,sha256=Qj3Slpl7hCP5Xa84A1Ek6wWl0dI_8U7Etm1DMitDyxs,1798
-cogames/maps/evals/eval_balanced_spread.map,sha256=rPyfcKS6Ma9BxTd383oddOs9ZmDZ8bbtJdZeoQM8BoA,2072
-cogames/maps/evals/eval_clip_oxygen.map,sha256=j7-LmI91kYnvM71ZdUz3PsRth5DDc4g3mlVYgZ5EvSU,2074
-cogames/maps/evals/eval_collect_resources.map,sha256=6mjclsxSZMDS1sUN22Lu-Fp7v-xcTEnhQeti2ABUZ2A,2074
-cogames/maps/evals/eval_collect_resources_hard.map,sha256=BkG_NtrJ8TZlPAYiqZHOO13lFFwePIGWfOcVbtD_Rxs,2074
-cogames/maps/evals/eval_collect_resources_medium.map,sha256=bZl42Mx93c5B2oj5IcSENj6v9w0Du7gRFZD07wFLhyE,2074
-cogames/maps/evals/eval_divide_and_conquer.map,sha256=gdYe9A-E_E3S5RUMApJQxu-3xcsK9BnP5L1zKI4_SyE,2072
-cogames/maps/evals/eval_energy_starved.map,sha256=VDqtfJNen1mMpeQEGvr3pU2_9WndvcOKTUHGhmk3Tdc,2072
-cogames/maps/evals/eval_multi_coordinated_collect_hard.map,sha256=glqMYqI9Do2p1kjmuQhbMiQr2KyjLVE3P5RWAcwPakk,2075
-cogames/maps/evals/eval_oxygen_bottleneck.map,sha256=gVKrxuyTvd453BdSYBdxWYqas-oHizAxP6zNJnIJud0,2074
-cogames/maps/evals/eval_single_use_world.map,sha256=-oD4EI8Ti4WHGlfZQnvUwZcTF4CvCEzRxN_prS0v6-Y,2074
-cogames/maps/evals/extractor_hub_100x100.map,sha256=5lFQgZE2i9Hsha8ZXcaai5LYYK0g2d8K5rrColg7d_g,12702
-cogames/maps/evals/extractor_hub_30x30.map,sha256=DZDfDM7FWWxExMadxT5MsvMUc7CdksiNxlBPdJS4bjA,1992
-cogames/maps/evals/extractor_hub_50x50.map,sha256=Lx8BB511kU9SWYXGSmQyxP9AAuvSnQoigNAalTHxpKI,4052
-cogames/maps/evals/extractor_hub_70x70.map,sha256=10JUBhfIFybM9l1UBftn0a0dNnaWevKaOityV6rkoeY,6912
-cogames/maps/evals/extractor_hub_80x80.map,sha256=Gq7lAg2XC0DnuA6Y7BI6I3q-slNQ9mbF1rGx-zwGyao,8642
+cogames/maps/evals/eval_balanced_spread.map,sha256=Ix-NFCndwvJds3JTSam7HtYJjiuXJRoR8c33SDwUdZc,2162
+cogames/maps/evals/eval_clip_oxygen.map,sha256=a3RqOglzbNScOhsN-WDBuZY0CgmgFwKgSwTginmpbT4,2164
+cogames/maps/evals/eval_collect_resources.map,sha256=6rQpYwqDHR-bmA3sW-XHBDP9n09uorv8yQLTaBUWmfA,2164
+cogames/maps/evals/eval_collect_resources_hard.map,sha256=6LLWYSvdByGqqi-x9-w-akbpz_I--upLTTfmy7uXRvU,2164
+cogames/maps/evals/eval_collect_resources_medium.map,sha256=avNWaX3TfSxyKveRb6dfymUKq390PXzGvP1D0c4GlN8,2164
+cogames/maps/evals/eval_divide_and_conquer.map,sha256=p_Aw_g2GoAD1zlf45FR4fNjvBAdngpaqV6KZmEiFxxk,2162
+cogames/maps/evals/eval_energy_starved.map,sha256=1R5K0XHFHG_sJF3jgDQt5vkEd2S0Xoqc5H3iSq_4QVQ,2162
+cogames/maps/evals/eval_multi_coordinated_collect_hard.map,sha256=2ED8sqV9RHPdFEo5F3DBUwC9T0DqcGNTmJbF9iprMLY,2165
+cogames/maps/evals/eval_oxygen_bottleneck.map,sha256=XlUTquPT4V3YpbVc5sLpQBm8HVTeeq0W6pRX-dTpXEU,2164
+cogames/maps/evals/eval_single_use_world.map,sha256=Hj1KX5Fa4FAmhI8wIR2opRXqn5uUFbDLRthkiZA0ie4,2164
+cogames/maps/evals/extractor_hub_100x100.map,sha256=knCtQaQjHV5hwOn95JEfXbusB9NvODGG2u6lIHKZmSY,12792
+cogames/maps/evals/extractor_hub_30x30.map,sha256=RM4ZDkThW1emXOPwyKBr_3TB1JsQ0_NVSr7Ma8AHLdQ,2082
+cogames/maps/evals/extractor_hub_50x50.map,sha256=Y3BhaSqUNXmas-5ESWVmceeKIX4tbHdbCHG5UkWLvy0,4142
+cogames/maps/evals/extractor_hub_70x70.map,sha256=nB-GV-DDDZcUZLciCga5WJJYh932M8xgL7aZiU1OwmI,7002
+cogames/maps/evals/extractor_hub_80x80.map,sha256=hPL2bjISsayK7slBPQkGyQBvkDkWFrxd7jbNSNupXE8,8732
 cogames/maps/planky_evals/aligner_avoid_aoe.map,sha256=9C2pJsASv7rVUfqpLdoMTA1K01wGRJrBXBvbRRXaGqE,648
 cogames/maps/planky_evals/aligner_full_cycle.map,sha256=0ONRKlUI7XSI3L6PhglzNHup_SuNHzsHxl9bNYdmxUw,604
 cogames/maps/planky_evals/aligner_gear.map,sha256=5bK9MwJ3HGzB1sWmRol5AdxZ9rwjPp6-OsfFPPQSdDw,460
@@ -143,7 +144,7 @@ cogames/policy/trainable_policy_template.py,sha256=GbB4vi0wsIiuh_APtfjnavvh9ZVUx
 cogames/policy/nim_agents/__init__.py,sha256=q22rmDMKHMO2A4Cqt0P-kuH3f6yaldlaBaRuGydeEKM,1247
 cogames/policy/nim_agents/agents.py,sha256=2uxzs8yxcz3obdA_gaWf0qgojFbXSIU0W3cS-9XD0AI,5038
 cogames/policy/nim_agents/thinky_eval.py,sha256=NqIZng30MpyZD5hF03uoje4potd873hWyHOb3AZdeZk,1154
-cogames-0.3.59.post1.dev2.dist-info/licenses/LICENSE,sha256=NG4hf0NHdGZhkabVCK1MKX8RAJmWaEm4eaGcUsONZ_E,1065
+cogames-0.3.64.dist-info/licenses/LICENSE,sha256=NG4hf0NHdGZhkabVCK1MKX8RAJmWaEm4eaGcUsONZ_E,1065
 metta_alo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metta_alo/job_specs.py,sha256=_QT23tGb7V8W1jqiUijeQUQh6ZvKfW5-KYiYSuNTdVI,450
 metta_alo/policy.py,sha256=RnBwDzQ7abFiQSJe6MYr_JtsyHlKBES1CkDN6mZuvQI,613
@@ -151,8 +152,8 @@ metta_alo/pure_single_episode_runner.py,sha256=VsSBEn2BVWWHtiZ0SdL9_QMTom_vbbIyP
 metta_alo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metta_alo/rollout.py,sha256=hc7JRQD4ilfqTO57BvKav2v_JW1Vbcc-oYcEmoWVlB4,10192
 metta_alo/scoring.py,sha256=7ikuP6Vnvv57bAc_ARbTadDSf6wm5dCY49xX9QjD_fs,5809
-cogames-0.3.59.post1.dev2.dist-info/METADATA,sha256=G7xGJRB9xou1OqwZBIqiAH2RGS8l6sEySeBHNS4HJfw,232149
-cogames-0.3.59.post1.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cogames-0.3.59.post1.dev2.dist-info/entry_points.txt,sha256=GTHdgj-RC2hQYmjUMSp9RHX8kbru19k0LS2lAj8DnLE,45
-cogames-0.3.59.post1.dev2.dist-info/top_level.txt,sha256=YErBkYWJd3-eksLpbgbMrETni1MPBNL4mqEyhZUa0UE,18
-cogames-0.3.59.post1.dev2.dist-info/RECORD,,
+cogames-0.3.64.dist-info/METADATA,sha256=Vnhu2_9kNcq7ALn4VF4VFMP8j25Mj6ZE1f-d1p7zBU4,234991
+cogames-0.3.64.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cogames-0.3.64.dist-info/entry_points.txt,sha256=GTHdgj-RC2hQYmjUMSp9RHX8kbru19k0LS2lAj8DnLE,45
+cogames-0.3.64.dist-info/top_level.txt,sha256=YErBkYWJd3-eksLpbgbMrETni1MPBNL4mqEyhZUa0UE,18
+cogames-0.3.64.dist-info/RECORD,,