cogames-agents 0.0.0.7__tar.gz → 0.0.0.8__tar.gz

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cogames-agents
-Version: 0.0.0.7
+Version: 0.0.0.8
 Summary: Optional agent policies for CoGames
 Author: Metta AI
 License-Expression: MIT
@@ -12,8 +12,8 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
 Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: cogames==0.3.64
-Requires-Dist: mettagrid==0.2.0.74
+Requires-Dist: cogames==0.3.65
+Requires-Dist: mettagrid==0.2.0.75
 Requires-Dist: numpy>=2.0.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/docs/cogsguard-mechanics-deep-dive.md

@@ -206,8 +206,8 @@ Four resources mined from extractors in map corners:
 
 **Source:** `stations.py:122-206`
 
-**Miner bonus:** With miner gear, extractors yield 10x resources (large_amount vs small_amount in
-`SimpleExtractorConfig`, `stations.py:275-300`).
+**Miner bonus:** With miner gear, extractors yield 10x resources (large_amount vs small_amount in `CvCExtractorConfig`,
+`stations.py:275-300`).
 
 ### Hearts
 

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/pyproject.toml

@@ -17,7 +17,7 @@ classifiers = [
   "Operating System :: MacOS",
 ]
 urls = { Homepage = "https://github.com/Metta-AI/metta/tree/main/packages/cogames-agents", Repository = "https://github.com/Metta-AI/metta" }
-dependencies = ["cogames==0.3.64", "mettagrid==0.2.0.74", "numpy>=2.0.0"]
+dependencies = ["cogames==0.3.65", "mettagrid==0.2.0.75", "numpy>=2.0.0"]
 
 [project.optional-dependencies]
 test = ["pytest", "pytest-xdist", "ruff"]

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/src/cogames_agents/evals/planky_evals.py

@@ -14,7 +14,8 @@ 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 cogames.cogs_vs_clips.mission import CoGameSite as Site
+from cogames.cogs_vs_clips.mission import CvCMission as Mission
 from mettagrid.config.mettagrid_config import MettaGridConfig
 from mettagrid.map_builder.map_builder import MapBuilderConfig
 from mettagrid.mapgen.mapgen import MapGen, MapGenConfig

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/src/cogames_agents/policy/nim_agents/thinky_eval.py

@@ -8,7 +8,8 @@ from typing import Dict, List, Tuple
 import cogames_agents.policy.nim_agents.agents as na
 from cogames.cli.utils import suppress_noisy_logs
 from cogames.cogs_vs_clips.evals.diagnostic_evals import DIAGNOSTIC_EVALS
-from cogames.cogs_vs_clips.mission import Mission, NumCogsVariant
+from cogames.cogs_vs_clips.mission import CvCMission as Mission
+from cogames.cogs_vs_clips.mission import NumCogsVariant
 from mettagrid.policy.loader import initialize_or_load_policy
 from mettagrid.policy.policy import PolicySpec
 from mettagrid.policy.policy_env_interface import PolicyEnvInterface

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/src/cogames_agents/policy/scripted_agent/baseline_agent.py

@@ -100,12 +100,12 @@ class BaselineAgentPolicyImpl(StatefulPolicyImpl[SimpleAgentState]):
 
         # Map resource names to their corresponding vibe names for debugging glyphs.
         # This keeps resource naming (carbon, oxygen, germanium, silicon) separate from
-        # visual glyph naming (carbon_a, oxygen_a, etc.).
+        # visual glyph naming.
         self._resource_to_vibe: dict[str, str] = {
-            "carbon": "carbon_a",
-            "oxygen": "oxygen_a",
-            "germanium": "germanium_a",
-            "silicon": "silicon_a",
+            "carbon": "default",
+            "oxygen": "default",
+            "germanium": "default",
+            "silicon": "default",
         }
 
     def initial_agent_state(self) -> SimpleAgentState:
@@ -433,14 +433,14 @@ class BaselineAgentPolicyImpl(StatefulPolicyImpl[SimpleAgentState]):
         """Map phase to a vibe for visual debugging in replays."""
         # During GATHER, vibe the target resource we're currently collecting
         if phase == Phase.GATHER and state.target_resource is not None:
