#187 Be sure to remember the multiple files sometimes loaded so the Info will be displayed accurately and completely

Author: dmh23

src/log/log.py

@@ -46,7 +46,11 @@ class Log:
     #
 
     def load_meta(self, meta_file_name: str):
-        self._meta_file_name = meta_file_name
+        if self._meta_file_name == "":
+            self._meta_file_name = meta_file_name
+        else:
+            self._meta_file_name = [self._meta_file_name, meta_file_name]
+
         with open(os.path.join(self._log_directory, meta_file_name), 'rb') as file:
             received_json = json.load(file)
             self._log_meta.set_from_json(received_json)
@@ -100,16 +104,21 @@ def load_all(self, meta_file_names: Union[str, list], please_wait: PleaseWait, t
     def _load_all_single_episode(self, meta_file_name: str, please_wait: PleaseWait, track: Track,
                                  calculate_new_reward, calculate_alternate_discount_factors, progress_start, progress_finish):
         self.load_meta(meta_file_name)
-        self._log_file_name = meta_file_name[:-len(META_FILE_SUFFIX)]
+        log_file_name = meta_file_name[:-len(META_FILE_SUFFIX)]
         discount_factors.reset_for_log(self._log_meta.discount_factor.get())
 
+        if self._log_file_name == "":
+            self._log_file_name = log_file_name
+        else:
+            self._log_file_name = [self._log_file_name, log_file_name]
+
         if track is not None:
             assert track.has_world_name(self._log_meta.track_name.get())
 
         progress_middle = (progress_finish - progress_start) / 2 + progress_start
 
-        if self._log_file_name.endswith(CONSOLE_LOG_SUFFIX):
-            with tarfile.open(os.path.join(self._log_directory, self._log_file_name), "r") as tar:
+        if log_file_name.endswith(CONSOLE_LOG_SUFFIX):
+            with tarfile.open(os.path.join(self._log_directory, log_file_name), "r") as tar:
                 for member in tar:
                     if "/logs/training" in member.name and member.name.endswith("-robomaker.log"):
                         binary_io = tar.extractfile(member)
@@ -119,7 +128,7 @@ def _load_all_single_episode(self, meta_file_name: str, please_wait: PleaseWait,
                             progress_start, progress_middle, progress_finish, True, False, member.size, track,
                             calculate_new_reward, calculate_alternate_discount_factors)
         else:
-            with open(os.path.join(self._log_directory, self._log_file_name), "r") as file_io:
+            with open(os.path.join(self._log_directory, log_file_name), "r") as file_io:
                 self._parse_episode_events(
                     file_io, False,
                     please_wait,
@@ -169,6 +178,9 @@ def get_meta_file_name(self):
     def get_log_file_name(self):
         return self._log_file_name
 
+    def get_log_directory(self):
+        return self._log_directory
+
     def get_evaluation_phases(self):
         return self._evaluation_phases
 
@@ -213,9 +225,14 @@ def _parse_episode_events(self, file_io, is_binary: bool, please_wait: PleaseWai
         saved_object_locations = None
         iteration_id = 0
 
-        log_file_path = os.path.join(self._log_directory, self._log_file_name)
+        if isinstance(self._log_file_name, list):
+            log_file_name = self._log_file_name[-1]
+        else:
+            log_file_name = self._log_file_name
+
+        log_file_path = os.path.join(self._log_directory, log_file_name)
         self._log_meta.set_file_os_stats(os.stat(log_file_path))
-        self._log_meta.file_name.set(self._log_file_name)
+        self._log_meta.file_name.set(log_file_name)
 
         # TODO - This fudge goes away when all the file handling is re-located into here ...
         if file_size_override > 0:
@@ -309,10 +326,10 @@ def _parse_episode_events(self, file_io, is_binary: bool, please_wait: PleaseWai
 
         # Override AWS id with better model name from filename if possible
         if self._log_meta.model_name.get() and AWS_UID_REG_EX.match(self._log_meta.model_name.get()):
-            if TRAINING_FILE_REG_EXP.search(self._log_file_name):
-                self._log_meta.model_name.set(TRAINING_FILE_REG_EXP.sub("", self._log_file_name))
+            if TRAINING_FILE_REG_EXP.search(log_file_name):
+                self._log_meta.model_name.set(TRAINING_FILE_REG_EXP.sub("", log_file_name))
             else:
-                self._log_meta.model_name.set(re.sub("\\..*", "", self._log_file_name))
+                self._log_meta.model_name.set(re.sub("\\..*", "", log_file_name))
 
     def _analyze_episode_details(self):
         total_success_steps = 0

src/log/log_meta.py

@@ -14,7 +14,7 @@
 from src.action_space.action_space import ActionSpace
 from src.log.meta_field import MetaField, MetaFields, Optionality
 
-LOG_META_VERSION = "4.0.0.DRAFTxx"
+LOG_META_VERSION = "4.0.0.DEVELOPMENT"
 
 MANDATORY = Optionality.MANDATORY
 OPTIONAL = Optionality.OPTIONAL

src/prototype_ui/main.py

@@ -51,7 +51,7 @@ def __init__(self):
         self._open_file_dialog_chosen_files = None
 
         # Main variables to keep details of current open logs etc.
-        self._log = None
+        self._log: Log | None = None
         self._log_file_names = None
 
         # Canvas etc. comments TODO
@@ -102,7 +102,10 @@ def _chosen_open_file_callback(self, file_names, model_title):
         self._open_file_dialog_chosen_model_title = model_title
 
     def _action_file_info(self):
-        print("File Info - NOT IMPLEMENTED YET IN VERSION 4")
+        print("DEBUG FILE INFO")
+        print(self._log.get_log_directory())
+        print(self._log.get_log_file_name())
+        print(self._log.get_meta_file_name())
 
     def _action_change_log_directory(self):
         new_directory = QFileDialog.getExistingDirectory(self, self._actions.change_log_directory.statusTip(), self._config_manager.get_log_directory())
@@ -114,7 +117,7 @@ def _action_set_file_options(self):
         print("File Options - NOT IMPLEMENTED YET IN VERSION 4")
 
     def _action_exit(self):
-        print("File Exit - NOT IMPLEMENTED YET IN VERSION 4")
+        self.close()
 
 
 if __name__ == '__main__':