machineconfig 2.1__py3-none-any.whl → 2.2__py3-none-any.whl

machineconfig/scripts/python/helpers/cloud_helpers.py

@@ -4,10 +4,10 @@ from pydantic import ConfigDict
 from pydantic.dataclasses import dataclass
 from typing import Optional
 import os
-from machineconfig.utils.utils import DEFAULTS_PATH
+from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 from rich.console import Console
 from rich.panel import Panel
-from rich import box # Import box
+from rich import box  # Import box
 
 
 console = Console()
@@ -16,10 +16,10 @@ console = Console()
 class ArgsDefaults:
     # source: str=None
     # target: str=None
-    encrypt: bool=False
-    zip_: bool=False
-    overwrite: bool=False
-    share: bool=False
+    encrypt: bool = False
+    zip_: bool = False
+    overwrite: bool = False
+    share: bool = False
     rel2home = False
     root = None
     os_specific = False
@@ -28,12 +28,12 @@ class ArgsDefaults:
 
 
 @dataclass(config=ConfigDict(extra="forbid", frozen=False))
-class Args():
+class Args:
     cloud: Optional[str] = None
 
-    zip: bool=ArgsDefaults.zip_
-    overwrite: bool=ArgsDefaults.overwrite
-    share: bool=ArgsDefaults.share
+    zip: bool = ArgsDefaults.zip_
+    overwrite: bool = ArgsDefaults.overwrite
+    share: bool = ArgsDefaults.share
 
     root: Optional[str] = ArgsDefaults.root
     os_specific: bool = ArgsDefaults.os_specific
@@ -67,15 +67,16 @@ def find_cloud_config(path: Path):
 
 def absolute(path: str) -> Path:
     obj = Path(path).expanduser()
-    if not path.startswith(".") and  obj.exists(): return obj
-    try_absing =  Path.cwd().joinpath(path)
-    if try_absing.exists(): return try_absing
+    if not path.startswith(".") and obj.exists():
+        return obj
+    try_absing = Path.cwd().joinpath(path)
+    if try_absing.exists():
+        return try_absing
     display_warning(f"Path {path} could not be resolved to absolute path.")
     display_warning("Trying to resolve symlinks (this may result in unintended paths).")
     return obj.absolute()
 
 
-
 def get_secure_share_cloud_config(interactive: bool, cloud: Optional[str]) -> Args:
     console = Console()
     console.print(Panel("🔐 Secure Share Cloud Configuration", expand=False))
@@ -88,10 +89,10 @@ def get_secure_share_cloud_config(interactive: bool, cloud: Optional[str]) -> Ar
             console.print(f"☁️  Using cloud from environment: {cloud}")
         else:
             try:
-                default_cloud__ = read_ini(DEFAULTS_PATH)['general']['rclone_config_name']
+                default_cloud__ = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
             except Exception:
-                default_cloud__ = 'No default cloud found.'
-            if default_cloud__ == 'No default cloud found.' or interactive:
+                default_cloud__ = "No default cloud found."
+            if default_cloud__ == "No default cloud found." or interactive:
                 # assert default_cloud is not None
                 cloud = input(f"☁️  Enter cloud name (default {default_cloud__}): ") or default_cloud__
             else:
@@ -106,32 +107,36 @@ def get_secure_share_cloud_config(interactive: bool, cloud: Optional[str]) -> Ar
         pwd = ""
         default_message = "no default password found"
     pwd = input(f"🔑 Enter encryption password ({default_message}): ") or pwd
-    res = Args(cloud=cloud,
-               pwd=pwd, encrypt=True,
-               zip=True, overwrite=True, share=True,
-               rel2home=True, root="myshare", os_specific=False,)
+    res = Args(cloud=cloud, pwd=pwd, encrypt=True, zip=True, overwrite=True, share=True, rel2home=True, root="myshare", os_specific=False)
 
     display_success("Using SecureShare cloud config")
     pprint(res.__dict__, "SecureShare Config")
     return res
 
+
 def display_header(title: str):
-    console.print(Panel(title, box=box.DOUBLE_EDGE, title_align="left")) # Replace print with Panel
+    console.print(Panel(title, box=box.DOUBLE_EDGE, title_align="left"))  # Replace print with Panel
+
 
 def display_subheader(title: str):
