machineconfig 1.92__py3-none-any.whl → 1.94__py3-none-any.whl

machineconfig/scripts/python/cloud_manager.py

@@ -1,12 +1,17 @@
-
 """Run cloud manager.
 """
 
-from crocodile.cluster.loader_runner import CloudManager
+from machineconfig.cluster.loader_runner import CloudManager
 import argparse
 
 
 def main():
+    print(f"""
+╔{'═' * 70}╗
+║ ☁️  Cloud Manager                                                         ║
+╚{'═' * 70}╝
+""")
+    
     parser = argparse.ArgumentParser()
     parser.add_argument("-c", "--cloud", help="Rclone Config Name", action="store", type=str, default=None)
     parser.add_argument("-s", "--serve", help="Start job server", action="store_true", default=False)
@@ -18,18 +23,66 @@ def main():
     parser.add_argument("-j", "--num_jobs", help="Number of jobs the server will run in parallel.", action="store", type=int, default=1)
     args = parser.parse_args()
 
+    print(f"""
+╭{'─' * 70}╮
+│ 🔧 Initializing Cloud Manager with {args.num_jobs} worker{'s' if args.num_jobs > 1 else ''}    │
+╰{'─' * 70}╯
+""")
+    
     cm = CloudManager(max_jobs=args.num_jobs, cloud=args.cloud, reset_local=args.reset_local)
+    
     if args.release_lock:
+        print(f"""
+╭{'─' * 70}╮
+│ 🔓 Releasing lock...                                                      │
+╰{'─' * 70}╯
+""")
         cm.claim_lock()
         cm.release_lock()
+        print("✅ Lock successfully released")
+        
     if args.queue_failed_jobs:
+        print(f"""
+╭{'─' * 70}╮
+│ 🔄 Requeuing failed jobs...                                               │
+╰{'─' * 70}╯
+""")
         cm.clean_failed_jobs_mess()
+        print("✅ Failed jobs moved to queue")
+        
     if args.rerun_jobs:
+        print(f"""
+╭{'─' * 70}╮
+│ 🔁 Rerunning jobs...                                                      │
+╰{'─' * 70}╯
+""")
         cm.rerun_jobs()
+        print("✅ Jobs restarted successfully")
+        
     if args.monitor_cloud:
+        print(f"""
+╔{'═' * 70}╗
+║ 👁️  STARTING CLOUD MONITOR                                                 ║
+╚{'═' * 70}╝
+""")
         cm.run_monitor()
+        
     if args.serve:
+        print(f"""
+╔{'═' * 70}╗
+║ 🚀 STARTING JOB SERVER                                                    ║
+╠{'═' * 70}╣
+║ 💻 Running {args.num_jobs} worker{'s' if args.num_jobs > 1 else ''}                                                   ║
+║ ☁️  Cloud: {args.cloud if args.cloud else 'Default'}                                               
+╚{'═' * 70}╝
+""")
         cm.serve()
+        
+    print(f"""
+╔{'═' * 70}╗
+║ ✅ Cloud Manager finished successfully                                    ║
+╚{'═' * 70}╝
+""")
     import sys
     sys.exit(0)
 

machineconfig/scripts/python/cloud_mount.py

@@ -1,4 +1,3 @@
-
 """Cloud mount script
 """
 
@@ -43,32 +42,60 @@ mprocs "echo 'see {DEFAULT_MOUNT}/{cloud} for the mounted cloud'; rclone about {
 
 
 def mount(cloud: Optional[str], network: Optional[str], destination: Optional[str]) -> None:
+    print(f"""
+╔{'═' * 70}╗
+║ ☁️  Cloud Mount Utility                                                   ║
+╚{'═' * 70}╝
+""")
+    
     config = get_rclone_config()
     if cloud is None:
         res = choose_one_option(msg="which cloud", options=config.sections(), header="CLOUD MOUNT", default=None)
         if type(res) is str: cloud = res
         else: raise ValueError("no cloud selected")
