Fix: Output files

Author: klieret

codeclash/tournaments/pvp.py

@@ -17,7 +17,7 @@
 
 
 class PvpTournament(AbstractTournament):
-    def __init__(self, config: dict, *, cleanup: bool = False, push: bool = False, output_dir: Path | None = None):
+    def __init__(self, config: dict, *, output_dir: Path, cleanup: bool = False, push: bool = False):
         super().__init__(config, name="PvpTournament", output_dir=output_dir)
         self.cleanup_on_end = cleanup
         self.game: CodeGame = get_game(

codeclash/tournaments/single_player.py

@@ -19,7 +19,7 @@
 
 
 class SinglePlayerTraining(AbstractTournament):
-    def __init__(self, config: dict, *, cleanup: bool = False, output_dir: Path | None = None):
+    def __init__(self, config: dict, *, output_dir: Path, cleanup: bool = False):
         super().__init__(config, name="SinglePlayerTraining", output_dir=output_dir)
         self.cleanup_on_end = cleanup
         self.game: CodeGame = get_game(

codeclash/tournaments/tournament.py

@@ -1,20 +1,18 @@
-import getpass
 import os
 import time
 import traceback
 from pathlib import Path
 
-from codeclash.constants import DIR_LOGS
 from codeclash.utils.environment import create_file_in_container
 from codeclash.utils.log import get_logger
 
 
 class AbstractTournament:
-    def __init__(self, config: dict, *, name: str, output_dir: Path | None = None, **kwargs):
+    def __init__(self, config: dict, *, name: str, output_dir: Path, **kwargs):
         self.config: dict = config
         self.name: str = name
         self.tournament_id: str = f"{self.name}.{config['game']['name']}.{time.strftime('%y%m%d%H%M%S')}"
-        self._custom_output_dir: Path | None = output_dir
+        self._output_dir: Path = output_dir
         self._metadata: dict = {
             "name": self.name,
             "tournament_id": self.tournament_id,
@@ -25,15 +23,9 @@ def __init__(self, config: dict, *, name: str, output_dir: Path | None = None, *
 
     @property
     def local_output_dir(self) -> Path:
-        if self._custom_output_dir is not None:
-            # Custom output directory provided, add timestamp to make it unique
-            return (self._custom_output_dir / time.strftime("%y%m%d%H%M%S")).resolve()
-
-        # Default behavior
-        base_dir = DIR_LOGS
         if "PYTEST_CURRENT_TEST" in os.environ:
-            base_dir = Path("/tmp/codeclash")
-        return (base_dir / getpass.getuser() / self.tournament_id).resolve()
+            return Path("/tmp/codeclash") / self._output_dir.name
+        return self._output_dir.resolve()
 
     def get_metadata(self) -> dict:
         return self._metadata

main.py

@@ -1,5 +1,6 @@
 import argparse
 import getpass
+import time
 from pathlib import Path
 
 import yaml
@@ -22,13 +23,15 @@ def main(
     preprocessed_yaml = resolve_includes(yaml_content, base_dir=CONFIG_DIR)
     config = yaml.safe_load(preprocessed_yaml)
 
-    folder_name = f"PvpTournament.{config['game']['name']}{suffix}"
+    timestamp = time.strftime("%y%m%d%H%M%S")
+    suffix_part = f".{suffix}" if suffix else ""
+    folder_name = f"PvpTournament.{config['game']['name']}.{timestamp}{suffix_part}"
     if output_dir is None:
         full_output_dir = DIR_LOGS / getpass.getuser() / folder_name
     else:
         full_output_dir = output_dir / folder_name
 
-    tournament = PvpTournament(config, cleanup=cleanup, push=push, output_dir=full_output_dir)
+    tournament = PvpTournament(config, output_dir=full_output_dir, cleanup=cleanup, push=push)
     tournament.run()
 
 

main_single_player.py

@@ -1,5 +1,6 @@
 import argparse
 import getpass
+import time
 from pathlib import Path
 
 import yaml
@@ -21,13 +22,15 @@ def main(
     preprocessed_yaml = resolve_includes(yaml_content, base_dir=CONFIG_DIR)
     config = yaml.safe_load(preprocessed_yaml)
 
-    folder_name = f"SinglePlayerTraining.{config['game']['name']}{suffix}"
+    timestamp = time.strftime("%y%m%d%H%M%S")
+    suffix_part = f".{suffix}" if suffix else ""
+    folder_name = f"SinglePlayerTraining.{config['game']['name']}.{timestamp}{suffix_part}"
     if output_dir is None:
         full_output_dir = DIR_LOGS / getpass.getuser() / folder_name
     else:
         full_output_dir = output_dir / folder_name
 
-    training = SinglePlayerTraining(config, cleanup=cleanup, output_dir=full_output_dir)
+    training = SinglePlayerTraining(config, output_dir=full_output_dir, cleanup=cleanup)
     training.run()