-    console.print(Panel(title, box=box.ROUNDED, title_align="left")) # Replace print with Panel
+    console.print(Panel(title, box=box.ROUNDED, title_align="left"))  # Replace print with Panel
+
 
 def display_content(content: str):
-    console.print(Panel(content, box=box.ROUNDED, title_align="left")) # Replace print with Panel
+    console.print(Panel(content, box=box.ROUNDED, title_align="left"))  # Replace print with Panel
+
 
 def display_status(status: str):
-    console.print(Panel(status, box=box.ROUNDED, title_align="left")) # Replace print with Panel
+    console.print(Panel(status, box=box.ROUNDED, title_align="left"))  # Replace print with Panel
+
 
 def display_success(message: str):
-    console.print(Panel(message, box=box.ROUNDED, border_style="green", title_align="left")) # Replace print with Panel
+    console.print(Panel(message, box=box.ROUNDED, border_style="green", title_align="left"))  # Replace print with Panel
+
 
 def display_warning(message: str):
-    console.print(Panel(message, box=box.ROUNDED, border_style="yellow", title_align="left")) # Replace print with Panel
+    console.print(Panel(message, box=box.ROUNDED, border_style="yellow", title_align="left"))  # Replace print with Panel
+
 
 def display_error(message: str):
-    console.print(Panel(message, box=box.ROUNDED, border_style="red", title_align="left")) # Replace print with Panel
+    console.print(Panel(message, box=box.ROUNDED, border_style="red", title_align="left"))  # Replace print with Panel

machineconfig/scripts/python/helpers/helpers2.py

@@ -1,5 +1,5 @@
 from machineconfig.scripts.python.helpers.cloud_helpers import Args, ArgsDefaults, absolute, find_cloud_config, get_secure_share_cloud_config
-from machineconfig.utils.utils import DEFAULTS_PATH
+from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 from machineconfig.utils.utils2 import read_ini, pprint
 from typing import Optional
 from rich.console import Console
@@ -17,7 +17,8 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
     if config == "ss":
         cloud_maybe: Optional[str] = target.split(":")[0]
         # if cloud_maybe == "": cloud_maybe = source.split(":")[0]
-        if cloud_maybe == "": cloud_maybe = None
+        if cloud_maybe == "":
+            cloud_maybe = None
         print("cloud_maybe:", cloud_maybe)
         maybe_config = get_secure_share_cloud_config(interactive=True, cloud=cloud_maybe)
     elif config is not None:
@@ -27,13 +28,20 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
         maybe_config = None
 
     if maybe_config is not None:
-        if args.zip == ArgsDefaults.zip_: args.zip = maybe_config.zip
-        if args.encrypt == ArgsDefaults.encrypt: args.encrypt = maybe_config.encrypt
-        if args.share == ArgsDefaults.share: args.share = maybe_config.share
-        if args.root == ArgsDefaults.root: args.root = maybe_config.root
-        if args.rel2home == ArgsDefaults.rel2home: args.rel2home = maybe_config.rel2home
-        if args.pwd == ArgsDefaults.pwd: args.pwd = maybe_config.pwd
-        if args.os_specific == ArgsDefaults.os_specific: args.os_specific = maybe_config.os_specific
+        if args.zip == ArgsDefaults.zip_:
+            args.zip = maybe_config.zip
+        if args.encrypt == ArgsDefaults.encrypt:
+            args.encrypt = maybe_config.encrypt
+        if args.share == ArgsDefaults.share:
+            args.share = maybe_config.share
+        if args.root == ArgsDefaults.root:
+            args.root = maybe_config.root
+        if args.rel2home == ArgsDefaults.rel2home:
+            args.rel2home = maybe_config.rel2home
+        if args.pwd == ArgsDefaults.pwd:
+            args.pwd = maybe_config.pwd
+        if args.os_specific == ArgsDefaults.os_specific:
+            args.os_specific = maybe_config.os_specific
 
     root = args.root
     rel2home = args.rel2home
@@ -53,7 +61,7 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
             maybe_config = tmp_maybe_config
 
         if maybe_config is None:
-            default_cloud: str=read_ini(DEFAULTS_PATH)['general']['rclone_config_name']
+            default_cloud: str = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
             console.print(Panel(f"⚠️  No cloud config found. Using default cloud: {default_cloud}", width=150, border_style="yellow"))
             source = default_cloud + ":" + source[1:]
         else:
@@ -73,7 +81,7 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
             maybe_config = find_cloud_config(path)
 
         if maybe_config is None:
-            default_cloud = read_ini(DEFAULTS_PATH)['general']['rclone_config_name']
+            default_cloud = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
             console.print(Panel(f"⚠️  No cloud config found. Using default cloud: {default_cloud}", width=150, border_style="yellow"))
             target = default_cloud + ":" + target[1:]
             print("target mutated to:", target, f"because of default cloud being {default_cloud}")
@@ -88,7 +96,6 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
             zip_arg = tmp.zip
             share = tmp.share
 
-
     if ":" in source and (source[1] != ":" if len(source) > 1 else True):  # avoid the deceptive case of "C:/"
         source_parts: list[str] = source.split(":")
         cloud = source_parts[0]
@@ -97,6 +104,7 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
             assert ES not in target, f"You can't use expand symbol `{ES}` in both source and target. Cyclical inference dependency arised."
             target_obj = absolute(target)
             from machineconfig.utils.path_reduced import PathExtended as PathExtended
+
             remote_path = PathExtended(target_obj).get_remote_path(os_specific=os_specific, root=root, rel2home=rel2home, strict=False)
             source = f"{cloud}:{remote_path.as_posix()}"
         else:  # source path is mentioned, target? maybe.
@@ -116,6 +124,7 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
             assert ES not in source, "You can't use $ in both source and target. Cyclical inference dependency arised."
             source_obj = absolute(source)
             from machineconfig.utils.path_reduced import PathExtended as PathExtended
+
             remote_path = PathExtended(source_obj).get_remote_path(os_specific=os_specific, root=root, rel2home=rel2home, strict=False)
             target = f"{cloud}:{remote_path.as_posix()}"
         else:  # target path is mentioned, source? maybe.
@@ -124,8 +133,10 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
                 raise NotImplementedError("There is no .get_local_path method yet")
             else:
                 source_obj = absolute(source)
-        if zip_arg and ".zip" not in target: target += ".zip"
-        if encrypt and ".enc" not in target: target += ".enc"
+        if zip_arg and ".zip" not in target:
+            target += ".zip"
+        if encrypt and ".enc" not in target:
+            target += ".enc"
     else:
         console.print(Panel("❌ ERROR: Invalid path configuration\nEither source or target must be a remote path (i.e. machine:path)", title="[bold red]Error[/bold red]", border_style="red"))
         raise ValueError(f"Either source or target must be a remote path (i.e. machine:path)\nGot: source: `{source}`, target: `{target}`")

machineconfig/scripts/python/helpers/helpers4.py

@@ -1,7 +1,7 @@
-
 from typing import Any, Callable, Optional
 import inspect
 import os
+
 # import argparse
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
 # from machineconfig.utils.utils import choose_ssh_host
@@ -27,7 +27,7 @@ def convert_kwargs_to_fire_kwargs_str(kwargs: dict[str, Any]) -> str:
     # https://google.github.io/python-fire/guide/
     # https://github.com/google/python-fire/blob/master/docs/guide.md#argument-parsing
     if not kwargs:  # empty dict
-        kwargs_str = ''
+        kwargs_str = ""
     else:
         # For fire module, all keyword arguments should be passed as --key value pairs
         tmp_list: list[str] = []
@@ -40,40 +40,48 @@ def convert_kwargs_to_fire_kwargs_str(kwargs: dict[str, Any]) -> str:
 def parse_pyfile(file_path: str):
     print(f"🔍 Loading {file_path} ...")
     from typing import NamedTuple
+
     args_spec = NamedTuple("args_spec", [("name", str), ("type", str), ("default", Optional[str])])
     func_args: list[list[args_spec]] = [[]]  # this firt prepopulated dict is for the option 'RUN AS MAIN' which has no args
 
     import ast
