machineconfig 4.94__py3-none-any.whl → 4.97__py3-none-any.whl

machineconfig/scripts/python/devops_devapps_install.py

@@ -6,7 +6,7 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 from typing import Optional, cast, get_args
-from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS
+from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS, PACKAGE_GROUP2NAMES
 
 console = Console()
 
@@ -63,7 +63,7 @@ def main(
     if which is not None:
         return install_clis(clis_names=[x.strip() for x in which.split(",") if x.strip() != ""])
     if group is not None:
-        return get_programs_by_category(package_group=group)
+        return install_group(package_group=group)
     if interactive:
         return install_interactively()
     typer.echo("❌ You must provide either --which, --group, or --interactive/-ia option.")
@@ -78,21 +78,32 @@ def install_interactively():
     from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
     from machineconfig.utils.installer import get_installers
     from machineconfig.utils.installer_utils.installer_class import Installer
-    installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["ESSENTIAL", "DEV"])
+    installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=None)
     installer_options = []
     for x in installers:
         installer_options.append(Installer(installer_data=x).get_description())
-    category_options = [f"📦 {cat}" for cat in get_args(PACKAGE_GROUPS)]
-    options = category_options + ["─" * 50] + installer_options
+    
+    # Build category options and maintain a mapping from display text to actual category name
+    category_display_to_name: dict[str, str] = {}
+    for group_name, group_values in PACKAGE_GROUP2NAMES.items():
+        display = f"📦 {group_name:<20}" + "   --   " + f"{'|'.join(group_values):<60}"
+        category_display_to_name[display] = group_name
+    
+    options_system = get_installers_system_groups()
+    for item in options_system:
+        display = f"📦 {item['appName']:<20}   --   {item['doc']:<60}"
+        category_display_to_name[display] = item['appName']
+    
+    options = list(category_display_to_name.keys()) + ["─" * 50] + installer_options
     program_names = choose_from_options(multi=True, msg="Categories are prefixed with 📦", options=options, header="🚀 CHOOSE DEV APP OR CATEGORY", default="📦 essentials", fzf=True)
     installation_messages: list[str] = []
     for _an_idx, a_program_name in enumerate(program_names):
         if a_program_name.startswith("─"):  # 50 dashes separator
             continue
         if a_program_name.startswith("📦 "):
-            category_name = a_program_name[2:]  # Remove "📦 " prefix
-            if category_name in get_args(PACKAGE_GROUPS):
-                get_programs_by_category(package_group=cast(PACKAGE_GROUPS, category_name))
+            category_name = category_display_to_name.get(a_program_name)
+            if category_name:
+                install_group(package_group=cast(PACKAGE_GROUPS, category_name))
         else:
             installer_idx = installer_options.index(a_program_name)
             an_installer_data = installers[installer_idx]
@@ -103,27 +114,24 @@ def install_interactively():
         console.print(panel)
 
 
-def get_programs_by_category(package_group: PACKAGE_GROUPS):
+def install_group(package_group: PACKAGE_GROUPS):
     panel = Panel(f"[bold yellow]Installing programs from category: [green]{package_group}[/green][/bold yellow]", title="[bold blue]📦 Category Installation[/bold blue]", border_style="blue", padding=(1, 2))
     console.print(panel)
-    from machineconfig.utils.installer import get_installers, install_all
+    from machineconfig.utils.installer import get_installers, install_bulk
     from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
-    match package_group:
-        case "ESSENTIAL":
-            installers_ = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["ESSENTIAL"])
-            install_all(installers_data=installers_)
-        case "DEV":
-            installers_ = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["DEV", "ESSENTIAL"])
-            install_all(installers_data=installers_)
-        case "DEV_SYSTEM" | "ESSENTIAL_SYSTEM":
-            options_system = get_installers_system_groups()
-            from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
-            from machineconfig.utils.code import run_script
-            for an_item in options_system:
-                if an_item["appName"] == package_group:
-                    program = an_item["fileNamePattern"][get_normalized_arch()][get_os_name()]
-                    if program is not None:
-                        run_script(program)
+    if package_group in PACKAGE_GROUP2NAMES:
+        installers_ = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=[package_group])
+        install_bulk(installers_data=installers_)
+    else:
+        options_system = get_installers_system_groups()
+        from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
+        from machineconfig.utils.code import run_script
+        for an_item in options_system:
+            if an_item["appName"] == package_group:
+                program = an_item["fileNamePattern"][get_normalized_arch()][get_os_name()]
+                if program is not None:
+                    run_script(program)
+                    break
 
 
 def choose_from_system_package_groups(options_system: dict[str, tuple[str, str]]) -> str:

machineconfig/scripts/python/fire_jobs_args_helper.py

@@ -44,6 +44,10 @@ def extract_kwargs(args: FireJobArgs) -> dict[str, object]:
     
     # Look for Fire-style arguments in sys.argv
     for arg in sys.argv:
+        # Skip the -- separator
+        if arg == '--':
+            continue
+            
         # Match patterns like --key=value or --key value (but we'll focus on --key=value)
         if arg.startswith('--') and '=' in arg:
             key, value = arg[2:].split('=', 1)  # Remove -- prefix and split on first =
@@ -53,6 +57,11 @@ def extract_kwargs(args: FireJobArgs) -> dict[str, object]:
         elif arg.startswith('--') and '=' not in arg:
             # Handle boolean flags like --debug
             key = arg[2:]  # Remove -- prefix
+            
+            # Skip empty key (this would happen if someone just used '--')
+            if not key:
+                continue
+                
             # Check if next argument exists and doesn't start with --
             arg_index = sys.argv.index(arg)
             if arg_index + 1 < len(sys.argv) and not sys.argv[arg_index + 1].startswith('--'):

machineconfig/scripts/python/helpers/helpers4.py

@@ -1,7 +1,6 @@
-from typing import Any, Callable, Optional
-import inspect
-import os
 
+from typing import Optional
+import os
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 
@@ -21,19 +20,6 @@ def search_for_files_of_interest(path_obj: PathExtended):
     return files
 
 
-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 = ""
-    else:
-        # For fire module, all keyword arguments should be passed as --key value pairs
-        tmp_list: list[str] = []
-        for k, v in kwargs.items():
-            tmp_list.append(f"--{k} {v}")
-        kwargs_str = " " + " ".join(tmp_list) + " "
-    return kwargs_str
-
 
 def parse_pyfile(file_path: str):
     print(f"🔍 Loading {file_path} ...")
@@ -84,58 +70,6 @@ def parse_pyfile(file_path: str):
     return options, func_args
 
 
-def interactively_run_function(func: Callable[[Any], Any]):
-    sig = inspect.signature(func)
-    params = list(sig.parameters.values())
-    args = []
-    kwargs = {}
-    for param in params:
-        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}) : ")
-        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))
-    args_to_kwargs = dict(args)
-    return args_to_kwargs, kwargs
-
-
-def get_attrs_recursively(obj: Any):
-    if hasattr(obj, "__dict__"):
-        res = {}
-        for k, v in obj.__dict__.items():
-            res[k] = get_attrs_recursively(v)
-        return res
-    return obj
-
-
-# def run_on_remote(func_file: str, args: argparse.Namespace):
-#     host = choose_ssh_host(multi=False)
-#     assert isinstance(host, str), f"host must be a string. Got {type(host)}"
-#     from machineconfig.cluster.remote_machine import RemoteMachine, RemoteMachineConfig
-#     config = RemoteMachineConfig(copy_repo=True, update_repo=False, update_essential_repos=True,
-#                                  notify_upon_completion=True, ssh_params=dict(host=host),
-#                                  # to_email=None, email_config_name='enaut',
-#                                  data=[],
-#                                  ipython=False, interactive=args.interactive, pdb=False, pudb=args.debug, wrap_in_try_except=False,
-#                                  transfer_method="sftp")
-#     m = RemoteMachine(func=func_file, func_kwargs=None, config=config)
-#     m.run()
-
 
 def find_repo_root_path(start_path: str) -> Optional[str]:
     root_files = ["setup.py", "pyproject.toml", ".git"]

machineconfig/scripts/python/helpers/repo_sync_helpers.py

@@ -1,10 +1,11 @@
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.terminal import Terminal
+from machineconfig.utils.terminal import Response
 from machineconfig.scripts.python.get_zellij_cmd import get_zellij_cmd
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.code import write_shell_script_to_file
 import platform
+import subprocess
 from rich.console import Console
 from rich.panel import Panel
 
