machineconfig 7.98__py3-none-any.whl → 8.51__py3-none-any.whl

machineconfig/scripts/python/{interactive.py → helpers/helpers_devops/interactive.py}

@@ -2,17 +2,6 @@
 """
 Interactive Machine Configuration Setup Script
 
-A Python version of the interactive installation script that uses questionary
-for better user experience with checkbox selections.
-
-
-# echo # 📧 Thunderbird Setup Note:
-# Run after installing Thunderbird and starting it once:
-# cd ~/AppData/Roaming/ThunderBird/Profiles
-# $res = ls
-# $name = $res[0].Name
-# mv $backup_folder $name
-#
 
 
 """
@@ -63,31 +52,6 @@ def display_header() -> None:
     console.print()
     console.print(Align.center(Text(bug_report, style="dim white")))
     console.print()
-def display_completion_message() -> None:
-    completion_text = Text("INSTALLATION COMPLETE", style="bold green")
-    subtitle_text = Text("System setup finished successfully", style="italic green")
-    console.print(Panel(f"✨ {completion_text}\n{subtitle_text}\n\n🎉 Your system has been configured successfully!\n🔄 You may need to reboot to apply all changes.", border_style="green", padding=(1, 2)))
-def display_dotfiles_instructions() -> None:
-    header_text = Text("DOTFILES MIGRATION", style="bold yellow")
-    subtitle_text = Text("Configuration transfer options", style="italic yellow")
-    instructions = """
-🖱️  [bold blue]Method 1: USING MOUSE WITHOUT KB OR BROWSER SHARE[/bold blue]
-    On original machine, run:
-    [dim]cd ~/dotfiles/creds/msc
-    easy-sharing . --password rew --username al[/dim]
-    Then open brave on new machine to get MouseWithoutBorders password
-
-🔐 [bold blue]Method 2: USING SSH[/bold blue]
-    FROM REMOTE, RUN:
-    [dim]fptx ~/dotfiles $USER@$(hostname):^ -z
-    # OR, using IP address if router has not yet found the hostname:
-    fptx ~/dotfiles $USER@$(hostname -I | awk '{print $1}'):^ -z[/dim]
-
-☁️  [bold blue]Method 3: USING INTERNET SECURE SHARE[/bold blue]
-    [dim]cd ~
-    cloud_copy SHARE_URL . --config ss[/dim]
-    (requires symlinks to be created first)"""
-    console.print(Panel(f"📂 {header_text}\n{subtitle_text}\n\n{instructions}", border_style="yellow", padding=(1, 2)))
 
 
 def get_installation_choices() -> list[str]:
@@ -117,12 +81,12 @@ def execute_installations(selected_options: list[str]) -> None:
             except Exception as e:
                 console.print(f"❌ Error installing CLI applications: {e}", style="bold red")
             if platform.system() != "Windows":
-                run_shell_script(". $HOME/.bashrc")
+                run_shell_script(". $HOME/.bashrc", display_script=True, clean_env=False)
 
     if "install_machineconfig" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
-        from machineconfig.scripts.python.helpers_devops.cli_self import install
-        install()
+        from machineconfig.scripts.python.helpers.helpers_devops.cli_self import install
+        install(copy_assets=True, dev=False)
 
     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"))
@@ -131,9 +95,9 @@ 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_shell_script(f'powershell -Command "{powershell_script}"')
+            run_shell_script(f'powershell -Command "{powershell_script}"', display_script=True, clean_env=False)
         else:
-            run_shell_script("sudo nala install openssh-server -y")
+            run_shell_script("sudo nala install openssh-server -y", display_script=True, clean_env=False)
 
     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"))
@@ -142,27 +106,71 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
             from machineconfig.profile.create_shell_profile import create_default_shell_profile
             create_default_shell_profile()
             console.print("✅ Shell profile configured successfully", style="bold green")
-            from machineconfig.profile.create_links_export import main_public_from_parser
-            main_public_from_parser(method="copy", on_conflict="overwrite-default-path", which="all", interactive=False)
+            from machineconfig.profile.create_links_export import main_from_parser
+            main_from_parser(sensitivity="public", method="copy", on_conflict="overwrite-default-path", which="all")
             if platform.system() == "Windows":
-                from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
+                from machineconfig.jobs.installer.python_scripts.nerfont_windows_helper import install_nerd_fonts
                 install_nerd_fonts()
