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

machineconfig/scripts/python/cloud_repo_sync.py

@@ -7,7 +7,8 @@ from machineconfig.utils.terminal import Terminal
 from machineconfig.utils.utils2 import randstr, read_ini
 
 from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
-from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH, choose_one_option
+from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH
+from machineconfig.utils.options import choose_one_option
 from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
 import platform
 import argparse
@@ -20,24 +21,23 @@ console = Console()
 _ = fetch_dotfiles
 
 
-def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optional[str] = None,
-         action: Literal["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"] = "ask",
-         pwd: Optional[str] = None):
+def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optional[str] = None, action: Literal["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"] = "ask", pwd: Optional[str] = None):
     if cloud is None:
         try:
-            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}", title="Default Cloud", border_style="yellow"))
         except FileNotFoundError:
             console.print(Panel(f"❌ ERROR: No cloud profile found\nLocation: {DEFAULTS_PATH}\nPlease set one up or provide one via the --cloud flag.", title="Error", border_style="red"))
             return ""
-    else: cloud_resolved = cloud
+    else:
+        cloud_resolved = cloud
 
     # repo_root = PathExtended(args.repo).expanduser().absolute()
     repo_local_root = PathExtended.cwd() if path is None else PathExtended(path).expanduser().absolute()
     repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
     repo_local_root = PathExtended(repo_local_obj.working_dir)  # cwd might have been in a sub directory of repo_root, so its better to redefine it.
-    CONFIG_PATH.joinpath("remote").mkdir(parents=True, exist_ok=True)
-    repo_remote_root = CONFIG_PATH.joinpath("remote", repo_local_root.rel2home())  # .delete(sure=True)
+    PathExtended(CONFIG_PATH).joinpath("remote").mkdir(parents=True, exist_ok=True)
+    repo_remote_root = PathExtended(CONFIG_PATH).joinpath("remote", repo_local_root.rel2home())  # .delete(sure=True)
 
     try:
         console.print(Panel("📥 DOWNLOADING REMOTE REPOSITORY", title_align="left", border_style="blue"))
@@ -80,6 +80,7 @@ git pull originEnc master
         console.print(Panel("✅ Pull succeeded!\n🧹 Removing originEnc remote and local copy\n📤 Pushing merged repository to cloud storage", title="Success", border_style="green"))
         repo_remote_root.delete(sure=True)
         from git.remote import Remote
+
         Remote.remove(repo_local_obj, "originEnc")
         repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
         return "success"
@@ -87,20 +88,21 @@ git pull originEnc master
         console.print(Panel(f"⚠️  MERGE FAILED\n💾 Keeping local copy of remote at:\n📂 {repo_remote_root}", title="Merge Failed", border_style="red"))
 
         # ================================================================================
-        option1 = 'Delete remote copy and push local:'
+        option1 = "Delete remote copy and push local:"
         program_1_py = f"""
 from machineconfig.scripts.python.helpers.repo_sync_helpers import delete_remote_repo_copy_and_push_local as func
 func(remote_repo=r'{str(repo_remote_root)}', local_repo=r'{str(repo_local_root)}', cloud=r'{cloud_resolved}')
 """
-        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=str(Path.home().joinpath("code", "crocodile", ".venv")))
+        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=str(Path.home().joinpath("code", "machineconfig", ".venv")))
         # ================================================================================
 
-        option2 = 'Delete local repo and replace it with remote copy:'
+        option2 = "Delete local repo and replace it with remote copy:"
         program_2 = f"""
 rm -rfd {repo_local_root}
 mv {repo_remote_root} {repo_local_root}
 """
-        if platform.system() in ["Linux", "Darwin"]: program_2 += """
+        if platform.system() in ["Linux", "Darwin"]:
+            program_2 += """
 sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
@@ -109,15 +111,15 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
         shell_file_2 = write_shell_script_to_file(shell_script=program_2)
 
         # ================================================================================
