Compress round logs after every round rather than at the end

Author: klieret

aws/docker_and_sync.sh

@@ -22,6 +22,8 @@ cleanup() {
     if [ -n "$(ls -A logs/ 2>/dev/null)" ]; then
         echo "Compressing rounds..."
         # Tar.gz all subfolders of any 'rounds' directory if we haven't done so.
+        # This python in bash is not pretty, but it's still more readable than a bash script.
+        # Also we do `|| true` to ignore failures, because we still want to sync the logs to s3 anyway.
         python3 - <<'PY' || true
 import subprocess
 from pathlib import Path
@@ -50,7 +52,7 @@ PY
         echo "Syncing codeclash logs to S3..."
         aws s3 sync logs/ s3://codeclash/logs/ || echo "Warning: Failed to sync logs to S3"
     else
-        echo "No codeclashlogs to sync"
+        echo "No codeclash logs to sync"
     fi
     echo "docker ps:"
     docker ps
@@ -60,7 +62,7 @@ PY
     docker system df
     echo "--------------------------------"
     echo "Last 100 lines of Docker logs"
-    docker ps -aq | xargs -I {} sh -c 'logs=$(docker logs --tail 100 {} 2>&1); [ -n "$logs" ] && echo "=== {} ===" && echo "$logs"'Retry
+    docker ps -aq | xargs -I {} sh -c 'logs=$(docker logs --tail 100 {} 2>&1); [ -n "$logs" ] && echo "=== {} ===" && echo "$logs"'
     echo "--------------------------------"
     echo "Docker cleanup"
     docker system prune -af

codeclash/tournaments/pvp.py

@@ -75,10 +75,13 @@ def get_agent(self, agent_config: dict, prompts: dict, push: bool) -> Player:
     def run(self) -> None:
         """Main execution function that runs all rounds."""
         try:
-            self.run_competition_phase(0)  # Warm up (doesn't count)
+            self.run_competition_phase(0)  # Initial round with identical codebases
             for round_num in range(1, self.rounds + 1):
                 self.run_edit_phase(round_num)
                 self.run_competition_phase(round_num)
+            # Need to separately compress the last round, because
+            # in run_edit_phase we always only compress the previous round
+            self._compress_round_folder(self.rounds)
         finally:
             self.end()
 
@@ -108,6 +111,7 @@ def run_edit_phase(self, round_num: int) -> None:
                 self.game.log_local / "rounds" / str(round_num - 1),
                 DIR_LOGS / "rounds" / str(round_num - 1),
             )
+        self._compress_round_folder(round_num - 1)
 
         with ThreadPoolExecutor() as executor:
             futures = [executor.submit(self.run_agent, agent, round_num) for agent in self.agents]
@@ -156,8 +160,31 @@ def _compress_round_logs(self) -> None:
         shutil.rmtree(self.game.log_local / "rounds")
         self.logger.info("Round logs compressed successfully")
 
+    def _compress_round_folder(self, round_num_zero_indexed: int) -> None:
+        round_dir = self.game.log_local / "rounds" / str(round_num_zero_indexed)
+        if not round_dir.exists():
+            return
+
+        archive = self.game.log_local / "rounds" / f"round_{round_num_zero_indexed}.tar.gz"
+        cmd = [
+            "tar",
+            "-zcf",
+            str(archive),
+            "-C",
+            str(round_dir.parent),
+            str(round_num_zero_indexed),
+        ]
+        self.logger.info(
+            f"Compressing round {round_num_zero_indexed} logs, this might take a while... ({' '.join(cmd)})"
+        )
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        if result.returncode != 0:
+            raise RuntimeError(f"Command failed with exit code {result.returncode}:\n{result.stderr}")
+        self.logger.debug("Removing %s", round_dir)
+        shutil.rmtree(round_dir)
+        self.logger.info(f"Round {round_num_zero_indexed} logs compressed successfully")
+
     def end(self) -> None:
         """Save output files, clean up game resources and push agents if requested."""
         self._save()
         self.game.end(self.cleanup_on_end)
-        self._compress_round_logs()