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

cogames/cogs_vs_clips/evals/diagnostic_evals.py

@@ -1,54 +1,21 @@
 from __future__ import annotations
 
-from pathlib import Path
 from typing import Dict
 
 from pydantic import Field
 
 from cogames.cogs_vs_clips.cog import CogConfig
-from cogames.cogs_vs_clips.mission import Mission, Site
-from mettagrid.config.game_value import stat
+from cogames.cogs_vs_clips.mission import CvCMission
+from cogames.cogs_vs_clips.sites import EVALS, get_map
+from cogames.core import CoGameSite
 from mettagrid.config.handler_config import Handler
 from mettagrid.config.mettagrid_config import (
-    ChestConfig,
     MettaGridConfig,
-    ResourceLimitsConfig,
 )
 from mettagrid.config.mutation.resource_mutation import updateActor
-from mettagrid.config.reward_config import reward
-from mettagrid.map_builder.map_builder import MapBuilderConfig
-from mettagrid.mapgen.mapgen import MapGen
 
 RESOURCE_NAMES: tuple[str, ...] = ("carbon", "oxygen", "germanium", "silicon")
 
-MAPS_DIR = Path(__file__).resolve().parent.parent.parent / "maps"
-
-
-def get_map(map_name: str) -> MapBuilderConfig:
-    """Load a map builder configuration from the local diagnostics directory."""
-    normalized = map_name
-    if normalized.startswith("evals/"):
-        normalized = f"diagnostic_evals/{normalized.split('/', 1)[1]}"
-    map_path = MAPS_DIR / normalized
-    if not map_path.exists():
-        raise FileNotFoundError(f"Diagnostic map not found: {map_path}")
-    # Wrap AsciiMapBuilderConfig in MapGen.Config to match standard get_map() behavior
-    return MapGen.Config(
-        instance=MapBuilderConfig.from_uri(str(map_path)),
-        instances=1,  # Force single instance - use spawn points from ASCII map directly
-        fixed_spawn_order=False,
-        instance_border_width=0,  # Don't add border - maps already have borders built in
-    )
-
-
-EVALS = Site(
-    name="evals",
-    description="Diagnostic evaluation arenas.",
-    map_builder=get_map("evals/diagnostic_radial.map"),
-    min_cogs=1,
-    max_cogs=4,
-)
-
 
 # Generous cog config for diagnostic missions: high limits and full energy regen
 _GENEROUS_COG = CogConfig(
@@ -64,25 +31,11 @@ _GENEROUS_COG = CogConfig(
     influence_regen=0,
 )
 
-# Same but without generous energy regen (for charge-up diagnostics)
-_MODEST_COG = CogConfig(
-    gear_limit=255,
-    hp_limit=255,
-    heart_limit=255,
-    energy_limit=255,
-    cargo_limit=255,
-    initial_energy=255,
-    initial_hp=100,
-    energy_regen=1,
-    hp_regen=0,
-    influence_regen=0,
-)
-
 
-class _DiagnosticMissionBase(Mission):
+class _DiagnosticMissionBase(CvCMission):
     """Base class for minimal diagnostic evaluation missions."""
 
-    site: Site = EVALS
+    site: CoGameSite = EVALS
     cog: CogConfig = Field(default_factory=lambda: _GENEROUS_COG.model_copy())
 
     map_name: str = Field(default="evals/diagnostic_eval_template.map")
@@ -90,15 +43,9 @@ class _DiagnosticMissionBase(Mission):
     required_agents: int | None = Field(default=None)
 
     inventory_seed: Dict[str, int] = Field(default_factory=dict)
-    communal_chest_hearts: int | None = Field(default=None)
-    resource_chest_stock: Dict[str, int] = Field(default_factory=dict)
     # If True, give agents high energy capacity and regen (overridden by specific missions)
     generous_energy: bool = Field(default=True)
 
-    # Disable clips events for diagnostic evals
-    clips_scramble_start: int = Field(default=99999)
-    clips_align_start: int = Field(default=99999)
-
     def configure_env(self, cfg: MettaGridConfig) -> None:  # pragma: no cover - hook for subclasses
         """Hook for mission-specific environment alterations."""
 
@@ -114,10 +61,6 @@ class _DiagnosticMissionBase(Mission):
             cfg.game.map_builder = forced_map
             cfg.game.max_steps = self.max_steps
             self._apply_inventory_seed(cfg)
-            self._apply_communal_chest(cfg)
-            self._apply_resource_chests(cfg)
-            # Finally, normalize rewards so a single deposited heart yields at most 1 reward.
-            self._apply_heart_reward_cap(cfg)
             self.configure_env(cfg)
             return cfg
         finally:
@@ -134,45 +77,15 @@ class _DiagnosticMissionBase(Mission):
         seed = dict(cfg.game.agent.inventory.initial)
         seed.update(self.inventory_seed)
         cfg.game.agent.inventory.initial = seed
-
-    def _apply_communal_chest(self, cfg: MettaGridConfig) -> None:
-        if self.communal_chest_hearts is None:
-            return
-        chest = cfg.game.objects.get("communal_chest")
-        if isinstance(chest, ChestConfig):
-            chest.inventory.initial = {"heart": self.communal_chest_hearts}
-
-    def _apply_resource_chests(self, cfg: MettaGridConfig) -> None:
-        if not self.resource_chest_stock:
-            return
-        for resource, amount in self.resource_chest_stock.items():
-            chest_cfg = cfg.game.objects.get(f"chest_{resource}")
-            if isinstance(chest_cfg, ChestConfig):
-                chest_cfg.inventory.initial = {resource: amount}
-
-    def _apply_heart_reward_cap(self, cfg: MettaGridConfig) -> None:
-        """Normalize diagnostics so a single deposited heart yields at most 1 reward per episode.
-
-        - Make each agent-deposited heart worth exactly 1.0 reward (credited only to the depositor).
-        - Ensure all chests can store at most 1 heart so total reward per episode cannot exceed 1.
-        """
-        agent_cfg = cfg.game.agent
-        rewards = dict(agent_cfg.rewards)
-        rewards["chest_heart_deposited_by_agent"] = reward(stat("chest.heart.deposited_by_agent"))
-        agent_cfg.rewards = rewards
-
-        # Cap heart capacity for every chest used in diagnostics (communal or resource-specific).
-        for _name, obj in cfg.game.objects.items():
-            if not isinstance(obj, ChestConfig):
-                continue
-            # Find existing heart limit or create new one
-            heart_limit = obj.inventory.limits.get("heart", ResourceLimitsConfig(min=1, resources=["heart"]))
-            heart_limit.min = 1
-            obj.inventory.limits["heart"] = heart_limit
+        # Also apply to per-agent configs (used by CvCMission)
+        for agent_cfg in cfg.game.agents:
+            agent_seed = dict(agent_cfg.inventory.initial)
+            agent_seed.update(self.inventory_seed)
+            agent_cfg.inventory.initial = agent_seed
 
 
 # ----------------------------------------------------------------------
-# Diagnostics (non-hub)
+# Diagnostic missions (no assemblers)
 # ----------------------------------------------------------------------
 
 
@@ -234,7 +147,7 @@ class DiagnosticChargeUp(_DiagnosticMissionBase):
     max_steps: int = Field(default=250)
 
     def configure_env(self, cfg: MettaGridConfig) -> None:
-        # Set starting energy to 30 and no regen
+        # Set starting energy to 60 and no regen
         agent = cfg.game.agent
         agent.inventory.initial = dict(agent.inventory.initial)
         agent.inventory.initial["energy"] = 60
@@ -302,7 +215,7 @@ class DiagnosticChargeUpHard(_DiagnosticMissionBase):
     max_steps: int = Field(default=350)
 
     def configure_env(self, cfg: MettaGridConfig) -> None:
-        # Set starting energy to 30 and no regen
+        # Set starting energy to 60 and no regen
         agent = cfg.game.agent
         agent.inventory.initial = dict(agent.inventory.initial)
         agent.inventory.initial["energy"] = 60

cogames/cogs_vs_clips/evals/difficulty_variants.py

@@ -9,11 +9,14 @@ energy regen, move cost, and capacity limits.
 from __future__ import annotations
 
 import logging
-from typing import override
+from typing import TYPE_CHECKING, override
 
 from pydantic import Field
 
-from cogames.cogs_vs_clips.mission import Mission, MissionVariant
+from cogames.core import CoGameMissionVariant
+
+if TYPE_CHECKING:
+    from cogames.cogs_vs_clips.mission import CvCMission
 from mettagrid.config.mettagrid_config import MettaGridConfig
 
 logger = logging.getLogger(__name__)
@@ -28,7 +31,7 @@ ENERGY_REGEN_FLOOR = 0
 # =============================================================================
 
 
-class DifficultyLevel(MissionVariant):
+class DifficultyLevel(CoGameMissionVariant):
     """Configuration for a difficulty level."""
 
     name: str = Field(description="Difficulty name (easy, medium, hard, brutal, etc.)")
@@ -45,24 +48,12 @@ class DifficultyLevel(MissionVariant):
     max_steps_override: int | None = Field(default=None)
 
     @override
-    def modify_mission(self, mission: Mission):
+    def modify_mission(self, mission: CvCMission):
         """Apply a difficulty level to a mission instance."""
-        # Energy regen
-        if self.energy_regen_override is not None:
-            mission.cog.energy_regen = self.energy_regen_override
-        else:
-            mission.cog.energy_regen = max(0, int(mission.cog.energy_regen * self.energy_regen_mult))
-
-        # Mission-level overrides
-        if self.move_energy_cost_override is not None:
-            mission.cog.move_energy_cost = self.move_energy_cost_override
-        if self.energy_capacity_override is not None:
-            mission.cog.energy_limit = self.energy_capacity_override
-        if self.cargo_capacity_override is not None:
-            mission.cog.cargo_limit = self.cargo_capacity_override
+        pass  # No mission-level modifications needed currently
 
     @override
-    def modify_env(self, mission: Mission, env: MettaGridConfig):
+    def modify_env(self, mission: CvCMission, env: MettaGridConfig):
         if self.max_steps_override is not None:
             env.game.max_steps = self.max_steps_override
 

cogames/cogs_vs_clips/evals/integrated_evals.py

@@ -2,22 +2,18 @@ from __future__ import annotations
 
 import logging
 
-from cogames.cogs_vs_clips.mission import Mission, Site
-from cogames.cogs_vs_clips.procedural import MachinaArena
+from cogames.cogs_vs_clips.mission import CvCMission
 from cogames.cogs_vs_clips.sites import HELLO_WORLD
+from cogames.cogs_vs_clips.terrain import MachinaArena
 from cogames.cogs_vs_clips.variants import (
     DarkSideVariant,
-    DistantResourcesVariant,
-    EmptyBaseVariant,
-    PackRatVariant,
-    QuadrantBuildingsVariant,
-    SingleResourceUniformVariant,
 )
+from cogames.core import CoGameSite
 from mettagrid.mapgen.mapgen import MapGen
 
 logger = logging.getLogger(__name__)
 
-SMALL_HELLO_WORLD = Site(
+SMALL_HELLO_WORLD = CoGameSite(
     name="small_hello_world",
     description="Small hello world map.",
     map_builder=MapGen.Config(width=50, height=50, instance=MachinaArena.Config(spawn_count=20)),
@@ -25,7 +21,7 @@ SMALL_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-MEDIUM_HELLO_WORLD = Site(
+MEDIUM_HELLO_WORLD = CoGameSite(
     name="medium_hello_world",
     description="Medium hello world map.",
     map_builder=MapGen.Config(width=100, height=100, instance=MachinaArena.Config(spawn_count=20)),
@@ -33,7 +29,7 @@ MEDIUM_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-LARGE_HELLO_WORLD = Site(
+LARGE_HELLO_WORLD = CoGameSite(
     name="large_hello_world",
     description="Large hello world map.",
     map_builder=MapGen.Config(width=150, height=150, instance=MachinaArena.Config(spawn_count=20)),
@@ -41,65 +37,17 @@ LARGE_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-# Resource Bottleneck evals
-OxygenBottleneck = Mission(
-    name="oxygen_bottleneck",
-    description="Oxygen is the limiting resource; agents must prioritize oxygen over other resources.",
-    site=HELLO_WORLD,
-    variants=[
-        EmptyBaseVariant(missing=["oxygen_extractor"]),
-        SingleResourceUniformVariant(building_name="oxygen_extractor"),
-        PackRatVariant(),
-    ],
-)
-
 # Energy Starved evals
-EnergyStarved = Mission(
+EnergyStarved = CvCMission(
     name="energy_starved",
     description="Energy is the limiting resource; agents must prioritize energy over other resources.",
     site=HELLO_WORLD,
     variants=[
-        EmptyBaseVariant(),
         DarkSideVariant(),
     ],
 )
 
-# Collect Distant Resources evals
-DistantResources = Mission(
-    name="distant_resources",
-    description="Resources scattered far from base; heavy routing coordination.",
-    site=HELLO_WORLD,
-    variants=[
-        EmptyBaseVariant(),
-        DistantResourcesVariant(),
-    ],
-)
-
-# Divide and Conquer evals
-QuadrantBuildings = Mission(
-    name="quadrant_buildings",
-    description="Place buildings in the four quadrants of the map.",
-    site=HELLO_WORLD,
-    variants=[
-        EmptyBaseVariant(),
-        QuadrantBuildingsVariant(),
-    ],
-)
-
-EasyHeartsMission = Mission(
-    name="easy_hearts",
-    description="Simplified heart crafting with generous caps and extractor base.",
-    site=HELLO_WORLD,
-    variants=[
-        PackRatVariant(),
-    ],
-)
-
 
-EVAL_MISSIONS: list[Mission] = [
-    OxygenBottleneck,
+EVAL_MISSIONS: list[CvCMission] = [
     EnergyStarved,
-    DistantResources,
-    QuadrantBuildings,
-    EasyHeartsMission,
 ]

cogames/cogs_vs_clips/evals/spanning_evals.py

@@ -5,26 +5,24 @@ from __future__ import annotations
 
 import logging
 
-from cogames.cogs_vs_clips.mission import Mission, Site
-from cogames.cogs_vs_clips.procedural import MachinaArena
+from cogames.cogs_vs_clips.mission import CvCMission
 from cogames.cogs_vs_clips.sites import HELLO_WORLD, TRAINING_FACILITY
+from cogames.cogs_vs_clips.terrain import MachinaArena
 from cogames.cogs_vs_clips.variants import (
-    CompassVariant,
     DarkSideVariant,
     DistantResourcesVariant,
     EmptyBaseVariant,
     EnergizedVariant,
-    PackRatVariant,
     QuadrantBuildingsVariant,
-    RoughTerrainVariant,
     SingleResourceUniformVariant,
     SuperChargedVariant,
 )
+from cogames.core import CoGameSite
 from mettagrid.mapgen.mapgen import MapGen
 
 logger = logging.getLogger(__name__)
 
-SMALL_HELLO_WORLD = Site(
+SMALL_HELLO_WORLD = CoGameSite(
     name="small_hello_world",
     description="Small hello world map.",
     map_builder=MapGen.Config(width=50, height=50, instance=MachinaArena.Config(spawn_count=20)),
@@ -32,7 +30,7 @@ SMALL_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-MEDIUM_HELLO_WORLD = Site(
+MEDIUM_HELLO_WORLD = CoGameSite(
     name="medium_hello_world",
     description="Medium hello world map.",
     map_builder=MapGen.Config(width=100, height=100, instance=MachinaArena.Config(spawn_count=20)),
@@ -40,7 +38,7 @@ MEDIUM_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-LARGE_HELLO_WORLD = Site(
+LARGE_HELLO_WORLD = CoGameSite(
     name="large_hello_world",
     description="Large hello world map.",
     map_builder=MapGen.Config(width=500, height=500, instance=MachinaArena.Config(spawn_count=20)),
@@ -49,19 +47,19 @@ LARGE_HELLO_WORLD = Site(
 )
 
 # Resource Bottleneck evals
-OxygenBottleneck = Mission(
+OxygenBottleneck = CvCMission(
     name="oxygen_bottleneck",
     description="Oxygen is the limiting resource; agents must prioritize oxygen over other resources.",
     site=HELLO_WORLD,
     variants=[
         EmptyBaseVariant(missing=["oxygen_extractor"]),
         SingleResourceUniformVariant(building_name="oxygen_extractor"),
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
 # Energy Starved evals
-EnergyStarved = Mission(
+EnergyStarved = CvCMission(
     name="energy_starved",
     description="Energy is the limiting resource; agents must prioritize energy over other resources.",
     site=HELLO_WORLD,
@@ -74,17 +72,17 @@ EnergyStarved = Mission(
 # Curated difficulty tiers per mission
 # ------------------------------------------------------------
 # Oxygen Bottleneck
-OxygenBottleneckEasy = Mission(
+OxygenBottleneckEasy = CvCMission(
     name="oxygen_bottleneck_easy",
     description="Easy: tuned oxygen focus with simple layout and generous capacities.",
     site=HELLO_WORLD,
     variants=[
         SingleResourceUniformVariant(building_name="oxygen_extractor"),
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-OxygenBottleneckStandard = Mission(
+OxygenBottleneckStandard = CvCMission(
     name="oxygen_bottleneck_standard",
     description="Standard: oxygen is the bottleneck; extractor missing at base.",
     site=HELLO_WORLD,
@@ -93,18 +91,18 @@ OxygenBottleneckStandard = Mission(
     ],
 )
 
-OxygenBottleneckHard = Mission(
+OxygenBottleneckHard = CvCMission(
     name="oxygen_bottleneck_hard",
-    description="Hard: oxygen bottleneck plus rough terrain.",
+    description="Hard: oxygen bottleneck with dark side.",
     site=HELLO_WORLD,
     variants=[
         EmptyBaseVariant(missing=["oxygen_extractor"]),
-        RoughTerrainVariant(),
+        DarkSideVariant(),
     ],
 )
 
 # Energy Starved
-EnergyStarvedEasy = Mission(
+EnergyStarvedEasy = CvCMission(
     name="energy_starved_easy",
     description="Easy: abundant energy regen and capacity.",
     site=HELLO_WORLD,
@@ -114,7 +112,7 @@ EnergyStarvedEasy = Mission(
     ],
 )
 
-EnergyStarvedStandard = Mission(
+EnergyStarvedStandard = CvCMission(
     name="energy_starved_standard",
     description="Standard: energy is the limiting resource with dark-side regen.",
     site=HELLO_WORLD,
@@ -123,18 +121,17 @@ EnergyStarvedStandard = Mission(
     ],
 )
 
-EnergyStarvedHard = Mission(
+EnergyStarvedHard = CvCMission(
     name="energy_starved_hard",
-    description="Hard: energy bottleneck with dark side and rough terrain.",
+    description="Hard: energy bottleneck with dark side.",
     site=HELLO_WORLD,
     variants=[
         DarkSideVariant(),
-        RoughTerrainVariant(),
     ],
 )
 
 # Collect Distant Resources evals
-DistantResources = Mission(
+DistantResources = CvCMission(
     name="distant_resources",
     description="Resources scattered far from base; heavy routing coordination.",
     site=HELLO_WORLD,
@@ -145,39 +142,37 @@ DistantResources = Mission(
 )
 
 # Distant Resources tiers
-DistantResourcesEasy = Mission(
+DistantResourcesEasy = CvCMission(
     name="distant_resources_easy",
-    description="Easy: simplified distribution and navigation aids.",
+    description="Easy: simplified distribution with generous capacity.",
     site=HELLO_WORLD,
     variants=[
-        CompassVariant(),
-        PackRatVariant(),
+        EnergizedVariant(),
         DistantResourcesVariant(),
     ],
 )
 
-DistantResourcesStandard = Mission(
+DistantResourcesStandard = CvCMission(
     name="distant_resources_standard",
     description="Standard: resources scattered far from base.",
     site=HELLO_WORLD,
     variants=[
-        CompassVariant(),
         DistantResourcesVariant(),
     ],
 )
 
-DistantResourcesHard = Mission(
+DistantResourcesHard = CvCMission(
     name="distant_resources_hard",
-    description="Hard: distant resources with rough terrain.",
+    description="Hard: distant resources with dark side.",
     site=HELLO_WORLD,
     variants=[
         DistantResourcesVariant(),
-        RoughTerrainVariant(),
+        DarkSideVariant(),
     ],
 )
 
 # Divide and Conquer evals
-QuadrantBuildings = Mission(
+QuadrantBuildings = CvCMission(
     name="quadrant_buildings",
     description="Place buildings in the four quadrants of the map.",
     site=HELLO_WORLD,
@@ -188,18 +183,17 @@ QuadrantBuildings = Mission(
 )
 
 # Quadrant Buildings tiers
-QuadrantBuildingsEasy = Mission(
+QuadrantBuildingsEasy = CvCMission(
     name="quadrant_buildings_easy",
-    description="Easy: buildings in quadrants with navigation aid and inventory boost.",
+    description="Easy: buildings in quadrants with energy boost.",
     site=HELLO_WORLD,
     variants=[
         QuadrantBuildingsVariant(),
-        CompassVariant(),
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-QuadrantBuildingsStandard = Mission(
+QuadrantBuildingsStandard = CvCMission(
     name="quadrant_buildings_standard",
     description="Standard: buildings placed in quadrants.",
     site=HELLO_WORLD,
@@ -209,54 +203,54 @@ QuadrantBuildingsStandard = Mission(
     ],
 )
 
-QuadrantBuildingsHard = Mission(
+QuadrantBuildingsHard = CvCMission(
     name="quadrant_buildings_hard",
-    description="Hard: quadrant distribution with empty base and rough terrain.",
+    description="Hard: quadrant distribution with empty base and dark side.",
     site=HELLO_WORLD,
     variants=[
         QuadrantBuildingsVariant(),
         EmptyBaseVariant(),
-        RoughTerrainVariant(),
+        DarkSideVariant(),
     ],
 )
 
-EasyHeartsTraining = Mission(
+EasyHeartsTraining = CvCMission(
     name="easy_hearts_training",
-    description="Simplified heart crafting with generous caps and extractor base.",
+    description="Simplified heart crafting with generous energy.",
     site=TRAINING_FACILITY,
     variants=[
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-EasyHeartsSmallWorld = Mission(
+EasyHeartsSmallWorld = CvCMission(
     name="easy_small_hearts",
-    description="Simplified heart crafting with generous caps and extractor base.",
+    description="Simplified heart crafting with generous energy.",
     site=SMALL_HELLO_WORLD,
     variants=[
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-EasyHeartsMediumWorld = Mission(
+EasyHeartsMediumWorld = CvCMission(
     name="easy_medium_hearts",
-    description="Simplified heart crafting with generous caps and extractor base.",
+    description="Simplified heart crafting with generous energy.",
     site=MEDIUM_HELLO_WORLD,
     variants=[
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-EasyHeartsLargeWorld = Mission(
+EasyHeartsLargeWorld = CvCMission(
     name="easy_large_hearts",
-    description="Simplified heart crafting with generous caps and extractor base.",
+    description="Simplified heart crafting with generous energy.",
     site=LARGE_HELLO_WORLD,
     variants=[
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-EVAL_MISSIONS: list[Mission] = [
+EVAL_MISSIONS: list[CvCMission] = [
     # Oxygen bottleneck tiers
     OxygenBottleneckEasy,
     OxygenBottleneckStandard,