machineconfig 3.3__py3-none-any.whl → 3.7__py3-none-any.whl

machineconfig/scripts/python/ai/solutions/crush/crush.json

@@ -0,0 +1,216 @@
+{
+  "$schema": "https://charm.land/crush.json",
+  "providers": {
+    "openai": {
+      "id": "openai",
+      "name": "OpenAI",
+      "base_url": "https://api.openai.com/v1",
+      "type": "openai",
+      "api_key": "$OPENAI_API_KEY",
+      "extra_headers": {
+        "OpenAI-Beta": "assistants=v2"
+      },
+      "models": [
+        {
+          "id": "gpt-4o",
+          "name": "GPT-4o",
+          "cost_per_1m_in": 5,
+          "cost_per_1m_out": 15,
+          "cost_per_1m_in_cached": 1,
+          "cost_per_1m_out_cached": 3,
+          "context_window": 128000,
+          "default_max_tokens": 16384,
+          "can_reason": false,
+          "has_reasoning_efforts": false,
+          "supports_attachments": true
+        },
+        {
+          "id": "gpt-4o-mini",
+          "name": "GPT-4o mini",
+          "cost_per_1m_in": 0.15,
+          "cost_per_1m_out": 0.6,
+          "cost_per_1m_in_cached": 0.05,
+          "cost_per_1m_out_cached": 0.2,
+          "context_window": 128000,
+          "default_max_tokens": 8192,
+          "can_reason": false,
+          "has_reasoning_efforts": false,
+          "supports_attachments": true
+        }
+      ]
+    },
+    "anthropic": {
+      "id": "anthropic",
+      "name": "Anthropic",
+      "base_url": "https://api.anthropic.com/v1",
+      "type": "anthropic",
+      "api_key": "$ANTHROPIC_API_KEY",
+      "extra_headers": {
+        "anthropic-version": "2023-06-01"
+      },
+      "models": [
+        {
+          "id": "claude-3-5-sonnet-20240620",
+          "name": "Claude 3.5 Sonnet",
+          "cost_per_1m_in": 3,
+          "cost_per_1m_out": 15,
+          "cost_per_1m_in_cached": 3.75,
+          "cost_per_1m_out_cached": 0.3,
+          "context_window": 200000,
+          "default_max_tokens": 8000,
+          "can_reason": true,
+          "has_reasoning_efforts": true,
+          "default_reasoning_effort": "medium",
+          "supports_attachments": true
+        },
+        {
+          "id": "claude-3-haiku-20240307",
+          "name": "Claude 3 Haiku",
+          "cost_per_1m_in": 0.25,
+          "cost_per_1m_out": 1.25,
+          "cost_per_1m_in_cached": 0.05,
+          "cost_per_1m_out_cached": 0.1,
+          "context_window": 200000,
+          "default_max_tokens": 4000,
+          "can_reason": true,
+          "has_reasoning_efforts": true,
+          "default_reasoning_effort": "low",
+          "supports_attachments": true
+        }
+      ]
+    },
+    "openrouter": {
+      "id": "openrouter",
+      "name": "OpenRouter",
+      "base_url": "https://openrouter.ai/api/v1",
+      "type": "openai",
+      "api_key": "$OPENROUTER_API_KEY",
+      "models": [
+        {
+          "id": "deepseek/deepseek-chat",
+          "name": "Deepseek V3",
+          "cost_per_1m_in": 0.27,
+          "cost_per_1m_out": 1.1,
+          "cost_per_1m_in_cached": 0.07,
+          "cost_per_1m_out_cached": 0.3,
+          "context_window": 64000,
+          "default_max_tokens": 5000,
+          "can_reason": true,
+          "has_reasoning_efforts": false,
+          "supports_attachments": false
+        }
+      ]
+    },
+    "ollama": {
+      "id": "ollama",
+      "name": "Ollama",
+      "base_url": "http://localhost:11434/v1/",
+      "type": "openai",
+      "models": [
+        {
+          "id": "qwen2.5-coder:14b",
+          "name": "Qwen2.5 Coder 14B",
+          "cost_per_1m_in": 0,
+          "cost_per_1m_out": 0,
+          "cost_per_1m_in_cached": 0,
+          "cost_per_1m_out_cached": 0,
+          "context_window": 32768,
+          "default_max_tokens": 4096,
+          "can_reason": false,
+          "has_reasoning_efforts": false,
+          "supports_attachments": false
+        }
+      ]
+    }
+  },
+  "models": {
+    "large": {
+      "provider": "anthropic",
+      "model": "claude-3-5-sonnet-20240620",
+      "think": true,
+      "max_tokens": 6000
+    },
+    "small": {
+      "provider": "openai",
+      "model": "gpt-4o-mini",
+      "max_tokens": 4096
+    }
+  },
+  "lsp": {
+    "python": {
+      "command": "pyright-langserver",
+      "args": ["--stdio"],
+      "filetypes": ["py"],
+      "env": {
+        "PYRIGHT_PYTHON_FORCE_VERSION": "3.13"
+      }
+    },
+    "ruff": {
+      "command": "ruff",
+      "args": ["server"],
+      "filetypes": ["py"]
+    },
+    "json": {
+      "command": "vscode-json-languageserver",
+      "args": ["--stdio"]
+    }
+  },
+  "mcp": {
+    "filesystem": {
+      "type": "stdio",
+      "command": "uv",
+      "args": [
+        "run",
+        "python",
+        "-m",
+        "machineconfig.scripts.python.ai.solutions._shared"
+      ],
+      "timeout": 120,
+      "env": {
+        "UV_PROJECT_ENV": "$(pwd)"
+      }
+    },
+    "github-docs": {
+      "type": "http",
+      "url": "https://api.github.com/mcp/",
+      "timeout": 90,
+      "headers": {
+        "Authorization": "$(echo Bearer $GITHUB_MCP_TOKEN)",
+        "X-Crush-Client": "machineconfig"
+      }
+    },
+    "architect": {
+      "type": "sse",
+      "url": "https://architect.mcp.machineconfig.local/stream",
+      "timeout": 120,
+      "headers": {
+        "Authorization": "$(echo Bearer $ARCHITECT_MCP_TOKEN)"
+      }
+    }
+  },
+  "options": {
+    "context_paths": [
+      "CRUSH.md",
+      "src/machineconfig/scripts/python/ai/solutions/crush/privacy.md",
+      ".github/copilot-instructions.md",
+      "src/machineconfig/scripts/python/ai/solutions/_shared.py"
+    ],
+    "tui": {
+      "compact_mode": true,
+      "diff_mode": "unified"
+    },
+    "debug": false,
+    "debug_lsp": false,
+    "disable_auto_summarize": false,
+    "data_directory": ".crush"
+  },
+  "permissions": {
+    "allowed_tools": [
+      "view",
+      "ls",
+      "glob",
+      "grep",
+      "write"
+    ]
+  }
+}