+        print(f"🌩️  Selected cloud: {cloud}")
 
     if network is None:
         if destination is None:
             mount_loc = P(DEFAULT_MOUNT).expanduser().joinpath(cloud)
         else:
             mount_loc = P(destination)
+        
+        print(f"""
+╭{'─' * 70}╮
+│ 📂 Mount location: {mount_loc}                          │
+╰{'─' * 70}╯
+""")
 
         if platform.system() == "Windows":
+            print("🪟 Creating mount directory on Windows...")
             mount_loc.parent.create()
         elif platform.system() == "Linux":
+            print("🐧 Creating mount directory on Linux...")
             try: mount_loc.create()
             except (FileExistsError, OSError) as err:
                 # We need a umount command here.
-                print(err)
+                print(f"""
+╭{'─' * 70}╮
+│ ⚠️  WARNING: Mount directory issue                                        │
+│    {err}                                                           
+╰{'─' * 70}╯
+""")
                 pass
         else: raise ValueError("unsupported platform")
 
-    elif network and platform.system() == "Windows": mount_loc = "X: --network-mode"
+    elif network and platform.system() == "Windows": 
+        mount_loc = "X: --network-mode"
+        print(f"🔌 Setting up network mount at {mount_loc}")
     else: raise ValueError("network mount only supported on windows")
 
     mount_cmd = f"rclone mount {cloud}: {mount_loc} --vfs-cache-mode full --file-perms=0777"
+    print(f"""
+╭{'─' * 70}╮
+│ 🚀 Preparing mount command:                                              │
+│ {mount_cmd}
+╰{'─' * 70}╯
+""")
 
     # txt = get_mprocs_mount_txt(cloud, mount_cmd)
     if platform.system() == "Windows":
@@ -110,15 +137,27 @@ zellij action move-focus up
     else: raise ValueError("unsupported platform")
     # print(f"running command: \n{txt}")
     PROGRAM_PATH.write_text(txt)
+    print(f"""
+╔{'═' * 70}╗
+║ ✅ Cloud mount command prepared successfully                              ║
+║ 🔄 Running mount process...                                              ║
+╚{'═' * 70}╝
+""")
 
 
 def main():
+    print(f"""
+╔{'═' * 70}╗
+║ ☁️  RCLONE CLOUD MOUNT                                                    ║
+╚{'═' * 70}╝
+""")
+    
     parser = argparse.ArgumentParser(description='mount cloud')
     parser.add_argument('cloud', nargs='?', type=str, default=None, help='cloud to mount')
     parser.add_argument('destination', nargs='?', type=str, default=None, help='destination to mount')
     parser.add_argument('--network', type=str, default=None, help='mount network drive')
     args = parser.parse_args()
-    mount(cloud=args.cloud, network=args.network, destination=args.destination)
+    mount(cloud=args.clEoud, network=args.network, destination=args.destination)
 
 
 if __name__ == '__main__':

machineconfig/scripts/python/cloud_repo_sync.py

@@ -1,62 +1,17 @@
-
 """utils"""
 
 import git
 from crocodile.file_management import P, Read
-from crocodile.core import randstr
 from crocodile.meta import Terminal
+from crocodile.core import randstr
 
-from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH, write_shell_script, get_shell_file_executing_python_script, get_shell_script, choose_one_option
-import argparse
+from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
+from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH, get_shell_file_executing_python_script, write_shell_script_to_file, choose_one_option
 import platform
+import argparse
 from typing import Optional, Literal
-# import sys
-# import subprocess
-
 
