machineconfig 6.29__tar.gz → 6.31__tar.gz

{machineconfig-6.29/src/machineconfig.egg-info → machineconfig-6.31}/PKG-INFO

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

{machineconfig-6.29 → machineconfig-6.31}/pyproject.toml

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

{machineconfig-6.29 → machineconfig-6.31}/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -20,11 +20,12 @@ def get_fire_command_and_artifact_files(func: FunctionType):
     }
     return tab_config, py_script_path
 def get_fire_command_and_artifact_files_v2(func: FunctionType):
-    import os
-    command_to_run = f"""$HOME/.local/bin/fire {func.__module__.replace(".", os.sep)} {func.__name__} """
+    import inspect
+    path = inspect.getfile(func)
+    command_to_run = f"""$HOME/.local/bin/fire {path} {func.__name__} """
     tab_config: TabConfig = {
         "command": command_to_run,
-        "startDir": str(Path(func.__module__).parent),
+        "startDir": "$HOME",
         "tabName": func.__name__
     }
     return tab_config

{machineconfig-6.29 → machineconfig-6.31}/src/machineconfig/utils/scheduler.py

@@ -146,8 +146,6 @@ class Scheduler:
 
 # T = TypeVar("T")
 T2 = TypeVar("T2")
-
-
 def to_pickle(obj: Any, path: Path) -> None:
     import pickle
     path.parent.mkdir(parents=True, exist_ok=True)
@@ -156,11 +154,11 @@ def to_pickle(obj: Any, path: Path) -> None:
 
 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: Optional[Path] = None, saver: Callable[[T, Path], Any] = to_pickle, reader: Callable[[Path], T] = from_pickle, name: Optional[str] = None
+        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
     ) -> None:
         self.cache: T
         self.source_func = source_func  # function which when called returns a fresh object to be frozen.
-        self.path: Optional[PathExtended] = PathExtended(path) if path is not None else None  # if path is passed, it will function as disk-based flavour.
+        self.path: PathExtended = PathExtended(path)
         self.time_produced = datetime.now()  # if path is None else
         self.save = saver
         self.reader = reader
@@ -172,21 +170,11 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
     @property
     def age(self):
         """Throws AttributeError if called before cache is populated and path doesn't exists"""
-        if self.path is None:  # memory-based cache.
-            return datetime.now() - self.time_produced
-        return datetime.now() - datetime.fromtimestamp(self.path.stat().st_mtime)
-
-    # def __setstate__(self, state: dict[str, Any]) -> None:
-    #     self.__dict__.update(state)
-    #     self.path = P.home() / self.path if self.path is not None else self.path
-    # def __getstate__(self) -> dict[str, Any]:
-    #     state = self.__dict__.copy()
-    #     state["path"] = self.path.rel2home() if self.path is not None else state["path"]
-    #     return state  # With this implementation, instances can be pickled and loaded up in different machine and still works.
+        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"):  # populate cache for the first time
-            if not fresh and self.path is not None and self.path.exists():
+            if not fresh and self.path.exists():
                 age = datetime.now() - datetime.fromtimestamp(self.path.stat().st_mtime)
                 msg1 = f"""
 📦 ════════════════════ CACHE OPERATION ════════════════════
@@ -225,8 +213,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                 self.cache = self.source_func()  # fresh data.
                 self.last_call_is_fresh = True
                 self.time_produced = datetime.now()
-                if self.path is not None:
-                    self.save(self.cache, self.path)
+                self.save(self.cache, self.path)
         else:  # cache exists
             try:
                 age = self.age
@@ -242,8 +229,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                 self.cache = self.source_func()
                 self.last_call_is_fresh = True
                 self.time_produced = datetime.now()
-                if self.path is not None:
-                    self.save(self.cache, self.path)
+                self.save(self.cache, self.path)
             else:
                 if self.logger:
                     self.logger.warning(f"""
@@ -255,7 +241,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
 
     @staticmethod
     def as_decorator(
-        expire: timedelta, logger: LoggerTemplate, path: Optional[Path] = None, saver: Callable[[T2, Path], Any] = to_pickle, reader: Callable[[Path], T2] = from_pickle, name: Optional[str] = None
+        expire: timedelta, logger: LoggerTemplate, path: Path, saver: Callable[[T2, Path], Any] = to_pickle, reader: Callable[[Path], T2] = from_pickle, name: Optional[str] = None
     ):  # -> Callable[..., 'Cache[T2]']:
         def decorator(source_func: Callable[[], T2]) -> Cache["T2"]:
             res = Cache(source_func=source_func, expire=expire, logger=logger, path=path, name=name, reader=reader, saver=saver)
@@ -263,20 +249,20 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
 
         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)
+#     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.29 → machineconfig-6.31/src/machineconfig.egg-info}/PKG-INFO

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