machineconfig 6.23__py3-none-any.whl → 8.12__py3-none-any.whl

machineconfig/scripts/python/helpers_devops/run_script.py

@@ -0,0 +1,168 @@
+
+
+"""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)
+
+"""
+
+
+import typer
+from typing import Annotated, Optional, Literal
+
+
+
+def run_py_script(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"], 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,
+                #   use_machineconfig_env: Annotated[bool, typer.Option(..., "--use-machineconfig-env/--no-use-machineconfig-env", "-m/-nm", help="Whether to use the machineconfig python environment")] = False
+                ) -> None:
+    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)
+
+    from pathlib import Path
+    if command:
+        exec(name)
+        return
+    if 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:
+            raise RuntimeError(f"File '{name}' is not a python (.py) file.")
+
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT, LIBRARY_ROOT
+    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")
+
+    roots: list[Path] = []
+    match where:
+        case "all" | "a":
+            roots = [private_root, public_root, library_root]
+        case "private" | "p":
+            roots = [private_root]
+        case "public" | "b":
+            roots = [public_root]
+        case "library" | "l":
+            roots = [library_root]
+        case "dynamic" | "d":
+            roots = []
+
+    suffixes: list[str]
+    import platform
+    if platform.system() == "Windows":
+        suffixes = [".py", ".bat", ".cmd", ".ps1"]
+    elif platform.system() == "Darwin" or platform.system() == "Linux":
+        suffixes = [".py", ".sh"]
+    else:
+        suffixes = [".py"]
+
+    # Finding target file
+    target_file: Optional[Path] = None
+    potential_matches: list[Path] = []
+    for a_root in roots:
+        for a_suffix in suffixes:
+            candidates = [a_root.joinpath(name), a_root.joinpath(f"{name}{a_suffix}")]
+            for result in candidates:
+                if result.exists() and result.is_file():
+                    target_file = result
+                    break
+            candidates = [a_file for a_file in a_root.rglob(f"*{name}{a_suffix}") if a_file.is_file()]
+            if name != "":
+                candidates += [a_file for a_file in a_root.rglob(f"*{name}*") if a_file.is_file()]
+            # print(candidates)
+            if len(candidates) == 1 and candidates[0].stem == name.split(".")[0]:  # perfect match with name at least.
+                target_file = candidates[0]
+            else:
+                potential_matches += candidates
+    # print(target_file)
+
+    if target_file is None and where in ["all", "dynamic"] and not interactive:
+        # 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 suffixes]
+        for a_resolved_name in resolved_names:
+            try:
+                url = f"""https://raw.githubusercontent.com/thisismygitrepo/machineconfig/refs/heads/main/src/machineconfig/jobs/scripts_dynamic/{a_resolved_name}"""
+                print(f"Fetching temporary script from {url} ...")
+                import requests
+                response = requests.get(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:
+        print(f"❌ ERROR: Could not find script '{name}.py'. Checked {len(potential_matches)} candidate files, trying interactively:")
+        from machineconfig.utils.options import choose_from_options
+        options = ["/".join(p.parts[-3:]) for p in potential_matches]
+        chosen_file_part = choose_from_options(options, multi=False, msg="Select the script to run:", tv=True)
+        for an_option, a_path in zip(options, potential_matches):
+            if chosen_file_part == an_option:
+                target_file = a_path
+                break
+        assert target_file is not None, "No script selected."
+        target_file = Path(target_file)
+
+    print(f"✅ Found script at: {target_file}")
+    if target_file.suffix == ".py":
+        from machineconfig.utils.code import get_uv_command_executing_python_script, exit_then_run_shell_script
+        script_content = target_file.read_text(encoding="utf-8")
+        shell_script, _shell_script_path = get_uv_command_executing_python_script(python_script=script_content, uv_project_dir=None, uv_with=None, prepend_print=False)
+        exit_then_run_shell_script(script=shell_script)
+    else:
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(target_file.read_text(encoding="utf-8")) 
+
+
+def copy_script_to_local(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:
+        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
+    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)
+    print(f"✅ Script '{name}.py' has been copied to '{local_path}'.")
+
+
+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_devops/themes/choose_starship_theme.bash

@@ -0,0 +1,3 @@
+
+
+

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

@@ -45,7 +45,7 @@ schemes_list = [
 
 def main2():
     console.print(Panel("🎨 WezTerm Theme Selector", title_align="left", border_style="green"))
-    option = choose_from_options(multi=False, options=schemes_list, header="Choose a theme for Wezterm", fzf=True, msg="Use arrow keys to navigate, Enter to select a theme")
+    option = choose_from_options(multi=False, options=schemes_list, header="Choose a theme for Wezterm", tv=True, msg="Use arrow keys to navigate, Enter to select a theme")
     set_theme(option)
     print(f"✅ Theme set to: {option}")
 

machineconfig/scripts/python/{helpers_fire/helpers4.py → helpers_fire_command/file_wrangler.py}

@@ -1,24 +1,7 @@
-
 from typing import Optional
 import os
-from machineconfig.utils.path_extended import PathExtended
-
-
-def search_for_files_of_interest(path_obj: PathExtended):
-    if path_obj.joinpath(".venv").exists():
-        path_objects = path_obj.search("*", not_in=[".venv"])
-        files: list[PathExtended] = []
-        for a_path_obj in path_objects:
-            files += search_for_files_of_interest(path_obj=a_path_obj)
-        return files
-    if path_obj.is_file():
-        return [path_obj]
-    py_files = path_obj.search(pattern="*.py", not_in=["__init__.py"], r=True)
-    ps_files = path_obj.search(pattern="*.ps1", r=True)
-    sh_files = path_obj.search(pattern="*.sh", r=True)
-    files = py_files + ps_files + sh_files
-    return files
-
+from pathlib import Path
+import platform
 
 
 def parse_pyfile(file_path: str):
@@ -29,7 +12,7 @@ def parse_pyfile(file_path: str):
     func_args: list[list[args_spec]] = [[]]  # this firt prepopulated dict is for the option 'RUN AS MAIN' which has no args
     import ast
 
-    parsed_ast = ast.parse(PathExtended(file_path).read_text(encoding="utf-8"))
+    parsed_ast = ast.parse(Path(file_path).read_text(encoding="utf-8"))
     functions = [node for node in ast.walk(parsed_ast) if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))]
     module__doc__ = ast.get_docstring(parsed_ast)
     main_option = f"RUN AS MAIN -- {module__doc__ if module__doc__ is not None else 'NoDocs'}"