-def get_wt_cmd(wd1: P, wd2: P) -> 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 """
-    ]
-    return " `; ".join(lines)
-
-
-def get_zellij_cmd(wd1: P, wd2: P) -> str:
-    _ = wd1, wd2
-    lines = [""" zellij action new-tab --name gitdiff""",
-             """zellij action new-pane --direction down --name local --cwd ./data """,
-             """zellij action write-chars "cd '{wd1}'; git status" """,
-             """zellij action move-focus up; zellij action close-pane """,
-             """zellij action new-pane --direction down --name remote --cwd code """,
-             """zellij action write-chars "cd '{wd2}' """,
-             """git status" """
-    ]
-    return "; ".join(lines)
-
-
-def args_parser():
-    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("--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()}")
-    # parser.add_argument("--skip_confirmation", "-s", help="Skip confirmation.", action="store_true", default=False)
-    # parser.add_argument("--key", "-k", help="Key for encryption", default=None)
-    parser.add_argument("--pwd", "-p", help="Password for encryption", default=None)
-    # parser.add_argument("--no_push", "-u", help="push to reomte.", action="store_true")  # default is False
-    parser.add_argument("--action", "-a", help="Action to take if merge fails.", choices=["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"], default="ask")
-    args = parser.parse_args()
-
-    # if args.share:
-    #     from machineconfig.scripts.cloud.dotfiles import put
-    #     put()
-    #     return None
-    main(cloud=args.cloud, path=args.path, message=args.message, action=args.action)
+_ = fetch_dotfiles
 
 
 def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optional[str] = None,
@@ -65,42 +20,77 @@ def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optio
     if cloud is None:
         try:
             cloud_resolved = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
-            print(f"⚠️ Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH} ⚠️")
+            print(f"""
+╭{'─' * 70}╮
+│ ⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}     │
+╰{'─' * 70}╯
+""")
         except FileNotFoundError:
-            print(f"No cloud profile found @ {DEFAULTS_PATH}, please set one up or provide one via the --cloud flag.")
+            print(f"""
+╔{'═' * 70}╗
+║ ❌ ERROR: No cloud profile found                                          ║
+╠{'═' * 70}╣
+║ Location: {DEFAULTS_PATH}                        
+║ Please set one up or provide one via the --cloud flag.                   ║
+╚{'═' * 70}╝
+""")
             return ""
     else: cloud_resolved = cloud