-    parsed_ast = ast.parse(PathExtended(file_path).read_text(encoding='utf-8'))
-    functions = [
-        node
-        for node in ast.walk(parsed_ast)
-        if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))
-    ]
+
+    parsed_ast = ast.parse(PathExtended(file_path).read_text(encoding="utf-8"))
+    functions = [node for node in ast.walk(parsed_ast) if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))]
     module__doc__ = ast.get_docstring(parsed_ast)
     main_option = f"RUN AS MAIN -- {module__doc__ if module__doc__ is not None else 'NoDocs'}"
     options = [main_option]
     for function in functions:
-        if function.name.startswith('__') and function.name.endswith('__'): continue
-        if any(arg.arg == 'self' for arg in function.args.args): continue
-        if any(arg.arg == 'self' for arg in function.args.args): continue
+        if function.name.startswith("__") and function.name.endswith("__"):
+            continue
+        if any(arg.arg == "self" for arg in function.args.args):
+            continue
+        if any(arg.arg == "self" for arg in function.args.args):
+            continue
         doc_string_tmp: str | None = ast.get_docstring(function)
-        if doc_string_tmp is None: doc_string = "NoDocs"
-        else: doc_string = doc_string_tmp.replace('\n', ' ')
+        if doc_string_tmp is None:
+            doc_string = "NoDocs"
+        else:
+            doc_string = doc_string_tmp.replace("\n", " ")
         options.append(f"{function.name} -- {', '.join([arg.arg for arg in function.args.args])} -- {doc_string}")
         tmp = []
         for idx, arg in enumerate(function.args.args):
             if arg.annotation is not None:
-                try: type_ = arg.annotation.__dict__['id']
+                try:
+                    type_ = arg.annotation.__dict__["id"]
                 except KeyError as ke:
                     type_ = "Any"  # e.g. a callable object
                     _ = ke
-            else: type_ = "Any"
+            else:
+                type_ = "Any"
             default_tmp = function.args.defaults[idx] if idx < len(function.args.defaults) else None
-            if default_tmp is None: default = None
+            if default_tmp is None:
+                default = None
             else:
-                if hasattr(default_tmp, "__dict__"): default = default_tmp.__dict__.get("value", None)
-                else: default = None
+                if hasattr(default_tmp, "__dict__"):
+                    default = default_tmp.__dict__.get("value", None)
+                else:
+                    default = None
             tmp.append(args_spec(name=arg.arg, type=type_, default=default))
         func_args.append(tmp)
     return options, func_args
@@ -85,26 +93,32 @@ def interactively_run_function(func: Callable[[Any], Any]):
     args = []
     kwargs = {}
     for param in params:
-        if param.annotation is not inspect.Parameter.empty: hint = f" ({param.annotation.__name__})"
-        else: hint = ""
+        if param.annotation is not inspect.Parameter.empty:
+            hint = f" ({param.annotation.__name__})"
+        else:
+            hint = ""
         if param.default is not inspect.Parameter.empty:
             default = param.default
             value = input(f"Please enter a value for argument `{param.name}` (type = {hint}) (default = {default}) : ")
-            if value == "": value = default
-        else: value = input(f"Please enter a value for argument `{param.name}` (type = {hint}) : ")
+            if value == "":
+                value = default
+        else:
+            value = input(f"Please enter a value for argument `{param.name}` (type = {hint}) : ")
         try:
             if param.annotation is not inspect.Parameter.empty:
                 value = param.annotation
         except (TypeError, ValueError) as err:
             raise ValueError(f"Invalid input: {value} is not of type {param.annotation}") from err
-        if param.kind == inspect.Parameter.KEYWORD_ONLY: kwargs[param.name] = value
-        else: args.append((param.name, value))
+        if param.kind == inspect.Parameter.KEYWORD_ONLY:
+            kwargs[param.name] = value
+        else:
+            args.append((param.name, value))
     args_to_kwargs = dict(args)
     return args_to_kwargs, kwargs
 
 
 def get_attrs_recursively(obj: Any):
-    if hasattr(obj, '__dict__'):
+    if hasattr(obj, "__dict__"):
         res = {}
         for k, v in obj.__dict__.items():
             res[k] = get_attrs_recursively(v)
