assert_zero_exit_code helper function

Author: klieret

codeclash/agents/abstract.py

@@ -6,6 +6,7 @@
 from minisweagent import Environment
 
 from codeclash.constants import GH_ORG
+from codeclash.utils.environment import assert_zero_exit_code
 
 load_dotenv()
 
@@ -30,7 +31,7 @@ def commit(self):
             "git add -A",
             f"git commit --allow-empty -m 'Round {self.round}/{rounds} Update'",
         ]:
-            self.environment.execute(cmd)
+            assert_zero_exit_code(self.environment.execute(cmd))
         print(f"Committed changes for {self.name} for round {self.round}/{rounds}")
 
     def push(self):
@@ -46,7 +47,7 @@ def push(self):
             f"git remote add origin https://x-access-token:{token}@github.com/{GH_ORG}/{self.name}.git",
             "git push -u origin main",
         ]:
-            self.environment.execute(cmd)
+            assert_zero_exit_code(self.environment.execute(cmd))
 
     @abstractmethod
     def run(self):

codeclash/games/abstract.py

@@ -10,6 +10,7 @@
 
 from codeclash.constants import DIR_LOGS, DIR_WORK, GH_ORG
 from codeclash.games.utils import copy_between_containers
+from codeclash.utils.environment import assert_zero_exit_code
 
 
 class CodeGame(ABC):
@@ -86,10 +87,7 @@ def get_environment(self) -> DockerEnvironment:
             "git add -A",
             "git commit -m 'init'",
         ]:
-            out = environment.execute(cmd)
-            if out.get("returncode", 0) != 0:
-                msg = f"Failed to execute command: {cmd}. Output so far:\n{out.get('output')}"
-                raise RuntimeError(msg)
+            assert_zero_exit_code(environment.execute(cmd))
         return environment
 
     def _pre_round_setup(self, agents: list[Any]):
@@ -107,8 +105,8 @@ def _pre_round_setup(self, agents: list[Any]):
             )
 
         # Ensure the log path + file exists
-        self.environment.execute(f"mkdir -p {self.log_path}")
-        self.environment.execute(f"touch {self.round_log_path}")
+        assert_zero_exit_code(self.environment.execute(f"mkdir -p {self.log_path}"))
+        assert_zero_exit_code(self.environment.execute(f"touch {self.round_log_path}"))
 
     @abstractmethod
     def determine_winner(self, agents: list[Any]) -> Any:

codeclash/games/battlesnake/main.py

@@ -3,6 +3,7 @@
 from typing import Any
 
 from codeclash.games.abstract import CodeGame
+from codeclash.utils.environment import assert_zero_exit_code
 
 
 class BattleSnakeGame(CodeGame):
@@ -19,7 +20,9 @@ def __init__(self, config):
                 self.run_cmd_round += f" --{arg} {val}"
 
     def determine_winner(self, agents: list[Any]):
-        response = self.environment.execute(f"tail -1 {self.round_log_path}")
+        response = assert_zero_exit_code(
+            self.environment.execute(f"tail -1 {self.round_log_path}")
+        )
         winner = json.loads(response["output"].strip("\n"))["winnerName"]
         self.scoreboard.append((self.round, winner))
 
@@ -39,12 +42,14 @@ def execute_round(self, agents: list[Any]):
         cmd = " ".join(cmd)
         print(f"Running command: {cmd}")
 
+        # todo: should probably keep output somewhere?
         try:
-            response = self.environment.execute(
-                f"{self.run_cmd_round} {cmd}",
-                cwd=f"{self.environment.config.cwd}/game",
+            assert_zero_exit_code(
+                self.environment.execute(
+                    f"{self.run_cmd_round} {cmd}",
+                    cwd=f"{self.environment.config.cwd}/game",
+                )
             )
-            assert response["returncode"] == 0, response
         finally:
             # Kill all python servers when done
             self.environment.execute("pkill -f 'python main.py' || true")

codeclash/games/utils.py

@@ -4,6 +4,8 @@
 
 from minisweagent.environments.docker import DockerEnvironment
 
+from codeclash.utils.environment import assert_zero_exit_code
+
 
 def copy_between_containers(
     src_container: DockerEnvironment,
@@ -33,7 +35,9 @@ def copy_between_containers(
             )
 
         # Ensure destination folder exists
-        dest_container.execute(f"mkdir -p {Path(dest_path).parent}")
+        assert_zero_exit_code(
+            dest_container.execute(f"mkdir -p {Path(dest_path).parent}")
+        )
 
         # Copy from temporary local directory to destination container
         cmd_dest = [