+    
     # repo_root = P(args.repo).expanduser().absolute()
     repo_local_root = P.cwd() if path is None else P(path).expanduser().absolute()
     repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
     repo_local_root = P(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").create()
     repo_remote_root = CONFIG_PATH.joinpath("remote", repo_local_root.rel2home())  # .delete(sure=True)
+    
     try:
-        print("\n", "=============================== Downloading Remote Repo ====================================")
+        print(f"""
+╔{'═' * 70}╗
+║ 📥 DOWNLOADING REMOTE REPOSITORY                                          ║
+╚{'═' * 70}╝
+""")
         remote_path = repo_local_root.get_remote_path(rel2home=True, os_specific=False, root="myhome") + ".zip.enc"
         repo_remote_root.from_cloud(remotepath=remote_path, cloud=cloud_resolved, unzip=True, decrypt=True, rel2home=True, os_specific=False, pwd=pwd)
     except AssertionError:
-        print("Remote does not exist, creating it and exiting ... ")
+        print(f"""
+╔{'═' * 70}╗
+║ 🆕 Remote repository doesn't exist                                        ║
+║ 📤 Creating new remote and exiting...                                     ║
+╚{'═' * 70}╝
+""")
         repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
         return ""
+        
     repo_remote_obj = git.Repo(repo_remote_root)
     if repo_remote_obj.is_dirty():
-        print("=" * 50, '\n', f"WRANING: the remote `{repo_remote_root}` is dirty, please commit or stash changes before proceeding.", '\n', "=" * 50)
+        print(f"""
+╔{'═' * 70}╗
+║ ⚠️  WARNING: REMOTE REPOSITORY IS DIRTY                                    ║
+╠{'═' * 70}╣
+║ Location: {repo_remote_root}               
+║ Please commit or stash changes before proceeding.                        ║
+╚{'═' * 70}╝
+""")
 
     script = f"""
 echo ""
-echo "=============================== Committing Local Changes ==================================="
+echo "╔{'═' * 70}╗"
+echo "║ 💾 COMMITTING LOCAL CHANGES                                               ║"
+echo "╚{'═' * 70}╝"
 cd {repo_local_root}
 git status
 git add .
 git commit -am "{message}"
 echo ""
 echo ""
-echo "=============================== Pulling Latest From Remote ================================"
+echo "╔{'═' * 70}╗"
+echo "║ 🔄 PULLING LATEST FROM REMOTE                                             ║"
+echo "╚{'═' * 70}╝"
 cd {repo_local_root}
 echo '-> Trying to removing originEnc remote from local repo if it exists.'
-git remote remove originEnc
+# git remote remove originEnc
+git remote remove originEnc 2>/dev/null || true
 echo '-> Adding originEnc remote to local repo'
 git remote add originEnc {repo_remote_root}
 echo '-> Fetching originEnc remote.'
@@ -108,17 +98,31 @@ git pull originEnc master
 
 """
 
-    shell_path = get_shell_script(shell_script=script)
+    shell_path = write_shell_script_to_file(shell_script=script)
     res = Terminal().run(f". {shell_path}", shell="powershell").capture().print()
 
     if res.is_successful(strict_err=True, strict_returcode=True):
-        print("\n", "Pull succeeded, removing originEnc, the local copy of remote & pushing merged repo_root to remote ... ")
+        print(f"""
+╔{'═' * 70}╗
+║ ✅ Pull succeeded!                                                        ║
+╠{'═' * 70}╣
+║ 🧹 Removing originEnc remote and local copy                               ║
+║ 📤 Pushing merged repository to cloud storage                             ║
+╚{'═' * 70}╝
+""")
         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)
     else:
-        print(f"Failed to merge with no errors, keeping local copy of remote at {repo_remote_root} ... ")
+        print(f"""
+╔{'═' * 70}╗
+║ ⚠️  MERGE FAILED                                                          ║
+╠{'═' * 70}╣
+║ 💾 Keeping local copy of remote at:                                       ║
+║ 📂 {repo_remote_root}                    
+╚{'═' * 70}╝
+""")
 
         # ================================================================================
         option1 = 'Delete remote copy and push local:'
