Fixes #24; Add branch_name

Author: john-b-yang

codeclash/agents/__init__.py

@@ -11,7 +11,9 @@ def get_agent(config: dict, game: CodeGame) -> Player:
     }.get(config["agent"])
     if agents is None:
         raise ValueError(f"Unknown agent type: {config['agent']}")
-    environment = game.get_environment(f"{game.game_id}_{config['name']}")
+    environment = game.get_environment(
+        f"{game.game_id}.{config['name']}"
+    )  # NOTE: MUST be branch_name (defined in agents/abstract.py)
     template_vars = {
         "game_name": game.name,
         "game_id": game.game_id,

codeclash/agents/abstract.py

@@ -19,7 +19,7 @@ def __init__(
         template_vars: dict,
     ):
         self.config = config
-        self.name = f"{template_vars['game_id']}_{config['name']}"
+        self.name = config["name"]
         self.environment = environment
         self.template_vars = template_vars
         self.logger = get_logger(
@@ -28,6 +28,11 @@ def __init__(
             emoji="👤",
         )
 
+    @property
+    def branch_name(self):
+        """Get the branch name for the agent's codebase."""
+        return f"{self.template_vars['game_id']}.{self.name}"
+
     def commit(self):
         """Commit changes to the agent's codebase."""
         rounds = self.template_vars["rounds"]
@@ -54,11 +59,11 @@ def push(self):
         for cmd in [
             "git remote remove origin",
             f"git remote add origin https://x-access-token:{token}@github.com/{GH_ORG}/{self.template_vars['game_name']}.git",
-            f"git push origin {self.name}",
+            f"git push origin {self.branch_name}",
         ]:
             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.name})"
+            f"Pushed {self.name} commit history to remote repository (branch {self.branch_name})"
         )
 
     @abstractmethod

codeclash/agents/minisweagent.py

@@ -93,11 +93,10 @@ def run(self):
             result = exc_message
             print(exc_message)
         finally:
-            player_id = self.name.split("_")[-1]
             save_traj(
                 self.agent,  # type: ignore
                 DIR_LOGS
-                / f"{self.template_vars['game_id']}/{player_id}_r{self.template_vars['round']}.traj.json",
+                / f"{self.template_vars['game_id']}/{self.name}_r{self.template_vars['round']}.traj.json",
                 exit_status=exit_status,
                 result=result,
             )

codeclash/games/abstract.py

@@ -26,7 +26,7 @@ def __init__(self, config: dict):
         self.config: dict = config["game"]
         self.rounds: int = self.config.get("rounds", 1)
         self.round: int = 0
-        self.game_id: str = f"{self.name}{time.strftime('%y%m%d%H%M')}"
+        self.game_id: str = f"{self.name}{time.strftime('%y%m%d%H%M%S')}"
         self.log_path: Path = (DIR_WORK / DIR_LOGS / self.game_id).resolve()
         self.logger = get_logger(
             self.name, log_path=DIR_LOGS / self.game_id / "game.log", emoji="🏓"