@@ -127,8 +141,8 @@ def get_attrs_recursively(obj: Any):
 
 
 def find_repo_root_path(start_path: str) -> Optional[str]:
-    root_files = ['setup.py', 'pyproject.toml', '.git']
-    path: str=start_path
+    root_files = ["setup.py", "pyproject.toml", ".git"]
+    path: str = start_path
     trials = 0
     root_path = os.path.abspath(os.sep)
     while path != root_path and trials < 20:
@@ -144,12 +158,12 @@ def find_repo_root_path(start_path: str) -> Optional[str]:
 def get_import_module_code(module_path: str):
     root_path = find_repo_root_path(module_path)
     if root_path is None:  # just make a desperate attempt to import it
-        module_name = module_path.lstrip(os.sep).replace(os.sep, '.')
+        module_name = module_path.lstrip(os.sep).replace(os.sep, ".")
         if module_name.endswith(".py"):
             module_name = module_name[:-3]
     else:
-        relative_path = module_path.replace(root_path, '')
-        module_name = relative_path.lstrip(os.sep).replace(os.sep, '.')
+        relative_path = module_path.replace(root_path, "")
+        module_name = relative_path.lstrip(os.sep).replace(os.sep, ".")
         if module_name.endswith(".py"):
             module_name = module_name[:-3]
         # module_name = module_name.replace("src.", "").replace("myresources.", "").replace("resources.", "").replace("source.", "")

machineconfig/scripts/python/helpers/helpers5.py

@@ -47,4 +47,4 @@ def get_jupyter_notebook(python_code: str):
 #     nb: NotebookNode = nbf.v4.new_notebook()
 #     nb.cells.append(nbf.v4.new_code_cell(py_script))
 #     with open("new_notebook.ipynb", mode="w", encoding="utf-8") as f:
-#         nbf.write(nb,f)
+#         nbf.write(nb,f)

machineconfig/scripts/python/helpers/repo_sync_helpers.py

@@ -1,7 +1,7 @@
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.terminal import Terminal
 from machineconfig.scripts.python.get_zellij_cmd import get_zellij_cmd
-from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH
+from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
 from machineconfig.utils.utils2 import read_ini
 from machineconfig.utils.code import write_shell_script_to_file
 import platform
@@ -19,10 +19,12 @@ def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cl
     print("🧹 Removed temporary remote copy")
     from git.remote import Remote
     from git.repo import Repo
+
     try:
         Remote.remove(Repo(repo_root_path), "originEnc")
         console.print(Panel("🔗 Removed originEnc remote reference", border_style="blue"))
-    except Exception: pass  # type: ignore
+    except Exception:
+        pass  # type: ignore
     console.print(Panel("📈 Deleting remote repository copy and pushing local changes", width=150, border_style="blue"))
 
     repo_root_path.to_cloud(cloud=cloud, zip=True, encrypt=True, rel2home=True, os_specific=False)
@@ -37,7 +39,7 @@ def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cl
 def get_wt_cmd(wd1: PathExtended, wd2: PathExtended) -> str:
     lines = [
         f"""wt --window 0 new-tab --profile pwsh --title "gitdiff" --tabColor `#3b04d1 --startingDirectory {wd1} ` --colorScheme "Solarized Dark" """,
-        f"""split-pane --horizontal --profile pwsh --startingDirectory {wd2} --size 0.5 --colorScheme "Tango Dark" -- pwsh -Interactive """
+        f"""split-pane --horizontal --profile pwsh --startingDirectory {wd2} --size 0.5 --colorScheme "Tango Dark" -- pwsh -Interactive """,
     ]
     return " `; ".join(lines)
 
@@ -53,24 +55,24 @@ def inspect_repos(repo_local_root: str, repo_remote_root: str):
         program = get_zellij_cmd(wd1=PathExtended(repo_local_root), wd2=PathExtended(repo_remote_root))
         write_shell_script_to_file(shell_script=program)
         return None
-    else: raise NotImplementedError(f"Platform {platform.system()} not implemented.")
+    else:
+        raise NotImplementedError(f"Platform {platform.system()} not implemented.")
 
 
 def fetch_dotfiles():
     console.print(Panel("📁 Fetching Dotfiles", title="[bold blue]Dotfiles[/bold blue]", border_style="blue"))
 
