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

machineconfig/scripts/python/{helpers_fire_command → helpers/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.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.helpers_utils.path import get_machine_specs
+    from machineconfig.scripts.python.helpers.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/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/python/helpers/helpers_msearch/msearch_impl.py

@@ -0,0 +1,248 @@
+"""Pure Python implementation for msearch command - no typer dependencies."""
+
+
+from typing import Optional
+
+
+def machineconfig_search(
+    path: str, ast: bool, symantic: bool, extension: str, file: bool, no_dotfiles: bool, rga: bool, edit: bool, install_dependencies: bool
+) -> None:
+    """Machineconfig search helper."""
+    
+
+    if install_dependencies:
+        _install_dependencies()
+        return
+    if symantic:
+        _run_symantic_search(extension=extension)
+        return
+    if ast:
+        _run_ast_search(directory=path)
+        return
+    if file:
+        _run_file_search(no_dotfiles=no_dotfiles, edit=edit)
+        return
+
+    from pathlib import Path
+    import sys
+    import tempfile
+    import io
+    is_temp_file = False
+    if not sys.stdin.isatty() and Path(path).is_dir():
+        # Use UTF-8 encoding to handle emoji and Unicode characters on Windows
+        if sys.stdin.encoding != 'utf-8':
+            stdin_wrapper = io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8', errors='replace')
+            content = stdin_wrapper.read()
+        else:
+            content = sys.stdin.read()
+        if content:
+            tf = tempfile.NamedTemporaryFile(mode='w', encoding='utf-8', delete=False, prefix="msearch_stdin_")
+            tf.write(content)
+            tf.close()
+            path = tf.name
+            is_temp_file = True
+
+    if Path(path).absolute().resolve().is_file():
+        from machineconfig.utils.code import exit_then_run_shell_script
+        code = search_file_with_context(path=path, is_temp_file=is_temp_file, edit=edit)
+        exit_then_run_shell_script(script=code, strict=False)
+        return
+
+    _run_text_search(rga=rga, directory=path)
+
+
+def _install_dependencies() -> None:
+    """Install required dependencies."""
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
+
+    install_if_missing("fzf")
+    install_if_missing("tv")
+    install_if_missing("bat")
+    install_if_missing("fd")
+    install_if_missing("rg")
+    install_if_missing("rga")
+
+
+
+def search_file_with_context(path: str, is_temp_file: bool, edit: bool) -> str:
+    import platform
+    import base64
+    from pathlib import Path
+    abs_path = str(Path(path).absolute())
+    if platform.system() == "Linux" or platform.system() == "Darwin":
+        if edit:
+            code = """
+res=$(nl -ba -w1 -s' ' "$TEMP_FILE" | tv \
+--preview-command "bat --color=always --style=numbers --highlight-line {split: :0} $TEMP_FILE" \
+--preview-size 80 \
+--preview-offset "{split: :0}" \
+--source-output "{}")
+if [ -n "$res" ]; then
+    line=$(echo "$res" | cut -d' ' -f1)
+    hx "$TEMP_FILE:$line"
+fi
+"""
+        else:
+            code = """
+nl -ba -w1 -s' ' "$TEMP_FILE" | tv \
+--preview-command "bat --color=always --style=numbers --highlight-line {split: :0} $TEMP_FILE" \
+--preview-size 80 \
+--preview-offset "{split: :0}" \
+--source-output "{}" \
+| cut -d' ' -f2-
+"""
+        code = code.replace("$TEMP_FILE", abs_path)
+        if is_temp_file:
+            code += f"\nrm {path}"
+    elif platform.system() == "Windows":
+        # Windows: avoid piping INTO `tv` (it breaks TUI interactivity on Windows terminals).
+        # Use `tv --source-command` so stdin remains attached to the console.
+        # Note: using `cmd /C type` here has proven brittle due to quoting/command-line parsing
+        # differences; generate the numbered lines via a self-contained PowerShell command.
+        abs_path_escaped = abs_path.replace("'", "''")
+        # Use `-EncodedCommand` to avoid nested quoting issues across PowerShell/tv/cmd.
+        ps_script = (
+            "$OutputEncoding = [Console]::OutputEncoding = [System.Text.UTF8Encoding]::new(); "
+            "$i = 0; "
+            f"Get-Content -LiteralPath '{abs_path_escaped}' | ForEach-Object {{ $i = $i + 1; \"{{0}} {{1}}\" -f $i, $_ }}"
+        )
+        encoded = base64.b64encode(ps_script.encode("utf-16le")).decode("ascii")
+        source_cmd = f"powershell -NoProfile -ExecutionPolicy Bypass -EncodedCommand {encoded}"
+        source_cmd_ps_literal = source_cmd.replace("'", "''")
+        if edit:
+            code = f"""
+$sourceCmd = '{source_cmd_ps_literal}'
+$res = tv `
+--source-command $sourceCmd `
+--preview-command 'bat --color=always --style=numbers --highlight-line {{split: :0}} {abs_path}' `
+--preview-size 80 `
+--preview-offset "{{split: :0}}" `
+--source-output "{{}}"
+if ($res) {{
+    $line = $res.Split(' ')[0]
+    hx "{abs_path_escaped}:$line"
+}}
+"""
+        else:
+            code = f"""
+$sourceCmd = '{source_cmd_ps_literal}'
+tv `
+--source-command $sourceCmd `
+--preview-command 'bat --color=always --style=numbers --highlight-line {{split: :0}} {abs_path}' `
+--preview-size 80 `
+--preview-offset "{{split: :0}}" `
+--source-output "{{}}" | ForEach-Object {{ $_ -replace '^\\d+\\s+', '' }}
+"""
+        if is_temp_file:
+            code += f"\nRemove-Item '{abs_path_escaped}' -Force"
+    else:
+        raise RuntimeError(f"Unsupported platform, {platform.system()}")
+    return code
+
+def _run_symantic_search(extension: str) -> None:
+    """Run symantic search."""
+    script = ""
+    for an_ex in extension.split(","):
+        script = script + f"""\nparse *.{an_ex} """
+    from machineconfig.utils.code import run_shell_script
+
+    run_shell_script(script=script, display_script=True, clean_env=False)
+
+
+def _run_ast_search(directory: str) -> None:
+    """Run AST search."""
+    from machineconfig.scripts.python.helpers.helpers_search.ast_search import get_repo_symbols
+
+    symbols = get_repo_symbols(directory)
+    from machineconfig.utils.options import choose_from_options
+
+    try:
+        res = choose_from_options(options=symbols, msg="Select a symbol to search for:", tv=True, multi=False)
+        from rich import print_json
+        import json
+
+        res_json = json.dumps(res, indent=4)
+        print_json(res_json)
+    except Exception as e:
+        print(f"❌ Error during selection: {e}")
+
+
+def _run_file_search(no_dotfiles: bool, edit: bool) -> None:
+    """Run file search."""
+    import platform
+
+    if not edit:
+        script = """fzf --ansi --preview-window 'right:60%' --preview 'bat --color=always --style=numbers,grid,header --line-range :300 {}' """
+        if no_dotfiles:
+            script = "fd | " + script
+        from machineconfig.utils.code import run_shell_script
+
+        run_shell_script(script=script, display_script=True, clean_env=False)
+        return
+
+    if platform.system() == "Linux" or platform.system() == "Darwin":
+        script = """
+selected=$({SOURCE_CMD} fzf --ansi --preview-window 'right:60%' --preview 'bat --color=always --style=numbers,grid,header --line-range :300 {}')
+if [ -n "$selected" ]; then
+    res=$(nl -ba -w1 -s' ' "$selected" | tv \
+    --preview-command "bat --color=always --style=numbers --highlight-line {split: :0} $selected" \
+    --preview-size 80 \
+    --preview-offset "{split: :0}" \
+    --source-output "{}")
+    if [ -n "$res" ]; then
+        line=$(echo "$res" | cut -d' ' -f1)
+        hx "$selected:$line"
+    fi
+fi
+"""
+        source_cmd = "" if not no_dotfiles else "fd | "
+        script = script.replace("{SOURCE_CMD}", source_cmd)
+    elif platform.system() == "Windows":
+        script = r"""
+$selected = {SOURCE_CMD} fzf --ansi --preview-window 'right:60%' --preview 'bat --color=always --style=numbers,grid,header --line-range :300 {}'
+if ($selected) {
+    $choicesPath = Join-Path $env:TEMP ("msearch_choices_" + [guid]::NewGuid().ToString() + ".txt")
+    $i = 0
+    Get-Content -LiteralPath "$selected" | ForEach-Object { $i = $i + 1; "{0} {1}" -f $i, $_ } | Set-Content -LiteralPath $choicesPath -Encoding utf8
+    $sourceCmd = 'cmd /C type "' + $choicesPath + '"'
+    $previewCmd = 'bat --color=always --style=numbers --highlight-line {split: :0} "' + $selected + '"'
+    $res = tv `
+    --source-command $sourceCmd `
+    --preview-command $previewCmd `
+    --preview-size 80 `
+    --preview-offset "{split: :0}" `
+    --source-output "{}"
+    Remove-Item -LiteralPath $choicesPath -Force -ErrorAction SilentlyContinue
+    if ($res) {
+        $line = $res.Split(' ')[0]
+        hx "$($selected):$line"
+    }
+}
+"""
+        source_cmd = "" if not no_dotfiles else "fd | "
+        script = script.replace("{SOURCE_CMD}", source_cmd)
+    else:
+        raise RuntimeError("Unsupported platform")
+
+    from machineconfig.utils.code import run_shell_script
+
+    run_shell_script(script=script, display_script=True, clean_env=False)
+
+
+def _run_text_search(rga: bool, directory: Optional[str]) -> None:
+    """Run text search using fzf with ripgrep."""
+    from machineconfig.scripts.python.helpers.helpers_msearch import FZFG_LINUX_PATH, FZFG_WINDOWS_PATH
+    import platform
+
+    if platform.system() == "Linux" or platform.system() == "Darwin":
+        script = FZFG_LINUX_PATH.read_text(encoding="utf-8")
+    elif platform.system() == "Windows":
+        script = FZFG_WINDOWS_PATH.read_text(encoding="utf-8")
+    else:
+        raise RuntimeError("Unsupported platform")
+    if rga:
+        script = script.replace("rg ", "rga ").replace("ripgrep", "ripgrep-all")
+    from machineconfig.utils.code import exit_then_run_shell_script
+    if directory:
+        script = "cd " + directory + "\n" + script
+    exit_then_run_shell_script(script=script, strict=False)

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

@@ -2,9 +2,11 @@
 # fzf and ggrep with switch keys for modes
 # https://github.com/junegunn/fzf/blob/master/ADVANCED.md#switching-between-ripgrep-mode-and-fzf-mode
 
+
+
 # Switch between Ripgrep launcher mode (CTRL-R) and fzf filtering mode (CTRL-F)
 RG_PREFIX="rg --column --line-number --no-heading --color=always --smart-case "
-INITIAL_QUERY="${*:-}"
+INITIAL_QUERY=""
 IFS=: read -ra selected < <(
   FZF_DEFAULT_COMMAND="$RG_PREFIX $(printf %q "$INITIAL_QUERY")" \
   fzf --ansi \
@@ -13,11 +15,10 @@ 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/helpers_msearch/scripts_linux/search_with_context.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# This script allows searching through input (stdin) using 'tv' (television)
+# while showing the context around the matching line in the preview window.
+#
+# Usage: command | ./search_with_context.sh
+# Example: hyperfine --help | ./search_with_context.sh
+
+# set -o pipefail
+
+
+# Create a temporary file to store the stdin input
+TEMP_FILE=$(mktemp)
+# Capture stdin to the temp file
+cat > "$TEMP_FILE"
+# Ensure cleanup of the temp file on exit
+trap "rm -f $TEMP_FILE" EXIT
+
+# Run tv with the following configuration:
+# 1. `nl -ba -w1 -s' '`: Add line numbers to the input (e.g., "1 line content").
+#    -ba: number all lines
+#    -w1: width of line numbers (minimal)
+#    -s' ': separator is a single space
+#
+# 2. `tv`: The television fuzzy finder.
+#
+# 3. `--preview-command`: Use `bat` to show the file content.
+#    - `--color=always`: Force color output for the preview.
+#    - `--highlight-line {split: :0}`: Highlight the line number extracted from the entry.
+#      `{split: :0}` splits the entry by space (default) and takes the first field (index 0), which is the line number.
+#    - `$TEMP_FILE`: The file to preview.
+#
+# 4. `--preview-offset`: Scroll the preview to the matching line.
+#    - `{split: :0}`: Use the extracted line number as the offset.
+#
+# 5. `--source-output`: Define what `tv` outputs when an entry is selected.
+#    - `{}`: Output the full entry (including the line number).
+#
+# 6. `cut -d' ' -f2-`: Post-process the output to remove the line number.
+#    - `-d' '`: Delimiter is space.
+#    - `-f2-`: Keep fields from 2 onwards (dropping the line number).
+
+nl -ba -w1 -s' ' "$TEMP_FILE" | tv \
+    --preview-command "bat --color=always --highlight-line {split: :0} $TEMP_FILE" \
+    --preview-size 80 \
+    --preview-offset "{split: :0}" \
+    --source-output "{}" \
+    | cut -d' ' -f2-

machineconfig/scripts/python/helpers/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 = ''
+$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/helpers_navigator/__init__.py

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