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

Author: john-b-yang

aws/setup/docker/build_and_push_all.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -euo pipefail
+
+THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BUILD_SCRIPT="$THIS_DIR/build_and_push_aws.sh"
+GAMES_DOCKER_DIR="$THIS_DIR/../../docker"
+
+# AWSCodeClash -> codeclash
+"$BUILD_SCRIPT" AWSCodeClash.Dockerfile codeclash "$THIS_DIR"
+
+# Games -> codeclash/<game>
+"$BUILD_SCRIPT" "$GAMES_DOCKER_DIR/BattleSnake.Dockerfile" codeclash/battlesnake "$GAMES_DOCKER_DIR"
+"$BUILD_SCRIPT" "$GAMES_DOCKER_DIR/BattleCode.Dockerfile" codeclash/battlecode "$GAMES_DOCKER_DIR"
+"$BUILD_SCRIPT" "$GAMES_DOCKER_DIR/CoreWar.Dockerfile" codeclash/corewar "$GAMES_DOCKER_DIR"
+"$BUILD_SCRIPT" "$GAMES_DOCKER_DIR/DummyGame.Dockerfile" codeclash/dummygame "$GAMES_DOCKER_DIR"
+"$BUILD_SCRIPT" "$GAMES_DOCKER_DIR/HuskyBench.Dockerfile" codeclash/huskybench "$GAMES_DOCKER_DIR"
+"$BUILD_SCRIPT" "$GAMES_DOCKER_DIR/RoboCode.Dockerfile" codeclash/robocode "$GAMES_DOCKER_DIR"
+"$BUILD_SCRIPT" "$GAMES_DOCKER_DIR/RobotRumble.Dockerfile" codeclash/robotrumble "$GAMES_DOCKER_DIR"

codeclash/analysis/matrix.py

@@ -12,7 +12,7 @@
 from codeclash.games import get_game
 from codeclash.tournaments.utils.git_utils import filter_git_diff
 from codeclash.utils.atomic_write import atomic_write
-from codeclash.utils.log import add_file_handler, get_logger
+from codeclash.utils.log import add_root_file_handler, get_logger
 
 # todo: add visualization code
 # todo: Should start from initial commit set in metadata rather than last commit
@@ -29,7 +29,7 @@ def __init__(self, pvp_output_dir: Path, n_repetitions: int = 3, max_workers: in
 
         # Set up logging with thread safety
         self.logger = get_logger("MatrixEvaluator", log_path=self.pvp_output_dir / "matrix_eval.log", emoji="📊")
-        add_file_handler(get_logger("."), self.pvp_output_dir / "matrix_eval.log")
+        add_root_file_handler(self.pvp_output_dir / "matrix_everything.log")
 
         # Thread safety for progress saving
         self._save_lock = Lock()

codeclash/tournaments/tournament.py

@@ -5,7 +5,7 @@
 
 from codeclash.utils.aws import get_aws_metadata
 from codeclash.utils.environment import create_file_in_container
-from codeclash.utils.log import add_file_handler, get_logger
+from codeclash.utils.log import add_root_file_handler, get_logger
 
 
 class AbstractTournament:
@@ -22,7 +22,7 @@ def __init__(self, config: dict, *, name: str, output_dir: Path, **kwargs):
             "aws": get_aws_metadata(),
         }
         self.logger = get_logger(self.name, log_path=self.local_output_dir / "tournament.log", emoji="🏆")
-        add_file_handler(get_logger("."), self.local_output_dir / "everything.log")
+        add_root_file_handler(self.local_output_dir / "everything.log")
 
     @property
     def local_output_dir(self) -> Path:

codeclash/utils/log.py

@@ -80,6 +80,11 @@ def add_file_handler(logger: logging.Logger, log_path: Path) -> None:
     logger.addHandler(file_handler)
 
 
+def add_root_file_handler(log_path: Path) -> None:
+    """Add a file handler to the root logger to capture all log messages."""
+    add_file_handler(logging.getLogger(), log_path)
+
+
 def get_logger(name: str, *, emoji: str = "", log_path: Path | None = None) -> logging.Logger:
     """Get logger. Use this instead of `logging.getLogger` to ensure
     that the logger is set up with the correct handlers.