machineconfig/scripts/python/ai/solutions/crush/crush.py

@@ -0,0 +1,25 @@
+
+
+"""
+ref: https://github.com/charmbracelet/crush
+
+"""
+
+from pathlib import Path
+import platform
+from machineconfig.scripts.python.ai.solutions._shared import get_generic_instructions_path
+
+
+
+def build_configuration(repo_root: Path) -> None:
+    instructions_path = get_generic_instructions_path()
+    repo_root.joinpath("CRUSH.md").write_text(data=instructions_path.read_text(encoding="utf-8"), encoding="utf-8")
+
+    repo_settings = repo_root.joinpath(".crush.json")
+    ignore_settings = repo_root.joinpath(".crushignore")
+    if platform.system() == "Windows":
+        global_settings = Path.home().joinpath("AppData/Local/crush/crush.json")
+    else:
+        global_settings = Path.home().joinpath(".config/crush/crush.json")
+    
+    _ = repo_settings, ignore_settings, global_settings  # to avoid unused variable warnings

machineconfig/scripts/python/ai/solutions/crush/privacy.md

@@ -0,0 +1,2 @@
+
+docs don't mention at all anything about user code privacy, data collection or telemetry or any reporting.

machineconfig/scripts/python/ai/solutions/cursor/cursors.py

