Add log_local, log_env vars

Author: john-b-yang

codeclash/agents/__init__.py

@@ -21,6 +21,8 @@ def get_agent(config: dict, prompts: dict, game: CodeGame) -> Player:
         environment,
         GameContext(
             id=game.game_id,
+            log_env=game.log_env,
+            log_local=game.log_local,
             name=game.name,
             player_id=config["name"],
             prompts=prompts,

codeclash/agents/abstract.py

@@ -5,7 +5,7 @@
 from minisweagent import Environment
 
 from codeclash.agents.utils import GameContext
-from codeclash.constants import DIR_LOGS, GH_ORG
+from codeclash.constants import GH_ORG
 from codeclash.utils.environment import assert_zero_exit_code
 from codeclash.utils.log import get_logger
 
@@ -26,7 +26,7 @@ def __init__(
         self.game_context.render_and_set_prompts()
         self.logger = get_logger(
             self.name,
-            log_path=DIR_LOGS / game_context.id / f"{self.name}.log",
+            log_path=self.game_context.log_local / f"{self.name}.log",
             emoji="👤",
         )
 

codeclash/agents/minisweagent.py

@@ -16,7 +16,6 @@
 
 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
 
 
@@ -97,8 +96,7 @@ def run(self):
             print(exc_message)
         finally:
             traj_path = (
-                DIR_LOGS
-                / self.game_context.id
+                self.game_context.log_local
                 / f"{self.name}_r{self.game_context.round}.traj.json"
             )
             save_traj(
@@ -107,5 +105,9 @@ def run(self):
                 exit_status=exit_status,
                 result=result,
             )
-            copy_file_to_container(self.environment, traj_path, traj_path)
+            copy_file_to_container(
+                self.environment,
+                traj_path,
+                self.game_context.log_env / traj_path.name,
+            )
             self.commit()

codeclash/agents/utils.py

@@ -1,5 +1,6 @@
 import os
 from dataclasses import asdict, dataclass
+from pathlib import Path
 
 from dotenv import load_dotenv
 from jinja2 import Template
@@ -26,6 +27,8 @@ class GameContext:
     """
 
     id: str
+    log_env: Path
+    log_local: Path
     name: str
     player_id: str
     prompts: dict

codeclash/games/abstract.py

@@ -1,3 +1,4 @@
+import getpass
 import os
 import subprocess
 import time
@@ -30,9 +31,10 @@ def __init__(self, config: dict):
         self.rounds: int = self.config.get("rounds", 1)
         self.round: int = 0
         self.game_id: str = f"{self.name}{time.strftime('%y%m%d%H%M%S')}"
-        self.log_path: Path = (DIR_WORK / DIR_LOGS / self.game_id).resolve()
+        self.log_env: Path = (DIR_WORK / DIR_LOGS / self.game_id).resolve()
+        self.log_local: Path = (DIR_LOGS / getpass.getuser() / self.game_id).resolve()
         self.logger = get_logger(
-            self.name, log_path=DIR_LOGS / self.game_id / "game.log", emoji="🏓"
+            self.name, log_path=self.log_local / "game.log", emoji="🏓"
         )
         self.environment: DockerEnvironment = self.get_environment()
         assert len(config["players"]) >= 2, "At least two players are required"
@@ -120,7 +122,8 @@ def _pre_round_setup(self, agents: list[Player]):
 
         # Ensure the log path + file exists
         assert_zero_exit_code(
-            self.environment.execute(f"mkdir -p {self.log_path}"), logger=self.logger
+            self.environment.execute(f"mkdir -p {self.log_env}"),
+            logger=self.logger,
         )
         assert_zero_exit_code(
             self.environment.execute(f"touch {self.round_log_path}"), logger=self.logger
@@ -156,7 +159,7 @@ def _post_round_setup(self, agents: list[Player]):
                 copy_file_from_container(
                     self.environment,
                     self.round_log_path,
-                    DIR_LOGS / f"{self.game_id}/round_{self.round}.log",
+                    self.log_local / self.round_log_path.name,
                 )
             except Exception:
                 self.logger.error(
@@ -186,4 +189,4 @@ def round_log_path(self) -> Path:
         """
         Get the path to the current round's log file.
         """
-        return self.log_path / f"round_{self.round}.log"
+        return self.log_env / f"round_{self.round}.log"