-                from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
+                from machineconfig.settings.wt.set_wt_settings import main as set_wt_settings_main
                 set_wt_settings_main()
         except Exception as e:
             console.print(f"❌ Error configuring shell profile: {e}", style="bold red")
 
+    if "retrieve_repositories" in selected_options or "retrieve_data" in selected_options:
+        # we cannot proceed before dotfiles are in place
+        if Path.home().joinpath("dotfiles").exists():
+            console.print("✅ Dotfiles directory found.", style="bold green")
+        else:
+            header_text = Text("DOTFILES MIGRATION", style="bold yellow")
+            subtitle_text = Text("Configuration transfer options", style="italic yellow")
+            instructions = """
+            On remote, run:
+            devops config export-dotfiles --password pwd
+            On new machine, run:
+            devops config import-dotfiles --password pwd
+            """
+            console.print(Panel(f"📂 {header_text}\n{subtitle_text}\n\n{instructions}", border_style="yellow", padding=(1, 2)))
+            i_sorted_it_out = "I have sorted out dotfiles migration already and want to proceed."
+            exit_now = "Exit now and sort out dotfiles migration first."
+            fetch_over_lan = "I already exposed dotfiles over LAN, let's fetch them now."
+            fetch_over_ssh = "I wanted to bring them using SSH SCP now."
+            options: list[str] = [
+                i_sorted_it_out,
+                exit_now,
+                fetch_over_lan,
+                fetch_over_ssh,
+            ]
+            answer = questionary.select("⚠️  DOTFILES NOT FOUND. How do you want to proceed?", choices=options).ask()
+            if answer == i_sorted_it_out:
+                console.print("✅ Proceeding as per user confirmation.", style="bold green")
+            elif answer == exit_now:
+                console.print("❌ Exiting for dotfiles migration.", style="bold red")
+                sys.exit(0)
+            elif answer == fetch_over_lan:
+                from machineconfig.scripts.python.helpers.helpers_devops.cli_config_dotfile import import_dotfiles
+                import_dotfiles(use_ssh=False)
+            elif answer == fetch_over_ssh:
+                from machineconfig.scripts.python.helpers.helpers_devops.cli_config_dotfile import import_dotfiles
+                import_dotfiles(use_ssh=True)
+            if not Path.home().joinpath("dotfiles").exists():
+                console.print("❌ Dotfiles directory still not found after attempted import. Exiting...", style="bold red")
+                sys.exit(1)
+            # devops config sync --sensitivity public --method symlink --on-conflict overwrite-default-path --which all
+            # devops config sync --sensitivity private --method symlink --on-conflict overwrite-default-path --which all
+            from machineconfig.profile.create_links_export import main_from_parser
+            main_from_parser(sensitivity="private", method="symlink", on_conflict="overwrite-default-path", which="all")
+
     if "retrieve_repositories" in selected_options:
         console.print(Panel("📚 [bold bright_magenta]REPOSITORIES[/bold bright_magenta]\n[italic]Project code retrieval[/italic]", border_style="bright_magenta"))
-        from machineconfig.scripts.python.helpers_devops import cli_repos
-        cli_repos.clone(directory=str(Path.home() / "code"), cloud="odg1")
+        from machineconfig.scripts.python.helpers.helpers_devops import cli_repos
+        cli_repos.clone(interactive=True)
 
     if "retrieve_data" in selected_options:
         console.print(Panel("💾 [bold bright_cyan]DATA RETRIEVAL[/bold bright_cyan]\n[italic]Backup restoration[/italic]", border_style="bright_cyan"))
         console.print("🔧 Retrieving backup data", style="bold cyan")
         try:
-            from machineconfig.scripts.python.helpers_devops.devops_backup_retrieve import main_backup_retrieve
-            main_backup_retrieve(direction="RETRIEVE", cloud=None, which=None)
+            from machineconfig.scripts.python.helpers.helpers_devops.cli_backup_retrieve import main_backup_retrieve
+            main_backup_retrieve(direction="RETRIEVE", cloud=None, which=None, repo="all")
             console.print("✅ Backup data retrieved successfully", style="bold green")
         except Exception as e:
             console.print(f"❌ Error retrieving backup data: {e}", style="bold red")
@@ -180,7 +188,13 @@ def main() -> None:
         console.print("❌ Installation cancelled.", style="bold red")
         sys.exit(0)
     execute_installations(selected_options=selected_options)