@@ -0,0 +1,10 @@
+from pathlib import Path
+
+from machineconfig.scripts.python.ai.solutions._shared import get_generic_instructions_path
+
+
+def build_configuration(repo_root: Path) -> None:
+    instructions_path = get_generic_instructions_path()
+    cursor_rules_path = repo_root.joinpath(".cursor/rules/python_dev.mdc")
+    cursor_rules_path.parent.mkdir(parents=True, exist_ok=True)
+    cursor_rules_path.write_text(data=instructions_path.read_text(encoding="utf-8"), encoding="utf-8")

machineconfig/scripts/python/ai/solutions/gemini/gemini.py

@@ -0,0 +1,14 @@
+from pathlib import Path
+
+from machineconfig.scripts.python.ai.solutions._shared import get_generic_instructions_path
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+
+def build_configuration(repo_root: Path) -> None:
+    instructions_path = get_generic_instructions_path()
+    repo_root.joinpath("GEMINI.md").write_text(data=instructions_path.read_text(encoding="utf-8"), encoding="utf-8")
+
+    gemini_dir = repo_root.joinpath(".gemini")
+    settings_source_path = LIBRARY_ROOT.joinpath("scripts/python/ai/solutions/gemini/settings.json")
+    gemini_dir.mkdir(parents=True, exist_ok=True)
+
+    settings_source_path.write_text(data=settings_source_path.read_text(encoding="utf-8"), encoding="utf-8")

machineconfig/scripts/python/ai/solutions/generic.py

@@ -0,0 +1,41 @@
+from pathlib import Path
+
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+
+
+def create_dot_scripts(repo_root: Path) -> None:
+    scripts_dir = LIBRARY_ROOT.joinpath("scripts/python/ai/scripts")
+    target_dir = repo_root.joinpath(".scripts")
+    target_dir.mkdir(parents=True, exist_ok=True)
+    for script_path in scripts_dir.iterdir():
+        target_dir.joinpath(script_path.name).write_text(data=script_path.read_text(encoding="utf-8"), encoding="utf-8")
+
+
+def adjust_gitignore(repo_root: Path) -> None:
+    dot_git_ignore_path = repo_root.joinpath(".gitignore")
+    if dot_git_ignore_path.exists() is False:
+        return
+
+    dot_git_ignore_content = dot_git_ignore_path.read_text(encoding="utf-8")
+    entries_to_add: list[str] = []
+    required_entries: list[str] = [
+        ".links",
+        "notebooks",
+        ".ai",
+        ".scripts",
+        "GEMINI.md",
+        "CLAUDE.md",
+        ".cursor",
+        ".github/instructions",
+        ".github/chatmodes",
+        ".github/prompts",
+    ]
+
+    for entry in required_entries:
+        if entry not in dot_git_ignore_content:
+            entries_to_add.append(entry)
+
+    if len(entries_to_add) == 0:
+        return
+
+    dot_git_ignore_path.write_text(data=dot_git_ignore_content + "\n" + "\n".join(entries_to_add), encoding="utf-8")

machineconfig/scripts/python/ai/solutions/kilocode/privacy.md

@@ -0,0 +1,3 @@
+
+# disable usage and erroror reports to kilocode in About/Export page.
+# Disable model api provider data collection.

machineconfig/scripts/python/ai/solutions/opencode/opencode.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "https://opencode.ai/config.json",
+  "instructions": [".github/instructions/*.md"]
+}

machineconfig/scripts/python/ai/solutions/opencode/opencode.py

@@ -0,0 +1 @@
+

machineconfig/scripts/python/choose_wezterm_theme.py

@@ -2,8 +2,8 @@
 Choose a theme for Wezterm
 """
 
-from machineconfig.utils.options import choose_one_option
-from machineconfig.utils.path_reduced import PathExtended
+from machineconfig.utils.options import choose_from_options
+from machineconfig.utils.path_extended import PathExtended
 from typing import Any
 import time
 from rich.panel import Panel
@@ -45,7 +45,7 @@ schemes_list = [
 
 def main2():
     console.print(Panel("🎨 WezTerm Theme Selector", title_align="left", border_style="green"))
-    option = choose_one_option(options=schemes_list, header="Choose a theme for Wezterm", fzf=True)
+    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")
     set_theme(option)
     print(f"✅ Theme set to: {option}")
 

machineconfig/scripts/python/cloud_copy.py

@@ -2,7 +2,7 @@
 CC
 """
 
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from tenacity import retry, stop_after_attempt, wait_chain, wait_fixed
 import getpass
 import argparse