@@ -89,7 +90,8 @@ sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
 """
     shell_path = write_shell_script_to_file(shell_script=script)
-    Terminal().run(f". {shell_path}", shell="bash").capture().print()
+    completed = subprocess.run(f". {shell_path}", capture_output=True, check=False, text=True, shell=True)
+    Response.from_completed_process(completed).capture().print()
 
     console.print(Panel("✅ Dotfiles successfully fetched and installed", title="[bold green]Dotfiles[/bold green]", border_style="green"))
 

machineconfig/scripts/python/interactive.py

@@ -17,7 +17,6 @@ for better user experience with checkbox selections.
 
 """
 
-import subprocess
 import sys
 from pathlib import Path
 from platform import system
@@ -28,21 +27,12 @@ from questionary import Choice
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
-
+from machineconfig.utils.code import run_script as run_command
 
 _ = cast
 console = Console()
 
 
-def run_command(command: str, description: str) -> bool:
-    """Execute a shell command and return success status."""
-    console.print(f"\n🔧 {description}", style="bold cyan")
-    try:
-        result = subprocess.run(command, shell=True, check=True, capture_output=False)
-        return result.returncode == 0
-    except subprocess.CalledProcessError as e:
-        console.print(f"❌ Error executing command: {e}", style="bold red")
-        return False
 def display_header() -> None:
     """Display the script header."""
     header_text = Text("MACHINE CONFIGURATION", style="bold magenta")
@@ -111,6 +101,7 @@ def get_installation_choices() -> list[str]:
         Choice(value="TerminalEyeCandy", title="🎨 Install ASCII Art Libraries    - Terminal visualization tools", checked=False),
         Choice(value="install_repos", title="🐍 Install Repos                - Set up Python environment and repositories permanently.", checked=False),
         Choice(value="install_ssh_server", title="🔒 Install SSH Server             - Set up remote access", checked=False),
+        Choice(value="install_shell_profile", title="🐚 Configure Shell Profile         - Source machineconfig shell initialization", checked=False),
         Choice(value="create_symlinks", title="🔗 Create Symlinks                - Set up configuration symlinks (finish dotfiles transfer first)", checked=False),
         Choice(value="retrieve_repositories", title="📚 Retrieve Repositories          - Clone repositories to ~/code", checked=False),
         Choice(value="retrieve_data", title="💾 Retrieve Data                  - Backup restoration", checked=False),
@@ -124,36 +115,35 @@ def get_installation_choices() -> list[str]:
 
 def execute_installations(selected_options: list[str]) -> None:
     """Execute the selected installation options."""
-    # Always start with VE setup
-    console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Setting up base virtual environment[/italic]", border_style="green"))
-    run_command("curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash", "Setting up base virtual environment")
-
+    if system() == "Windows":
+        run_command("$HOME/.local/bin/uv.exe self update")
+    else:
+        run_command("$HOME/.local/bin/uv self update")
     for maybe_a_group in selected_options:
         if maybe_a_group in ("ESSENTIAL", "DEV", "ESSENTIAL_SYSTEM", "DEV_SYSTEM", "TerminalEyeCandy"):
             console.print(Panel("⚡ [bold bright_yellow]CLI APPLICATIONS[/bold bright_yellow]\n[italic]Command-line tools installation[/italic]", border_style="bright_yellow"))
             console.print("🔧 Installing CLI applications", style="bold cyan")
             try:
                 from machineconfig.scripts.python.devops_devapps_install import main as devops_devapps_install_main
-                # maybe_a_group = cast(PA, maybe_a_group)
                 devops_devapps_install_main(group=maybe_a_group)  # type: ignore
                 console.print("✅ CLI applications installed successfully", style="bold green")
             except Exception as e:
                 console.print(f"❌ Error installing CLI applications: {e}", style="bold red")
-            run_command(". $HOME/.bashrc", "Reloading bash configuration")
+            run_command(". $HOME/.bashrc")
 
     if "upgrade_system" in selected_options:
         if system() == "Windows":
             console.print("❌ System upgrade is not applicable on Windows via this script.", style="bold red")
         elif system() == "Linux":
             console.print(Panel("🔄 [bold magenta]SYSTEM UPDATE[/bold magenta]\n[italic]Package management[/italic]", border_style="magenta"))
-            run_command("sudo nala upgrade -y", "Upgrading system packages")
+            run_command("sudo nala upgrade -y")
         else:
             console.print(f"❌ System upgrade not supported on {system()}.", style="bold red")
     if "install_repos" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
         from machineconfig import setup_linux as module
         script = Path(module.__file__).parent / "repos.sh"