-    display_completion_message()
+    completion_text = Text("INSTALLATION COMPLETE", style="bold green")
+    subtitle_text = Text("System setup finished successfully", style="italic green")
+    console.print(Panel(f"✨ {completion_text}\n{subtitle_text}\n\n🎉 Your system has been configured successfully!\n🔄 You may need to reboot to apply all changes.", border_style="green", padding=(1, 2)))
+
+    from machineconfig.profile.create_shell_profile import reload_shell_profile_and_exit
+    reload_shell_profile_and_exit()
+
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/helpers/helpers_devops/run_script.py

@@ -0,0 +1,197 @@
+
+
+"""run python/shell scripts from pre-defined directorys, or, run command/file in the machineconfig environment
+
+Recursively Searched Predefined Directories:
+
+
+* 'private' : $HOME/dotfiles/scripts
+
+* 'public'  : $HOME/.config/machineconfig/scripts
+
+* 'library' : $MACHINECONFIG_LIBRARY_ROOT/jobs/scripts
+
+* 'dynamic' : fetched from GitHub repository on the fly (relies on latest commit, rather than the version currently installed)
+
+* 'custom'  : custom directories from comma separated entry 'scripts' under 'general' section @ ~/dotfiles/machineconfig/defaults.ini
+
+"""
+
+
+import typer
+from typing import Annotated, Optional, Literal
+
+
+def run_py_script(ctx: typer.Context,
+                  name: Annotated[str, typer.Argument(help="Name of script to run, e.g., 'a' for a.py, or command to execute")] = "",
+                  where: Annotated[Literal["all", "a", "private", "p", "public", "b", "library", "l", "dynamic", "d", "custom", "c"], typer.Option("--where", "-w", help="Where to look for the script")] = "all",
+                  interactive: Annotated[bool, typer.Option(..., "--interactive", "-i", help="Interactive selection of scripts to run")] = False,
+                  command: Annotated[Optional[bool], typer.Option(..., "--command", "-c", help="Run as command")] = False,
+                  list_scripts: Annotated[bool, typer.Option(..., "--list", "-l", help="List available scripts in all locations")] = False,
+                ) -> None:
+    if command:
+        exec(name)
+        return
+
+    from pathlib import Path
+    if list_scripts:
+        from machineconfig.scripts.python.helpers.helpers_search.script_help import list_available_scripts
+        list_available_scripts(where=where)
+        return
+
+    if not interactive and not name:
+        typer.echo("❌ ERROR: You must provide a script name or use --interactive option to select a script.")
+        raise typer.Exit(code=1)
+    target_file: Optional[Path] = None
+
+    if where in ["dynamic", "d"]:
+        # src/machineconfig/jobs/scripts/python_scripts/a.py
+        if "." in name: resolved_names: list[str] = [name]
+        else: resolved_names = [f"{name}{a_suffix}" for a_suffix in [".py", ".sh", "", ".ps1", ".bat", ".cmd"]]
+        urls = [f"""https://raw.githubusercontent.com/thisismygitrepo/machineconfig/refs/heads/main/src/machineconfig/jobs/scripts_dynamic/{a_resolved_name}""" for a_resolved_name in resolved_names]
+        for a_url in urls:
+            try:
+                print(f"Fetching temporary script from {a_url} ...")
+                import requests
+                response = requests.get(a_url)
+                if response.status_code != 200:
+                    print(f"❌ ERROR: Could not fetch script '{name}.py' from repository. Status Code: {response.status_code}")
+                    raise RuntimeError(f"Could not fetch script '{name}.py' from repository.")
+                script_content = response.text
+                target_file = Path.home().joinpath("tmp_results", "tmp_scripts", "python", f"{name}.py")
+                target_file.parent.mkdir(parents=True, exist_ok=True)
+                target_file.write_text(script_content, encoding="utf-8")
+            except Exception as _e:
+                pass
+
+
+    if target_file is None and Path(name).is_file():
+        if name.endswith(".py"):
+            import machineconfig
+            import subprocess
+            import sys
+            subprocess.run([sys.executable, name], cwd=machineconfig.__path__[0])
+            return
+        else:
+            if Path(name).suffix in [".sh", ".ps1", ".bat", ".cmd", ""]:
+                target_file = Path(name)
+            else:
+                print(f"❌ Error: File '{name}' is not a recognized script type. Supported types are {'.py', '.sh', '.ps1', '.bat', '.cmd', ''}.")
+                raise typer.Exit(code=1)
+
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT, LIBRARY_ROOT, DEFAULTS_PATH
+    private_root = Path.home().joinpath("dotfiles/scripts")  # local directory
+    public_root = CONFIG_ROOT.joinpath("scripts")  # local machineconfig directory
+    library_root = LIBRARY_ROOT.joinpath("jobs", "scripts")
+
+    def get_custom_roots() -> list[Path]:
+        custom_roots: list[Path] = []
+        if DEFAULTS_PATH.is_file():
+            from configparser import ConfigParser
+            config = ConfigParser()
+            config.read(DEFAULTS_PATH)
+            if config.has_section("general") and config.has_option("general", "scripts"):
+                custom_dirs = config.get("general", "scripts").split(",")
+                for custom_dir in custom_dirs:
+                    custom_path = Path(custom_dir.strip()).expanduser().resolve()
+                    if custom_path.is_dir():
+                        custom_roots.append(custom_path)
+        return custom_roots
+
+    roots: list[Path] = []
+    match where:
+        case "all" | "a":
+            roots = [private_root, public_root, library_root] + get_custom_roots()
+        case "private" | "p":
+            roots = [private_root]
+        case "public" | "b":
+            roots = [public_root]
+        case "library" | "l":
+            roots = [library_root]
+        case "dynamic" | "d":
+            roots = []
+        case "custom" | "c":
+            roots = get_custom_roots()
+
+    suffixes: list[str]
+    if "." in name:
+        suffixes = [""]
+    else:
+        import platform
+        if platform.system() == "Windows":
+            suffixes = [".py", ".bat", ".cmd", ".ps1"]
+        elif platform.system() == "Darwin" or platform.system() == "Linux":
+            suffixes = [""]  # files without suffix could be shell scripts, and that already cover files with .sh suffix without duplications
+        else:
+            suffixes = [".py"]
+
+    # Finding target file
+    potential_matches: list[Path] = []
+    if target_file is None:
+        for a_root in roots:
+            for a_suffix in suffixes:
+                if a_root.joinpath(f"{name}{a_suffix}").is_file():
+                    target_file = a_root.joinpath(f"{name}{a_suffix}")
+                    break  # perfect match
+                potential_matches += [a_file for a_file in a_root.rglob(f"*{name}*{a_suffix}") if a_file.is_file()]
+
+    if target_file is None:
+        if len(potential_matches) == 1:
+            target_file = potential_matches[0]
+        elif len(potential_matches) == 0:
+            typer.echo(ctx.get_help())
+            typer.echo()
+            typer.echo(typer.style(f"❌ ERROR: Could not find script '{name}'.", fg=typer.colors.RED, bold=True))
+            typer.echo("Searched in:")
+            for r in roots:
+                typer.echo(f"  - {r}")
+            raise typer.Exit(code=1)
+        else:
+            typer.echo(typer.style(f"Warning: Could not find script '{name}'. Checked {len(potential_matches)} candidate files, trying interactively:", fg=typer.colors.YELLOW))
+            from machineconfig.utils.options import choose_from_options
+            options = [str(p) for p in potential_matches]
+            chosen_file_part = choose_from_options(options, multi=False, msg="Select the script to run:", tv=True, preview="bat")
+            target_file = Path(chosen_file_part)
+
+    typer.echo(typer.style(f"✅ Found script at: {target_file}", fg=typer.colors.GREEN))
+    if target_file.suffix == ".py":
+        from machineconfig.utils.code import get_uv_command_executing_python_file, exit_then_run_shell_script
+        shell_script = get_uv_command_executing_python_file(python_file=str(target_file), uv_project_dir=None, uv_with=None, prepend_print=False)
+        exit_then_run_shell_script(script=shell_script)
+    else:
+        from machineconfig.utils.code import exit_then_run_shell_file
+        exit_then_run_shell_file(script_path=str(target_file), strict=True)
+
+
+def copy_script_to_local(ctx: typer.Context,
+                         name: Annotated[str, typer.Argument(help="Name of the temporary python script to copy, e.g., 'a' for a.py")],
+                         alias: Annotated[Optional[str], typer.Option("--alias", "-a", help="Whether to create call it a different name locally")] = None
+                         ) -> None:
+    """
+    Copy a temporary python script stored in machineconfig/scripts/python/helpers/tmp_py_scripts to the local machine.
+    """
+    url = f"""https://raw.githubusercontent.com/thisismygitrepo/machineconfig/refs/heads/main/src/machineconfig/scripts/python/helpers/tmp_py_scripts/{name}.py"""
+    import requests
+    response = requests.get(url)
+    if response.status_code != 200:
+        typer.echo(ctx.get_help())
+        typer.echo()
+        typer.echo(typer.style(f"❌ ERROR: Could not fetch script '{name}.py' from repository. Status Code: {response.status_code}", fg=typer.colors.RED, bold=True))
+        raise typer.Exit(code=1)
+    script_content = response.text
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
+    local_path = CONFIG_ROOT.joinpath(f"scripts_python/{alias or name}.py")
+    with open(local_path, "w") as f:
+        f.write(script_content)
+    typer.echo(typer.style(f"✅ Script '{name}.py' has been copied to '{local_path}'.", fg=typer.colors.GREEN))
+
+
+def get_app():
+    app = typer.Typer(
+        name="run-tmp-script",
+        help="Helper to run temporary python scripts stored in machineconfig/scripts/python/helpers/tmp_py_scripts",
+        no_args_is_help=True,
+    )
+    from machineconfig.jobs.scripts_dynamic import a
+    app.command()(a.main)
+    return app

