Pin start date and pass it to directives

Author: domfournier

simpeg_drivers/components/factories/directives_factory.py

@@ -245,7 +245,7 @@ def save_iteration_log_files(self):
         """"""
         if self._save_iteration_log_files is None and self.driver.logger:
             self._save_iteration_log_files = directives.SaveLogFilesGeoH5(
-                self.driver.out_group,
+                self.driver.out_group, self.driver.logger.start_date_time
             )
         return self._save_iteration_log_files
 
@@ -285,7 +285,8 @@ def scale_misfits(self):
         ):
             nested_tiles = self.driver.get_nested_tiles()
             self._scale_misfits = directives.ScaleMisfitMultipliers(
-                self.params.geoh5.h5file.parent,
+                self.params.geoh5.h5file.parent
+                / f"ChiFactors_{self.driver.logger.start_date_time}.log",
                 nested_tiles,
                 target_chi=self.params.cooling_schedule.chi_factor,
             )

simpeg_drivers/driver.py

@@ -440,7 +440,7 @@ def logger(self) -> InversionLogger | None:
     @logger.setter
     def logger(self, value: InversionLogger | None | bool):
         if value is True or value is None:
-            self._logger = InversionLogger("SimPEG.log", self)
+            self._logger = InversionLogger(self)
         elif value is False:
             self._logger = None
         elif isinstance(value, logging.Logger):
@@ -897,17 +897,19 @@ class InversionLogger:
     Logger for the inversion process.
     """
 
-    def __init__(self, logfile, driver):
+    def __init__(self, driver):
         self.driver = driver
         self.terminal = sys.stdout
-        self.logfile = self.get_path(logfile)
+
         self.initial_time = time()
+        self.start_date_time = datetime.now().strftime("%Y%m%d_%Hh%Mm%Ss")
+        self.logfile = self.get_path(f"SimPEG_{self.start_date_time}.log")
 
     def start(self):
-        date_time = datetime.now().strftime("%b-%d-%Y:%H:%M:%S")
+
         self.write(
             f"Running simpeg-drivers {__version__}\n"
-            f"Started {date_time}\n"
+            f"Started {self.start_date_time}\n"
             f"{self.driver.params.title}\n"
         )
 

tests/run_tests/driver_grav_test.py

@@ -164,7 +164,9 @@ def test_gravity_run(
     assert driver.directives.directive_list[0].chifact_start == 0.75
     assert driver.directives.directive_list[0].chifact_target == 0.75
 
-    with open(workpath.parent / "SimPEG.log", encoding="utf8") as file:
+    with open(
+        workpath.parent / f"SimPEG_{driver.logger.start_date_time}.log", encoding="utf8"
+    ) as file:
         content = file.read()
         assert "Target Misfit: 3.00e+00 (3 data with chifact = 1.0)" in content
         assert "IRLS Start Misfit: 3.00e+00 (3 data with chifact = 1.0)" in content
@@ -190,7 +192,12 @@ def test_gravity_run(
         )
         output["data"] = orig_gz
 
-        assert len(run_ws.get_entity("SimPEG.log")) == 2
+        assert (
+            len(run_ws.get_entity(f"SimPEG_{driver.logger.start_date_time}.log")) == 1
+        )
+        assert (
+            len(run_ws.get_entity(f"SimPEG_{driver.logger.start_date_time}.out")) == 1
+        )
 
         if pytest:
             check_target(output, target_run)

tests/utils/targets.py

@@ -34,7 +34,7 @@ def get_inversion_output(h5file: str | Workspace, inversion_group: str | UUID):
             f"BaseInversion group {inversion_group} could not be found in the target geoh5 {h5file}"
         ) from exc
 
-    outfile = group.get_entity("SimPEG.out")[0]
+    outfile = next(file for file in group.children if ".out" in file.name)
     out = list(outfile.file_bytes.decode("utf-8").replace("\r", "").split("\n"))[:-1]
     cols = out.pop(0).split(" ")
     out = [[string_to_numeric(k) for k in elem.split(" ")] for elem in out]