Merge branch 'main' of github.com:emagedoc/CodeClash

Author: john-b-yang

codeclash/agents/minisweagent.py

@@ -15,6 +15,7 @@
 
 from codeclash.agents.abstract import Player
 from codeclash.agents.utils import resolve_api_key
+from codeclash.constants import DIR_LOGS
 
 
 class ClashAgent(DefaultAgent):
@@ -88,9 +89,11 @@ def run(self):
             result = exc_message
             print(exc_message)
         finally:
+            player_id = self.name.split("_")[-1]
             save_traj(
                 self.agent,  # type: ignore
-                Path(f"{self.name}_r{self.format_vars['round']}.traj.json"),
+                DIR_LOGS
+                / f"{self.format_vars['game_id']}/{player_id}_r{self.format_vars['round']}.traj.json",
                 exit_status=exit_status,
                 result=result,
             )

codeclash/games/abstract.py

@@ -1,5 +1,6 @@
 import os
 import subprocess
+import traceback
 from abc import ABC, abstractmethod
 from collections import Counter
 from pathlib import Path
@@ -10,7 +11,7 @@
 
 from codeclash.agents.abstract import Player
 from codeclash.constants import DIR_LOGS, DIR_WORK, GH_ORG
-from codeclash.games.utils import copy_between_containers
+from codeclash.games.utils import copy_between_containers, copy_file_from_container
 from codeclash.utils.environment import assert_zero_exit_code
 
 
@@ -119,13 +120,34 @@ def execute_round(self, agents: list[Player]):
 
     def _post_round_setup(self, agents: list[Player]):
         for agent in agents:
-            copy_between_containers(
-                self.environment,
-                agent.environment,
-                self.round_log_path,
-                f"{agent.environment.config.cwd}/logs/round_{self.round}.log",
-            )
-            print(f"Copied round log to {agent.name}'s container.")
+            try:
+                copy_between_containers(
+                    self.environment,
+                    agent.environment,
+                    self.round_log_path,
+                    f"{agent.environment.config.cwd}/logs/round_{self.round}.log",
+                )
+            except Exception:
+                print(
+                    f"Error copying round log to {agent.name}'s container: {traceback.format_exc()}"
+                )
+            else:
+                print(f"Copied round log to {agent.name}'s container.")
+
+            try:
+                copy_file_from_container(
+                    self.environment,
+                    self.round_log_path,
+                    DIR_LOGS / f"{self.game_id}/round_{self.round}.log",
+                )
+            except Exception:
+                print(
+                    f"Error copying round log to {agent.name}'s container: {traceback.format_exc()}"
+                )
+            else:
+                print(
+                    f"Copied round log from {agent.name}'s container to local log dir."
+                )
         print(f"Round {self.round} completed.")
 
     def run_round(self, agents: list[Player]):

codeclash/games/utils.py

@@ -76,3 +76,26 @@ def copy_file_to_container(
         raise RuntimeError(
             f"Failed to copy {src_path} to {container.container_id}:{dest_path}: {result.stdout}{result.stderr}"
         )
+
+
+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