cogames 0.3.49__py3-none-any.whl → 0.3.64__py3-none-any.whl

cogames/cli/mission.py

@@ -8,41 +8,57 @@ from rich import box
 from rich.table import Table
 
 from cogames.cli.base import console
-from cogames.cogs_vs_clips.mission import MAP_MISSION_DELIMITER, Mission, MissionVariant, NumCogsVariant, Site
+from cogames.cogs_vs_clips.mission import (
+    MAP_MISSION_DELIMITER,
+    AnyMission,
+    Mission,
+    MissionVariant,
+    NumCogsVariant,
+    Site,
+)
 from cogames.cogs_vs_clips.procedural import MachinaArena
 from cogames.cogs_vs_clips.sites import SITES
 from cogames.cogs_vs_clips.variants import HIDDEN_VARIANTS, VARIANTS
 from cogames.game import load_mission_config, load_mission_config_from_python
 from mettagrid import MettaGridConfig
-from mettagrid.config.mettagrid_config import AssemblerConfig
 from mettagrid.mapgen.mapgen import MapGen
 
 
 @lru_cache(maxsize=1)
-def _get_core_missions() -> list[Mission]:
+def _get_core_missions() -> list[AnyMission]:
     from cogames.cogs_vs_clips.missions import get_core_missions
 
     return get_core_missions()
 
 
 @lru_cache(maxsize=1)
-def _get_eval_missions_all() -> list[Mission]:
+def _get_legacy_missions() -> list[Mission]:
+    from cogames.cogs_vs_clips.missions import get_legacy_missions
+
+    return get_legacy_missions()
+
+
+@lru_cache(maxsize=1)
+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]
     return missions
 
 
-def load_mission_set(mission_set: str) -> list[Mission]:
+def load_mission_set(mission_set: str) -> list[AnyMission]:
     """Load a predefined set of evaluation missions.
 
     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
@@ -54,6 +70,7 @@ def load_mission_set(mission_set: str) -> list[Mission]:
     Raises:
         ValueError: If mission_set name is unknown
     """
+    missions_list: list[AnyMission]
     if mission_set == "all":
         # All missions: eval missions + integrated + spanning + diagnostic + core missions
         missions_list = list(_get_eval_missions_all())
@@ -67,7 +84,11 @@ def load_mission_set(mission_set: str) -> list[Mission]:
     elif mission_set == "diagnostic_evals":
         from cogames.cogs_vs_clips.evals.diagnostic_evals import DIAGNOSTIC_EVALS
 
-        missions_list: list[Mission] = [mission_cls() for mission_cls in DIAGNOSTIC_EVALS]  # type: ignore[call-arg]
+        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
 
@@ -77,7 +98,7 @@ def load_mission_set(mission_set: str) -> list[Mission]:
 
         missions_list = list(SPANNING_EVAL_MISSIONS)
     else:
-        available = "eval_missions, 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
@@ -145,7 +166,7 @@ def get_site_by_name(site_name: str) -> Site:
 
 def get_mission_name_and_config(
     ctx: typer.Context, mission_arg: Optional[str], variants_arg: Optional[list[str]] = None, cogs: Optional[int] = None
-) -> tuple[str, MettaGridConfig, Optional[Mission]]:
+) -> tuple[str, MettaGridConfig, Optional[AnyMission]]:
     if not mission_arg:
         console.print(ctx.get_help())
         console.print("[yellow]Missing: --mission / -m[/yellow]\n")
