rename some constants

Author: henrique

README.md

@@ -549,7 +549,10 @@ Optional:
 output_directory/
 ├── config.yaml              # Copy of configuration used
 ├── 0/                       # Island 0 results
-│   ├── island.log          # Detailed execution log
+│   └── logs/                # Logs
+│       ├── run_1.log
+│       ├── run_2.log
+│       └── ...
 │   ├── best_sol.py          # Best solution found
 │   ├── best_prompt.txt      # Best prompt evolved
 │   └── ckpt/                # Checkpoints

src/codeevolve/evolution.py

@@ -1141,7 +1141,7 @@ def _create_timeout_scheduler(
     kwargs: Dict[str, Any] = timeout_cfg.get("kwargs", {})
     scheduler_type: str = timeout_cfg.get("type", "ExponentialScheduler")
     return SCHEDULER_TYPES[scheduler_type](
-        value=float(budget["eval_timeout"]),
+        value=float(kwargs["min_value"]),
         **kwargs,
     )
 
@@ -1442,7 +1442,7 @@ async def codeevolve(
     components.logger.info("Waiting for other islands to finish setup...")
     global_data.barrier.wait()
     components.logger.info("All islands finished. Starting CodeEvolve loop.")
-
+    
     await codeevolve_loop(
         components.start_epoch,
         components.evolve_state,

src/codeevolve/runner.py

@@ -136,9 +136,9 @@ def async_run_codeevolve(
         error_msg = f"Island {isl_data.id} crashed with exception: {type(e).__name__}: {str(e)}"
         full_traceback = traceback.format_exc()
         try:
-            isl_out_dir: Path = run_args.get("isl_out_dir")
-            if isl_out_dir:
-                _write_island_crash_log(isl_out_dir, error_msg, full_traceback)
+            isl_logs_dir: Path = run_args.get("logs_dir")
+            if isl_logs_dir:
+                _write_island_crash_log(isl_logs_dir, error_msg, full_traceback, int(global_data.start_time.value))
         except Exception:
             pass
 
@@ -247,29 +247,29 @@ def cleanup_log_daemon(
 # ---------------------------------------------------------------------------
 
 
-def _write_island_crash_log(isl_out_dir: Path, error_msg: str, full_traceback: str) -> None:
+def _write_island_crash_log(isl_logs_dir: Path, error_msg: str, full_traceback: str, time: int = 0) -> None:
     """Writes detailed crash information to an island's crash log file.
 
     Called from within the child process where the exception occurred.
 
     Args:
-        isl_out_dir: Island's output directory.
+        isl_logs_dir: Island's logs directory.
         error_msg: Summary error message.
         full_traceback: Full Python traceback string.
+        time: Int identifying global time of the run.
     """
-    crash_log_path: Path = isl_out_dir.joinpath(CRASH_LOG_FILE)
-    timestamp: str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    crash_log_path: Path = isl_logs_dir.joinpath(CRASH_LOG_FILE.format(time=time))
     with open(crash_log_path, "a") as f:
         f.write(f"\n{'='*60}\n")
-        f.write(f"CRASH REPORT - {timestamp}\n")
+        f.write(f"CRASH REPORT\n")
         f.write(f"{'='*60}\n")
         f.write(f"{error_msg}\n\n")
         f.write("Full Traceback:\n")
         f.write(full_traceback)
         f.write(f"{'='*60}\n\n")
 
 
-def _write_crash_summary(out_dir: Path, island_id: int, exit_code: int, message: str) -> None:
+def _write_crash_summary(out_dir: Path, island_id: int, exit_code: int, message: str, time: int = 0) -> None:
     """Writes crash summary to the main output directory's crash log.
 
     Called from the parent process when it detects an island has crashed.
@@ -279,18 +279,17 @@ def _write_crash_summary(out_dir: Path, island_id: int, exit_code: int, message:
         island_id: ID of the island that crashed.
         exit_code: Exit code of the crashed process.
         message: Summary message.
+        time: Int identifying global time of the run.
     """
-    crash_log_path: Path = out_dir.joinpath(CRASH_LOG_FILE)
-    timestamp: str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
+    crash_log_path: Path = out_dir.joinpath(CRASH_LOG_FILE.format(time=time))
     with open(crash_log_path, "a") as f:
         f.write(f"\n{'='*60}\n")
-        f.write(f"CRASH REPORT - {timestamp}\n")
+        f.write(f"CRASH REPORT\n")
         f.write(f"{'='*60}\n")
         f.write(f"Island: {island_id}\n")
         f.write(f"Exit Code: {exit_code}\n")
         f.write(f"Message: {message}\n")
-        f.write(f"See island {island_id}/{CRASH_LOG_FILE} for full traceback.\n")
+        f.write(f"See island_{island_id}/logs/{CRASH_LOG_FILE.format(time=time)} for full traceback.\n")
         f.write(f"{'='*60}\n\n")
 
 
@@ -327,6 +326,7 @@ def monitor_island_processes(
     """
     num_islands: int = len(processes)
     completed: List[bool] = [False] * num_islands
+    time: int = int(global_data.start_time.value)
 
     try:
         while not all(completed):
@@ -345,13 +345,12 @@ def monitor_island_processes(
                         error_msg: str = (
                             f"Island {i} died unexpectedly with exit code {process.exitcode}"
                         )
-
-                        _write_crash_summary(out_dir, i, process.exitcode, error_msg)
+                        _write_crash_summary(out_dir, i, process.exitcode, error_msg, time)
 
                         print(f"\n{'='*60}", file=sys.stderr)
                         print(f"ERROR: {error_msg}", file=sys.stderr)
                         print(
-                            f"See {out_dir}/{CRASH_LOG_FILE} and island logs for details.",
+                            f"See {out_dir}/{CRASH_LOG_FILE.format(time=time)} and island logs for details.",
                             file=sys.stderr,
                         )
                         print(f"{'='*60}\n", file=sys.stderr)

src/codeevolve/utils/cli_setup.py

@@ -210,7 +210,7 @@ def setup_island_args(
 
     for island_id in range(num_islands):
         isl_args: Dict[str, Any] = args.copy()
-        isl_out_dir: Path = args["out_dir"].joinpath(f"{island_id}")
+        isl_out_dir: Path = args["out_dir"].joinpath(f"island_{island_id}")
         ckpt_dir: Path = isl_out_dir.joinpath("ckpt")
         logs_dir: Path = isl_out_dir.joinpath("logs")
 

src/codeevolve/utils/constants.py

@@ -41,8 +41,8 @@
 # ---------------------------------------------------------------------------
 
 LOCK_FILE: str = ".codeevolve.lock"
-ISLAND_LOG_FILE: str = "island_{time}.log"
-CRASH_LOG_FILE: str = "crash.log"
+ISLAND_LOG_FILE: str = "run_{time}.log"
+CRASH_LOG_FILE: str = "crash_{time}.log"
 RUN_METADATA_FILE: str = "run_metadata.json"
 BEST_SOLUTION_FILE: str = "best_sol"
 BEST_PROMPT_FILE: str = "best_prompt.txt"

tests/test_ckpt.py

@@ -210,13 +210,14 @@ def test_save_and_load_metadata(self, tmp_path: Path):
         best_sol.depth.value = 5
 
         save_run_metadata(
-            tmp_path, epoch=10, elapsed_time=120.5, cpu_count=8, global_best_sol=best_sol
+            tmp_path, epoch=10, elapsed_time=120.5, cpu_count=8, global_best_sol=best_sol,early_stop_counter=5
         )
 
         metadata: Optional[Dict[str, Any]] = load_run_metadata(tmp_path, epoch=10)
         assert metadata is not None
         assert metadata["elapsed_time"] == 120.5
         assert metadata["cpu_count"] == 8
+        assert metadata["early_stop_counter"] == 5
         assert metadata["best_sol"]["fitness"] == 42.0
 
     def test_load_nonexistent_metadata(self, tmp_path: Path):
@@ -228,7 +229,7 @@ def test_load_missing_epoch(self, tmp_path: Path):
         """Tests loading metadata for a missing epoch returns empty dict."""
         best_sol: GlobalBestProg = GlobalBestProg()
         save_run_metadata(
-            tmp_path, epoch=10, elapsed_time=100.0, cpu_count=4, global_best_sol=best_sol
+            tmp_path, epoch=10, elapsed_time=100.0, cpu_count=4, global_best_sol=best_sol, early_stop_counter=5
         )
 
         metadata: Optional[Dict[str, Any]] = load_run_metadata(tmp_path, epoch=99)
@@ -238,10 +239,10 @@ def test_metadata_accumulates(self, tmp_path: Path):
         """Tests that multiple saves accumulate in the same file."""
         best_sol: GlobalBestProg = GlobalBestProg()
         save_run_metadata(
-            tmp_path, epoch=10, elapsed_time=100.0, cpu_count=4, global_best_sol=best_sol
+            tmp_path, epoch=10, elapsed_time=100.0, cpu_count=4, global_best_sol=best_sol, early_stop_counter=5
         )
         save_run_metadata(
-            tmp_path, epoch=20, elapsed_time=200.0, cpu_count=4, global_best_sol=best_sol
+            tmp_path, epoch=20, elapsed_time=200.0, cpu_count=4, global_best_sol=best_sol, early_stop_counter=10
         )
 
         metadata_file: Path = tmp_path / RUN_METADATA_FILE

tests/test_logging.py

@@ -137,11 +137,11 @@ def test_logger_without_results_dir(self):
         assert logger is not None
         assert logger.level == logging.INFO
 
-    def test_logger_with_results_dir(self, tmp_path: Path):
+    def test_logger_with_logs_dir(self, tmp_path: Path):
         """Tests that a logger creates a log file in logs_dir."""
         logger: logging.Logger = get_logger(island_id=0, logs_dir=tmp_path, time=100)
         logger.info("test message")
-        log_file: Path = tmp_path / "island_100.log"
+        log_file: Path = tmp_path / "run_100.log"
         assert log_file.exists()
 
     def test_logger_unique_names(self, tmp_path: Path):