cogames 0.3.59.post1.dev2__tar.gz → 0.3.64__tar.gz

{cogames-0.3.59.post1.dev2/src/cogames.egg-info → cogames-0.3.64}/PKG-INFO

@@ -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 → cogames-0.3.64}/README.ipynb

@@ -2609,13 +2609,13 @@
      "data": {
       "text/html": [
        "<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>\n",
-       "<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>\n",
+       "<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>\n",
        "<span style=\"font-weight: bold\">                                                                                                                   </span>\n",
        "</pre>\n"
       ],
       "text/plain": [
        "\u001b[1m                                                                                                                   \u001b[0m\n",
-       "\u001b[1m \u001b[0m\u001b[1;33mUsage: \u001b[0m\u001b[1mcogames seasons [OPTIONS]\u001b[0m\u001b[1m                                                                                 \u001b[0m\u001b[1m \u001b[0m\n",
+       "\u001b[1m \u001b[0m\u001b[1;33mUsage: \u001b[0m\u001b[1mcogames seasons [OPTIONS] [SEASON_NAME]\u001b[0m\u001b[1m                                                                   \u001b[0m\u001b[1m \u001b[0m\n",
        "\u001b[1m                                                                                                                   \u001b[0m\n"
       ]
      },
@@ -2637,6 +2637,40 @@
      "metadata": {},
      "output_type": "display_data"
     },
+    {
+     "data": {
+      "text/html": [
+       "<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>\n",
+       "<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>\n",
+       "<span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>\n",
+       "</pre>\n"
+      ],
+      "text/plain": [
+       "\u001b[2m╭─\u001b[0m\u001b[2m Arguments \u001b[0m\u001b[2m────────────────────────────────────────────────────────────────────────────────────────────────────\u001b[0m\u001b[2m─╮\u001b[0m\n",
+       "\u001b[2m│\u001b[0m   season_name      \u001b[1;2;33m[\u001b[0m\u001b[1;33mSEASON_NAME\u001b[0m\u001b[1;2;33m]\u001b[0m  Show versions of a specific season                                            \u001b[2m│\u001b[0m\n",
+       "\u001b[2m╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯\u001b[0m\n"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/html": [
+       "<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>\n",
+       "<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>\n",
+       "<span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>\n",
+       "</pre>\n"
+      ],
+      "text/plain": [
+       "\u001b[2m╭─\u001b[0m\u001b[2m Options \u001b[0m\u001b[2m──────────────────────────────────────────────────────────────────────────────────────────────────────\u001b[0m\u001b[2m─╮\u001b[0m\n",
+       "\u001b[2m│\u001b[0m \u001b[1;36m-\u001b[0m\u001b[1;36m-versions\u001b[0m  \u001b[1;32m-v\u001b[0m        List all versions of the season                                                           \u001b[2m│\u001b[0m\n",
+       "\u001b[2m╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯\u001b[0m\n"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
     {
      "data": {
       "text/html": [

{cogames-0.3.59.post1.dev2 → cogames-0.3.64}/README.md

@@ -1270,7 +1270,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>
 
@@ -1284,6 +1284,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 → cogames-0.3.64}/pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 requires-python = ">=3.12,<3.13"
 classifiers = ["Programming Language :: Python :: 3", "Programming Language :: Python :: 3.12"]
 dependencies = [
-  "mettagrid==0.2.0.67",
+  "mettagrid==0.2.0.74",
   "packaging>=24.0.0",
   "pufferlib-core",
   "pydantic>=2.11.5",

{cogames-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.64/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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-0.3.59.post1.dev2 → cogames-0.3.64}/src/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