cogames 0.3.65__py3-none-any.whl → 0.3.69__py3-none-any.whl

cogames/maps/planky_evals/scrambler_target.map

@@ -13,14 +13,14 @@ char_to_map_name:
   "#": wall
   ".": empty
   "@": agent.agent
-  "M": miner_station
-  "S": scout_station
-  "A": aligner_station
-  "X": scrambler_station
+  "M": c:miner
+  "S": c:scout
+  "A": c:aligner
+  "X": c:scrambler
   "C": carbon_extractor
   "O": oxygen_extractor
   "G": germanium_extractor
   "I": silicon_extractor
   "J": junction
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest

cogames/maps/planky_evals/stuck_corridor.map

@@ -19,14 +19,14 @@ char_to_map_name:
   "#": wall
   ".": empty
   "@": agent.agent
-  "M": miner_station
-  "S": scout_station
-  "A": aligner_station
-  "X": scrambler_station
+  "M": c:miner
+  "S": c:scout
+  "A": c:aligner
+  "X": c:scrambler
   "C": carbon_extractor
   "O": oxygen_extractor
   "G": germanium_extractor
   "I": silicon_extractor
   "J": junction
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest

cogames/maps/planky_evals/survive_retreat.map

@@ -13,14 +13,14 @@ char_to_map_name:
   "#": wall
   ".": empty
   "@": agent.agent
-  "M": miner_station
-  "S": scout_station
-  "A": aligner_station
-  "X": scrambler_station
+  "M": c:miner
+  "S": c:scout
+  "A": c:aligner
+  "X": c:scrambler
   "C": carbon_extractor
   "O": oxygen_extractor
   "G": germanium_extractor
   "I": silicon_extractor
   "J": junction
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest

cogames/maps/training_facility_clipped.map

@@ -38,7 +38,7 @@ char_to_map_name:
   "N": clipped_oxygen_extractor
   "+": junction
   "@": agent.agent
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest
   "F": clipped_germanium_extractor
   "R": clipped_silicon_extractor

cogames/maps/training_facility_open_1.map

@@ -28,7 +28,7 @@ char_to_map_name:
   "+": junction
   "o": oxygen_extractor
   "@": agent.agent
-  "&": hub
+  "&": c:hub
   "g": germanium_extractor
-  "=": chest
+  "=": c:chest
   "s": silicon_extractor

cogames/maps/training_facility_open_2.map

@@ -38,7 +38,7 @@ char_to_map_name:
   "O": oxygen_extractor
   "+": junction
   "@": agent.agent
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest
   "G": germanium_extractor
   "S": silicon_extractor

cogames/maps/training_facility_open_3.map

@@ -26,8 +26,8 @@ char_to_map_name:
   ".": empty
   "@": agent.agent
   "+": junction
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest
   "C": carbon_extractor
   "O": oxygen_extractor
   "G": germanium_extractor

cogames/maps/training_facility_tight_4.map

@@ -26,8 +26,8 @@ char_to_map_name:
   ".": empty
   "@": agent.agent
   "+": junction
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest
   "C": carbon_extractor
   "O": oxygen_extractor
   "G": germanium_extractor

cogames/maps/training_facility_tight_5.map

@@ -26,8 +26,8 @@ char_to_map_name:
   ".": empty
   "@": agent.agent
   "+": junction
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest
   "C": carbon_extractor
   "O": oxygen_extractor
   "G": germanium_extractor

cogames/maps/vanilla_large.map

@@ -47,5 +47,5 @@ char_to_map_name:
   ".": empty
   "+": junction
   "@": agent.agent
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest

cogames/maps/vanilla_small.map

@@ -24,5 +24,5 @@ char_to_map_name:
   ".": empty
   "+": junction
   "@": agent.agent
-  "&": hub
-  "=": chest
+  "&": c:hub
+  "=": c:chest

cogames/pickup.py

@@ -1,15 +1,14 @@
 from __future__ import annotations
 
+import random
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Optional
 
-import numpy as np
 import typer
 from rich.console import Console
 from rich.table import Table
 