-        option3 = 'Inspect repos:'
+        option3 = "Inspect repos:"
         program_3_py = f"""
 from machineconfig.scripts.python.helper.repo_sync_helpers import inspect_repos as func
 func(repo_local_root=r'{str(repo_local_root)}', repo_remote_root=r'{str(repo_remote_root)}')
 """
-        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=str(Path.home().joinpath("code", "crocodile", ".venv")))
+        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=str(Path.home().joinpath("code", "machineconfig", ".venv")))
         # ================================================================================
 
-        option4 = 'Remove problematic rclone file from repo and replace with remote:'
+        option4 = "Remove problematic rclone file from repo and replace with remote:"
         program_4 = f"""
 rm $HOME/dotfiles/creds/rclone/rclone.conf
 cp $HOME/.config/machineconfig/remote/dotfiles/creds/rclone/rclone.conf $HOME/dotfiles/creds/rclone
@@ -139,26 +141,36 @@ git commit -am "finished merging"
         match action:
             case "ask":
                 choice = choose_one_option(options=[option1, option2, option3, option4], fzf=False)
-                if choice == option1: program_content = shell_file_1.read_text(encoding="utf-8")
-                elif choice == option2: program_content = program_2
-                elif choice == option3: program_content = shell_file_3.read_text(encoding="utf-8")
-                elif choice == option4: program_content = program_4
-                else: raise NotImplementedError(f"Choice {choice} not implemented.")
-            case "pushLocalMerge": program_content = shell_file_1.read_text(encoding="utf-8")
-            case "overwriteLocal": program_content = program_2
-            case "InspectRepos": program_content = shell_file_3.read_text(encoding="utf-8")
-            case "RemoveLocalRclone": program_content = program_4
+                if choice == option1:
+                    program_content = shell_file_1.read_text(encoding="utf-8")
+                elif choice == option2:
+                    program_content = program_2
+                elif choice == option3:
+                    program_content = shell_file_3.read_text(encoding="utf-8")
+                elif choice == option4:
+                    program_content = program_4
+                else:
+                    raise NotImplementedError(f"Choice {choice} not implemented.")
+            case "pushLocalMerge":
+                program_content = shell_file_1.read_text(encoding="utf-8")
+            case "overwriteLocal":
+                program_content = program_2
+            case "InspectRepos":
+                program_content = shell_file_3.read_text(encoding="utf-8")
+            case "RemoveLocalRclone":
+                program_content = program_4
             case _:
                 raise ValueError(f"Unknown action: {action}")
         PROGRAM_PATH.write_text(program_content, encoding="utf-8")
     return program_content
 
+
 def args_parser():
     console.print(Panel("🔄 Repository Synchronization Utility", title_align="left", border_style="blue"))
 
     parser = argparse.ArgumentParser(description="Secure Repo CLI.")
     # parser.add_argument("cmd", help="command to run", choices=["pull", "push"])
-    parser.add_argument("path", nargs='?', type=str, help="Repository path, defaults to cwd.", default=None)
+    parser.add_argument("path", nargs="?", type=str, help="Repository path, defaults to cwd.", default=None)
     # parser.add_argument("--share", help="Repository path, defaults to cwd.", action="store_true", default=False)
     parser.add_argument("--cloud", "-c", help="rclone cloud profile name.", default=None)
     parser.add_argument("--message", "-m", help="Commit Message", default=f"new message {randstr()}")
@@ -170,5 +182,6 @@ def args_parser():
     args = parser.parse_args()
     main(cloud=args.cloud, path=args.path, message=args.message, action=args.action)
 
+
 if __name__ == "__main__":
     args_parser()

machineconfig/scripts/python/cloud_sync.py

@@ -5,7 +5,7 @@ TODO: use typer or typed-argument-parser to parse args
 from machineconfig.scripts.python.helpers.helpers2 import parse_cloud_source_target
 from machineconfig.scripts.python.helpers.cloud_helpers import Args
 from machineconfig.scripts.python.cloud_mount import get_mprocs_mount_txt
-from machineconfig.utils.utils import PROGRAM_PATH
+from machineconfig.utils.source_of_truth import PROGRAM_PATH
 import argparse
 from rich.console import Console
 from rich.panel import Panel
@@ -57,9 +57,9 @@ def args_parser():
         target_line = f"Target: {target}"
         console.print(Panel(f"{source_line}\n{arrow_line}\n{target_line}", title=title, border_style="blue"))
         if delete:
-            rclone_cmd = f"rclone sync -P \"{source}\" \"{target}\" --delete-during --transfers={transfers}"
+            rclone_cmd = f'rclone sync -P "{source}" "{target}" --delete-during --transfers={transfers}'
         else:
-            rclone_cmd = f"rclone sync -P \"{source}\" \"{target}\" --transfers={transfers}"
+            rclone_cmd = f'rclone sync -P "{source}" "{target}" --transfers={transfers}'
 
     rclone_cmd += f" --progress --transfers={transfers} --verbose"
     # rclone_cmd += f"  --vfs-cache-mode full"
@@ -78,5 +78,5 @@ def args_parser():
     PROGRAM_PATH.write_text(txt, encoding="utf-8")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     args_parser()

machineconfig/scripts/python/croshell.py

@@ -7,12 +7,13 @@ croshell
 import argparse
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.utils2 import randstr
-from machineconfig.utils.utils import PROGRAM_PATH, display_options
-from machineconfig.utils.ve import get_ve_path_and_ipython_profile, get_ve_activate_line
+from machineconfig.utils.source_of_truth import PROGRAM_PATH
+from machineconfig.utils.options import display_options
+from machineconfig.utils.ve import get_ve_activate_line
 from typing import Optional
 from rich.console import Console
 from rich.panel import Panel
-from rich.text import Text # Added import for rich.text
+from rich.text import Text  # Added import for rich.text
 # from machineconfig.utils.utils2 import pprint
 
 console = Console()
@@ -61,14 +62,16 @@ except Exception as e:
 """
 
 