@@ -14,7 +14,7 @@ from machineconfig.scripts.python.helpers.cloud_helpers import ArgsDefaults, Arg
 from rich.console import Console
 from rich.panel import Panel
 from rich.progress import Progress
-from machineconfig.utils.utils2 import pprint
+from machineconfig.utils.accessories import pprint
 
 console = Console()
 

machineconfig/scripts/python/cloud_mount.py

@@ -1,8 +1,8 @@
 """Cloud mount script"""
 
-from machineconfig.utils.options import choose_one_option
-from machineconfig.utils.utils2 import read_ini
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.options import choose_from_options
+from machineconfig.utils.io import read_ini
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 import platform
 import argparse
@@ -59,7 +59,7 @@ def mount(cloud: Optional[str], network: Optional[str], destination: Optional[st
 
     config = get_rclone_config()
     if cloud is None:
-        res = choose_one_option(msg="which cloud", options=config.sections(), header="CLOUD MOUNT", default=None)
+        res = choose_from_options(multi=False, msg="which cloud", options=config.sections(), header="CLOUD MOUNT", default=None)
         if type(res) is str:
             cloud = res
         else:

machineconfig/scripts/python/cloud_repo_sync.py

@@ -2,13 +2,14 @@
 
 from pathlib import Path
 import git
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.io import read_ini
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.terminal import Terminal
-from machineconfig.utils.utils2 import randstr, read_ini
+from machineconfig.utils.accessories import randstr
 
 from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
-from machineconfig.utils.options import choose_one_option
+from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
 import platform
 import argparse
@@ -140,7 +141,7 @@ git commit -am "finished merging"
         program_content = None
         match action:
             case "ask":
-                choice = choose_one_option(options=[option1, option2, option3, option4], fzf=False)
+                choice = choose_from_options(multi=False, msg="Choose one option", options=[option1, option2, option3, option4], fzf=False)
                 if choice == option1:
                     program_content = shell_file_1.read_text(encoding="utf-8")
                 elif choice == option2:

machineconfig/scripts/python/croshell.py

@@ -5,10 +5,10 @@ croshell
 """
 
 import argparse
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.utils2 import randstr
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.accessories import randstr
 
-from machineconfig.utils.options import display_options
+from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.ve import get_ve_activate_line
 from typing import Optional
 from rich.console import Console
@@ -21,8 +21,10 @@ console = Console()
 
 def add_print_header_pycode(path: str, title: str):
     return f"""
-# from machineconfig.utils.path_reduced import P as PathExtended
-from crocodile.file_management import P as PathExtended
+try:
+    from crocodile.file_management import P as PathExtended
+except ImportError:
+    from machineconfig.utils.path_reduced import PathExtended
 pycode = PathExtended(r'{path}').read_text(encoding="utf-8")
 pycode = pycode.split("except Exception: print(pycode)")[2]
 
@@ -119,7 +121,7 @@ def build_parser():
         text = "🔍 Searching for Python files..."
         console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
         options = [str(item) for item in PathExtended.cwd().search("*.py", r=True)]
-        file = display_options(msg="Choose a python file to run", options=options, fzf=True, multi=False)
+        file = choose_from_options(msg="Choose a python file to run", options=options, fzf=True, multi=False)
         assert isinstance(file, str)
         program = PathExtended(file).read_text(encoding="utf-8")
         text = f"📄 Selected file: {PathExtended(file).name}"
@@ -160,10 +162,13 @@ def build_parser():
     preprogram = """
 
 #%%
-from crocodile.croshell import *
+try:
+    from crocodile.croshell import *
+    print_header()
+    print_logo(logo="crocodile")
+except ImportError:
+    print("Crocodile not found, skipping import.")
 from pathlib import Path
-print_header()
-print_logo(logo="crocodile")
 print(f"🐊 Crocodile Shell | Running @ {Path.cwd()}")
 """
 

machineconfig/scripts/python/devops.py

@@ -1,6 +1,6 @@
 """devops with emojis"""
 
-from machineconfig.utils.options import display_options
+from machineconfig.utils.options import choose_from_options
 
 from platform import system
 from enum import Enum
@@ -45,7 +45,7 @@ def main(which: Optional[str] = None):
     options = [op.value for op in Options]
     if which is None:
         try:
-            choice_key = display_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0])
+            choice_key = choose_from_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0], multi=False)
         except KeyboardInterrupt:
             console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
             return