-        run_command(f"bash {script}", "Setting up Python environment and repositories")
+        run_command(f"bash {script}")
 
     if "install_ssh_server" in selected_options:
         console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
@@ -162,9 +152,20 @@ def execute_installations(selected_options: list[str]) -> None:
 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
 Start-Service sshd
 Set-Service -Name sshd -StartupType 'Automatic'"""
-            run_command(f'powershell -Command "{powershell_script}"', "Installing and configuring SSH server")
+            run_command(f'powershell -Command "{powershell_script}"')
         else:
-            run_command("sudo nala install openssh-server -y", "Installing SSH server")
+            run_command("sudo nala install openssh-server -y")
+
+    if "install_shell_profile" in selected_options:
+        console.print(Panel("🐚 [bold green]SHELL PROFILE[/bold green]\n[italic]Shell configuration setup[/italic]", border_style="green"))
+        console.print("🔧 Configuring shell profile", style="bold cyan")
+        try:
+            from machineconfig.profile.create import main_profile
+
+            main_profile()
+            console.print("✅ Shell profile configured successfully", style="bold green")
+        except Exception as e:
+            console.print(f"❌ Error configuring shell profile: {e}", style="bold red")
 
     if "create_symlinks" in selected_options:
         display_dotfiles_instructions()
@@ -178,8 +179,8 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
                 console.print("✅ Symlinks created successfully", style="bold green")
             except Exception as e:
                 console.print(f"❌ Error creating symlinks: {e}", style="bold red")
-            run_command("sudo chmod 600 $HOME/.ssh/*", "Setting SSH key permissions")
-            run_command("sudo chmod 700 $HOME/.ssh", "Setting SSH directory permissions")
+            run_command("sudo chmod 600 $HOME/.ssh/*")
+            run_command("sudo chmod 700 $HOME/.ssh")
         else:
             console.print("⏭️  Skipping symlink creation - finish dotfiles transfer first", style="yellow")
 

machineconfig/scripts/python/mount_nfs.py

@@ -2,10 +2,10 @@
 
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.ssh import SSH
-from machineconfig.utils.terminal import Terminal
 from machineconfig.utils.options import choose_from_options, choose_ssh_host
 
 import platform
+import subprocess
 
 
 def main():
@@ -49,15 +49,14 @@ share_path={share_path}
 local_mount_point={local_mount_point}
         """
         # PROGRAM_PATH.write_text(txt)
-        import subprocess
-
         subprocess.run(txt, shell=True, check=True)
 
         print("✅ Mount paths prepared successfully!\n")
 
     elif platform.system() == "Windows":
         print("\n🔍 Checking existing drives...")
-        print(Terminal().run("Get-PSDrive -PSProvider 'FileSystem'", shell="powershell").op)
+        completed = subprocess.run(["powershell", "-Command", "Get-PSDrive -PSProvider 'FileSystem'"], capture_output=True, check=False, text=True)
+        print((completed.stdout or "").strip())
         driver_letter = input(r"🖥️ Choose driver letter (e.g., Z:\\) [Avoid already used ones]: ") or "Z:\\"
         txt = f"""
 $server = "{remote_server}"
@@ -65,8 +64,6 @@ $sharePath = "{share_path}"
 $driveLetter = "{driver_letter}"
 """
         # PROGRAM_PATH.write_text(txt)
-        import subprocess
-
         subprocess.run(txt, shell=True, check=True)
         print("✅ Drive letter selected and configuration saved!\n")
 

machineconfig/scripts/python/mount_ssh.py

@@ -1,8 +1,8 @@
 """Mount a remote SSHFS share on a local directory"""
 
 from platform import system
+import subprocess
 from machineconfig.utils.ssh import SSH
-from machineconfig.utils.terminal import Terminal
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 from machineconfig.utils.options import choose_ssh_host
@@ -27,7 +27,8 @@ def main():
 
     if system() == "Windows":
         print("\n🔍 Checking existing drives...")
-        print(Terminal().run("net use", shell="powershell").op)
+        completed = subprocess.run(["powershell", "-Command", "net use"], capture_output=True, check=False, text=True)
+        print((completed.stdout or "").strip())
         driver_letter = input(r"🖥️ Choose driver letter (e.g., Z:\\) [Avoid already used ones]: ") or "Z:\\"
     else:
         driver_letter = None
