Push to branch every commit, instead of all at the end

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) -> Player:
+def get_agent(config: dict, game_context: GameContext, environment: DockerEnvironment, push: bool = False) -> 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)
+    return agents(config, environment, game_context, push=push)

codeclash/agents/player.py

@@ -21,13 +21,15 @@ 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.logger = get_logger(
             self.name,
             log_path=self.game_context.log_local / "players" / self.name / "player.log",
@@ -43,6 +45,17 @@ def __init__(
             "initial_commit_hash": self._get_commit_hash(),
         }
 
+        if self.push:
+            self.logger.info("Will push agent gameplay as branch to remote repository after each round")
+            token = os.getenv("GITHUB_TOKEN")
+            if not token:
+                raise ValueError("GITHUB_TOKEN environment variable is required")
+            for cmd in [
+                "git remote remove origin",
+                f"git remote add origin https://x-access-token:{token}@github.com/{GH_ORG}/{self.game_context.name}.git",
+            ]:
+                assert_zero_exit_code(self.environment.execute(cmd), logger=self.logger)
+
     # --- Main methods ---
 
     def pre_run_hook(self, *, new_round: int) -> None:
@@ -56,6 +69,13 @@ def post_run_hook(self, *, round: int) -> None:
         self._commit()
         self._metadata["diff"][round] = self._get_round_diff(round)
         self._metadata["incremental_diff"][round] = self._get_round_diff(round, incremental=True)
+        if self.push:
+            for cmd in [
+                f"git push origin {self._branch_name}",
+                "git push origin --tags",
+            ]:
+                assert_zero_exit_code(self.environment.execute(cmd), logger=self.logger)
+            self.logger.info(f"Pushed {self.name} commit history to remote repository (branch {self._branch_name})")
 
     @abstractmethod
     def run(self) -> None:
@@ -65,21 +85,6 @@ def get_metadata(self) -> dict:
         """Get metadata for the agent."""
         return self._metadata
 
-    def push(self) -> None:
-        """Push codebase to a branch on the game's remote repository."""
-        token = os.getenv("GITHUB_TOKEN")
-        if not token:
-            raise ValueError("GITHUB_TOKEN environment variable is required")
-
-        for cmd in [
-            "git remote remove origin",
-            f"git remote add origin https://x-access-token:{token}@github.com/{GH_ORG}/{self.game_context.name}.git",
-            f"git push origin {self._branch_name}",
-            "git push origin --tags",
-        ]:
-            assert_zero_exit_code(self.environment.execute(cmd), logger=self.logger)
-        self.logger.info(f"Pushed {self.name} commit history to remote repository (branch {self._branch_name})")
-
     def reset_and_apply_patch(self, patch: str, *, base_commit: str = "", filter_patch: bool = True) -> None:
         """Clean all uncommitted changes. If base_commit is provided, reset to that commit.
         Then apply the patch to the codebase.

codeclash/tournaments/pvp.py

@@ -19,15 +19,14 @@ class PvpTournament(AbstractTournament):
     def __init__(self, config: dict, *, cleanup: bool = False, push: bool = False):
         super().__init__(config, name="PvpTournament")
         self.cleanup_on_end = cleanup
-        self.push = push
         self.game: CodeGame = get_game(
             self.config,
             tournament_id=self.tournament_id,
             local_output_dir=self.local_output_dir,
         )
         self.agents: list[Player] = []
         for agent_conf in self.config["players"]:
-            self.agents.append(self.get_agent(agent_conf, self.config["prompts"]))
+            self.agents.append(self.get_agent(agent_conf, self.config["prompts"], push=push))
 
     @property
     def scoreboard(self) -> list[tuple[int, str]]:
@@ -46,7 +45,7 @@ def get_metadata(self) -> dict:
             "agents": [agent.get_metadata() for agent in self.agents],
         }
 
-    def get_agent(self, agent_config: dict, prompts: dict) -> Player:
+    def get_agent(self, agent_config: dict, prompts: dict, push: bool) -> Player:
         """Create an agent with environment and game context."""
         environment = self.game.get_environment(f"{self.game.game_id}.{agent_config['name']}")
 
@@ -62,7 +61,7 @@ def get_agent(self, agent_config: dict, prompts: dict) -> Player:
             working_dir=str(DIR_WORK),
         )
 
-        return get_agent(agent_config, game_context, environment)
+        return get_agent(agent_config, game_context, environment, push=push)
 
     def run(self) -> None:
         """Main execution function that runs all rounds."""
@@ -121,6 +120,3 @@ def end(self) -> None:
         """Save output files, clean up game resources and push agents if requested."""
         (self.local_output_dir / "metadata.json").write_text(json.dumps(self.get_metadata(), indent=2))
         self.game.end(self.cleanup_on_end)
-        if self.push:
-            for agent in self.agents:
-                agent.push()