machineconfig/scripts/python/helpers/helpers_devops/themes/choose_starship_theme.ps1

@@ -0,0 +1,41 @@
+$presets = @{
+    "nerd-font-symbols" = "Changes the symbols for each module to use Nerd Font symbols."
+    "no-nerd-font" = "Changes the symbols so that no Nerd Font symbols are used."
+    "bracketed-segments" = "Changes the format to show segments in brackets."
+    "plain-text-symbols" = "Changes the symbols for each module into plain text."
+    "no-runtime-versions" = "Hides the version of language runtimes."
+    "no-empty-icons" = "Does not show icons if the toolset is not found."
+    "pure-preset" = "Emulates the look and behavior of Pure."
+    "pastel-powerline" = "Inspired by M365Princess."
+    "tokyo-night" = "Inspired by tokyo-night-vscode-theme."
+    "gruvbox-rainbow" = "Inspired by Pastel Powerline and Tokyo Night."
+    "jetpack" = "Pseudo minimalist preset inspired by geometry and spaceship."
+}
+
+$input_list = $presets.Keys | ForEach-Object { "$_`t$($presets[$_])" }
+
+$preview_config = "$env:TEMP/starship_preview.toml"
+
+# Preview command for PowerShell
+# We need to split the line and get the first part.
+# tv replaces {} with the line.
+# We use powershell -c for the preview command to be safe and consistent.
+
+$preview_cmd = "powershell -c `"`$preset = '{}'.Split('`t')[0]; starship preset `$preset > $preview_config; `$env:STARSHIP_CONFIG='$preview_config'; `$env:STARSHIP_SHELL='powershell'; starship prompt`""
+
+if (Get-Command "tv" -ErrorAction SilentlyContinue) {
+    $selected_line = $input_list | tv --preview-command $preview_cmd --preview-size 50
+} elseif (Get-Command "fzf" -ErrorAction SilentlyContinue) {
+    # fzf fallback
+    $selected_line = $input_list | fzf --ansi --delimiter "`t" --with-nth 1,2 --preview "powershell -c `"`$preset = {1}; starship preset `$preset > $preview_config; `$env:STARSHIP_CONFIG='$preview_config'; `$env:STARSHIP_SHELL='powershell'; starship prompt`"" --preview-window bottom:50%
+} else {
+    Write-Host "Error: 'tv' or 'fzf' not found."
+    exit 1
+}
+
+if ($selected_line) {
+    $selected_preset = $selected_line.Split("`t")[0]
+    Write-Host "Applying $selected_preset..."
+    starship preset $selected_preset -o "$HOME/.config/starship.toml"
+    Write-Host "Done!"
+}