@@ -133,11 +137,14 @@ func(remote_repo=r'{repo_remote_root.to_str()}', local_repo=r'{repo_local_root.t
         program_2 = f"""
 rm -rfd {repo_local_root}
 mv {repo_remote_root} {repo_local_root}
+"""
+        if platform.system() == "Linux": program_2 += """
 sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
+sudo chmod +x $HOME/dotfiles/scripts/linux -R
 """
 
-        shell_file_2 = get_shell_script(shell_script=program_2)
+        shell_file_2 = write_shell_script_to_file(shell_script=program_2)
 
         # ================================================================================
         option3 = 'Inspect repos:'
@@ -156,54 +163,58 @@ cd $HOME/dotfiles
 git commit -am "finished merging"
 . {shell_file_1}
 """
-        shell_file_4 = get_shell_script(shell_script=program_4)
+        shell_file_4 = write_shell_script_to_file(shell_script=program_4)
         # ================================================================================
 
-        print(f"• {option1:75} 👉 {shell_file_1}")
-        print(f"• {option2:75} 👉 {shell_file_2}")
-        print(f"• {option3:75} 👉 {shell_file_3}")
-        print(f"• {option4:75} 👉 {shell_file_4}")
-
+        print(f"""
+╔{'═' * 70}╗
+║ 🔄 RESOLVE MERGE CONFLICT                                                 ║
+╠{'═' * 70}╣
+║ Choose an option to resolve the conflict:                                ║
+╚{'═' * 70}╝
+""")
+        
+        print(f"• 1️⃣  {option1:75} 👉 {shell_file_1}")
+        print(f"• 2️⃣  {option2:75} 👉 {shell_file_2}")
+        print(f"• 3️⃣  {option3:75} 👉 {shell_file_3}")
+        print(f"• 4️⃣  {option4:75} 👉 {shell_file_4}")
+
+        program_content = None
         match action:
             case "ask":
                 choice = choose_one_option(options=[option1, option2, option3, option4], fzf=False)
-                if choice == option1: PROGRAM_PATH.write_text(shell_file_1.read_text())
-                elif choice == option2: PROGRAM_PATH.write_text(program_2)
-                elif choice == option3: PROGRAM_PATH.write_text(shell_file_3.read_text())
-                elif choice == option4: PROGRAM_PATH.write_text(program_4)
+                if choice == option1: program_content = shell_file_1.read_text()
+                elif choice == option2: program_content = program_2
+                elif choice == option3: program_content = shell_file_3.read_text()
+                elif choice == option4: program_content = program_4
                 else: raise NotImplementedError(f"Choice {choice} not implemented.")
-            case "pushLocalMerge":
-                PROGRAM_PATH.write_text(shell_file_1.read_text())
-            case "overwriteLocal":
-                PROGRAM_PATH.write_text(program_2)
-            case "InspectRepos":
-                PROGRAM_PATH.write_text(shell_file_3.read_text())
-            case "RemoveLocalRclone":
-                PROGRAM_PATH.write_text(program_4)
-
-
-def delete_remote_repo_copy_and_push_local(remote_repo: str, local_repo: str, cloud: str):
-    repo_sync_root = P(remote_repo).expanduser().absolute()
-    repo_root_path = P(local_repo).expanduser().absolute()
-    repo_sync_root.delete(sure=True)
-    from git.remote import Remote
-    from git.repo import Repo
-    try: Remote.remove(Repo(repo_root_path), "originEnc")
-    except Exception: pass  # type: ignore
-    repo_root_path.to_cloud(cloud=cloud, zip=True, encrypt=True, rel2home=True, os_specific=False)
-
-
-def inspect_repos(repo_local_root: str, repo_remote_root: str):
-    if platform.system() == "Windows":
-        program = get_wt_cmd(wd1=P(repo_local_root), wd2=P(repo_local_root))
-        write_shell_script(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
-        return None
-    elif platform.system() == "Linux":
-        program = get_zellij_cmd(wd1=P(repo_local_root), wd2=P(repo_remote_root))
-        write_shell_script(program=program, execute=True, desc="Inspecting repos ...", preserve_cwd=True, display=True)
-        return None
-    else: raise NotImplementedError(f"Platform {platform.system()} not implemented.")
+            case "pushLocalMerge": program_content = shell_file_1.read_text()
+            case "overwriteLocal": program_content = program_2
+            case "InspectRepos": program_content = shell_file_3.read_text()
+            case "RemoveLocalRclone": program_content = program_4
+        PROGRAM_PATH.write_text(program_content)
+    return program_content
+
+def args_parser():
+    print(f"""
+╔{'═' * 70}╗
+║ 🔄 Repository Synchronization Utility                                     ║
+╚{'═' * 70}╝
+""")
 
+    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("--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()}")
+    # parser.add_argument("--skip_confirmation", "-s", help="Skip confirmation.", action="store_true", default=False)
+    # parser.add_argument("--key", "-k", help="Key for encryption", default=None)
+    parser.add_argument("--pwd", "-p", help="Password for encryption", default=None)
+    # parser.add_argument("--no_push", "-u", help="push to reomte.", action="store_true")  # default is False
+    parser.add_argument("--action", "-a", help="Action to take if merge fails.", choices=["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"], default="ask")
+    args = parser.parse_args()
+    main(cloud=args.cloud, path=args.path, message=args.message, action=args.action)
 
 if __name__ == "__main__":
     args_parser()