-            # Map resource name (e.g., "silicon") to a valid vibe name (e.g., "silicon_a").
+            # Map resource name (e.g., "silicon") to a valid vibe name.
             return self._resource_to_vibe.get(state.target_resource, "default")
 
         phase_to_vibe = {
-            Phase.GATHER: "carbon_a",  # Default fallback if no target resource
-            Phase.ASSEMBLE: "heart_a",  # Red for assembly
+            Phase.GATHER: "default",  # Default fallback if no target resource
+            Phase.ASSEMBLE: "heart",  # Heart for assembly
             Phase.DELIVER: "default",  # Must be "default" to deposit hearts into chest
-            Phase.RECHARGE: "junction",  # Blue/electric for recharging
+            Phase.RECHARGE: "default",  # Default for recharging
             Phase.CRAFT_UNCLIP: "gear",  # Gear icon for crafting unclip items
             Phase.UNCLIP: "gear",  # Gear icon for unclipping
         }
@@ -1019,10 +1019,10 @@ class BaselinePolicy(MultiAgentPolicy):
 
 
 RESOURCE_VIBE_ALIASES: dict[str, str] = {
-    "carbon": "carbon_a",
-    "oxygen": "oxygen_a",
-    "germanium": "germanium_a",
-    "silicon": "silicon_a",
+    "carbon": "default",
+    "oxygen": "default",
+    "germanium": "default",
+    "silicon": "default",
     # Crafting resources (appear when crafting unclipping items)
     "decoder": "gear",
     "modulator": "gear",

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/src/cogames_agents/policy/scripted_agent/demo_policy.py

@@ -160,9 +160,9 @@ class DemoPolicyImpl(StatefulPolicyImpl[SimpleAgentState]):
 
         # ---------------- PRE-PHASE: find hub to learn recipe ----------------
         if s.heart_recipe is None:
-            if s.current_glyph != "heart_a":
-                s.current_glyph = "heart_a"
-                return change_vibe_action("heart_a", action_names=self._action_names), s
+            if s.current_glyph != "heart":
+                s.current_glyph = "heart"
+                return change_vibe_action("heart", action_names=self._action_names), s
 
             hub = self._closest(s, parsed, lambda o: is_station(o.name.lower(), "hub"))
             if hub:
@@ -194,9 +194,9 @@ class DemoPolicyImpl(StatefulPolicyImpl[SimpleAgentState]):
         ):
             hub = self._closest(s, parsed, lambda o: is_station(o.name.lower(), "hub"))
             if hub:
-                if s.current_glyph != "heart_a":
-                    s.current_glyph = "heart_a"
-                    return change_vibe_action("heart_a", action_names=self._action_names), s
+                if s.current_glyph != "heart":
+                    s.current_glyph = "heart"
+                    return change_vibe_action("heart", action_names=self._action_names), s
                 if self._adjacent(s, hub):
                     return use_object_at(s, hub), s
                 return self._step_towards(s, hub, parsed), s

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/src/cogames_agents/policy/scripted_agent/planky/PLAN.md

@@ -78,13 +78,13 @@ cogames play --mission cogsguard_machina_1.basic \
 
 ### Testing Combat Roles Without Economy
 
-The `CogsGuardMission` has a `wealth` field that multiplies initial collective resources. To test aligners/scramblers
-without resource constraints, temporarily edit `mission.py`:
+The `CvCMission` has a `wealth` field that multiplies initial collective resources. To test aligners/scramblers without
+resource constraints, temporarily edit `mission.py`:
 
 ```python
 # In packages/cogames/src/cogames/cogs_vs_clips/missions.py
 # Change wealth=100 for 1000 of each resource + 500 hearts
-CogsGuardMachina1Mission = CogsGuardMission(
+CogsGuardMachina1Mission = CvCMission(
     name="basic",
     ...
     wealth=100,  # Add this line temporarily

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/src/cogames_agents.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cogames-agents
-Version: 0.0.0.7
+Version: 0.0.0.8
 Summary: Optional agent policies for CoGames
 Author: Metta AI
 License-Expression: MIT
@@ -12,8 +12,8 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
 Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: cogames==0.3.64
-Requires-Dist: mettagrid==0.2.0.74
+Requires-Dist: cogames==0.3.65
+Requires-Dist: mettagrid==0.2.0.75
 Requires-Dist: numpy>=2.0.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"

{cogames_agents-0.0.0.7 → cogames_agents-0.0.0.8}/src/cogames_agents.egg-info/requires.txt

@@ -1,5 +1,5 @@
-cogames==0.3.64
-mettagrid==0.2.0.74
+cogames==0.3.65
+mettagrid==0.2.0.75
 numpy>=2.0.0
 
 [test]