Move push to config

Author: john-b-yang

codeclash/agents/__init__.py

@@ -6,11 +6,11 @@
 from codeclash.agents.utils import GameContext
 
 
-def get_agent(config: dict, game_context: GameContext, environment: DockerEnvironment, push: bool = False) -> Player:
+def get_agent(config: dict, game_context: GameContext, environment: DockerEnvironment) -> Player:
     agents = {
         "dummy": Dummy,
         "mini": MiniSWEAgent,
     }.get(config["agent"])
     if agents is None:
         raise ValueError(f"Unknown agent type: {config['agent']}")
-    return agents(config, environment, game_context, push=push)
+    return agents(config, environment, game_context)

codeclash/agents/minisweagent.py

@@ -47,8 +47,8 @@ def add_message(self, role: str, content: str, **kwargs):
 class MiniSWEAgent(Player):
     """Player with agentic code editing capabilities"""
 
-    def __init__(self, config: dict, environment: DockerEnvironment, game_context: GameContext, push: bool = False):
-        super().__init__(config, environment=environment, game_context=game_context, push=push)
+    def __init__(self, config: dict, environment: DockerEnvironment, game_context: GameContext):
+        super().__init__(config, environment=environment, game_context=game_context)
 
     def run(self):
         # temporary workaround around https://github.com/SWE-agent/mini-swe-agent/issues/477

codeclash/agents/player.py

@@ -22,15 +22,14 @@ def __init__(
         config: dict,
         environment: DockerEnvironment,
         game_context: GameContext,
-        push: bool = False,
     ) -> None:
         self.config = config
         self.name = config["name"]
         self._player_unique_id = str(uuid.uuid4())
         """Unique ID that doesn't clash even across multiple games. Used for git tags."""
         self.environment = environment
         self.game_context = game_context
-        self.push = push
+        self.push = config.get("push", False)
         self.logger = get_logger(
             self.name,
             log_path=self.game_context.log_local / "players" / self.name / "player.log",

codeclash/tournaments/pvp.py

@@ -27,7 +27,6 @@ def __init__(
         *,
         output_dir: Path,
         cleanup: bool = False,
-        push: bool = False,
         keep_containers: bool = False,
     ):
         metadata_file = output_dir / "metadata.json"
@@ -44,7 +43,7 @@ def __init__(
         )
         self.agents: list[Player] = []
         for agent_conf in self.config["players"]:
-            self.agents.append(self.get_agent(agent_conf, self.config["prompts"], push=push))
+            self.agents.append(self.get_agent(agent_conf, self.config["prompts"]))
 
     @property
     def metadata_file(self) -> Path:
@@ -66,7 +65,7 @@ def get_metadata(self) -> dict:
             "agents": [agent.get_metadata() for agent in self.agents],
         }
 
-    def get_agent(self, agent_config: dict, prompts: dict, push: bool) -> Player:
+    def get_agent(self, agent_config: dict, prompts: dict) -> Player:
         """Create an agent with environment and game context."""
         environment = self.game.get_environment(f"{self.game.game_id}.{agent_config['name']}")
 
@@ -82,7 +81,7 @@ def get_agent(self, agent_config: dict, prompts: dict, push: bool) -> Player:
             working_dir=str(DIR_WORK),
         )
 
-        return get_agent(agent_config, game_context, environment, push=push)
+        return get_agent(agent_config, game_context, environment)
 
     def run(self) -> None:
         """Main execution function that runs all rounds."""

main.py

@@ -18,7 +18,6 @@ def main(
     config_path: Path,
     *,
     cleanup: bool = False,
-    push: bool = False,
     output_dir: Path | None = None,
     suffix: str = "",
     keep_containers: bool = False,
@@ -62,9 +61,7 @@ def get_output_path() -> Path:
 
     full_output_dir = get_output_path()
 
-    tournament = PvpTournament(
-        config, output_dir=full_output_dir, cleanup=cleanup, push=push, keep_containers=keep_containers
-    )
+    tournament = PvpTournament(config, output_dir=full_output_dir, cleanup=cleanup, keep_containers=keep_containers)
     tournament.run()
 
 
@@ -81,12 +78,6 @@ def main_cli(argv: list[str] | None = None):
         action="store_true",
         help="If set, do not clean up the game environment after running.",
     )
-    parser.add_argument(
-        "-p",
-        "--push",
-        action="store_true",
-        help="If set, push each agent's codebase to a new repository after running.",
-    )
     parser.add_argument(
         "-o",
         "--output-dir",

scripts/make_ladder.py

@@ -0,0 +1,52 @@
+import argparse
+from pathlib import Path
+
+import yaml
+
+from codeclash import CONFIG_DIR
+from codeclash.constants import LOCAL_LOG_DIR
+from codeclash.tournaments.pvp import PvpTournament
+from codeclash.utils.yaml_utils import resolve_includes
+
+
+def main(
+    config_path: Path,
+):
+    yaml_content = config_path.read_text()
+    preprocessed_yaml = resolve_includes(yaml_content, base_dir=CONFIG_DIR)
+    config = yaml.safe_load(preprocessed_yaml)
+
+    players = config["players"]
+    num_players = len(players)
+    for i in range(num_players):
+        for j in range(i + 1, num_players):
+            player1 = players[i]
+            player1["name"] = player1["branch_init"]
+            player2 = players[j]
+            player2["name"] = player2["branch_init"]
+            pvp_config = {
+                **config,
+                "players": [player1, player2],
+            }
+            vs = f"PvpTournament.{player1['name']}_vs_{player2['name']}".replace("/", "_")
+            output_dir = LOCAL_LOG_DIR / "ladder" / config["game"]["name"] / vs
+            try:
+                tournament = PvpTournament(pvp_config, output_dir=output_dir)
+            except FileExistsError:
+                continue
+            tournament.run()
+
+
+def main_cli(argv: list[str] | None = None):
+    parser = argparse.ArgumentParser(description="CodeClash Ladder Runner")
+    parser.add_argument(
+        "config_path",
+        type=Path,
+        help="Path to the ladder configuration YAML file.",
+    )
+    args = parser.parse_args(argv)
+    main(**vars(args))
+
+
+if __name__ == "__main__":
+    main_cli()