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

machineconfig/scripts/python/cloud_repo_sync.py

@@ -6,10 +6,16 @@ from crocodile.meta import Terminal
 from crocodile.core import randstr
 
 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
+from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH, choose_one_option
+from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
 import platform
 import argparse
 from typing import Optional, Literal
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+
+console = Console()
 
 _ = fetch_dotfiles
 
@@ -20,20 +26,9 @@ 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"""
-╭{'─' * 70}╮
-│ ⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}     │
-╰{'─' * 70}╯
-""")
+            console.print(Panel(f"⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}", title="Default Cloud", border_style="yellow"))
         except FileNotFoundError:
-            print(f"""
-╔{'═' * 70}╗
-║ ❌ ERROR: No cloud profile found                                          ║
-╠{'═' * 70}╣
-║ Location: {DEFAULTS_PATH}                        
-║ Please set one up or provide one via the --cloud flag.                   ║
-╚{'═' * 70}╝
-""")
+            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
     
@@ -45,48 +40,28 @@ def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optio
     repo_remote_root = CONFIG_PATH.joinpath("remote", repo_local_root.rel2home())  # .delete(sure=True)
     
     try:
-        print(f"""
-╔{'═' * 70}╗
-║ 📥 DOWNLOADING REMOTE REPOSITORY                                          ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("📥 DOWNLOADING REMOTE REPOSITORY", title_align="left", border_style="blue"))
         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(f"""
-╔{'═' * 70}╗
-║ 🆕 Remote repository doesn't exist                                        ║
-║ 📤 Creating new remote and exiting...                                     ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("🆕 Remote repository doesn't exist\n📤 Creating new remote and exiting...", title_align="left", border_style="green"))
         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(f"""
-╔{'═' * 70}╗
-║ ⚠️  WARNING: REMOTE REPOSITORY IS DIRTY                                    ║
-╠{'═' * 70}╣
-║ Location: {repo_remote_root}               
-║ Please commit or stash changes before proceeding.                        ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel(f"⚠️  WARNING: REMOTE REPOSITORY IS DIRTY\nLocation: {repo_remote_root}\nPlease commit or stash changes before proceeding.", title="Warning", border_style="yellow"))
 
     script = f"""
 echo ""
-echo "╔{'═' * 70}╗"
-echo "║ 💾 COMMITTING LOCAL CHANGES                                               ║"
-echo "╚{'═' * 70}╝"
+echo 'echo -e "\\033[1;34m═════ COMMITTING LOCAL CHANGES ═════\\033[0m"'
 cd {repo_local_root}
 git status
 git add .
 git commit -am "{message}"
 echo ""
 echo ""
-echo "╔{'═' * 70}╗"
-echo "║ 🔄 PULLING LATEST FROM REMOTE                                             ║"
-echo "╚{'═' * 70}╝"
+echo 'echo -e "\\033[1;34m═════ PULLING LATEST FROM REMOTE ═════\\033[0m"'
 cd {repo_local_root}
 echo '-> Trying to removing originEnc remote from local repo if it exists.'
 # git remote remove originEnc
@@ -102,32 +77,18 @@ git pull originEnc master
     res = Terminal().run(f". {shell_path}", shell="powershell").capture().print()
 
     if res.is_successful(strict_err=True, strict_returcode=True):
-        print(f"""
-╔{'═' * 70}╗
-║ ✅ Pull succeeded!                                                        ║
-╠{'═' * 70}╣
-║ 🧹 Removing originEnc remote and local copy                               ║
-║ 📤 Pushing merged repository to cloud storage                             ║
-╚{'═' * 70}╝
-""")
+        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)
     else:
-        print(f"""
-╔{'═' * 70}╗
-║ ⚠️  MERGE FAILED                                                          ║
-╠{'═' * 70}╣
-║ 💾 Keeping local copy of remote at:                                       ║
-║ 📂 {repo_remote_root}                    
-╚{'═' * 70}╝
-""")
+        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:'
         program_1_py = f"""
-from machineconfig.scripts.python.cloud_repo_sync import delete_remote_repo_copy_and_push_local as func
+from machineconfig.scripts.python.helpers.repo_sync_helpers import delete_remote_repo_copy_and_push_local as func
 func(remote_repo=r'{repo_remote_root.to_str()}', local_repo=r'{repo_local_root.to_str()}', cloud=r'{cloud_resolved}')
 """
         shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_name="ve")