-def get_read_pyfile_pycode(path: PathExtended, as_module: bool, cmd: str=""):
-    if as_module: pycode = fr"""
+def get_read_pyfile_pycode(path: PathExtended, as_module: bool, cmd: str = ""):
+    if as_module:
+        pycode = rf"""
 import sys
 sys.path.append(r'{path.parent}')
 from {path.stem} import *
 {cmd}
 """
-    else: pycode = f"""
+    else:
+        pycode = f"""
 __file__ = PathExtended(r'{path}')
 {path.read_text(encoding="utf-8")}
 """
@@ -78,7 +81,7 @@ __file__ = PathExtended(r'{path}')
 def build_parser():
     parser = argparse.ArgumentParser(description="Generic Parser to launch crocodile shell.")
     # A FLAG:
-    parser.add_argument("--module", '-m', help="flag to run the file as a module as opposed to main.", action="store_true", default=False)  # default is running as main, unless indicated by --module flag.
+    parser.add_argument("--module", "-m", help="flag to run the file as a module as opposed to main.", action="store_true", default=False)  # default is running as main, unless indicated by --module flag.
     parser.add_argument("--newWindow", "-w", help="flag for running in new window.", action="store_true", default=False)
     parser.add_argument("--nonInteratctive", "-N", help="flag for a non-interactive session.", action="store_true", default=False)
     parser.add_argument("--python", "-p", help="flag to use python over IPython.", action="store_true", default=False)
@@ -100,8 +103,8 @@ def build_parser():
 
     # ==================================================================================
     # flags processing
-    interactivity = '' if args.nonInteratctive else '-i'
-    interpreter = 'python' if args.python else 'ipython'
+    interactivity = "" if args.nonInteratctive else "-i"
+    interpreter = "python" if args.python else "ipython"
     ipython_profile: Optional[str] = args.profile
     file = PathExtended.cwd()  # initialization value, could be modified according to args.
 