@@ -153,13 +174,14 @@ def get_mission_name_and_config(
         try:
             return get_mission(mission_arg, variants_arg, cogs)
         except ValueError as e:
-            console.print(f"[yellow]{e}[/yellow]\n")
+            console.print(f"[red]Mission '{mission_arg}' not found.[/red]")
+            console.print("[dim]Run: cogames missions (or cogames missions <site>) to list options.[/dim]\n")
+            raise typer.Exit(1) from e
     list_missions()
 
-    if mission_arg is not None:
-        console.print("\n" + ctx.get_usage())
+    console.print("\n" + ctx.get_usage())
     console.print("\n")
-    raise typer.Exit(0)
+    raise typer.Exit(1)
 
 
 def get_mission_names_and_configs(
@@ -196,13 +218,14 @@ def get_mission_names_and_configs(
 
             return deduped
         except ValueError as e:
-            console.print(f"[yellow]{e}[/yellow]\n")
+            console.print(f"[red]{e}[/red]")
+            console.print("[dim]Run: cogames missions (or cogames missions <site>) to list options.[/dim]\n")
+            raise typer.Exit(1) from e
     list_missions()
 
-    if missions_arg is not None:
-        console.print("\n" + ctx.get_usage())
+    console.print("\n" + ctx.get_usage())
     console.print("\n")
-    raise typer.Exit(0)
+    raise typer.Exit(1)
 
 
 def _get_missions_by_possible_wildcard(
@@ -229,10 +252,13 @@ def find_mission(
     mission_name: str | None = None,  # None means first mission on the site
     *,
     include_evals: bool = False,
-) -> Mission:
-    missions = _get_core_missions()
+    include_legacy: bool = False,
+) -> AnyMission:
+    missions: list[AnyMission] = list(_get_core_missions())
     if include_evals:
         missions = [*missions, *_get_eval_missions_all()]
+    if include_legacy:
+        missions = [*missions, *_get_legacy_missions()]
 
     found_site = False
     for mission in missions:
@@ -258,14 +284,18 @@ def find_mission(
 
 
 def get_mission(
-    mission_arg: str, variants_arg: Optional[list[str]] = None, cogs: Optional[int] = None
-) -> tuple[str, MettaGridConfig, Optional[Mission]]:
+    mission_arg: str,
+    variants_arg: Optional[list[str]] = None,
+    cogs: Optional[int] = None,
+    include_legacy: bool = False,
+) -> tuple[str, MettaGridConfig, Optional[AnyMission]]:
     """Get a specific mission configuration by name or file path.
 
     Args:
         mission_arg: Name of the map or path to config file (.yaml, .json, or .py)
         variants_arg: List of variant names like ["solar_flare", "dark_side"]
         cogs: Number of cogs (agents) to use, overrides the default from the mission
+        include_legacy: Whether to include legacy (pre-CogsGuard) missions
 
     Returns:
         Tuple of (mission name, MettaGridConfig, Mission or None)
@@ -300,10 +330,10 @@ def get_mission(
     else:
         site_name, mission_name = mission_arg.split(MAP_MISSION_DELIMITER)
 
-    mission = find_mission(site_name, mission_name, include_evals=True)
-    # Apply variants
-    mission = mission.with_variants(variants)
+    mission: AnyMission = find_mission(site_name, mission_name, include_evals=True, include_legacy=include_legacy)
 
+    if variants:
+        mission = mission.with_variants(variants)
     if cogs is not None:
         mission = mission.with_variants([NumCogsVariant(num_cogs=cogs)])
 
@@ -403,22 +433,17 @@ def list_missions(site_filter: Optional[str] = None) -> None:
     console.print(table)
 
     console.print("\nTo set [bold blue]-m[/bold blue]:")
-    console.print("  • Use [blue]<site>.<mission>[/blue] (e.g., training_facility.harvest)")
+    console.print("  • Use [blue]<site>.<mission>[/blue] (e.g., cogsguard_machina_1.basic)")
     console.print("  • Or pass a mission config file path")
-    console.print("  • List a site's missions: [blue]cogames missions training_facility[/blue]")
-    console.print("\nVariants:")
-    console.print("  • Repeat [yellow]--variant <name>[/yellow] (e.g., --variant solar_flare)")
+    console.print("  • List a site's missions: [blue]cogames missions cogsguard_machina_1[/blue]")
     console.print("\nCogs:")
     console.print("  • [green]--cogs N[/green] or [green]-c N[/green]")
     console.print("\n[bold green]Examples:[/bold green]")
     console.print("  cogames missions")
-    console.print("  cogames missions training_facility")
-    console.print("  cogames play --mission [blue]training_facility.harvest[/blue]")
-    console.print(
-        "  cogames play --mission [blue]machina_1.open_world[/blue] "
-        "--variant [yellow]solar_flare[/yellow] --variant [yellow]rough_terrain[/yellow] --cogs [green]8[/green]"
-    )
-    console.print("  cogames train --mission [blue]<site>.<mission>[/blue] --cogs [green]4[/green]")
+    console.print("  cogames missions cogsguard_machina_1")
+    console.print("  cogames play --mission [blue]cogsguard_machina_1.basic[/blue]")
+    console.print("  cogames play --mission [blue]cogsguard_machina_1.basic[/blue] --cogs [green]8[/green]")
+    console.print("  cogames train --mission [blue]cogsguard_machina_1.basic[/blue] --cogs [green]4[/green]")
 
 
 def list_evals() -> None:
@@ -429,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)
 
@@ -481,7 +506,7 @@ def list_evals() -> None:
     console.print("  [bold]cogames play[/bold] --mission [blue]evals.divide_and_conquer[/blue]")
 
 
-def describe_mission(mission_name: str, game_config: MettaGridConfig, mission_cfg: Mission | None = None) -> None:
+def describe_mission(mission_name: str, game_config: MettaGridConfig, mission_cfg: AnyMission | None = None) -> None:
     """Print detailed information about a specific mission.
 
     Args:
@@ -497,7 +522,6 @@ def describe_mission(mission_name: str, game_config: MettaGridConfig, mission_cf
         console.print("[bold]Description:[/bold]")
         console.print(f"  {mission_cfg.description}\n")
 
-        # Variants applied
         if mission_cfg.variants:
             console.print("[bold]Variants Applied:[/bold]")
             for v in mission_cfg.variants:
@@ -519,14 +543,7 @@ def describe_mission(mission_name: str, game_config: MettaGridConfig, mission_cf
                 console.print(f"  • Biome weights: {instance.biome_weights}")
             console.print(f"  • Building coverage: {instance.building_coverage}")
     # Key knobs
-    console.print(
-        f"  • Regen interval: {game_config.game.inventory_regen_interval}, "
-        f"Move energy cost: {game_config.game.actions.move.consumed_resources.get('energy', 0)}"
-    )
-    # Clipping info
-    clip_period = getattr(game_config.game.clipper, "clip_period", 0)
-    if clip_period:
-        console.print(f"  • Clip period: {clip_period}")
+    console.print(f"  • Move energy cost: {game_config.game.actions.move.consumed_resources.get('energy', 0)}")
 
     # Display available actions
     console.print("\n[bold]Available Actions:[/bold]")
@@ -536,14 +553,8 @@ def describe_mission(mission_name: str, game_config: MettaGridConfig, mission_cf
 
     # Display objects
     console.print("\n[bold]Stations:[/bold]")
-    for obj_name, obj_config in game_config.game.objects.items():
+    for obj_name, _obj_config in game_config.game.objects.items():
         console.print(f"  • {obj_name}")
-        if isinstance(obj_config, AssemblerConfig):
-            for protocol in obj_config.protocols:
-                if protocol.input_resources:
-                    inputs = ", ".join(f"{k}:{v}" for k, v in protocol.input_resources.items())
-                    outputs = ", ".join(f"{k}:{v}" for k, v in protocol.output_resources.items())
-                    console.print(f"    {inputs} → {outputs} (cooldown: {protocol.cooldown})")
 
     # Display agent configuration
     console.print("\n[bold]Agent Configuration:[/bold]")

cogames/cli/policy.py

@@ -19,8 +19,8 @@ ParsedPolicies = list[PolicySpec]
 
 default_checkpoint_dir = Path("train_dir")
 
-policy_arg_example = "URI (bundle dir or .zip) or class=NAME[,data=FILE][,kw.x=val]"
-policy_arg_w_proportion_example = "URI[,proportion=N] or class=NAME[,data=FILE][,proportion=N]"
+policy_arg_example = "URI (bundle dir or .zip) or NAME or class=NAME[,data=FILE][,kw.x=val]"
+policy_arg_w_proportion_example = "URI[,proportion=N] or NAME or class=NAME[,data=FILE][,proportion=N]"
 
 
 class PolicySpecWithProportion(PolicySpec):
@@ -74,7 +74,7 @@ def get_policy_spec(ctx: typer.Context, policy_arg: Optional[str]) -> PolicySpec
         console.print("[yellow]Missing: --policy / -p[/yellow]\n")
     else:
         try:
-            return _parse_policy_spec(spec=policy_arg).to_policy_spec()
+            return parse_policy_spec(spec=policy_arg).to_policy_spec()
         except (ValueError, ModuleNotFoundError) as e:
             translated = _translate_error(e)
             console.print(f"[yellow]Error parsing policy argument: {translated}[/yellow]\n")
@@ -97,7 +97,7 @@ def get_policy_specs_with_proportions(
         console.print("[yellow]Supply at least one: --policy / -p[/yellow]\n")
     else:
         try:
-            return [_parse_policy_spec(spec=policy_arg) for policy_arg in policy_args]
+            return [parse_policy_spec(spec=policy_arg) for policy_arg in policy_args]
         except (ValueError, ModuleNotFoundError) as e:
             translated = _translate_error(e)
             console.print(f"[yellow]Error parsing policy argument: {translated}[/yellow]")
@@ -112,16 +112,13 @@ def get_policy_specs_with_proportions(
     raise typer.Exit(1)
 
 
-def _parse_policy_spec(spec: str) -> PolicySpecWithProportion:
+def parse_policy_spec(spec: str) -> PolicySpecWithProportion:
     """Parse a policy CLI option into its components.
 
     Supports two formats:
-    - class=...[,data=...][,proportion=1.0][,kw.<key>=<value>]
+    - NAME (short name) or class=...[,data=...][,proportion=1.0][,kw.<key>=<value>]
     - URI: metta://policy/xxx[,proportion=1.0]
     """
-    entries = [part.strip() for part in spec.split(",") if part.strip()]
-    if not entries:
-        raise ValueError("Policy specification cannot be empty.")
 
     def parse_key_value(entry: str) -> tuple[str, str]:
         if "=" not in entry:
@@ -142,9 +139,43 @@ def _parse_policy_spec(spec: str) -> PolicySpecWithProportion:
             raise ValueError("Policy proportion must be a positive number.")
         return fraction
 
+    def is_path_like(value: str) -> bool:
+        if value.startswith((".", "/", "~")):
+            return True
+        return len(value) >= 3 and value[0].isalpha() and value[1] == ":" and value[2] in ("/", "\\")
+
+    def is_uri(value: str) -> bool:
+        # Check for URI schemes before checking for '=' to handle query strings
+        if value.startswith("metta://"):
+            return True
+        return parse_uri(value, allow_none=True, default_scheme=None) is not None
+
+    # For metta:// URIs, we need to handle commas in query strings specially.
+    # Split on ",proportion=" to separate the URI from the proportion suffix.
+    if spec.startswith("metta://"):
+        proportion_marker = ",proportion="
+        if proportion_marker in spec:
+            uri_part, proportion_value = spec.split(proportion_marker, 1)
+            fraction = parse_proportion(proportion_value.strip())
+        else:
+            uri_part = spec
+            fraction = 1.0
+
+        policy = policy_spec_from_uri(uri_part.strip())
+        return PolicySpecWithProportion(
+            class_path=policy.class_path,
+            data_path=policy.data_path,
+            proportion=fraction,
+            init_kwargs=policy.init_kwargs,
+        )
+
+    entries = [part.strip() for part in spec.split(",") if part.strip()]
+    if not entries:
+        raise ValueError("Policy specification cannot be empty.")
+
     fraction = 1.0
     first = entries[0]
-    if parse_uri(first, allow_none=True, default_scheme=None):
+    if is_uri(first) or ("=" not in first and is_path_like(first)):
         policy = policy_spec_from_uri(first)
         for entry in entries[1:]:
             key, value = parse_key_value(entry)
@@ -159,6 +190,11 @@ def _parse_policy_spec(spec: str) -> PolicySpecWithProportion:
             init_kwargs=policy.init_kwargs,
         )
 
+    if "=" not in first:
+        if ":" in first:
+            raise ValueError("Policy shorthand cannot include ':'; use class=... or a supported URI instead.")
+        entries[0] = f"class={first}"
+
     class_path: str | None = None
     data_path: str | None = None
     init_kwargs: dict[str, str] = {}