-from metta_alo.rollout import run_multi_episode_rollout
 from metta_alo.scoring import (
     VorTotals,
     allocate_counts,
@@ -20,6 +19,7 @@ from metta_alo.scoring import (
 from mettagrid import MettaGridConfig
 from mettagrid.mapgen.mapgen import MapGen
 from mettagrid.policy.policy import PolicySpec
+from mettagrid.runner.rollout import run_multi_episode_rollout
 
 
 @dataclass(frozen=True)
@@ -48,6 +48,7 @@ def pickup(
     map_seed: Optional[int],
     action_timeout_ms: int,
     save_replay_dir: Optional[Path],
+    device: Optional[str] = None,
     candidate_label: Optional[str] = None,
     pool_labels: Optional[list[str]] = None,
 ) -> None:
@@ -77,11 +78,11 @@ def pickup(
 
     results: list[PickupScenarioResult] = []
     totals = VorTotals()
-    rng = np.random.default_rng(seed)
+    rng = random.Random(seed)
 
     with typer.progressbar(scenarios, label="Simulating") as progress:
         for scenario in progress:
-            assignments = np.repeat(np.arange(len(policy_specs)), [scenario.candidate_count, *scenario.pool_counts])
+            assignments = [i for i, c in enumerate([scenario.candidate_count, *scenario.pool_counts]) for _ in range(c)]
 
             rollout, replay_paths = run_multi_episode_rollout(
                 policy_specs=policy_specs,
@@ -92,7 +93,7 @@ def pickup(
                 max_action_time_ms=action_timeout_ms,
                 replay_dir=save_replay_dir,
                 rng=rng,
-                device="cpu",
+                device=device,
             )
             summary = summarize_vor_scenario(
                 rollout,

cogames/play.py

@@ -9,11 +9,11 @@ from rich import box
 from rich.console import Console
 from rich.table import Table
 
-from metta_alo.pure_single_episode_runner import PureSingleEpisodeResult
-from metta_alo.rollout import run_single_episode
 from mettagrid import MettaGridConfig
 from mettagrid.policy.policy import PolicySpec
 from mettagrid.renderer.renderer import RenderMode
+from mettagrid.runner.rollout import run_episode_local
+from mettagrid.runner.types import PureSingleEpisodeResult
 
 logger = logging.getLogger("cogames.play")
 
@@ -162,8 +162,10 @@ def play(
     policy_spec: PolicySpec,
     game_name: str,
     seed: int = 42,
+    device: str = "cpu",
     render_mode: RenderMode = "gui",
     save_replay: Optional[Path] = None,
+    autostart: bool = False,
 ) -> None:
     """Play a single game episode with a policy.
 
@@ -185,20 +187,16 @@ def play(
         save_replay.mkdir(parents=True, exist_ok=True)
         replay_path = save_replay / f"{uuid.uuid4()}.json.z"
 
-    try:
-        results, _replay = run_single_episode(
-            policy_specs=[policy_spec],
-            assignments=[0] * env_cfg.game.num_agents,
-            env=env_cfg,
-            results_uri=None,
-            replay_uri=str(replay_path) if replay_path else None,
-            seed=seed,
-            device="cpu",
-            render_mode=render_mode,
-        )
-    except KeyboardInterrupt:
-        logger.info("Interrupted; ending episode early.")
-        return
+    results, _replay = run_episode_local(
+        policy_specs=[policy_spec],
+        assignments=[0] * env_cfg.game.num_agents,
+        env=env_cfg,
+        replay_path=replay_path,
+        seed=seed,
+        device=device,
+        render_mode=render_mode,
+        autostart=autostart,
+    )
 
     # Print summary
     console.print("\n[bold green]Episode Complete![/bold green]")

cogames/policy/nim_agents/__init__.py

@@ -13,7 +13,6 @@ try:
     import cogames.policy.nim_agents.agents as agents  # noqa: F401
     from cogames.policy.nim_agents.agents import (  # noqa: F401
         CogsguardAlignAllAgentsMultiPolicy,
-        LadyBugAgentsMultiPolicy,
         RaceCarAgentsMultiPolicy,
         RandomAgentsMultiPolicy,
         ThinkyAgentsMultiPolicy,
@@ -30,6 +29,5 @@ __all__ = [
     "RandomAgentsMultiPolicy",
     "ThinkyAgentsMultiPolicy",
     "RaceCarAgentsMultiPolicy",
-    "LadyBugAgentsMultiPolicy",
     "CogsguardAlignAllAgentsMultiPolicy",
 ]

cogames/policy/nim_agents/agents.py

@@ -26,7 +26,6 @@ end_measure: Callable[[], None]
 ThinkyAgentsMultiPolicy: type[MultiAgentPolicy]
 RandomAgentsMultiPolicy: type[MultiAgentPolicy]
 RaceCarAgentsMultiPolicy: type[MultiAgentPolicy]
-LadyBugAgentsMultiPolicy: type[MultiAgentPolicy]
 CogsguardAgentsMultiPolicy: type[MultiAgentPolicy]
 CogsguardAlignAllAgentsMultiPolicy: type[MultiAgentPolicy]
 
@@ -37,9 +36,6 @@ try:
     from cogames_agents.policy.nim_agents.agents import (
         CogsguardAlignAllAgentsMultiPolicy as _CogsguardAlignAllAgentsMultiPolicy,
     )
-    from cogames_agents.policy.nim_agents.agents import (
-        LadyBugAgentsMultiPolicy as _LadyBugAgentsMultiPolicy,
-    )
     from cogames_agents.policy.nim_agents.agents import (
         RaceCarAgentsMultiPolicy as _RaceCarAgentsMultiPolicy,
     )
@@ -85,10 +81,6 @@ except (ModuleNotFoundError, OSError) as exc:
         def __init__(self, policy_env_info: PolicyEnvInterface, **_: object):
             _raise_missing_nim_agents()
 
-    class _MissingLadyBugAgentsMultiPolicy(MultiAgentPolicy):
-        def __init__(self, policy_env_info: PolicyEnvInterface, **_: object):
-            _raise_missing_nim_agents()
-
     class _MissingCogsguardAgentsMultiPolicy(MultiAgentPolicy):
         def __init__(self, policy_env_info: PolicyEnvInterface, **_: object):
             _raise_missing_nim_agents()
@@ -102,7 +94,6 @@ except (ModuleNotFoundError, OSError) as exc:
     ThinkyAgentsMultiPolicy = _MissingThinkyAgentsMultiPolicy
     RandomAgentsMultiPolicy = _MissingRandomAgentsMultiPolicy
     RaceCarAgentsMultiPolicy = _MissingRaceCarAgentsMultiPolicy
-    LadyBugAgentsMultiPolicy = _MissingLadyBugAgentsMultiPolicy
     CogsguardAgentsMultiPolicy = _MissingCogsguardAgentsMultiPolicy
     CogsguardAlignAllAgentsMultiPolicy = _MissingCogsguardAlignAllAgentsMultiPolicy
 else:
@@ -111,7 +102,6 @@ else:
     ThinkyAgentsMultiPolicy = _ThinkyAgentsMultiPolicy
     RandomAgentsMultiPolicy = _RandomAgentsMultiPolicy
     RaceCarAgentsMultiPolicy = _RaceCarAgentsMultiPolicy
-    LadyBugAgentsMultiPolicy = _LadyBugAgentsMultiPolicy
     CogsguardAgentsMultiPolicy = _CogsguardAgentsMultiPolicy
     CogsguardAlignAllAgentsMultiPolicy = _CogsguardAlignAllAgentsMultiPolicy
 
@@ -121,7 +111,6 @@ __all__ = [
     "ThinkyAgentsMultiPolicy",
     "RandomAgentsMultiPolicy",
     "RaceCarAgentsMultiPolicy",
-    "LadyBugAgentsMultiPolicy",
     "CogsguardAgentsMultiPolicy",
     "CogsguardAlignAllAgentsMultiPolicy",
 ]

cogames/policy/starter_agent.py

@@ -93,7 +93,10 @@ class StarterCogPolicyImpl(StatefulPolicyImpl[StarterCogState]):
                 continue
             if token.value not in tag_ids:
                 continue
-            distance = abs(token.location[0] - self._center[0]) + abs(token.location[1] - self._center[1])
+            loc = token.location
+            if loc is None:
+                continue
+            distance = abs(loc[0] - self._center[0]) + abs(loc[1] - self._center[1])
             if distance < best_distance:
                 best_distance = distance
                 best_location = token.location