@@ -110,3 +93,57 @@ def get_import_module_code(module_path: str):
         module_name = "IncorrectModuleName"
     # TODO: use py_compile to check if the statement is valid code to avoid syntax errors that can't be caught.
     return f"from {module_name} import *"
+
+
+def wrap_import_in_try_except(import_line: str, pyfile: str, repo_root: Optional[str] = None) -> None:
+    try:
+        exec(import_line)  # type: ignore
+    except (ImportError, ModuleNotFoundError) as ex:
+        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)
+        exec(f"from {Path(pyfile).stem} import *")
+        print(fr"✅ Successfully imported `{pyfile}`")
+
+
+def add_to_path(path_variable: str, directory: str) -> str:
+    """
+    Generate shell script to add directory to path_variable.
+    Handles both Windows (cmd) and Unix-like systems (bash/zsh).
+    Checks if variable exists before appending, otherwise creates it.
+    """
+    system = platform.system()
+    
+    if system == "Windows":
+        script = f"""# Check if {path_variable} is defined
+if (Test-Path env:{path_variable}) {{
+    Write-Host "Adding {directory} to existing {path_variable}"
+    $currentValue = [Environment]::GetEnvironmentVariable("{path_variable}", "User")
+    $newValue = "$currentValue;{directory}"
+    [Environment]::SetEnvironmentVariable("{path_variable}", $newValue, "User")
+    $env:{path_variable} = $newValue
+}} else {{
+    Write-Host "Creating new {path_variable} variable"
+    [Environment]::SetEnvironmentVariable("{path_variable}", "{directory}", "User")
+    $env:{path_variable} = "{directory}"
+}}
+Write-Host "{path_variable} is now: $env:{path_variable}\""""
+        return script
+    else:
+        script = f"""#!/bin/bash
+# Check if {path_variable} is defined and not empty
+if [ -z "${{{path_variable}}}" ]; then
+    echo "Creating new {path_variable} variable"
+    export {path_variable}="{directory}"
+else
+    echo "Adding {directory} to existing {path_variable}"
+    export {path_variable}="${{{path_variable}}}:{directory}"
+fi
+echo "{path_variable} is now: ${{{path_variable}}}"
+"""
+        return script
+

