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

machineconfig/scripts/python/croshell.py

@@ -3,16 +3,24 @@ croshell
 """
 
 import argparse
-from crocodile.file_management import P
-from crocodile.core_modules.core_1 import randstr
+from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.utils2 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 machineconfig.utils.ve import get_ve_path_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
+# from machineconfig.utils.utils2 import pprint
+
+console = Console()
 
 
 def add_print_header_pycode(path: str, title: str):
     return f"""
-pycode = P(r'{path}').read_text(encoding="utf-8")
+# from machineconfig.utils.path_reduced import P as PathExtended 
+from crocodile.file_management import P as PathExtended
+pycode = PathExtended(r'{path}').read_text(encoding="utf-8")
 pycode = pycode.split("except Exception: print(pycode)")[2]
 
 try:
@@ -28,38 +36,30 @@ 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 = PathExtended(r'{path}').absolute()
 try:
     dat = p.readit()
-    if isinstance(dat, dict): 
-        print(f'''
-╔{'═' * 70}╗
-║ 📄 File Data: {{p.name}}                                              
-╚{'═' * 70}╝
-''')
-        Struct(dat).print(as_config=True, title=p.name)
-    else: 
-        print(f'''
-╔{'═' * 70}╗
-║ 📄 Successfully read the file: {{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))
+        pprint(dat, PathExtended.name)
+    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=""):
+def get_read_pyfile_pycode(path: PathExtended, as_module: bool, cmd: str=""):
     if as_module: pycode = fr"""
 import sys
 sys.path.append(r'{path.parent}')
@@ -67,7 +67,7 @@ from {path.stem} import *
 {cmd}
 """
     else: pycode = f"""
-__file__ = P(r'{path}')
+__file__ = PathExtended(r'{path}')
 {path.read_text(encoding="utf-8")}
 """
     return pycode
@@ -101,50 +101,35 @@ def build_parser():
     interactivity = '' if args.nonInteratctive else '-i'
     interpreter = 'python' if args.python else 'ipython'
     ipython_profile: Optional[str] = args.profile
-    file = P.cwd()  # initialization value, could be modified according to args.
+    file = PathExtended.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}╯
-""")
-        options = P.cwd().search("*.py", r=True).apply(str).list
+        text = "🔍 Searching for Python files..."
+        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
+        options = PathExtended.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}╯
-""")
+        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]"))
 
     elif args.file != "":
-        file = P(args.file.lstrip()).expanduser().absolute()
+        file = PathExtended(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"""
@@ -154,23 +139,19 @@ streamlit run {py_file_path}
 """
             PROGRAM_PATH.write_text(data=final_program)
             return None
-        file = P(str(args.read).lstrip()).expanduser().absolute()
+        file = PathExtended(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 = """
 
 #%%
@@ -179,7 +160,8 @@ print_header()
 print_logo(logo="crocodile")
 """
 
-    pyfile = P.tmp().joinpath(f"tmp_scripts/python/croshell/{randstr()}.py").create(parents_only=True)
+    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"
@@ -188,15 +170,14 @@ print_logo(logo="crocodile")
 
     pyfile.write_text(total_program, encoding='utf-8')
 
-    ve_profile_suggested: Optional[str] = None
-    if ipython_profile is None:
-        ve_profile_suggested, ipython_profile = get_ve_name_and_ipython_profile(P(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=P.cwd())
+    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/venvs/ve")
     final_program = f"""
 #!/bin/bash
 
-{ve_activateion_line}
+{activate_ve_line}
 
 """
     if args.jupyter:
@@ -208,16 +189,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')
 

machineconfig/scripts/python/devops.py

@@ -5,12 +5,18 @@ from machineconfig.utils.utils import display_options, PROGRAM_PATH, write_shell
 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
+
+console = Console()
+
+BOX_WIDTH = 150  # width for box drawing
 
 
 class Options(Enum):
     update         = '🔄 UPDATE essential repos'
     cli_install    = '⚙️ DEVAPPS install'
-    ve             = '🐍 VE install'
     sym_path_shell = '🔗 SYMLINKS, PATH & SHELL PROFILE'
     sym_new        = '🆕 SYMLINKS new'
     ssh_add_pubkey = '🔑 SSH add pub key to this machine'
@@ -25,11 +31,8 @@ class Options(Enum):
 
 
 def args_parser():
-    print(f"""
-╔{'═' * 70}╗
-║ 🛠️  DevOps Tool Suite                                                    ║
-╚{'═' * 70}╝
-""")
+    # Print header
+    console.print(Panel("🛠️  DevOps Tool Suite", title_align="left", border_style="blue", width=BOX_WIDTH))
     
     import argparse
     parser = argparse.ArgumentParser()
@@ -39,177 +42,115 @@ def args_parser():
     main(which=args.which)
 
 
+def display_title(title: str) -> None:
+    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
+
+def display_task_status(status: str) -> None:
+    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
+
+def display_task_error(error: str) -> None:
+    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
+
+def display_task_success(success: str) -> None:
+    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)
-    print(f"""
-╭{'─' * 70}╮
-│ 🚀 Initializing DevOps operation...                                      │
-╰{'─' * 70}╯
-""")
+    console.print(Panel("🚀 Initializing DevOps operation...", width=BOX_WIDTH, border_style="blue"))
     
     options = [op.value for op in Options]
     if which is None:
         try:
             choice_key = display_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0])
         except KeyboardInterrupt:
-            print(f"""
-╔{'═' * 70}╗
-║ ❌ Operation cancelled by user                                           ║
-╚{'═' * 70}╝
-""")
+            console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
             return
     else: choice_key = Options[which].value
 
-    print(f"""
-╔{'═' * 70}╗
-║ 🔧 SELECTED OPERATION                                                    ║
-╠{'═' * 70}╣
-║ {choice_key.center(68)} ║
-╚{'═' * 70}╝
-""")
+    console.print(Panel(f"🔧 SELECTED OPERATION\n{choice_key}", title_align="left", border_style="green", width=BOX_WIDTH))
 
     if choice_key == Options.update.value:
-        print(f"""
-╭{'─' * 70}╮
-│ 🔄 Updating essential repositories...                                    │
-╰{'─' * 70}╯
-""")
+        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.ve.value:
-        print(f"""
-╭{'─' * 70}╮
-│ 🐍 Setting up virtual environment...                                     │
-╰{'─' * 70}╯
-""")
-        from machineconfig.utils.ve import get_ve_install_script
-        program = get_ve_install_script()
-
     elif choice_key == Options.cli_install.value:
-        print(f"""
-╭{'─' * 70}╮
-│ ⚙️  Installing development applications...                                │
-╰{'─' * 70}╯
-""")
+        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:
-        print(f"""
-╭{'─' * 70}╮
-│ 🔄 Creating new symlinks...                                              │
-╰{'─' * 70}╯
-""")
+        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:
-        print(f"""
-╭{'─' * 70}╮
-│ 🔗 Setting up symlinks, PATH, and shell profile...                       │
-╰{'─' * 70}╯
-""")
+        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:
-        print(f"""
-╭{'─' * 70}╮
-│ 🔑 Adding public SSH key to this machine...                              │
-╰{'─' * 70}╯
-""")
+        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:
-        print(f"""
-╔{'═' * 70}╗
-║ ❌ ERROR: Not Implemented                                                ║
-║ SSH key pair connection feature is not yet implemented                   ║
-╚{'═' * 70}╝
-""")
+        console.print(Panel("❌ ERROR: Not Implemented\nSSH key pair connection feature is not yet implemented", title_align="left", border_style="red", width=BOX_WIDTH))
         raise NotImplementedError
 
     elif choice_key == Options.ssh_add_id.value:  # so that you can SSH directly withuot pointing to identity key.
-        print(f"""
-╭{'─' * 70}╮
-│ 🗝️  Adding SSH identity (private key) to this machine...                  │
-╰{'─' * 70}╯
-""")
+        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:
-        print(f"""
-╭{'─' * 70}╮
-│ 📡 Setting up SSH...                                                     │
-╰{'─' * 70}╯
-""")
+        console.print(Panel("📡 Setting up SSH...", width=BOX_WIDTH, border_style="blue"))
         program_windows = """Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
         program_linux = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
         program = program_linux if system() == "Linux" else program_windows
 
     elif choice_key == Options.ssh_setup_wsl.value:
-        print(f"""
-╭{'─' * 70}╮
-│ 🐧 Setting up SSH for WSL...                                             │
-╰{'─' * 70}╯
-""")
+        console.print(Panel("🐧 Setting up SSH for WSL...", width=BOX_WIDTH, border_style="blue"))
         program = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash"""
 
     elif choice_key == Options.backup.value:
-        print(f"""
-╭{'─' * 70}╮
-│ 💾 Creating backup...                                                    │
-╰{'─' * 70}╯
-""")
+        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:
-        print(f"""
-╭{'─' * 70}╮
-│ 📥 Retrieving backup...                                                  │
-╰{'─' * 70}╯
-""")
+        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:
-        print(f"""
-╭{'─' * 70}╮
-│ ⏰ Setting up scheduler...                                               │
-╰{'─' * 70}╯
-""")
-        from machineconfig.scripts.python.scheduler import main as helper
-        program = helper()
+        console.print(Panel("⏰ Setting up scheduler...", width=BOX_WIDTH, border_style="blue"))
+        # from machineconfig.scripts.python.scheduler import main as helper
+        # program = helper()
+        program = ""
 
     elif choice_key == Options.dot_files_sync.value:
-        print(f"""
-╭{'─' * 70}╮
-│ 🔗 Synchronizing dotfiles...                                             │
-╰{'─' * 70}╯
-""")
-        from machineconfig.scripts.python.cloud_repo_sync import main as helper, P
-        program = helper(cloud=None, path=str(P.home() / "dotfiles"), pwd=None, action="ask")
+        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: 
-        print(f"""
-╔{'═' * 70}╗
-║ ❌ ERROR: Invalid choice                                                 ║
-║ The selected operation is not implemented: {choice_key}                  
-╚{'═' * 70}╝
-""")
+        console.print(Panel("❌ ERROR: Invalid choice", title_align="left", border_style="red", width=BOX_WIDTH))
         raise ValueError(f"Unimplemented choice: {choice_key}")
         
     if program:
-        print(f"""
-╭{'─' * 70}╮
-│ 📜 Preparing shell script...                                             │
-╰{'─' * 70}╯
-""")
+        console.print(Panel("📜 Preparing shell script...", width=BOX_WIDTH, border_style="blue"))
         write_shell_script_to_default_program_path(program=program, display=True, preserve_cwd=True, desc="🔧 Shell script prepared by Python.", execute=True if which is not None else False)
     else: 
         write_shell_script_to_default_program_path(program="echo '✨ Done.'", display=False, desc="🔧 Shell script prepared by Python.", preserve_cwd=True, execute=False)