machineconfig 6.36__tar.gz → 6.37__tar.gz

{machineconfig-6.36/src/machineconfig.egg-info → machineconfig-6.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.36
+Version: 6.37
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-6.36 → machineconfig-6.37}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.36"
+version = "6.37"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-6.36 → machineconfig-6.37}/src/machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -64,9 +64,9 @@ def get_app():
     nw_apps.command(name="i", help="Install SSH server", hidden=True)(install_ssh_server)
     nw_apps.command(name="add-ssh-key", help="🔑  [k] Add SSH public key to this machine", no_args_is_help=True)(add_ssh_key)
     nw_apps.command(name="k", help="Add SSH public key to this machine", hidden=True, no_args_is_help=True)(add_ssh_key)
-    nw_apps.command(name="add-ssh-identity", help="🗝️  [a] Add SSH identity (private key) to this machine")(add_ssh_identity)
-    nw_apps.command(name="a", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
-    nw_apps.command(name="show-address", help="[A] Show this computer addresses on network")(show_address)
+    nw_apps.command(name="add-ssh-identity", help="🗝️  [A] Add SSH identity (private key) to this machine")(add_ssh_identity)
+    nw_apps.command(name="A", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
+    nw_apps.command(name="show-address", help="📌  [a] Show this computer addresses on network")(show_address)
     nw_apps.command(name="a", help="Show this computer addresses on network", hidden=True)(show_address)
     nw_apps.command(name="debug-ssh", help="🐛  [d] Debug SSH connection")(debug_ssh)
     nw_apps.command(name="d", help="Debug SSH connection", hidden=True)(debug_ssh)

{machineconfig-6.36 → machineconfig-6.37}/src/machineconfig/utils/scheduler.py

@@ -1,4 +1,3 @@
-
 from pathlib import Path
 from typing import Callable, Optional, Union, Any, Protocol, List, TypeVar
 import logging
@@ -152,6 +151,64 @@ def to_pickle(obj: Any, path: Path) -> None:
     path.write_bytes(pickle.dumps(obj))
 
 
+class CacheMemory[T]():
+    def __init__(
+        self, source_func: Callable[[], T], expire: timedelta, logger: LoggerTemplate, name: Optional[str] = None
+    ) -> None:
+        self.cache: T
+        self.source_func = source_func
+        self.time_produced = datetime.now()
+        self.logger = logger
+        self.expire = expire
+        self.name = name if isinstance(name, str) else str(self.source_func)
+        self.last_call_is_fresh = False
+
+    @property
+    def age(self) -> timedelta:
+        return datetime.now() - self.time_produced
+
+    def __call__(self, fresh: bool = False) -> T:
+        self.last_call_is_fresh = False
+        if fresh or not hasattr(self, "cache"):
+            if self.logger:
+                why = "There was an explicit fresh order." if fresh else "Previous cache never existed."
+                self.logger.warning(f"""
+🆕 ════════════════════ NEW CACHE ════════════════════
+🔄 {self.name} cache: Populating fresh cache from source func
+ℹ️  Reason: {why}
+════════════════════════════════════════════════════════""")
+            self.cache = self.source_func()
+            self.last_call_is_fresh = True
+            self.time_produced = datetime.now()
+        else:
+            age = self.age
+            if age > self.expire:
+                if self.logger:
+                    self.logger.warning(f"""
+🔄 ════════════════════ CACHE UPDATE ════════════════════
+⚠️  {self.name} cache: Updating cache from source func
+⏱️  Age = {age} > {self.expire}
+════════════════════════════════════════════════════════""")
+                self.cache = self.source_func()
+                self.last_call_is_fresh = True
+                self.time_produced = datetime.now()
+            else:
+                if self.logger:
+                    self.logger.warning(f"""
+✅ ════════════════════ USING CACHE ════════════════════
+📦 {self.name} cache: Using cached values
+⏱️  Lag = {age}
+════════════════════════════════════════════════════════""")
+        return self.cache
+
+    @staticmethod
+    def as_decorator(expire: timedelta, logger: LoggerTemplate, name: Optional[str] = None):
+        def decorator(source_func: Callable[[], T2]) -> CacheMemory["T2"]:
+            res = CacheMemory(source_func=source_func, expire=expire, logger=logger, name=name)
+            return res
+        return decorator
+
+
 class Cache[T]():  # This class helps to accelrate access to latest data coming from expensive function. The class has two flavours, memory-based and disk-based variants."""
     def __init__(
         self, source_func: Callable[[], T], expire: timedelta, logger: LoggerTemplate, path: Path, saver: Callable[[T, Path], Any] = to_pickle, reader: Callable[[Path], T] = from_pickle, name: Optional[str] = None
@@ -180,8 +237,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
 📦 ════════════════════ CACHE OPERATION ════════════════════
 🔄 {self.name} cache: Reading cached values from `{self.path}`
 ⏱️  Lag = {age}
-════════════════════════════════════════════════════════════
-"""
+════════════════════════════════════════════════════════════"""
                 try:
                     self.cache = self.reader(self.path)
                 except Exception as ex:
@@ -190,8 +246,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
 ❌ ════════════════════ CACHE ERROR ════════════════════
 ⚠️  {self.name} cache: Cache file is corrupted
 🔍 Error: {ex}
-════════════════════════════════════════════════════════
-"""
+════════════════════════════════════════════════════════"""
                         self.logger.warning(msg1 + msg2)
                     self.cache = self.source_func()
                     self.last_call_is_fresh = True
@@ -208,8 +263,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
 🆕 ════════════════════ NEW CACHE ════════════════════
 🔄 {self.name} cache: Populating fresh cache from source func
 ℹ️  Reason: {why}
-════════════════════════════════════════════════════════
-""")
+════════════════════════════════════════════════════════""")
                 self.cache = self.source_func()  # fresh data.
                 self.last_call_is_fresh = True
                 self.time_produced = datetime.now()
@@ -248,21 +302,3 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
             return res
 
         return decorator
-
-#     def from_cloud(self, cloud: str, rel2home: bool = True, root: Optional[str] = None):
-#         assert self.path is not None
-#         exists = self.path.exists()
-#         exists_but_old = exists and ((datetime.now() - datetime.fromtimestamp(self.path.stat().st_mtime)) > self.expire)
-#         if not exists or exists_but_old:
-#             returned_path = self.path.from_cloud(cloud=cloud, rel2home=rel2home, root=root)
-#             if returned_path is None and not exists:
-#                 raise FileNotFoundError(f"❌ Failed to get @ {self.path}. Build the cache first with signed API.")
-#             elif returned_path is None and exists:
-#                 self.logger.warning(f"""
-# ⚠️ ════════════════════ CLOUD FETCH WARNING ════════════════════
-# 🔄 Failed to get fresh data from cloud
-# 📦 Using old cache @ {self.path}
-# ════════════════════════════════════════════════════════════════""")
-#         else:
-#             pass  # maybe we don't need to fetch it from cloud, if its too hot
-#         return self.reader(self.path)

{machineconfig-6.36 → machineconfig-6.37/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.36
+Version: 6.37
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0