@@ -109,15 +112,16 @@ def build_parser():
         text = "🖥️  Executing command from CLI argument"
         console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
         import textwrap
+
         program = textwrap.dedent(args.cmd)
 
     elif args.fzf:
         text = "🔍 Searching for Python files..."
         console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
         options = [str(item) for item in PathExtended.cwd().search("*.py", r=True)]
-        file = display_options(msg="Choose a python file to run", options=options, fzf=True, multi=False, )
+        file = display_options(msg="Choose a python file to run", options=options, fzf=True, multi=False)
         assert isinstance(file, str)
-        program = PathExtended(file).read_text(encoding='utf-8')
+        program = PathExtended(file).read_text(encoding="utf-8")
         text = f"📄 Selected file: {PathExtended(file).name}"
         console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
 
@@ -130,16 +134,16 @@ def build_parser():
 
     elif args.read != "":
         if args.streamlit_viewer:
-#             text = "📊 STARTING STREAMLIT VIEWER"
-#             console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
-#             from machineconfig.scripts.python.viewer import run
-#             py_file_path = run(data_path=args.read, data=None, get_figure=None)
-#             final_program = f"""
-# #!/bin/bash
-# . $HOME/scripts/activate_ve '.venv'
-# streamlit run {py_file_path}
-# """
-#             PROGRAM_PATH.write_text(data=final_program, encoding="utf-8")
+            #             text = "📊 STARTING STREAMLIT VIEWER"
+            #             console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
+            #             from machineconfig.scripts.python.viewer import run
+            #             py_file_path = run(data_path=args.read, data=None, get_figure=None)
+            #             final_program = f"""
+            # #!/bin/bash
+            # . $HOME/scripts/activate_ve '.venv'
+            # streamlit run {py_file_path}
+            # """
+            #             PROGRAM_PATH.write_text(data=final_program, encoding="utf-8")
             return None
         file = PathExtended(str(args.read).lstrip()).expanduser().absolute()
         program = get_read_data_pycode(str(file))
@@ -158,24 +162,29 @@ def build_parser():
 
 #%%
 from crocodile.croshell import *
+from pathlib import Path
 print_header()
 print_logo(logo="crocodile")
+print(f"🐊 Crocodile Shell | Running @ {Path.cwd()}")
 """
 
     pyfile = PathExtended.tmp().joinpath(f"tmp_scripts/python/croshell/{randstr()}.py")
     pyfile.parent.mkdir(parents=True, exist_ok=True)
 
-    if args.read != "": title = "Reading Data"
-    elif args.file != "": title = "Running Python File"
-    else: title = "Executed code"
+    if args.read != "":
+        title = "Reading Data"
+    elif args.file != "":
+        title = "Running Python File"
+    else:
+        title = "Executed code"
     total_program = preprogram + add_print_header_pycode(str(pyfile), title=title) + program
 
-    pyfile.write_text(total_program, encoding='utf-8')
+    pyfile.write_text(total_program, encoding="utf-8")
 
-    ve_root_from_file, ipython_profile = get_ve_path_and_ipython_profile(PathExtended(file))
+    # ve_root_from_file, ipython_profile = get_ve_path_and_ipython_profile(PathExtended(file))
     ipython_profile = ipython_profile if ipython_profile is not None else "default"
     # ve_activateion_line = get_ve_activate_line(ve_name=args.ve or ve_profile_suggested, a_path=str(PathExtended.cwd()))
-    activate_ve_line  = get_ve_activate_line(ve_root=args.ve or ve_root_from_file or "$HOME/code/machineconfig/.venv")
+    activate_ve_line = get_ve_activate_line(ve_root="$HOME/code/machineconfig/.venv")
     final_program = f"""
 #!/bin/bash
 
@@ -202,7 +211,7 @@ print_logo(logo="crocodile")
     # (PROGRAM_PATH + ".py").write_text(str(pyfile), encoding='utf-8')
 
     # if platform.system() == "Windows":