machineconfig/scripts/python/devops_add_identity.py

@@ -1,8 +1,8 @@
 """ID"""
 
 # from platform import system
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.options import display_options
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.options import choose_from_options
 from rich.panel import Panel
 from rich.text import Text
 
@@ -22,7 +22,7 @@ def main() -> None:
     else:
         print(Panel("⚠️  No SSH private keys found", expand=False))
 
-    choice = display_options(msg="Path to private key to be used when ssh'ing: ", options=[str(x) for x in private_keys] + ["I have the path to the key file", "I want to paste the key itself"])
+    choice = choose_from_options(msg="Path to private key to be used when ssh'ing: ", options=[str(x) for x in private_keys] + ["I have the path to the key file", "I want to paste the key itself"], multi=False)
 
     if choice == "I have the path to the key file":
         print(Panel("📄 Please enter the path to your private key file", expand=False))
@@ -37,15 +37,10 @@ def main() -> None:
         path_to_key.write_text(input("🔑 Paste the private key here: "), encoding="utf-8")
         print(Panel(f"💾 Key saved to: {path_to_key}", expand=False))
 
-    elif isinstance(choice, str):
+    else:
         path_to_key = PathExtended(choice)
         print(Panel(f"🔑 Using selected key: {path_to_key.name}", expand=False))
 
-    else:
-        error_message = f"❌ ERROR: Invalid choice\nThe selected option is not supported: {choice}"
-        print(Panel(Text(error_message, justify="center"), expand=False, border_style="red"))
-        raise NotImplementedError(f"Choice {choice} not supported")
-
     txt = f"IdentityFile {path_to_key.collapseuser().as_posix()}"  # adds this id for all connections, no host specified.
     config_path = PathExtended.home().joinpath(".ssh/config")
 

machineconfig/scripts/python/devops_add_ssh_key.py

@@ -2,8 +2,8 @@
 
 from platform import system
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-from machineconfig.utils.options import display_options
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.options import choose_from_options
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from rich.console import Console
 from rich.panel import Panel
 from rich import box  # Import box
@@ -84,9 +84,7 @@ def main() -> None:
     i_have_path_option = "I have the path to the key file"
     i_paste_option = "I want to paste the key itself"
 
-    res = display_options("Which public key to add? ", options=[str(x) for x in pub_keys] + [all_keys_option, i_have_path_option, i_paste_option])
-    assert isinstance(res, str), f"Got {res} of type {type(res)} instead of str."
-
+    res = choose_from_options("Which public key to add? ", options=[str(x) for x in pub_keys] + [all_keys_option, i_have_path_option, i_paste_option], multi=False)
     if res == all_keys_option:
         console.print(Panel(f"🔄 Processing all {len(pub_keys)} public keys...", title="[bold blue]Processing[/bold blue]", border_style="blue"))
         program = "\n\n\n".join([get_add_ssh_key_script(key) for key in pub_keys])

machineconfig/scripts/python/devops_backup_retrieve.py

@@ -1,16 +1,17 @@
 """BR: Backup and Retrieve"""
 
 # import subprocess
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.utils2 import read_ini, read_toml
+from machineconfig.utils.io import read_ini
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, DEFAULTS_PATH
 from machineconfig.utils.code import print_code
-from machineconfig.utils.options import choose_cloud_interactively, choose_multiple_options
+from machineconfig.utils.options import choose_cloud_interactively, choose_from_options
 from machineconfig.scripts.python.helpers.helpers2 import ES
 from platform import system
 from typing import Any, Literal, Optional
 from rich.console import Console
 from rich.panel import Panel
+import tomllib
 
 
 OPTIONS = Literal["BACKUP", "RETRIEVE"]