machineconfig/scripts/python/helpers_fire_command/fire_jobs_args_helper.py

@@ -15,9 +15,11 @@ class FireJobArgs:
     choose_function: bool = False
     loop: bool = False
     jupyter: bool = False
+    marimo: bool = False
     submit_to_cloud: bool = False
     remote: bool = False
     module: bool = False
+    script: bool = False
     streamlit: bool = False
     environment: str = ""
     holdDirectory: bool = False

machineconfig/scripts/python/helpers_fire_command/fire_jobs_route_helper.py

@@ -5,11 +5,10 @@ from typing import Optional
 import tomllib
 from pathlib import Path
 from machineconfig.utils.accessories import randstr
-from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.options import choose_from_options
 
 
-def choose_function_or_lines(choice_file: PathExtended, kwargs_dict: dict[str, object]) -> tuple[Optional[str], PathExtended, dict[str, object]]:
+def choose_function_or_lines(choice_file: Path, kwargs_dict: dict[str, object]) -> tuple[Optional[str], Path, dict[str, object]]:
     """
     Choose a function to run from a Python file or lines from a shell script.
     
@@ -22,9 +21,9 @@ def choose_function_or_lines(choice_file: PathExtended, kwargs_dict: dict[str, o
     choice_function: Optional[str] = None
     
     if choice_file.suffix == ".py":
-        from machineconfig.scripts.python.helpers_fire.helpers4 import parse_pyfile
+        from machineconfig.scripts.python.helpers_fire_command.file_wrangler import parse_pyfile
         options, func_args = parse_pyfile(file_path=str(choice_file))
-        choice_function_tmp = choose_from_options(msg="Choose a function to run", options=options, fzf=True, multi=False)
+        choice_function_tmp = choose_from_options(msg="Choose a function to run", options=options, tv=True, multi=False)
         assert isinstance(choice_function_tmp, str), f"choice_function must be a string. Got {type(choice_function_tmp)}"
         choice_index = options.index(choice_function_tmp)
         choice_function = choice_function_tmp.split(" -- ")[0]
@@ -45,8 +44,8 @@ def choose_function_or_lines(choice_file: PathExtended, kwargs_dict: dict[str, o
             if line.startswith("echo"):
                 continue
             options.append(line)
-        chosen_lines = choose_from_options(msg="Choose a line to run", options=options, fzf=True, multi=True)
-        choice_file = PathExtended.tmpfile(suffix=".sh")
+        chosen_lines = choose_from_options(msg="Choose a line to run", options=options, tv=True, multi=True)
+        choice_file = Path.home().joinpath(f"tmp_results/tmp_scripts/shell/{randstr(10)}.sh")
         choice_file.parent.mkdir(parents=True, exist_ok=True)
         choice_file.write_text("\n".join(chosen_lines), encoding="utf-8")
         choice_function = None
@@ -55,15 +54,13 @@ def choose_function_or_lines(choice_file: PathExtended, kwargs_dict: dict[str, o
 
 
 def get_command_streamlit(choice_file: Path, environment: str, repo_root: Optional[Path]) -> str:
-    import socket
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    try:
-        s.connect(("8.8.8.8", 1))
-        local_ip_v4 = s.getsockname()[0]
-    except Exception:
-        local_ip_v4 = socket.gethostbyname(socket.gethostname())
-    finally:
-        s.close()
+    # from machineconfig.scripts.python.helpers_utils.path import get_machine_specs
+    from machineconfig.scripts.python.helpers_network.address import select_lan_ipv4
+    res = select_lan_ipv4(prefer_vpn=False)
+    if res is None:
+        raise RuntimeError("Could not determine local LAN IPv4 address for streamlit app.")
+    local_ip_v4 = res
+
     computer_name = platform.node()
     port = 8501
     toml_path: Optional[Path] = None
@@ -82,7 +79,7 @@ def get_command_streamlit(choice_file: Path, environment: str, repo_root: Option
                 port = config["server"]["port"]
         secrets_path = toml_path.with_name("secrets.toml")
         if repo_root is not None:
-            secrets_template_path = Path.home().joinpath(f"dotfiles/creds/streamlit/{PathExtended(repo_root).name}/{choice_file.name}/secrets.toml")
+            secrets_template_path = Path.home().joinpath(f"dotfiles/creds/streamlit/{Path(repo_root).name}/{choice_file.name}/secrets.toml")
             if environment != "" and not secrets_path.exists() and secrets_template_path.exists():
                 secrets_template = tomllib.loads(secrets_template_path.read_text(encoding="utf-8"))
                 if environment == "ip":
@@ -101,6 +98,19 @@ def get_command_streamlit(choice_file: Path, environment: str, repo_root: Option
                 except Exception as ex:
                     print(ex)
                     raise ex
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
+    install_if_missing("qrterminal")
+    script = f"""
+qrterminal "http://{local_ip_v4}:{port}"
+echo "http://{local_ip_v4}:{port}"
+qrterminal "http://{computer_name}:{port}"
+echo "http://{computer_name}:{port}"
+"""
+    # from machineconfig.utils.code import run_shell_script
+    # run_shell_script(script)
+    from machineconfig.utils.code import print_code
+    print_code(code=script, lexer="shell", desc="Streamlit QR Codes and URLs")
+
     message = f"🚀 Streamlit app is running @:\n1- http://{local_ip_v4}:{port}\n2- http://{computer_name}:{port}\n3- http://localhost:{port}"
     from rich.panel import Panel
     from rich import print as rprint

machineconfig/scripts/python/helpers_msearch/__init__.py

@@ -0,0 +1,5 @@
+
+from pathlib import Path
+
+FZFG_LINUX_PATH = Path(__file__).parent.joinpath("scripts_linux", "fzfg")
+FZFG_WINDOWS_PATH = Path(__file__).parent.joinpath("scripts_windows", "fzfg.ps1")

machineconfig/scripts/{linux → python/helpers_msearch/scripts_linux}/fzfg

@@ -13,11 +13,11 @@ IFS=: read -ra selected < <(
       --bind "change:reload:sleep 0.1; $RG_PREFIX {q} || true" \
       --bind "ctrl-f:unbind(change,ctrl-f)+change-prompt(2. fzf> )+enable-search+clear-query+rebind(ctrl-r)" \
       --bind "ctrl-r:unbind(ctrl-r)+change-prompt(1. ripgrep> )+disable-search+reload($RG_PREFIX {q} || true)+rebind(change,ctrl-f)" \
-      --prompt '1. Ripgrep> ' \
+      --prompt '1. ripgrep> ' \
       --delimiter : \
-      --header '╱ CTRL-R (Ripgrep mode) ╱ CTRL-F (fzf mode) ╱' \
+      --header '╱ CTRL-R (ripgrep mode) ╱ CTRL-F (fzf mode) ╱' \
       --preview 'bat --color=always {1} --highlight-line {2}' \
       --preview-window 'up,60%,border-bottom,+{2}+3/3,~3'
 )
-[ -n "${selected[0]}" ] && lvim "${selected[0]}" "+${selected[1]}
+[ -n "${selected[0]}" ] && hx "${selected[0]}:${selected[1]}:${selected[2]}"
 "

machineconfig/scripts/python/helpers_msearch/scripts_windows/fzfg.ps1

@@ -0,0 +1,59 @@
+#!/usr/bin/env pwsh
+[CmdletBinding()]
+param(
+    [Parameter(ValueFromRemainingArguments = $true)]
+    [string[]]$QueryTokens
+)
+
+if ($null -eq $QueryTokens) {
+    $QueryTokens = @()
+}
+
+$initialQuery = if ($QueryTokens.Count -gt 0) { [string]::Join(' ', $QueryTokens) } else { '' }
+$rgPrefix = 'rg --column --line-number --no-heading --color=always --smart-case '
+
+$escapedDefault = if ($initialQuery.Length -gt 0) {
+    $rgPrefix + '"' + $initialQuery.Replace('"', '""') + '" || type nul'
+} else {
+    'type nul'
+}
+
+$previousDefault = $env:FZF_DEFAULT_COMMAND
+$env:FZF_DEFAULT_COMMAND = $escapedDefault
+
+$reloadBinding = "change:reload:$rgPrefix{q} || type nul"
+$ctrlFBinding = 'ctrl-f:unbind(change,ctrl-f)+change-prompt(2. fzf> )+enable-search+clear-query+rebind(ctrl-r)'
+$ctrlRBinding = "ctrl-r:unbind(ctrl-r)+change-prompt(1. ripgrep> )+disable-search+reload($rgPrefix{q} || type nul)+rebind(change,ctrl-f)"
+
+try {
+    $selectionRaw = & fzf --ansi `
+        --color 'hl:-1:underline,hl+:-1:underline:reverse' `
+        --disabled `
+        --query $initialQuery `
+        --bind $reloadBinding `
+        --bind $ctrlFBinding `
+        --bind $ctrlRBinding `
+        --prompt '1. ripgrep> ' `
+        --delimiter ':' `
+        --header 'CTRL-R (ripgrep mode) | CTRL-F (fzf mode)' `
+        --preview 'bat --color=always {1} --highlight-line {2}' `
+        --preview-window 'up,60%,border-bottom,+{2}+3/3,~3'
+}
+finally {
+    if ($null -ne $previousDefault) {
+        $env:FZF_DEFAULT_COMMAND = $previousDefault
+    } else {
+        Remove-Item Env:FZF_DEFAULT_COMMAND -ErrorAction SilentlyContinue
+    }
+}
+
+if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($selectionRaw)) {
+    exit
+}
+
+if ($selectionRaw -match '^(?<path>.+?):(?<line>\d+):(?<column>\d+):') {
+    $path = $Matches['path']
+    $line = [int]$Matches['line']
+    $column = [int]$Matches['column']
+    & hx ("{0}:{1}:{2}" -f $path,$line,$column)
+}

machineconfig/scripts/python/helpers_navigator/__init__.py

@@ -0,0 +1,20 @@
+"""
+Helper modules for the devops navigator TUI application.
+"""
+
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo, ArgumentInfo
+from machineconfig.scripts.python.helpers_navigator.command_builder import CommandBuilderScreen
+from machineconfig.scripts.python.helpers_navigator.command_tree import CommandTree
+from machineconfig.scripts.python.helpers_navigator.command_detail import CommandDetail
+from machineconfig.scripts.python.helpers_navigator.search_bar import SearchBar
+from machineconfig.scripts.python.helpers_navigator.main_app import CommandNavigatorApp
+
+__all__ = [
+    "CommandInfo",
+    "ArgumentInfo",
+    "CommandBuilderScreen",
+    "CommandTree",
+    "CommandDetail",
+    "SearchBar",
+    "CommandNavigatorApp",
+]

machineconfig/scripts/python/{helper_navigator → helpers_navigator}/command_builder.py

@@ -7,7 +7,7 @@ from textual.app import ComposeResult
 from textual.containers import Horizontal, VerticalScroll
 from textual.widgets import Static, Input, Label, Button
 from textual.screen import ModalScreen
-from machineconfig.scripts.python.helper_navigator.data_models import CommandInfo, ArgumentInfo
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo, ArgumentInfo
 
 
 class CommandBuilderScreen(ModalScreen[str]):

machineconfig/scripts/python/{helper_navigator → helpers_navigator}/command_detail.py

@@ -6,7 +6,7 @@ from typing import Optional
 from textual.widgets import Static
 from rich.panel import Panel
 from rich.text import Text
-from machineconfig.scripts.python.helper_navigator.data_models import CommandInfo
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo
 
 
 class CommandDetail(Static):