machineconfig 6.82__py3-none-any.whl → 7.98__py3-none-any.whl

machineconfig/utils/scheduler.py

@@ -1,31 +1,26 @@
 
 from pathlib import Path
 from typing import Callable, Optional, Union, Any, Protocol, List, TypeVar
-import logging
+# import logging
 import time
 from datetime import datetime, timezone, timedelta
 from machineconfig.utils.io import from_pickle
 
 
 class LoggerTemplate(Protocol):
-    handlers: List[logging.Handler]
-
-    def debug(self, msg: str) -> None:
+    def trace(self,  __message: str, *args: Any, **kwargs: Any) -> None:
+        pass  # 5
+    def success(self,  __message: str, *args: Any, **kwargs: Any) -> None:
+        pass  # 25
+    def debug(self,  __message: str, *args: Any, **kwargs: Any) -> None:
         pass  # 10
-
-    def info(self, msg: str) -> None:
+    def info(self,  __message: str, *args: Any, **kwargs: Any) -> None:
         pass  # 20
-
-    def warning(self, msg: str) -> None:
+    def warning(self,  __message: str, *args: Any, **kwargs: Any) -> None:
         pass  # 30
-
-    def error(self, msg: str) -> None:
+    def error(self,  __message: str, *args: Any, **kwargs: Any) -> None:
         pass  # 40
-
-    def critical(self, msg: str) -> None:
-        pass  # 50
-
-    def fatal(self, msg: str) -> None:
+    def critical(self,  __message: str, *args: Any, **kwargs: Any) -> None:
         pass  # 50
 
 
@@ -139,7 +134,7 @@ class Scheduler:
     def default_exception_handler(self, ex: Union[Exception, KeyboardInterrupt], during: str, sched: "Scheduler") -> None:  # user decides on handling and continue, terminate, save checkpoint, etc.  # Use signal library.
         print(sched)
         self.record_session_end(reason=f"during {during}, " + str(ex))
-        self.logger.fatal(str(ex))
+        self.logger.critical(str(ex))
         raise ex
 
 
@@ -164,28 +159,20 @@ class CacheMemory[T]():
         if fresh or not hasattr(self, "cache"):
             why = "There was an explicit fresh order." if fresh else "Previous cache never existed."
             t0 = time.time()
-            self.logger.warning(f"""
-🆕 ════════════════════ NEW {self.name} CACHE ════════════════════
-ℹ️ Reason: {why}""")
+            self.logger.warning(f"""🆕  NEW CACHE 🔄 {self.name} CACHE ℹ️ Reason: {why}""")
             self.cache = self.source_func()
             self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
             self.time_produced = datetime.now()
         else:
             age = datetime.now() - self.time_produced
             if (age > self.expire) or (fresh and (age.total_seconds() > tolerance_seconds)):
-                self.logger.warning(f"""
-🔄 ════════════════════ CACHE UPDATE ════════════════════
-⚠️  {self.name} cache: Updating cache from source func
-⏱️  Age = {age} > {self.expire}""")
+                self.logger.warning(f"""🔄 CACHE UPDATE ⚠️  {self.name} cache: Updating cache from source func. """ + f""" ⏱️  Age = {age} > {self.expire}""" if not fresh else f""" ⏱️  Age = {age}. Fresh flag raised.""")
                 t0 = time.time()
                 self.cache = self.source_func()
                 self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
                 self.time_produced = datetime.now()
             else:
-                self.logger.warning(f"""
-✅ ════════════════════ USING CACHE ════════════════════
-📦 {self.name} cache: Using cached values
-⏱️  Lag = {age}""")
+                self.logger.warning(f"""✅ USING CACHE 📦 {self.name} cache: Using cached values ⏱️  Lag = {age} < {self.expire} < {tolerance_seconds} seconds.""")
         return self.cache
 
     @staticmethod
@@ -215,28 +202,18 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
             if self.path.exists():  # prefer to read from disk over source func as a default source of cache.
                 age = datetime.now() - datetime.fromtimestamp(self.path.stat().st_mtime)
                 if (age > self.expire) or (fresh and (age.total_seconds() > tolerance_seconds)):  # cache is old or if fresh flag is raised