machineconfig/scripts/python/helpers/helpers_devops/themes/choose_starship_theme.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Ensure UTF-8 encoding for symbols and CLI tools
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+export LC_CTYPE=C.UTF-8
+export PYTHONIOENCODING=utf-8
+
+# Presets
+presets=(
+    "nerd-font-symbols    Changes the symbols for each module to use Nerd Font symbols."
+    "no-nerd-font    Changes the symbols so that no Nerd Font symbols are used."
+    "bracketed-segments    Changes the format to show segments in brackets."
+    "plain-text-symbols    Changes the symbols for each module into plain text."
+    "no-runtime-versions    Hides the version of language runtimes."
+    "no-empty-icons    Does not show icons if the toolset is not found."
+    "pure-preset    Emulates the look and behavior of Pure."
+    "pastel-powerline    Inspired by M365Princess."
+    "tokyo-night    Inspired by tokyo-night-vscode-theme."
+    "gruvbox-rainbow    Inspired by Pastel Powerline and Tokyo Night."
+    "jetpack    Pseudo minimalist preset inspired by geometry and spaceship."
+)
+
+# Join presets with newlines
+input_data=$(printf "%s\n" "${presets[@]}")
+
+preview_config="/tmp/starship_preview.toml"
+# Preview command needs to extract the first column (preset name) from the line
+# {} will be replaced by the selected line
+# We use awk to handle multiple spaces as delimiter
+preview_cmd="preset=\$(echo '{}' | awk '{print \$1}'); starship preset \"\$preset\" > $preview_config && LANG=C.UTF-8 LC_ALL=C.UTF-8 STARSHIP_CONFIG=$preview_config STARSHIP_SHELL=fish starship prompt"
+
+if command -v tv &> /dev/null; then
+    # tv requires input from stdin if no source-command is given
+    selected_line=$(printf "%s" "$input_data" | LANG=C.UTF-8 LC_ALL=C.UTF-8 tv --ansi --preview-command "$preview_cmd" --preview-size 50)
+elif command -v fzf &> /dev/null; then
+    selected_line=$(printf "%s" "$input_data" | LANG=C.UTF-8 LC_ALL=C.UTF-8 fzf --ansi --preview "preset=\$(echo {} | awk '{print \$1}'); starship preset \$preset > $preview_config && LANG=C.UTF-8 LC_ALL=C.UTF-8 STARSHIP_CONFIG=$preview_config STARSHIP_SHELL=fish starship prompt" --preview-window bottom:30%)
+else
+    echo "Error: 'tv' or 'fzf' not found."
+    exit 1
+fi
+
+if [ -n "$selected_line" ]; then
+    selected_preset=$(echo "$selected_line" | awk '{print $1}')
+    echo "Applying $selected_preset..."
+    starship preset "$selected_preset" -o ~/.config/starship.toml
+    echo "Done!"
+fi