@@ -149,7 +110,7 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
         # ================================================================================
         option3 = 'Inspect repos:'
         program_3_py = f"""
-from machineconfig.scripts.python.cloud_repo_sync import inspect_repos as func
+from machineconfig.scripts.python.helper.repo_sync_helpers import inspect_repos as func
 func(repo_local_root=r'{repo_local_root.to_str()}', repo_remote_root=r'{repo_remote_root.to_str()}')
 """
         shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_name="ve")
@@ -166,13 +127,7 @@ git commit -am "finished merging"
         shell_file_4 = write_shell_script_to_file(shell_script=program_4)
         # ================================================================================
 
-        print(f"""
-╔{'═' * 70}╗
-║ 🔄 RESOLVE MERGE CONFLICT                                                 ║
-╠{'═' * 70}╣
-║ Choose an option to resolve the conflict:                                ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("🔄 RESOLVE MERGE CONFLICT\nChoose an option to resolve the conflict:", title_align="left", border_style="blue"))
         
         print(f"• 1️⃣  {option1:75} 👉 {shell_file_1}")
         print(f"• 2️⃣  {option2:75} 👉 {shell_file_2}")
@@ -196,11 +151,7 @@ git commit -am "finished merging"
     return program_content
 
 def args_parser():
-    print(f"""
-╔{'═' * 70}╗
-║ 🔄 Repository Synchronization Utility                                     ║
-╚{'═' * 70}╝
-""")
+    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"])

machineconfig/scripts/python/cloud_sync.py

@@ -7,39 +7,35 @@ 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
 import argparse
+from rich.console import Console
+from rich.panel import Panel
+
+console = Console()
 
 
 def args_parser():
-    print(f"""
-╔{'═' * 70}╗
-║ ☁️  Cloud Sync Utility                                                    ║
-╚{'═' * 70}╝
-""")
-    
+    title = "☁️  Cloud Sync Utility"
+    console.print(Panel(title, title_align="left", border_style="blue"))
     parser = argparse.ArgumentParser(description="""A wrapper for rclone sync and rclone bisync, with some extra features.""")
-
     parser.add_argument("source", help="source", default=None)
     parser.add_argument("target", help="target", default=None)
-
     parser.add_argument("--transfers", "-t", help="Number of threads in syncing.", default=10)  # default is False
     parser.add_argument("--root", "-R", help="Remote root.", default="myhome")  # default is 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("--encrypt", "-e", help="Decrypt after receiving.", action="store_true")  # default is False
     parser.add_argument("--zip", "-z", help="unzip after receiving.", action="store_true")  # default is False
-
     parser.add_argument("--bisync", "-b", help="Bidirectional sync.", action="store_true")  # default is False
     parser.add_argument("--delete", "-D", help="Delete files in remote that are not in local.", action="store_true")  # default is False
     parser.add_argument("--verbose", "-v", help="Verbosity of mprocs to show details of syncing.", action="store_true")  # default is False
 
     args = parser.parse_args()
     args_dict = vars(args)
-    source: str=args_dict.pop("source")
-    target: str=args_dict.pop("target")
-    verbose: bool=args_dict.pop("verbose")
-    delete: bool=args_dict.pop("delete")
-    bisync: bool=args_dict.pop("bisync")
+    source: str = args_dict.pop("source")
+    target: str = args_dict.pop("target")
+    verbose: bool = args_dict.pop("verbose")
+    delete: bool = args_dict.pop("delete")
+    bisync: bool = args_dict.pop("bisync")
     transfers: int = args_dict.pop("transfers")
     args_obj = Args(**args_dict)
 
@@ -49,42 +45,36 @@ def args_parser():
     cloud, source, target = parse_cloud_source_target(args=args_obj, source=source, target=target)
     # map short flags to long flags (-u -> --upload), for easier use in the script
     if bisync:
-        print(f"""
-╔{'═' * 70}╗
-║ 🔄 BI-DIRECTIONAL SYNC                                                    ║
-╠{'═' * 70}╣
-║ Source: {source}                       
-║ Target: {target}                       
-╚{'═' * 70}╝
-""")
+        title = "🔄 BI-DIRECTIONAL SYNC"
+        source_line = f"Source: {source}"
+        target_line = f"Target: {target}"
+        console.print(Panel(f"{source_line}\n{target_line}", title=title, border_style="blue"))
         rclone_cmd = f"""rclone bisync '{source}' '{target}' --resync"""
     else:
-        print(f"""
-╔{'═' * 70}╗
-║ 📤 ONE-WAY SYNC                                                           ║
-╠{'═' * 70}╣
-║ Source: {source}                       
-║ ↓                                                                        ║
-║ Target: {target}                       
-╚{'═' * 70}╝
-""")
-        rclone_cmd = f"""rclone sync '{source}' '{target}' """
+        title = "📤 ONE-WAY SYNC"
+        source_line = f"Source: {source}"
+        arrow_line = "↓"
+        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}"
+        else:
+            rclone_cmd = f"rclone sync -P \"{source}\" \"{target}\" --transfers={transfers}"
 
     rclone_cmd += f" --progress --transfers={transfers} --verbose"
     # rclone_cmd += f"  --vfs-cache-mode full"
-    if delete: rclone_cmd += " --delete-during"
+    if delete:
+        rclone_cmd += " --delete-during"
+
+    if verbose:
+        txt = get_mprocs_mount_txt(cloud=cloud, rclone_cmd=rclone_cmd, cloud_brand="Unknown")
+    else:
+        txt = f"""{rclone_cmd}"""
+
+    title = "🚀 EXECUTING COMMAND"
+    cmd_line = f"{rclone_cmd[:65]}..."
+    console.print(Panel(f"{title}\n{cmd_line}", title="[bold blue]Command[/bold blue]", expand=False))
 
-    if verbose: txt = get_mprocs_mount_txt(cloud=cloud, rclone_cmd=rclone_cmd, cloud_brand="Unknown")
-    else: txt = f"""{rclone_cmd}"""
-    
-    print(f"""
-╔{'═' * 70}╗
-║ 🚀 EXECUTING COMMAND                                                      ║
-╠{'═' * 70}╣
-║ {rclone_cmd[:65]}... ║
-╚{'═' * 70}╝
-""")
-    
     PROGRAM_PATH.write_text(txt)
 
 

machineconfig/scripts/python/croshell.py

@@ -8,6 +8,11 @@ from crocodile.core_modules.core_1 import randstr
 from machineconfig.utils.utils import PROGRAM_PATH, display_options
 from machineconfig.utils.ve_utils.ve1 import get_ve_name_and_ipython_profile, 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
+
+console = Console()
 
 
 def add_print_header_pycode(path: str, title: str):
@@ -28,35 +33,27 @@ except Exception: print(pycode)
 
 
 def get_read_data_pycode(path: str):
-    pycode = f"""
-p = P(r\'{path}\').absolute()
+    # We need to be careful here since we're generating Python code as a string
+    # that will use f-strings itself
+    return f"""
+from rich.panel import Panel
+from rich.text import Text
+from rich.console import Console
+console = Console()
+p = P(r'{path}').absolute()
 try:
     dat = p.readit()
-    if isinstance(dat, dict): 
-        print(f'''
-╔{'═' * 70}╗
-║ 📄 File Data: {{p.name}}                                              
-╚{'═' * 70}╝
-''')
+    if isinstance(dat, dict):
+        panel_title = f"📄 File Data: {{p.name}}"
+        console.print(Panel(Text(str(dat), justify="left"), title=panel_title, expand=False))
         Struct(dat).print(as_config=True, title=p.name)
-    else: 
-        print(f'''
-╔{'═' * 70}╗
-║ 📄 Successfully read the file: {{p.name}}                              
-╚{'═' * 70}╝
-''')
+    else:
+        panel_title = f"📄 Successfully read the file: {{p.name}}"
+        console.print(Panel(Text(str(dat), justify="left"), title=panel_title, expand=False))
 except Exception as e:
-    print(f'''
-╔{'═' * 70}╗
-║ ❌ ERROR READING FILE                                                    ║
-╠{'═' * 70}╣
-║ File: {{p.name}}                                                       
-║ Error: {{e}}                                                      
-╚{'═' * 70}╝
-''')
-
+    error_message = f'''❌ ERROR READING FILE\nFile: {{p.name}}\nError: {{e}}'''
+    console.print(Panel(Text(error_message, justify="left"), title="Error", expand=False, border_style="red"))
 """
-    return pycode
 
 
 def get_read_pyfile_pycode(path: P, as_module: bool, cmd: str=""):
@@ -104,47 +101,32 @@ def build_parser():
     file = P.cwd()  # initialization value, could be modified according to args.
 
     if args.cmd != "":
-        print(f"""
-╭{'─' * 70}╮
-│ 🖥️  Executing command from CLI argument                                   │
-╰{'─' * 70}╯
-""")
+        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:
-        print(f"""
-╭{'─' * 70}╮
-│ 🔍 Searching for Python files...                                         │
-╰{'─' * 70}╯
-""")
+        text = "🔍 Searching for Python files..."
+        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
         options = P.cwd().search("*.py", r=True).apply(str).list
         file = display_options(msg="Choose a python file to run", options=options, fzf=True, multi=False, )
         assert isinstance(file, str)
         program = P(file).read_text(encoding='utf-8')
-        print(f"""
-╭{'─' * 70}╮
-│ 📄 Selected file: {P(file).name}                                  │
-╰{'─' * 70}╯
-""")
+        text = f"📄 Selected file: {P(file).name}"
+        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
 
     elif args.file != "":
         file = P(args.file.lstrip()).expanduser().absolute()
         program = get_read_pyfile_pycode(file, as_module=args.module, cmd=args.cmd)
-        print(f"""
-╭{'─' * 70}╮
-│ 📄 Loading file: {file.name}                                    │
-│ 🔄 Mode: {'Module' if args.module else 'Script'}                                                 │
-╰{'─' * 70}╯
-""")
+        text1 = f"📄 Loading file: {file.name}"
+        text2 = f"🔄 Mode: {'Module' if args.module else 'Script'}"
+        console.print(Panel(f"{text1}\n{text2}", title="[bold blue]Info[/bold blue]"))
 
     elif args.read != "":
         if args.streamlit_viewer:
-            print(f"""
-╔{'═' * 70}╗
-║ 📊 STARTING STREAMLIT VIEWER                                              ║
-╚{'═' * 70}╝
-""")
+            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"""
@@ -156,21 +138,17 @@ streamlit run {py_file_path}
             return None
         file = P(str(args.read).lstrip()).expanduser().absolute()
         program = get_read_data_pycode(str(file))
-        print(f"""
-╭{'─' * 70}╮
-│ 📄 Reading data from: {file.name}                              │
-╰{'─' * 70}╯
-""")
-
-    else:  # just run croshell.py interactively
+        text = f"📄 Reading data from: {file.name}"
+        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
+
+    else:  # if nothing is specified, then run in interactive mode.
+        text = "⌨️  Entering interactive mode"
+        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
+        # from machineconfig.scripts.python.croshell import InteractiveShell
+        # InteractiveShell().run()
+        # return None
         program = ""
 
-        # from IPython import start_ipython
-        # start_ipython(argv=program.split(' ')[1:])
-        # return
-        # Clear-Host;
-        # # --autocall 1 in order to enable shell-like behaviour: e.g.: P x is interpretred as P(x)
-
     preprogram = """
 
 #%%
@@ -208,16 +186,13 @@ print_logo(logo="crocodile")
         fire_line += f" {str(pyfile)}"
             
     final_program += fire_line
-    
-    print(f"""
-╔{'═' * 70}╗
-║ 🚀 LAUNCHING SCRIPT   {PROGRAM_PATH}           ║
-╠{'═' * 70}╣
-║ 📄 Script: {pyfile}
-║ 🔥 Command: {fire_line}
-╚{'═' * 70}╝
-""")
-    
+
+    title = "🚀 LAUNCHING SCRIPT"
+    text1 = f"📄 Script: {pyfile}"
+    text2 = f"🔥 Command: {fire_line}"
+    launch_message = f"{title}   {PROGRAM_PATH}\n{text1}\n{text2}"
+    console.print(Panel(Text(launch_message, justify="left"), expand=False, border_style="blue"))
+
     PROGRAM_PATH.write_text(data=final_program)
     # (PROGRAM_PATH + ".py").write_text(str(pyfile), encoding='utf-8')