halib 0.2.4__tar.gz → 0.2.6__tar.gz

{halib-0.2.4 → halib-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: halib
-Version: 0.2.4
+Version: 0.2.6
 Summary: Small library for common tasks
 Author: Hoang Van Ha
 Author-email: hoangvanhauit@gmail.com
@@ -53,7 +53,7 @@ Dynamic: summary
 
 # Helper package for coding and automation
 
-**Version 0.2.4**
+**Version 0.2.6**
 + reorganize packages with most changes in `research` package; also rename `research` to `exp` (package for experiment management and utilities)
 
 **Version 0.2.1**

{halib-0.2.4 → halib-0.2.6}/README.md

@@ -1,6 +1,6 @@
 # Helper package for coding and automation
 
-**Version 0.2.4**
+**Version 0.2.6**
 + reorganize packages with most changes in `research` package; also rename `research` to `exp` (package for experiment management and utilities)
 
 **Version 0.2.1**

{halib-0.2.4 → halib-0.2.6}/halib/exp/core/base_exp.py

@@ -1,9 +1,16 @@
 from abc import ABC, abstractmethod
 from typing import Tuple, Any, Optional
-from base_config import ExpBaseCfg
+from .base_config import ExpBaseCfg
 from ..perf.perfcalc import PerfCalc
 from ..perf.perfmetrics import MetricsBackend
 
+
+class ExpHook:
+    """Base interface for all experiment hooks."""
+    def on_before_run(self, exp): pass
+    def on_after_run(self, exp, results): pass
+
+
 # ! SEE https://github.com/hahv/base_exp for sample usage
 class BaseExp(PerfCalc, ABC):
     """
@@ -16,6 +23,16 @@ class BaseExp(PerfCalc, ABC):
         self.metric_backend = None
         # Flag to track if init_general/prepare_dataset has run
         self._is_env_ready = False
+        self.hooks = []
+
+    def register_hook(self, hook: ExpHook):
+        self.hooks.append(hook)
+
+    def _trigger_hooks(self, method_name: str, *args, **kwargs):
+        for hook in self.hooks:
+            method = getattr(hook, method_name, None)
+            if callable(method):
+                method(*args, **kwargs)
 
     # -----------------------
     # PerfCalc Required Methods
@@ -52,11 +69,6 @@ class BaseExp(PerfCalc, ABC):
         """
         pass
 
-    @abstractmethod
-    def before_exec_exp_once(self, *args, **kwargs):
-        """Optional: any setup before exec_exp. Note this is called once per run_exp."""
-        pass
-
     @abstractmethod
     def exec_exp(self, *args, **kwargs) -> Optional[Tuple[Any, Any]]:
         """Run experiment process, e.g.: training/evaluation loop.
@@ -64,13 +76,6 @@ class BaseExp(PerfCalc, ABC):
         """
         pass
 
-    @abstractmethod
-    def exec_eval(self, *args, **kwargs) -> Optional[Tuple[Any, Any]]:
-        """Run evaluation process.
-        Return: either `None` or a tuple of (raw_metrics_data, extra_data) for calc_and_save_exp_perfs
-        """
-        pass
-
     # -----------------------
     # Internal Helpers
     # -----------------------
@@ -121,8 +126,8 @@ class BaseExp(PerfCalc, ABC):
         """
         self._prepare_environment(force_reload=reload_env)
 
-        # Any pre-exec setup (loading models, etc)
-        self.before_exec_exp_once(*args, **kwargs)
+        self._trigger_hooks("before_run", self)
+
         # Save config before running
         self.config.save_to_outdir()
 
@@ -135,23 +140,8 @@ class BaseExp(PerfCalc, ABC):
             perf_results = self.calc_perfs(
                 raw_metrics_data=metrics_data, extra_data=extra_data, *args, **kwargs
             )
+            self._trigger_hooks("after_run", self, perf_results)
             return perf_results
         else:
+            self._trigger_hooks("after_run", self, results)
             return results
-
-    # -----------------------
-    # Main Experiment Evaluator
-    # -----------------------
-    def eval_exp(self, reload_env=False, *args, **kwargs):
-        """
-        Run evaluation only.
-        :param reload_env: If True, forces dataset/general init to run again.
-        """
-        self._prepare_environment(force_reload=reload_env)
-        results = self.exec_eval(*args, **kwargs)
-        if results is not None:
-            metrics_data, extra_data = self._validate_and_unpack(results)
-            return self.calc_perfs(
-                raw_metrics_data=metrics_data, extra_data=extra_data, *args, **kwargs
-            )
-        return None

{halib-0.2.4 → halib-0.2.6}/halib/filetype/yamlfile.py

@@ -11,6 +11,7 @@ from ..system.path import *
 
 console = Console()
 
+
 def _load_yaml_recursively(
     yaml_file, yaml_files=[], share_nx_graph=nx.DiGraph(), log_info=False
 ):
@@ -53,25 +54,16 @@ def load_yaml(yaml_file, to_dict=False, log_info=False):
     else:
         return omgconf
 
+
 def load_yaml_with_PC_abbr(
-    yaml_file, pc_abbr_to_working_disk=DEFAULT_ABBR_WORKING_DISK
+    yaml_file, abbr_disk_map=ABBR_DISK_MAP
 ):
-    # current PC abbreviation
-    pc_abbr = get_PC_abbr_name()
-
-    # current plaftform: windows or linux
-    current_platform = platform.system().lower()
-
-    assert pc_abbr in pc_abbr_to_working_disk, f"The is no mapping for {pc_abbr} to <working_disk>"
-
-    # working disk
-    working_disk = pc_abbr_to_working_disk.get(pc_abbr)
-
     # load yaml file
     data_dict = load_yaml(yaml_file=yaml_file, to_dict=True)
-
     # Normalize paths in the loaded data
-    data_dict = normalize_paths(data_dict, working_disk, current_platform)
+    data_dict = normalize_paths(
+        data_dict, get_working_disk(abbr_disk_map), get_os_platform()
+    )
     return data_dict
 
 

{halib-0.2.4 → halib-0.2.6}/halib/system/path.py

@@ -2,9 +2,9 @@ from ..common.common import *
 from ..filetype import csvfile
 import pandas as pd
 import platform
+import re  # <--- [FIX 1] Added missing import
 
-
-PC_NAME_TO_ABBR = {
+PC_TO_ABBR = {
     "DESKTOP-JQD9K01": "MainPC",
     "DESKTOP-5IRHU87": "MSI_Laptop",
     "DESKTOP-96HQCNO": "4090_SV",
@@ -12,17 +12,16 @@ PC_NAME_TO_ABBR = {
     "DESKTOP-QNS3DNF": "1GPU_SV",
 }
 
-DEFAULT_ABBR_WORKING_DISK = {
+ABBR_DISK_MAP = {
     "MainPC": "E:",
     "MSI_Laptop": "D:",
     "4090_SV": "E:",
     "4GPU_SV": "D:",
 }
 
+
 def list_PCs(show=True):
-    df = pd.DataFrame(
-        list(PC_NAME_TO_ABBR.items()), columns=["PC Name", "Abbreviation"]
-    )
+    df = pd.DataFrame(list(PC_TO_ABBR.items()), columns=["PC Name", "Abbreviation"])
     if show:
         csvfile.fn_display_df(df)
     return df
@@ -34,13 +33,32 @@ def get_PC_name():
 
 def get_PC_abbr_name():
     pc_name = get_PC_name()
-    return PC_NAME_TO_ABBR.get(pc_name, "Unknown")
+    return PC_TO_ABBR.get(pc_name, "Unknown")
+
+
+def get_os_platform():
+    return platform.system().lower()
+
+
+def get_working_disk(abbr_disk_map=ABBR_DISK_MAP):
+    pc_abbr = get_PC_abbr_name()
+    return abbr_disk_map.get(pc_abbr, None)
 
 
 # ! This funcction search for full paths in the obj and normalize them according to the current platform and working disk
 # ! E.g: "E:/zdataset/DFire", but working_disk: "D:", current_platform: "windows" => "D:/zdataset/DFire"
 # ! E.g: "E:/zdataset/DFire", but working_disk: "D:", current_platform: "linux" => "/mnt/d/zdataset/DFire"
-def normalize_paths(obj, working_disk, current_platform):
+def normalize_paths(obj, working_disk=None, current_platform=None):
+    # [FIX 3] Resolve defaults inside function to be safer/cleaner
+    if working_disk is None:
+        working_disk = get_working_disk()
+    if current_platform is None:
+        current_platform = get_os_platform()
+
+    # [FIX 2] If PC is unknown, working_disk is None. Return early to avoid crash.
+    if working_disk is None:
+        return obj
+
     if isinstance(obj, dict):
         for key, value in obj.items():
             obj[key] = normalize_paths(value, working_disk, current_platform)
@@ -52,22 +70,25 @@ def normalize_paths(obj, working_disk, current_platform):
     elif isinstance(obj, str):
         # Normalize backslashes to forward slashes for consistency
         obj = obj.replace("\\", "/")
+
         # Regex for Windows-style path: e.g., "E:/zdataset/DFire"
         win_match = re.match(r"^([A-Z]):/(.*)$", obj)
         # Regex for Linux-style path: e.g., "/mnt/e/zdataset/DFire"
         lin_match = re.match(r"^/mnt/([a-z])/(.*)$", obj)
+
         if win_match or lin_match:
             rest = win_match.group(2) if win_match else lin_match.group(2)
+
             if current_platform == "windows":
                 # working_disk is like "D:", so "D:/" + rest
-                new_path = working_disk + "/" + rest
+                new_path = f"{working_disk}/{rest}"
             elif current_platform == "linux":
                 # Extract drive letter from working_disk (e.g., "D:" -> "d")
                 drive_letter = working_disk[0].lower()
-                new_path = "/mnt/" + drive_letter + "/" + rest
+                new_path = f"/mnt/{drive_letter}/{rest}"
             else:
-                # Unknown platform, return original
                 return obj
             return new_path
+
     # For non-strings or non-path strings, return as is
     return obj

{halib-0.2.4 → halib-0.2.6}/halib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: halib
-Version: 0.2.4
+Version: 0.2.6
 Summary: Small library for common tasks
 Author: Hoang Van Ha
 Author-email: hoangvanhauit@gmail.com
@@ -53,7 +53,7 @@ Dynamic: summary
 
 # Helper package for coding and automation
 
-**Version 0.2.4**
+**Version 0.2.6**
 + reorganize packages with most changes in `research` package; also rename `research` to `exp` (package for experiment management and utilities)
 
 **Version 0.2.1**

{halib-0.2.4 → halib-0.2.6}/setup.py

@@ -8,7 +8,7 @@ with open("requirements.txt") as f:
 
 setuptools.setup(
     name="halib",
-    version="0.2.4",
+    version="0.2.6",
     author="Hoang Van Ha",
     author_email="hoangvanhauit@gmail.com",
     description="Small library for common tasks",