Get rid of games/utils.py; copy traj to environment

Author: john-b-yang

codeclash/agents/minisweagent.py

@@ -17,6 +17,7 @@
 from codeclash.agents.abstract import Player
 from codeclash.agents.utils import GameContext, resolve_api_key
 from codeclash.constants import DIR_LOGS
+from codeclash.utils.environment import copy_file_to_container
 
 
 class ClashAgent(DefaultAgent):
@@ -95,11 +96,16 @@ def run(self):
             result = exc_message
             print(exc_message)
         finally:
+            traj_path = (
+                DIR_LOGS
+                / self.game_context.id
+                / f"{self.name}_r{self.game_context.round}.traj.json"
+            )
             save_traj(
                 self.agent,  # type: ignore
-                DIR_LOGS
-                / f"{self.game_context.id}/{self.name}_r{self.game_context.round}.traj.json",
+                traj_path,
                 exit_status=exit_status,
                 result=result,
             )
+            copy_file_to_container(self.environment, traj_path, traj_path)
             self.commit()

codeclash/games/abstract.py

@@ -11,8 +11,11 @@
 
 from codeclash.agents.abstract import Player
 from codeclash.constants import DIR_LOGS, DIR_WORK, GH_ORG
-from codeclash.games.utils import copy_between_containers, copy_file_from_container
-from codeclash.utils.environment import assert_zero_exit_code
+from codeclash.utils.environment import (
+    assert_zero_exit_code,
+    copy_between_containers,
+    copy_file_from_container,
+)
 from codeclash.utils.log import get_logger
 
 

codeclash/games/robocode/main.py

@@ -2,7 +2,7 @@
 
 from codeclash.agents.abstract import Player
 from codeclash.games.abstract import CodeGame
-from codeclash.games.utils import copy_file_to_container
+from codeclash.utils.environment import copy_file_to_container
 
 
 class RoboCodeGame(CodeGame):

codeclash/games/utils.py

@@ -1,4 +1,9 @@
 import logging
+import subprocess
+import tempfile
+from pathlib import Path
+
+from minisweagent.environments.docker import DockerEnvironment
 
 
 def assert_zero_exit_code(
@@ -10,3 +15,101 @@ def assert_zero_exit_code(
             logger.error(msg)
         raise RuntimeError(msg)
     return result
+
+
+def copy_between_containers(
+    src_container: DockerEnvironment,
+    dest_container: DockerEnvironment,
+    src_path: str | Path,
+    dest_path: str | Path,
+):
+    """
+    Copy files from one Docker container to another via a temporary local directory.
+    """
+    with tempfile.TemporaryDirectory() as temp_dir:
+        temp_path = Path(temp_dir) / Path(src_path).name
+
+        # Copy from source container to temporary local directory
+        cmd_src = [
+            "docker",
+            "cp",
+            f"{src_container.container_id}:{src_path}",
+            str(temp_path),
+        ]
+        result_src = subprocess.run(
+            cmd_src, check=False, capture_output=True, text=True
+        )
+        if result_src.returncode != 0:
+            raise RuntimeError(
+                f"Failed to copy from {src_container.container_id} to local temp: {result_src.stdout}{result_src.stderr}"
+            )
+
+        # Ensure destination folder exists
+        assert_zero_exit_code(
+            dest_container.execute(f"mkdir -p {Path(dest_path).parent}")
+        )
+
+        # Copy from temporary local directory to destination container
+        cmd_dest = [
+            "docker",
+            "cp",
+            str(temp_path),
+            f"{dest_container.container_id}:{dest_path}",
+        ]
+        result_dest = subprocess.run(
+            cmd_dest, check=False, capture_output=True, text=True
+        )
+        if result_dest.returncode != 0:
+            raise RuntimeError(
+                f"Failed to copy from local temp to {dest_container.container_id}: {result_dest.stdout}{result_dest.stderr}"
+            )
+
+
+def copy_file_to_container(
+    container: DockerEnvironment,
+    src_path: str | Path,
+    dest_path: str | Path,
+):
+    """
+    Copy a file from the local filesystem to a Docker container.
+    """
+    if not str(dest_path).startswith("/"):
+        # If not an absolute path, assume relative to container's cwd
+        dest_path = f"{container.config.cwd}/{dest_path}"
+    cmd = [
+        "docker",
+        "cp",
+        str(src_path),
+        f"{container.container_id}:{dest_path}",
+    ]
+    # Ensure destination folder exists
+    assert_zero_exit_code(container.execute(f"mkdir -p {Path(dest_path).parent}"))
+    result = subprocess.run(cmd, check=False, capture_output=True, text=True)
+    if result.returncode != 0:
+        raise RuntimeError(
+            f"Failed to copy {src_path} to {container.container_id}:{dest_path}: {result.stdout}{result.stderr}"
+        )
+    return result
+
+
+def copy_file_from_container(
+    container: DockerEnvironment,
+    src_path: str | Path,
+    dest_path: str | Path,
+):
+    """
+    Copy a file from a Docker container to the local filesystem.
+    """
+    cmd = [
+        "docker",
+        "cp",
+        f"{container.container_id}:{src_path}",
+        str(dest_path),
+    ]
+    Path(dest_path).parent.mkdir(parents=True, exist_ok=True)
+    result = subprocess.run(cmd, check=False, capture_output=True, text=True)
+    if result.returncode != 0:
+        raise RuntimeError(
+            f"Failed to copy {container.container_id}:{src_path} to {dest_path}: {result.stdout}{result.stderr}"
+        )
+    return result