-                    self.logger.warning(f"""
-🔄 ════════════════════ CACHE STALE ════════════════════
-📦 {self.name} cache: Populating fresh cache from source func
-⏱️  Lag = {age}""")
+                    self.logger.warning(f"""🔄 CACHE STALE 📦 {self.name} cache: Populating fresh cache from source func. """ + f"""⏱️  Age = {age} > Expiry {self.expire} """ if not fresh else """⚠️  Fresh flag raised.""")
                     t0 = time.time()
                     self.cache = self.source_func()  # fresh data.
                     self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
                     self.time_produced = datetime.now()
                     self.save(self.cache, self.path)
                     return self.cache
-
-                msg1 = f"""
-📦 ════════════════════ CACHE OPERATION ════════════════════
-🔄 {self.name} cache: Reading cached values from `{self.path}`
-⏱️  Lag = {age}"""
+                msg1 = f"""📦 CACHE OPERATION 🔄 {self.name} cache: Reading cached values from `{self.path}` ⏱️  Lag = {age}"""
                 try:
                     self.cache = self.reader(self.path)
                 except Exception as ex:
-                    msg2 = f"""
-❌ ════════════════════ CACHE ERROR ════════════════════
-⚠️  {self.name} cache: Cache file is corrupted
-🔍 Error: {ex}"""
+                    msg2 = f"""❌ CACHE ERROR ⚠️  {self.name} cache: Cache file is corrupted 🔍 Error: {ex}"""
                     self.logger.warning(msg1 + msg2)
                     t0 = time.time()
                     self.cache = self.source_func()
@@ -245,11 +222,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                     self.save(self.cache, self.path)
                     return self.cache
             else:  # disk cache does not exist, populate from source func.
-                why = "Previous cache never existed."
-                self.logger.warning(f"""
-🆕 ════════════════════ NEW CACHE ════════════════════
-🔄 {self.name} cache: Populating fresh cache from source func
-ℹ️  Reason: {why}""")
+                self.logger.warning(f"""🆕  NEW CACHE 🔄 {self.name} cache: Populating fresh cache from source func ℹ️  Reason: Previous cache never existed.""")
                 t0 = time.time()
                 self.cache = self.source_func()  # fresh data.
                 self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
@@ -258,20 +231,14 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
         else:  # memory cache exists
             age = datetime.now() - self.time_produced
             if (age > self.expire) or (fresh and (age.total_seconds() > tolerance_seconds)):  # cache is old or if fresh flag is raised
-                self.logger.warning(f"""
-🔄 ════════════════════ CACHE UPDATE ════════════════════
-⚠️  {self.name} cache: Updating cache from source func
-⏱️  Age = {age} > {self.expire}""")
+                self.logger.warning(f"""🔄 CACHE UPDATE ⚠️  {self.name} cache: Updating cache from source func. ⏱️  Age = {age} > {self.expire}""")
                 t0 = time.time()
                 self.cache = self.source_func()
                 self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
                 self.time_produced = datetime.now()
                 self.save(self.cache, self.path)
             else:
-                self.logger.warning(f"""
-✅ ════════════════════ USING CACHE ════════════════════
-📦 {self.name} cache: Using cached values
-⏱️  Lag = {age}""")
+                self.logger.warning(f"""✅ USING CACHE 📦 {self.name} cache: Using cached values ⏱️  Lag = {age} < {self.expire} < {tolerance_seconds} seconds.""")
         return self.cache
 
     @staticmethod

machineconfig/utils/scheduling.py

@@ -139,8 +139,6 @@
 #     start: datetime
 #     end: datetime
 #     status: str
-
-#     @classmethod
 #     def from_path(cls, path: PathExtended, return_default_if_not_found: bool=False):
 #         if not path.exists():
 #             if return_default_if_not_found:

machineconfig/utils/schemas/fire_agents/fire_agents_input.py

@@ -6,7 +6,7 @@ capturing all user inputs collected during interactive execution.
 
 from pathlib import Path
 from typing import TypedDict, Literal, NotRequired
-from machineconfig.scripts.python.helpers_fire.fire_agents_help_launch import AGENTS
+from machineconfig.scripts.python.helpers_agents.fire_agents_help_launch import AGENTS
 
 SEARCH_STRATEGIES = Literal["file_path", "keyword_search", "filename_pattern"]
 

machineconfig/utils/schemas/layouts/layout_types.py

@@ -13,7 +13,7 @@ class TabConfig(TypedDict):
     tabName: str
     startDir: str
     command: str
-    tabWeight: NotRequired[int]  # Optional, defaults to 1 if not provided
+    tabWeight: NotRequired[int]
 
 
 class LayoutConfig(TypedDict):