-    cloud_resolved = read_ini(DEFAULTS_PATH)['general']['rclone_config_name']
+    cloud_resolved = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
     console.print(Panel(f"⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}", width=150, border_style="yellow"))
 
     dotfiles_local = PathExtended.home().joinpath("dotfiles")
     CONFIG_PATH.joinpath("remote").mkdir(parents=True, exist_ok=True)
-    dotfiles_remote = CONFIG_PATH.joinpath("remote", dotfiles_local.rel2home())
+    dotfiles_remote = PathExtended(CONFIG_PATH).joinpath("remote", dotfiles_local.rel2home())
     remote_path = dotfiles_local.get_remote_path(rel2home=True, os_specific=False, root="myhome") + ".zip.enc"
 
     console.print(Panel("📥 Downloading dotfiles from cloud...", width=150, border_style="blue"))
 
-    dotfiles_remote.from_cloud(remotepath=remote_path, cloud=cloud_resolved,
-        unzip=True, decrypt=True, rel2home=True, os_specific=False, pwd=None)
+    dotfiles_remote.from_cloud(remotepath=remote_path, cloud=cloud_resolved, unzip=True, decrypt=True, rel2home=True, os_specific=False, pwd=None)
 
     console.print(Panel("🗑️  Removing old dotfiles and replacing with cloud version...", width=150, border_style="blue"))
 