@@ -26,7 +27,7 @@ def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None) -> Non
         console.print(Panel("🔍 DEFAULT CLOUD NOT FOUND\n🔄 Please select a cloud configuration from the options below", title="[bold red]Error: Cloud Not Found[/bold red]", border_style="red"))
         cloud = choose_cloud_interactively()
 
-    bu_file: dict[str, Any] = read_toml(LIBRARY_ROOT.joinpath("profile/backup.toml"))
+    bu_file: dict[str, Any] = tomllib.loads(LIBRARY_ROOT.joinpath("profile/backup.toml").read_text(encoding="utf-8"))
 
     console.print(Panel(f"🧰 LOADING BACKUP CONFIGURATION\n📄 File: {LIBRARY_ROOT.joinpath('profile/backup.toml')}", title="[bold blue]Backup Configuration[/bold blue]", border_style="blue"))
 
@@ -39,7 +40,7 @@ def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None) -> Non
 
     if which is None:
         console.print(Panel(f"🔍 SELECT {direction} ITEMS\n📋 Choose which configuration entries to process", title="[bold blue]Select Items[/bold blue]", border_style="blue"))
-        choices = choose_multiple_options(msg=f"WHICH FILE of the following do you want to {direction}?", options=["all"] + list(bu_file.keys()))
+        choices = choose_from_options(multi=True, msg=f"WHICH FILE of the following do you want to {direction}?", options=["all"] + list(bu_file.keys()))
     else:
         choices = which.split(",") if which else []
         console.print(Panel(f"🔖 PRE-SELECTED ITEMS\n📝 Using: {', '.join(choices)}", title="[bold blue]Pre-selected Items[/bold blue]", border_style="blue"))

machineconfig/scripts/python/devops_devapps_install.py

@@ -3,7 +3,7 @@
 # import subprocess
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-from machineconfig.utils.options import choose_multiple_options
+from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.installer import get_installers, install_all
 from platform import system
 from typing import Any, Optional, Literal, TypeAlias, get_args
@@ -59,7 +59,7 @@ def main(which: Optional[WHICH_CAT | str]) -> None:
 
     options += list(get_args(WHICH_CAT))
     # print("s"*1000)
-    program_names = choose_multiple_options(msg="", options=options, header="🚀 CHOOSE DEV APP", default="AllEssentials")
+    program_names = choose_from_options(multi=True, msg="", options=options, header="🚀 CHOOSE DEV APP", default="AllEssentials")
 
     total_commands = ""
     installation_messages: list[str] = []
@@ -112,7 +112,7 @@ def get_programs_by_category(program_name: WHICH_CAT):
                 options_system = {**options_system_1, **options_system_2}
             else:
                 raise NotImplementedError(f"❌ System {system()} not supported")
-            program_names = choose_multiple_options(msg="", options=sorted(list(options_system.keys())), header="🚀 CHOOSE DEV APP")
+            program_names = choose_from_options(multi=True, msg="", options=sorted(list(options_system.keys())), header="🚀 CHOOSE DEV APP")
             program = ""
             for name in program_names:
                 print(f"""
@@ -127,7 +127,7 @@ def get_programs_by_category(program_name: WHICH_CAT):
         # case "OtherDevApps":
         #     installers = get_installers(dev=True, system=system())
         #     options__: list[str] = [x.get_description() for x in tqdm(installers, desc="Checking installed programs")]
-        #     program_names = choose_multiple_options(msg="", options=sorted(options__) + ["all"], header="CHOOSE DEV APP")
+        #     program_names = choose_from_options(multi=True, msg="", options=sorted(options__) + ["all"], header="CHOOSE DEV APP")
         #     if "all" in program_names: program_names = options__
         #     program = ""
         #     print("Installing:")

machineconfig/scripts/python/devops_update_repos.py

@@ -3,9 +3,9 @@
 import git
 from pathlib import Path
 from machineconfig.scripts.python.repos_helper_update import RepositoryUpdateResult, run_uv_sync, update_repository
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
-from machineconfig.utils.utils2 import read_ini
+from machineconfig.utils.io import read_ini
 
 
 def _display_summary(results: list[RepositoryUpdateResult]) -> None:

machineconfig/scripts/python/dotfile.py

@@ -1,6 +1,6 @@
 """Like yadm and dotter."""
 
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.links import symlink_func
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, REPO_ROOT
 import argparse