-        # return subprocess.run([f"powershell", "-Command", res], shell=True, capture_output=False, text=True, check=True)
+    # return subprocess.run([f"powershell", "-Command", res], shell=True, capture_output=False, text=True, check=True)
     # else: return subprocess.run([res], shell=True, capture_output=False, text=True, check=True)
 
 

machineconfig/scripts/python/devops.py

@@ -1,13 +1,14 @@
-"""devops with emojis
-"""
+"""devops with emojis"""
 
-from machineconfig.utils.utils import display_options, PROGRAM_PATH, write_shell_script_to_default_program_path
+from machineconfig.utils.options import display_options
+from machineconfig.utils.source_of_truth import PROGRAM_PATH
+from machineconfig.utils.code import write_shell_script_to_default_program_path
 from platform import system
 from enum import Enum
 from typing import Optional
 from rich.console import Console
 from rich.panel import Panel
-from rich import box # Import box
+from rich import box  # Import box
 
 console = Console()
 
@@ -15,19 +16,19 @@ BOX_WIDTH = 150  # width for box drawing
 
 
 class Options(Enum):
-    update         = '🔄 UPDATE essential repos'
-    cli_install    = '⚙️ DEVAPPS install'
-    sym_path_shell = '🔗 SYMLINKS, PATH & SHELL PROFILE'
-    sym_new        = '🆕 SYMLINKS new'
-    ssh_add_pubkey = '🔑 SSH add pub key to this machine'
-    ssh_add_id     = '🗝️ SSH add identity (private key) to this machine'
-    ssh_use_pair   = '🔐 SSH use key pair to connect two machines'
-    ssh_setup      = '📡 SSH setup'
-    ssh_setup_wsl  = '🐧 SSH setup wsl'
-    dot_files_sync = '🔗 DOTFILES sync'
-    backup         = '💾 BACKUP'
-    retreive       = '📥 RETRIEVE'
-    scheduler      = '⏰ SCHEDULER'
+    update = "🔄 UPDATE essential repos"
+    cli_install = "⚙️ DEVAPPS install"
+    sym_path_shell = "🔗 SYMLINKS, PATH & SHELL PROFILE"
+    sym_new = "🆕 SYMLINKS new"
+    ssh_add_pubkey = "🔑 SSH add pub key to this machine"
+    ssh_add_id = "🗝️ SSH add identity (private key) to this machine"
+    ssh_use_pair = "🔐 SSH use key pair to connect two machines"
+    ssh_setup = "📡 SSH setup"
+    ssh_setup_wsl = "🐧 SSH setup wsl"
+    dot_files_sync = "🔗 DOTFILES sync"
+    backup = "💾 BACKUP"
+    retreive = "📥 RETRIEVE"
+    scheduler = "⏰ SCHEDULER"
 
 
 def args_parser():
@@ -35,6 +36,7 @@ def args_parser():
     console.print(Panel("🛠️  DevOps Tool Suite", title_align="left", border_style="blue", width=BOX_WIDTH))
 
     import argparse
+
     parser = argparse.ArgumentParser()
     new_line = "\n\n"
     parser.add_argument("-w", "--which", help=f"""which option to run\nChoose one of those:\n{new_line.join([f"{item.name}: {item.value}" for item in list(Options)])}""", type=str, default=None)  # , choices=[op.value for op in Options]
@@ -43,29 +45,37 @@ def args_parser():
 
 
 def display_title(title: str) -> None:
-    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_task_title(title: str) -> None:
-    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_task_status(status: str) -> None:
-    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_task_result(result: str) -> None:
-    console.print(Panel(result, box=box.ROUNDED, title_align="left")) # Replace print with Panel
+    console.print(Panel(result, box=box.ROUNDED, title_align="left"))  # Replace print with Panel
+
 
 def display_task_error(error: str) -> None:
-    console.print(Panel(error, box=box.ROUNDED, border_style="red", title_align="left")) # Replace print with Panel
+    console.print(Panel(error, box=box.ROUNDED, border_style="red", title_align="left"))  # Replace print with Panel
+
 
 def display_task_warning(warning: str) -> None:
-    console.print(Panel(warning, box=box.ROUNDED, border_style="yellow", title_align="left")) # Replace print with Panel
+    console.print(Panel(warning, box=box.ROUNDED, border_style="yellow", title_align="left"))  # Replace print with Panel
+
 
 def display_task_success(success: str) -> None:
-    console.print(Panel(success, box=box.ROUNDED, border_style="green", title_align="left")) # Replace print with Panel
+    console.print(Panel(success, box=box.ROUNDED, border_style="green", title_align="left"))  # Replace print with Panel
 
 
 def main(which: Optional[str] = None):
-    PROGRAM_PATH.delete(sure=True, verbose=False)
+    from machineconfig.utils.path_reduced import PathExtended
+
+    PathExtended(PROGRAM_PATH).delete(sure=True, verbose=False)
     console.print(Panel("🚀 Initializing DevOps operation...", width=BOX_WIDTH, border_style="blue"))
 
     options = [op.value for op in Options]
@@ -75,34 +85,40 @@ def main(which: Optional[str] = None):
         except KeyboardInterrupt:
             console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
             return