machineconfig/scripts/python/{helpers_devops → helpers/helpers_devops}/themes/choose_wezterm_theme.py

@@ -3,7 +3,7 @@ Choose a theme for Wezterm
 """
 
 from machineconfig.utils.options import choose_from_options
-from machineconfig.utils.path_extended import PathExtended
+from pathlib import Path
 from typing import Any
 import time
 from rich.panel import Panel
@@ -52,14 +52,14 @@ def main2():
 
 def set_theme(theme: str):
     print(f"🔄 Setting WezTerm theme to: {theme}")
-    txt_lines = PathExtended.home().joinpath(".config/wezterm/wezterm.lua").expanduser().read_text(encoding="utf-8").splitlines()
+    txt_lines = Path.home().joinpath(".config/wezterm/wezterm.lua").expanduser().read_text(encoding="utf-8").splitlines()
     res_lines = []
     for line in txt_lines:
         if "config.color_scheme = " in line:
             res_lines.append(f"config.color_scheme = '{theme}'")
         else:
             res_lines.append(line)
-    PathExtended.home().joinpath(".config/wezterm/wezterm.lua").expanduser().write_text("\n".join(res_lines), encoding="utf-8")
+    Path.home().joinpath(".config/wezterm/wezterm.lua").expanduser().write_text("\n".join(res_lines), encoding="utf-8")
     time.sleep(0.1)
     print("💾 Configuration saved")
 

machineconfig/scripts/python/{helpers_fire_command → helpers/helpers_fire_command}/file_wrangler.py

@@ -102,6 +102,7 @@ def wrap_import_in_try_except(import_line: str, pyfile: str, repo_root: Optional
         print(fr"❌ Failed to import `{pyfile}` as a module: {ex} ")
         print("⚠️ Attempting import with ad-hoc `$PATH` manipulation. DO NOT pickle any objects in this session as correct deserialization cannot be guaranteed.")
         import sys
+        from pathlib import Path
         sys.path.append(str(Path(pyfile).parent))
         if repo_root is not None:
             sys.path.append(repo_root)

machineconfig/scripts/python/{helpers_fire_command → helpers/helpers_fire_command}/fire_jobs_args_helper.py

@@ -19,6 +19,7 @@ class FireJobArgs:
     submit_to_cloud: bool = False
     remote: bool = False
     module: bool = False
+    script: bool = False
     streamlit: bool = False
     environment: str = ""
     holdDirectory: bool = False