@@ -53,8 +54,6 @@ fusermount -u /mnt/dbhdd
         raise ValueError(f"❌ Not implemented for this system: {system()}")
 
     # PROGRAM_PATH.write_text(txt, encoding="utf-8")
-    import subprocess
-
     subprocess.run(txt, shell=True, check=True)
     print("✅ Configuration saved successfully!\n")
 

machineconfig/scripts/python/sessions.py

@@ -50,7 +50,7 @@ def select_layout(layouts_json_file: Path, selected_layouts_names: Optional[list
     return layouts_chosen
 
 
-def handle_layout_args(layout_path: str, select_layouts: Optional[str], select_interactively: bool) -> list["LayoutConfig"]:
+def find_layout_file(layout_path: str, ) -> Path:
     from machineconfig.utils.path_extended import PathExtended
     from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_interest
     from machineconfig.utils.options import choose_from_options
@@ -66,23 +66,24 @@ def handle_layout_args(layout_path: str, select_layouts: Optional[str], select_i
         choice_file = PathExtended(choice_file)
     else:
         choice_file = path_obj
-    selected_layouts = select_layout(layouts_json_file=choice_file, selected_layouts_names=select_layouts.split(",") if select_layouts else None, select_interactively=select_interactively)
-    return selected_layouts
+    return choice_file
 
 
 def launch(layout_path: str = typer.Argument(..., help="Path to the layout.json file"),
         max_tabs: int = typer.Option(10, help="A Sanity checker that throws an error if any layout exceeds the maximum number of tabs to launch."),
         max_layouts: int = typer.Option(10, help="A Sanity checker that throws an error if the total number of layouts exceeds this number."),
         sleep_inbetween: float = typer.Option(1.0, help="Sleep time in seconds between launching layouts"),
-        monitor: bool = typer.Option(False, help="Monitor the layout sessions for completion"),
-        parallel: bool = typer.Option(False, help="Launch multiple layouts in parallel"),
-        kill_upon_completion: bool = typer.Option(False, help="Kill session(s) upon completion (only relevant if monitor flag is set)"),
-        select: Optional[str] = typer.Option(None, help="Comma separated names of layouts to be selected from the layout file passed"),
-        select_interactively: bool = typer.Option(False, help="Select layouts interactively")
+        monitor: bool = typer.Option(False, "--monitor", "-m", help="Monitor the layout sessions for completion"),
+        parallel: bool = typer.Option(False, "--parallel", "-p", help="Launch multiple layouts in parallel"),
+        kill_upon_completion: bool = typer.Option(False, "--kill-upon-completion", "-k", help="Kill session(s) upon completion (only relevant if monitor flag is set)"),
+        choose: Optional[str] = typer.Option(None, "--choose", "-c", help="Comma separated names of layouts to be selected from the layout file passed"),
+        choose_interactively: bool = typer.Option(False, "--choose-interactively", "-ia", help="Select layouts interactively")
         ):
     """
+    Launch terminal sessions based on a layout configuration file.
     """
-    layouts_selected = handle_layout_args(layout_path=layout_path, select_layouts=select, select_interactively=select_interactively)
+    layout_path_resolved = find_layout_file(layout_path=layout_path)
+    layouts_selected = select_layout(layouts_json_file=layout_path_resolved, selected_layouts_names=choose.split(",") if choose else None, select_interactively=choose_interactively)
 
     # ============= Basic sanity checks =============
     if len(layouts_selected) > max_layouts:

machineconfig/scripts/python/start_slidev.py

@@ -5,7 +5,7 @@ slidev
 from machineconfig.utils.source_of_truth import CONFIG_PATH
 from machineconfig.utils.code import print_code
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.terminal import Terminal
+from machineconfig.utils.terminal import Response
 from typing import Annotated, Optional
 import typer
 import subprocess
@@ -16,10 +16,20 @@ PORT_DEFAULT = 3030
 SLIDEV_REPO = PathExtended(CONFIG_PATH).joinpath(".cache/slidev")
 if not SLIDEV_REPO.joinpath("components").exists():
     print("📦 Initializing Slidev repository...")
-    Terminal(stderr=subprocess.PIPE, stdin=subprocess.PIPE, stdout=subprocess.PIPE).run(f"cd {SLIDEV_REPO.parent};npm init slidev@latest")
+    subprocess.run(f"cd {SLIDEV_REPO.parent};npm init slidev@latest", check=False, shell=True, text=True)
     print("✅ Slidev repository initialized successfully!\n")
 
 
+def _execute_with_shell(command: str) -> Response:
+    if platform.system() == "Windows":
+        completed = subprocess.run(["powershell", "-Command", command], capture_output=True, check=False, text=True)
+    else:
+        completed = subprocess.run(command, capture_output=True, check=False, text=True, shell=True)
+    response = Response.from_completed_process(completed)
+    response.print()
+    return response
+
+
 def jupyter_to_markdown(file: PathExtended):
     op_dir = file.parent.joinpath("presentation")
     print("📝 Converting Jupyter notebook to markdown...")
@@ -35,9 +45,9 @@ def jupyter_to_markdown(file: PathExtended):
     # for key, value in resources['outputs'].items():
 
     cmd = f"jupyter nbconvert --to markdown --no-prompt --no-input --output-dir {op_dir} --output slides_raw.md {file}"
-    Terminal().run(cmd, shell="powershell").print()
+    _execute_with_shell(cmd)
     cmd = f"jupyter nbconvert --to html --no-prompt --no-input --output-dir {op_dir} {file}"
-    Terminal().run(cmd, shell="powershell").print()
+    _execute_with_shell(cmd)
 
     op_file = op_dir.joinpath("slides_raw.md")
     slide_separator = "\n\n---\n\n"

machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py

@@ -8,6 +8,7 @@ import platform
 # from uuid import uuid4
 import os
 from typing import Any
+from rich import box
 from rich.console import Console
 from rich.panel import Panel
 
@@ -28,34 +29,41 @@ system = platform.system()  # Linux or Windows
 assert system == "Windows", "This script is only for Windows."
 
 
+def render_banner(message: str, title: str, border_style: str, box_style: box.Box) -> None:
+    console.print(Panel.fit(message, title=title, border_style=border_style, box=box_style, padding=(1, 4)))
+
+
 class TerminalSettings(object):
     def __init__(self):
         # Grabbing Terminal Settings file:
-        print(f"\n{'=' * 80}\n🔍 INITIALIZING TERMINAL SETTINGS 🔍\n{'=' * 80}")
+        console.print()
+        render_banner("🔍 INITIALIZING TERMINAL SETTINGS 🔍", "Windows Terminal", "cyan", box.DOUBLE)
+        console.print()
         tmp = os.getenv("LOCALAPPDATA")
         if not isinstance(tmp, str):
-            print("❌ ERROR: Could not find LOCALAPPDATA environment variable!")
+            console.print("❌ ERROR: Could not find LOCALAPPDATA environment variable!")
             raise ValueError("Could not find LOCALAPPDATA environment variable.")
         self.path = PathExtended(tmp).joinpath(r"Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\settings.json")
         backup_name = f".orig_{randstr()}"
-        print(f"📝 Creating backup of original settings as {backup_name}...")
+        console.print(f"📝 Creating backup of original settings as {backup_name}...")
         self.path.copy(append=backup_name)
-        print(f"📂 Loading Windows Terminal settings from: {self.path}")
+        console.print(f"📂 Loading Windows Terminal settings from: {self.path}")
         self.dat: dict[str, Any] = read_json(self.path)
         # Use a plain Python list for profiles
         self.profs = list(self.dat["profiles"]["list"])
-        console = Console()
-        console.print(Panel(f"✅ Successfully loaded {len(self.profs)} profiles", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
+        console.print(Panel(f"✅ Successfully loaded {len(self.profs)} profiles", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue", box=box.ROUNDED))
 
     def save_terminal_settings(self):
-        print(f"\n💾 Saving terminal settings to: {self.path}")
+        console.print()
+        console.print(f"💾 Saving terminal settings to: {self.path}")
         self.dat["profiles"]["list"] = list(self.profs)
         save_json(obj=self.dat, path=self.path, indent=5)
-        console.print(Panel("✅ Settings saved successfully!", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
+        console.print(Panel("✅ Settings saved successfully!", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue", box=box.ROUNDED))
 
     # ========================= Terminal Settings =========================================
     def update_default_settings(self):
-        print("\n⚙️  Updating default terminal settings...")
+        console.print()
+        console.print("⚙️  Updating default terminal settings...")
         # Changing start up settings:
         self.dat["startOnUserLogin"] = True
         self.dat["launchMode"] = "fullscreen"
@@ -64,12 +72,13 @@ class TerminalSettings(object):
         self.dat["copyOnSelect"] = True
         self.dat["profiles"]["defaults"]["padding"] = "0"
         self.dat["profiles"]["defaults"]["useAcrylic"] = False
-        console.print(Panel("✅ Default settings updated", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
+        console.print(Panel("✅ Default settings updated", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue", box=box.ROUNDED))
 
     # 1- Customizing Powershell========================================================
     # as opposed to Windows Powershell
     def customize_powershell(self, nerd_font: bool = True):
-        print("\n🛠️  Customizing PowerShell profile...")
+        console.print()
+        console.print("🛠️  Customizing PowerShell profile...")
         pwsh: dict[str, Any] = dict(
             name="PowerShell",
             commandline="pwsh",
@@ -79,45 +88,50 @@ class TerminalSettings(object):
             startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
         )
         if nerd_font:
-            print("🔤 Setting PowerShell font to CaskaydiaCove Nerd Font...")
+            console.print("🔤 Setting PowerShell font to CaskaydiaCove Nerd Font...")
             pwsh["font"] = dict(face="CaskaydiaCove Nerd Font")  # because oh-my-posh uses glyphs from this font.
 
         for idx, item in enumerate(self.profs):
             if item["name"] == "PowerShell":
                 self.profs[idx].update(pwsh)
-                console.print(Panel("✅ PowerShell profile customized successfully", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
+                console.print(Panel("✅ PowerShell profile customized successfully", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue", box=box.ROUNDED))
                 break
         else:
-            console.print(Panel("❌ Couldn't customize PowerShell because profile not found, try to install it first.", title="[bold red]Terminal Settings[/bold red]", border_style="red"))
+            console.print(Panel("❌ Couldn't customize PowerShell because profile not found, try to install it first.", title="[bold red]Terminal Settings[/bold red]", border_style="red", box=box.ROUNDED))
 
     def make_powershell_default_profile(self):
-        print("\n🌟 Setting PowerShell as the default profile...")
+        console.print()
+        console.print("🌟 Setting PowerShell as the default profile...")
         for profile in self.profs:
             if profile["name"] == "PowerShell":
                 self.dat["defaultProfile"] = profile["guid"]
-                console.print(Panel("✅ PowerShell is now the default profile!", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
+                console.print(Panel("✅ PowerShell is now the default profile!", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue", box=box.ROUNDED))
                 break
         else:
-            console.print(Panel("❌ PowerShell profile was not found in the list of profiles and therefore was not made the default.", title="[bold red]Terminal Settings[/bold red]", border_style="red"))
+            console.print(Panel("❌ PowerShell profile was not found in the list of profiles and therefore was not made the default.", title="[bold red]Terminal Settings[/bold red]", border_style="red", box=box.ROUNDED))
 
 
 def main():
-    print(f"\n{'=' * 80}\n🖥️  WINDOWS TERMINAL SETUP 🖥️\n{'=' * 80}")
+    console.print()
+    render_banner("🖥️  WINDOWS TERMINAL SETUP 🖥️", "Windows Terminal", "cyan", box.DOUBLE)
+    console.print()
     shell = {"powershell": "pwsh.exe", "Windows Powershell": "powershell.exe"}["powershell"].split(".exe", maxsplit=1)[0]
     if shell == "pwsh":
-        print("🚀 Starting Windows Terminal configuration with PowerShell...")
+        console.print("🚀 Starting Windows Terminal configuration with PowerShell...")
         ts = TerminalSettings()
         ts.update_default_settings()
         ts.customize_powershell(nerd_font=True)
         ts.make_powershell_default_profile()
-        print("⌨️  Adding keyboard shortcut for pane zoom (ctrl+shift+z)...")
+        console.print("⌨️  Adding keyboard shortcut for pane zoom (ctrl+shift+z)...")
         ts.dat["actions"].append({"command": "togglePaneZoom", "keys": "ctrl+shift+z"})
 
         ts.save_terminal_settings()
-        print(f"\n{'=' * 80}\n✨ WINDOWS TERMINAL SETUP COMPLETE ✨\n{'=' * 80}")
+        console.print()
+        render_banner("✨ WINDOWS TERMINAL SETUP COMPLETE ✨", "Windows Terminal", "green", box.DOUBLE)
+        console.print()
     else:
         error_msg = "❌ ERROR: Only PowerShell is supported, not Windows PowerShell!"
-        print(error_msg)
+        console.print(error_msg)
         raise NotImplementedError(error_msg)