@@ -80,7 +82,8 @@ def fetch_dotfiles():
 # rm -rf {dotfiles_local}
 # mv {dotfiles_remote} {dotfiles_local}
 """
-    if platform.system() == "Linux": script += """
+    if platform.system() == "Linux":
+        script += """
 sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
@@ -90,3 +93,22 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
 
     console.print(Panel("✅ Dotfiles successfully fetched and installed", title="[bold green]Dotfiles[/bold green]", border_style="green"))
 
+
+def check_dotfiles_version_is_beyond(commit_dtm: str, update: bool) -> bool:
+    dotfiles_path = str(PathExtended.home().joinpath("dotfiles"))
+    from git import Repo
+
+    repo = Repo(path=dotfiles_path)
+    last_commit = repo.head.commit
+    dtm = last_commit.committed_datetime
+    from datetime import datetime  # make it tz unaware
+
+    dtm = datetime(dtm.year, dtm.month, dtm.day, dtm.hour, dtm.minute, dtm.second)
+    res = dtm > datetime.fromisoformat(commit_dtm)
+    if res is False and update is True:
+        console = Console()
+        console.print(Panel(f"🔄 UPDATE REQUIRED | Updating dotfiles because {dtm} < {datetime.fromisoformat(commit_dtm)}", border_style="bold blue", expand=False))
+        from machineconfig.scripts.python.cloud_repo_sync import main
+
+        main(cloud=None, path=dotfiles_path)
+    return res

machineconfig/scripts/python/mount_nfs.py

@@ -1,12 +1,13 @@
-"""NFS mounting script
-"""
+"""NFS mounting script"""
 
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.ssh import SSH
 from machineconfig.utils.terminal import Terminal
-from machineconfig.utils.utils import display_options, PROGRAM_PATH, choose_ssh_host
+from machineconfig.utils.options import display_options, choose_ssh_host
+from machineconfig.utils.source_of_truth import PROGRAM_PATH
 import platform
 
+
 def main():
     print("\n" + "=" * 50)
     print("🚀 Starting NFS Mounting Process")
@@ -19,11 +20,7 @@ def main():
         assert isinstance(tmp, str)
         ssh = SSH(tmp)
         default = f"{ssh.hostname}:{ssh.run('echo $HOME').op}/data/share_nfs"
-        share_info = display_options(
-            "📂 Choose a share path:",
-            options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run("cat /etc/exports").op.split("\n") if not item.startswith("#")] + [default],
-            default=default
-        )
+        share_info = display_options("📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run("cat /etc/exports").op.split("\n") if not item.startswith("#")] + [default], default=default)
         assert isinstance(share_info, str), f"❌ share_info must be a string. Got {type(share_info)}"
 
     remote_server = share_info.split(":")[0]
@@ -41,12 +38,7 @@ def main():
             mount_path_3 = mount_path_2
 
         print("🔧 Preparing mount paths...")
-        local_mount_point = display_options(
-            msg="📂 Choose mount path OR input custom one:",
-            options=[mount_path_1, mount_path_2, mount_path_3],
-            default=mount_path_2,
-            custom_input=True
-        )
+        local_mount_point = display_options(msg="📂 Choose mount path OR input custom one:", options=[mount_path_1, mount_path_2, mount_path_3], default=mount_path_2, custom_input=True)
         assert isinstance(local_mount_point, PathExtended), f"❌ local_mount_point must be a pathlib.Path. Got {type(local_mount_point)}"
         local_mount_point = PathExtended(local_mount_point).expanduser()
 
@@ -79,5 +71,6 @@ $driveLetter = "{driver_letter}"
 
     print("🎉 NFS Mounting Process Completed Successfully!\n")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()

machineconfig/scripts/python/mount_nw_drive.py

@@ -1,7 +1,8 @@
-from machineconfig.utils.utils import PROGRAM_PATH
+from machineconfig.utils.source_of_truth import PROGRAM_PATH
 from pathlib import Path
 import platform
 
+
 def main():
     print("\n" + "=" * 50)
     print("🚀 Welcome to the Windows Network Drive Mounting Wizard")
@@ -12,7 +13,7 @@ def main():
 
     mount_point_input = input(f"📂 Enter the mount point directory (e.g., /mnt/network) [Default: ~/data/mount_nw/{machine_name}]: ")
     if mount_point_input == "":
-        mount_point = Path.home().joinpath(fr"data/mount_nw/{machine_name}")
+        mount_point = Path.home().joinpath(rf"data/mount_nw/{machine_name}")
     else:
         mount_point = Path(mount_point_input).expanduser()
 
@@ -24,13 +25,16 @@ def main():
 
     if platform.system() in ["Linux", "Darwin"]:
         print("\n🔧 Saving configuration for Linux...")
-        PROGRAM_PATH.write_text(f"""
+        PROGRAM_PATH.write_text(
+            f"""
 drive_location='{drive_location}'
 mount_point='{mount_point}'
 username='{username}'
 password='{password}'
 
-""", encoding="utf-8")
+""",
+            encoding="utf-8",
+        )
         print("✅ Configuration saved successfully!\n")
 
     elif platform.system() == "Windows":
@@ -39,5 +43,6 @@ password='{password}'
 
     print("🎉 Windows Network Drive Mounting Process Completed!\n")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()

machineconfig/scripts/python/mount_ssh.py

@@ -1,11 +1,12 @@
-"""Mount a remote SSHFS share on a local directory
-"""
+"""Mount a remote SSHFS share on a local directory"""
 
 from platform import system
 from machineconfig.utils.ssh import SSH
 from machineconfig.utils.terminal import Terminal
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.utils import PROGRAM_PATH, choose_ssh_host
+from machineconfig.utils.source_of_truth import PROGRAM_PATH
+from machineconfig.utils.options import choose_ssh_host
+
 
 def main():
     print("\n" + "=" * 50)
@@ -33,7 +34,7 @@ def main():
 
     mount_point = input(f"📂 Enter the mount point directory (e.g., /mnt/network) [Default: ~/data/mount_ssh/{ssh.hostname}]: ")
     if mount_point == "":
-        mount_point = PathExtended.home().joinpath(fr"data/mount_ssh/{ssh.hostname}")
+        mount_point = PathExtended.home().joinpath(rf"data/mount_ssh/{ssh.hostname}")
 
     print(f"\n📁 Mount Point: {mount_point}")
 
@@ -43,7 +44,7 @@ sshfs alex@:/media/dbhdd /media/dbhdd\
 """
         print("\n🔧 Preparing SSHFS mount command for Linux...")
     elif system() == "Windows":
-        txt = fr"""
+        txt = rf"""
 net use {driver_letter} {share_info}
 fusermount -u /mnt/dbhdd
 """
@@ -56,5 +57,6 @@ fusermount -u /mnt/dbhdd
 
     print("🎉 SSHFS Mounting Process Completed!\n")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()