-    else: choice_key = Options[which].value
+    else:
+        choice_key = Options[which].value
 
     console.print(Panel(f"🔧 SELECTED OPERATION\n{choice_key}", title_align="left", border_style="green", width=BOX_WIDTH))
 
     if choice_key == Options.update.value:
         console.print(Panel("🔄 Updating essential repositories...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_update_repos as helper
+
         program = helper.main()
 
     elif choice_key == Options.cli_install.value:
         console.print(Panel("⚙️  Installing development applications...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_devapps_install as helper
+
         program = helper.main()
 
     elif choice_key == Options.sym_new.value:
         console.print(Panel("🔄 Creating new symlinks...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.jobs.python.python_ve_symlink as helper
+
         program = helper.main()
 
     elif choice_key == Options.sym_path_shell.value:
         console.print(Panel("🔗 Setting up symlinks, PATH, and shell profile...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.profile.create as helper
+
         helper.main()
         program = "echo '✅ done with symlinks'"
 
     elif choice_key == Options.ssh_add_pubkey.value:
         console.print(Panel("🔑 Adding public SSH key to this machine...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_add_ssh_key as helper
+
         program = helper.main()
 
     elif choice_key == Options.ssh_use_pair.value:
@@ -112,6 +128,7 @@ def main(which: Optional[str] = None):
     elif choice_key == Options.ssh_add_id.value:  # so that you can SSH directly withuot pointing to identity key.
         console.print(Panel("🗝️  Adding SSH identity (private key) to this machine...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_add_identity as helper
+
         program = helper.main()
 
     elif choice_key == Options.ssh_setup.value:
@@ -127,11 +144,13 @@ def main(which: Optional[str] = None):
     elif choice_key == Options.backup.value:
         console.print(Panel("💾 Creating backup...", width=BOX_WIDTH, border_style="blue"))
         from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve as helper
+
         program = helper(direction="BACKUP")
 
     elif choice_key == Options.retreive.value:
         console.print(Panel("📥 Retrieving backup...", width=BOX_WIDTH, border_style="blue"))
         from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve as helper
+
         program = helper(direction="RETRIEVE")
 
     elif choice_key == Options.scheduler.value:
@@ -143,6 +162,7 @@ def main(which: Optional[str] = None):
     elif choice_key == Options.dot_files_sync.value:
         console.print(Panel("🔗 Synchronizing dotfiles...", width=BOX_WIDTH, border_style="blue"))
         from machineconfig.scripts.python.cloud_repo_sync import main as helper, PathExtended
+
         program = helper(cloud=None, path=str(PathExtended.home() / "dotfiles"), pwd=None, action="ask")
 
     else:
@@ -156,6 +176,5 @@ def main(which: Optional[str] = None):
         write_shell_script_to_default_program_path(program="echo '✨ Done.'", display=False, desc="🔧 Shell script prepared by Python.", preserve_cwd=True, execute=False)
 
 
-
 if __name__ == "__main__":
     args_parser()

machineconfig/scripts/python/devops_add_identity.py

@@ -1,9 +1,7 @@
-"""ID
-"""
-
+"""ID"""
 
 # from platform import system
-from machineconfig.utils.path_reduced import PathExtended as PathExtended, modify_text
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.options import display_options
 from rich.panel import Panel
 from rich.text import Text
@@ -53,35 +51,27 @@ def main():
 
     print(Panel("📝 Updating SSH configuration...", expand=False))
 
-    # Inline the previous P.modify_text behavior (now deprecated):
+    # Inline the previous modify_text behavior (now deprecated):
     # - If file doesn't exist, seed content with txt_search
-    # - Then run modify_text to replace/append accordingly and write back
+    # - Otherwise, replace a matching line or append if not found
     if config_path.exists():
         current = config_path.read_text(encoding="utf-8")
         print(Panel("✏️  Updated existing SSH config file", expand=False))
     else:
         current = txt
         print(Panel("📄 Created new SSH config file", expand=False))
-    new_content = modify_text(
-        txt_raw=current,
-        txt_search=txt,
-        txt_alt=txt,
-        replace_line=True,
-        notfound_append=True,
-        prepend=True,
-    )
+    lines = current.split("\n")
+    found = False
+    for i, line in enumerate(lines):
+        if txt in line:
+            lines[i] = txt
+            found = True
+    if not found:
+        lines.insert(0, txt)
+    new_content = "\n".join(lines)
     config_path.write_text(new_content, encoding="utf-8")
 
-    panel_complete = Panel(
-        Text(
-            "✅ SSH IDENTITY CONFIGURATION COMPLETE\n"
-            "Identity added to SSH config file\n"
-            "Consider reloading the SSH config to apply changes",
-            justify="center"
-        ),
-        expand=False,
-        border_style="green"
-    )
+    panel_complete = Panel(Text("✅ SSH IDENTITY CONFIGURATION COMPLETE\nIdentity added to SSH config file\nConsider reloading the SSH config to apply changes", justify="center"), expand=False, border_style="green")
     program = f"echo '{panel_complete}'"
 
     success_message = f"🎉 CONFIGURATION SUCCESSFUL\nIdentity added: {path_to_key.name}\nConfig file: {config_path}"
@@ -90,5 +80,5 @@ def main():
     return program
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass

machineconfig/scripts/python/devops_add_ssh_key.py

@@ -1,13 +1,12 @@
-"""SSH
-"""
-
+"""SSH"""
 
 from platform import system
-from machineconfig.utils.utils import LIBRARY_ROOT, display_options
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+from machineconfig.utils.options import display_options
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from rich.console import Console
 from rich.panel import Panel
-from rich import box # Import box
+from rich import box  # Import box
 
 
 console = Console()
@@ -46,7 +45,8 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
                 assert place_holder in program, f"This section performs string manipulation on the script {program_path} to add the key to the authorized_keys file. The script has changed and the string {place_holder} is not found."
                 program = program.replace(place_holder, f'$sshfile = "{path_to_key}"')
                 console.print(Panel("🔧 Configured PowerShell script for Windows\n📝 Replaced placeholder with actual key path", title="[bold blue]Configuration[/bold blue]"))
-            else: raise NotImplementedError
+            else:
+                raise NotImplementedError
     else:
         console.print(Panel(f"📝 Creating new authorized_keys file\n🔑 Using key: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
         if system() == "Linux":
@@ -114,5 +114,5 @@ def main():
     return program
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass