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

machineconfig/scripts/python/fire_agents.py

@@ -15,9 +15,9 @@ import sys
 from machineconfig.scripts.python.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout, AGENTS
 from machineconfig.scripts.python.fire_agents_help_search import search_files_by_pattern, search_python_files
 from machineconfig.scripts.python.fire_agents_load_balancer import chunk_prompts, SPLITTING_STRATEGY, DEFAULT_AGENT_CAP
-from machineconfig.utils.options import choose_one_option
+from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
-from machineconfig.utils.ve import get_repo_root
+from machineconfig.utils.accessories import get_repo_root
 
 SEARCH_STRATEGIES: TypeAlias = Literal["file_path", "keyword_search", "filename_pattern"]
 
@@ -80,9 +80,9 @@ def main():  # noqa: C901 - (complexity acceptable for CLI glue)
         sys.exit(1)
     print(f"Operating @ {repo_root}")
 
-    search_strategy = cast(SEARCH_STRATEGIES, choose_one_option(header="Choose search strategy:", options=get_args(SEARCH_STRATEGIES)))
-    splitting_strategy = cast(SPLITTING_STRATEGY, choose_one_option(header="Choose prompt splitting strategy:", options=get_args(SPLITTING_STRATEGY)))
-    agent_selected = cast(AGENTS, choose_one_option(header="Select agent type", options=get_args(AGENTS)))
+    search_strategy = cast(SEARCH_STRATEGIES, choose_from_options(multi=False, msg="Choose one option", header="Choose search strategy:", options=get_args(SEARCH_STRATEGIES)))
+    splitting_strategy = cast(SPLITTING_STRATEGY, choose_from_options(multi=False, msg="Choose one option", header="Choose prompt splitting strategy:", options=get_args(SPLITTING_STRATEGY)))
+    agent_selected = cast(AGENTS, choose_from_options(multi=False, msg="Choose one option", header="Select agent type", options=get_args(AGENTS)))
     print("Enter prefix prompt (end with Ctrl-D / Ctrl-Z):")
     prompt_prefix = "\n".join(sys.stdin.readlines())
     job_name = input("Enter job name [AI_AGENTS]: ") or "AI_Agents"
@@ -151,7 +151,7 @@ manager.run_monitoring_routine()
 
 
 def split_too_many_tabs_to_run_in_sequential_sessions(layout_tabs: list[TabConfig], every: int):
-    from machineconfig.utils.utils2 import split
+    from machineconfig.utils.accessories import split
     from machineconfig.cluster.sessions_managers.zellij_local_manager import ZellijLocalManager
 
     for idx, layout_tabs_chunk in enumerate(split(layout_tabs, every=every)):
@@ -163,7 +163,7 @@ def split_too_many_tabs_to_run_in_sequential_sessions(layout_tabs: list[TabConfi
 
 
 def split_too_many_layouts_to_run_in_sequential_sessions(layouts: list[LayoutConfig], every: int):
-    from machineconfig.utils.utils2 import split
+    from machineconfig.utils.accessories import split
     from machineconfig.cluster.sessions_managers.zellij_local_manager import ZellijLocalManager
 
     for _idx, layout_chunk in enumerate(split(layouts, every=every)):

machineconfig/scripts/python/fire_agents_help_launch.py

@@ -1,4 +1,4 @@
-from machineconfig.utils.utils2 import randstr
+from machineconfig.utils.accessories import randstr
 
 import random
 import shlex
@@ -14,7 +14,7 @@ AGENT_NAME_FORMATTER = "agent_{idx}_cmd.sh"  # e.g., agent_0_cmd.sh
 
 
 def get_gemini_api_keys() -> list[str]:
-    from machineconfig.utils.utils2 import read_ini
+    from machineconfig.utils.io import read_ini
 
     config = read_ini(Path.home().joinpath("dotfiles/creds/llm/gemini/api_keys.ini"))
     res: list[str] = []

machineconfig/scripts/python/fire_jobs.py

@@ -2,7 +2,7 @@
 fire
 
 # https://github.com/pallets/click combine with fire. Consider
-# https://github.com/ceccopierangiolieugenio/pyTermTk for display_options build TUI
+# https://github.com/ceccopierangiolieugenio/pyTermTk for choose_from_options build TUI
 # https://github.com/chriskiehl/Gooey build commandline interface
 
 """
@@ -11,17 +11,17 @@ from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_in
 from machineconfig.scripts.python.helpers.helpers4 import convert_kwargs_to_fire_kwargs_str
 from machineconfig.scripts.python.helpers.helpers4 import parse_pyfile
 from machineconfig.scripts.python.helpers.helpers4 import get_import_module_code
-from machineconfig.utils.ve import get_repo_root, get_ve_activate_line, get_ve_path_and_ipython_profile
-from machineconfig.utils.options import display_options, choose_one_option
-from machineconfig.utils.path import match_file_name, sanitize_path
+from machineconfig.utils.ve import get_ve_activate_line, get_ve_path_and_ipython_profile
+from machineconfig.utils.options import choose_from_options
+from machineconfig.utils.path_helper import match_file_name, sanitize_path
 
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.io_save import save_toml
-from machineconfig.utils.utils2 import randstr, read_toml
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.accessories import get_repo_root, randstr
 from machineconfig.scripts.python.fire_jobs_args_helper import get_args, FireJobArgs, extract_kwargs
 import platform
 from typing import Optional
 from pathlib import Path
+import tomllib
 # import os
 
 
@@ -39,7 +39,7 @@ def route(args: FireJobArgs) -> None:
         print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
         files = search_for_files_of_interest(path_obj)
         print(f"🔍 Got #{len(files)} results.")
-        choice_file = choose_one_option(options=files, fzf=True)
+        choice_file = choose_from_options(multi=False, options=files, fzf=True, msg="Choose one option")
         choice_file = PathExtended(choice_file)
     else:
         choice_file = path_obj
@@ -60,7 +60,7 @@ def route(args: FireJobArgs) -> None:
     if args.choose_function or args.submit_to_cloud:
         if choice_file.suffix == ".py":
             options, func_args = parse_pyfile(file_path=str(choice_file))
-            choice_function_tmp = display_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, fzf=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]
@@ -81,7 +81,7 @@ def route(args: FireJobArgs) -> None:
                 if line.startswith("echo"):
                     continue
                 options.append(line)
-            chosen_lines = display_options(msg="Choose a line to run", options=options, fzf=True, multi=True)
+            chosen_lines = choose_from_options(msg="Choose a line to run", options=options, fzf=True, multi=True)
             choice_file = PathExtended.tmpfile(suffix=".sh")
             choice_file.parent.mkdir(parents=True, exist_ok=True)
             choice_file.write_text("\n".join(chosen_lines), encoding="utf-8")
@@ -113,7 +113,7 @@ def route(args: FireJobArgs) -> None:
                     toml_path = toml_path_maybe
             if toml_path is not None:
                 print(f"📄 Reading config.toml @ {toml_path}")
-                config = read_toml(toml_path)
+                config = tomllib.loads(toml_path.read_text(encoding="utf-8"))
                 if "server" in config:
                     if "port" in config["server"]:
                         port = config["server"]["port"]
@@ -121,7 +121,7 @@ def route(args: FireJobArgs) -> None:
                 if repo_root is not None:
                     secrets_template_path = PathExtended.home().joinpath(f"dotfiles/creds/streamlit/{PathExtended(repo_root).name}/{choice_file.name}/secrets.toml")
                     if args.environment != "" and not secrets_path.exists() and secrets_template_path.exists():
-                        secrets_template = read_toml(secrets_template_path)
+                        secrets_template = tomllib.loads(secrets_template_path.read_text(encoding="utf-8"))
                         if args.environment == "ip":
                             host_url = f"http://{local_ip_v4}:{port}/oauth2callback"
                         elif args.environment == "localhost":
@@ -134,7 +134,7 @@ def route(args: FireJobArgs) -> None:
                             secrets_template["auth"]["redirect_uri"] = host_url
                             secrets_template["auth"]["cookie_secret"] = randstr(35)
                             secrets_template["auth"]["auth0"]["redirect_uri"] = host_url
-                            save_toml(obj=secrets_template, path=secrets_path)
+                            # save_toml(obj=secrets_template, path=secrets_path)
                         except Exception as ex:
                             print(ex)
                             raise ex

machineconfig/scripts/python/fire_jobs_layout_helper.py

@@ -2,9 +2,9 @@ from pathlib import Path
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig, LayoutsFile
 from typing import Optional, TYPE_CHECKING
 from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_interest
-from machineconfig.utils.options import choose_one_option
-from machineconfig.utils.path import match_file_name, sanitize_path
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.options import choose_from_options
+from machineconfig.utils.path_helper import match_file_name, sanitize_path
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 if TYPE_CHECKING:
     from machineconfig.scripts.python.fire_jobs_args_helper import FireJobArgs
@@ -18,9 +18,9 @@ def select_layout(layouts_json_file: Path, layout_name: Optional[str]):
         raise ValueError(f"No layouts found in {layouts_json_file}")
     if layout_name is None:
         options = [layout["layoutName"] for layout in layout_file["layouts"]]
-        from machineconfig.utils.options import choose_one_option
+        from machineconfig.utils.options import choose_from_options
 
-        layout_name = choose_one_option(options=options, prompt="Choose a layout configuration:", fzf=True)
+        layout_name = choose_from_options(multi=False, options=options, prompt="Choose a layout configuration:", fzf=True, msg="Choose one option")
     print(f"Selected layout: {layout_name}")
     layout_chosen = next((layout for layout in layout_file["layouts"] if layout["layoutName"] == layout_name), None)
     if layout_chosen is None:
@@ -59,7 +59,7 @@ def handle_layout_args(args: "FireJobArgs") -> None:
         print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
         files = search_for_files_of_interest(path_obj)
         print(f"🔍 Got #{len(files)} results.")
-        choice_file = choose_one_option(options=files, fzf=True)
+        choice_file = choose_from_options(multi=False, options=files, fzf=True, msg="Choose one option")
         choice_file = PathExtended(choice_file)
     else:
         choice_file = path_obj

machineconfig/scripts/python/ftpx.py

@@ -8,9 +8,9 @@ Currently, the only way to work around this is to predifine the host in ~/.ssh/c
 
 import argparse
 from machineconfig.utils.ssh import SSH
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.scripts.python.helpers.helpers2 import ES
-from machineconfig.utils.utils2 import pprint
+from machineconfig.utils.accessories import pprint
 
 
 def main():

machineconfig/scripts/python/helpers/cloud_helpers.py

@@ -1,5 +1,6 @@
 from pathlib import Path
-from machineconfig.utils.utils2 import pprint, read_json, read_ini
+from machineconfig.utils.io import read_ini, read_json
+from machineconfig.utils.accessories import pprint
 from typing import Optional
 import os
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH

machineconfig/scripts/python/helpers/helpers2.py

@@ -1,6 +1,7 @@
 from machineconfig.scripts.python.helpers.cloud_helpers import Args, ArgsDefaults, absolute, find_cloud_config, get_secure_share_cloud_config
+from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
-from machineconfig.utils.utils2 import read_ini, pprint
+from machineconfig.utils.accessories import pprint
 from typing import Optional
 from rich.console import Console
 from rich.panel import Panel
@@ -103,7 +104,7 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
         if len(source_parts) > 1 and source_parts[1] == ES:  # the source path is to be inferred from target.
             assert ES not in target, f"You can't use expand symbol `{ES}` in both source and target. Cyclical inference dependency arised."
             target_obj = absolute(target)
-            from machineconfig.utils.path_reduced import PathExtended as PathExtended
+            from machineconfig.utils.path_extended import PathExtended as PathExtended
 
             remote_path = PathExtended(target_obj).get_remote_path(os_specific=os_specific, root=root, rel2home=rel2home, strict=False)
             source = f"{cloud}:{remote_path.as_posix()}"
@@ -123,7 +124,7 @@ def parse_cloud_source_target(args: Args, source: str, target: str) -> tuple[str
         if len(target_parts) > 1 and target_parts[1] == ES:  # the target path is to be inferred from source.
             assert ES not in source, "You can't use $ in both source and target. Cyclical inference dependency arised."
             source_obj = absolute(source)
-            from machineconfig.utils.path_reduced import PathExtended as PathExtended
+            from machineconfig.utils.path_extended import PathExtended as PathExtended
 
             remote_path = PathExtended(source_obj).get_remote_path(os_specific=os_specific, root=root, rel2home=rel2home, strict=False)
             target = f"{cloud}:{remote_path.as_posix()}"

machineconfig/scripts/python/helpers/helpers4.py

@@ -3,7 +3,7 @@ import inspect
 import os
 
 # import argparse
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 # from machineconfig.utils.utils import choose_ssh_host
 
 

machineconfig/scripts/python/helpers/repo_sync_helpers.py

@@ -1,8 +1,8 @@
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.terminal import Terminal
 from machineconfig.scripts.python.get_zellij_cmd import get_zellij_cmd
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
-from machineconfig.utils.utils2 import read_ini
+from machineconfig.utils.io import read_ini
 from machineconfig.utils.code import write_shell_script_to_file
 import platform
 from rich.console import Console

machineconfig/scripts/python/mount_nfs.py

@@ -1,9 +1,9 @@
 """NFS mounting script"""
 
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.ssh import SSH
 from machineconfig.utils.terminal import Terminal
-from machineconfig.utils.options import display_options, choose_ssh_host
+from machineconfig.utils.options import choose_from_options, choose_ssh_host
 
 import platform
 
@@ -20,7 +20,7 @@ def main():
         assert isinstance(tmp, str)
         ssh = SSH(tmp)
         default = f"{ssh.hostname}:{ssh.run('echo $HOME').op}/data/share_nfs"
-        share_info = display_options("📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run("cat /etc/exports").op.split("\n") if not item.startswith("#")] + [default], default=default)
+        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run("cat /etc/exports").op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
         assert isinstance(share_info, str), f"❌ share_info must be a string. Got {type(share_info)}"
 
     remote_server = share_info.split(":")[0]
@@ -38,7 +38,7 @@ def main():
             mount_path_3 = mount_path_2
 
         print("🔧 Preparing mount paths...")
-        local_mount_point = display_options(msg="📂 Choose mount path OR input custom one:", options=[mount_path_1, mount_path_2, mount_path_3], default=mount_path_2, custom_input=True)
+        local_mount_point = choose_from_options(msg="📂 Choose mount path OR input custom one:", options=[mount_path_1, mount_path_2, mount_path_3], default=mount_path_2, custom_input=True, multi=False)
         assert isinstance(local_mount_point, PathExtended), f"❌ local_mount_point must be a pathlib.Path. Got {type(local_mount_point)}"
         local_mount_point = PathExtended(local_mount_point).expanduser()
 

machineconfig/scripts/python/mount_ssh.py

@@ -3,7 +3,7 @@
 from platform import system
 from machineconfig.utils.ssh import SSH
 from machineconfig.utils.terminal import Terminal
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 from machineconfig.utils.options import choose_ssh_host
 

machineconfig/scripts/python/repos.py

@@ -5,11 +5,13 @@ in the event that username@github.com is not mentioned in the remote url.
 
 """
 
+from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.utils2 import randstr, read_ini
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.accessories import randstr
 from machineconfig.scripts.python.repos_helper_update import update_repository
 from machineconfig.scripts.python.repos_helper_record import main as record_repos
+from machineconfig.scripts.python.repos_helper_clone import clone_repos
 
 import argparse
 from enum import Enum
@@ -119,7 +121,7 @@ def main():
     elif args.clone or args.checkout or args.checkout_to_branch:
         print("\n📥 Cloning or checking out repositories...")
         print(">>>>>>>>> Cloning Repos")
-        if not repos_root.exists() or repos_root.name != "repos.json":  # Fixed: use name instead of stem
+        if not repos_root.exists() or repos_root.name != "repos.json":
             repos_root = PathExtended(CONFIG_PATH).joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
             if not repos_root.exists():
                 if args.cloud is None:
@@ -130,6 +132,7 @@ def main():
                     assert cloud is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
                 repos_root.from_cloud(cloud=cloud, rel2home=True)
         assert (repos_root.exists() and repos_root.name == "repos.json") or args.cloud is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
+        clone_repos(spec_path=repos_root, preferred_remote=None, checkout_branch_flag=args.checkout_to_branch, checkout_commit_flag=args.checkout)
 
     elif args.all or args.commit or args.pull or args.push:
         print(f"\n🔄 Performing Git actions on repositories @ `{repos_root}`...")

machineconfig/scripts/python/repos_helper_clone.py

@@ -0,0 +1,121 @@
+from __future__ import annotations
+
+from typing import Literal, Optional, cast
+
+from git import Repo as GitRepo
+from git.exc import GitCommandError
+from rich import print as pprint
+from rich.progress import BarColumn, MofNCompleteColumn, Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
+
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.schemas.repos.repos_types import RepoRecordDict, RepoRecordFile, RepoRemote
+from machineconfig.utils.io import read_json
+
+
+CloneStatus = Literal["cloned", "skipped", "failed"]
+
+
+def choose_remote(remotes: list[RepoRemote], preferred_remote: Optional[str]) -> Optional[RepoRemote]:
+    if preferred_remote is not None:
+        for remote in remotes:
+            if remote["name"] == preferred_remote:
+                return remote
+    for remote in remotes:
+        if remote["name"] == "origin":
+            return remote
+    return remotes[0] if len(remotes) > 0 else None
+
+
+def ensure_destination(parent_dir: str, name: str) -> PathExtended:
+    parent_path = PathExtended(parent_dir).expanduser().absolute()
+    parent_path.mkdir(parents=True, exist_ok=True)
+    return parent_path.joinpath(name)
+
+
+def checkout_branch(repo: GitRepo, branch: str) -> bool:
+    if branch == "DETACHED":
+        return False
+    current_branch = repo.active_branch.name if not repo.head.is_detached else None
+    if current_branch == branch:
+        return False
+    repo.git.checkout(branch)
+    return True
+
+
+def checkout_commit(repo: GitRepo, commit: str) -> bool:
+    if commit in {"", "UNKNOWN"}:
+        return False
+    current_commit = repo.head.commit.hexsha
+    if current_commit == commit:
+        return False
+    repo.git.checkout(commit)
+    return True
+
+
+def clone_single_repo(repo_spec: RepoRecordDict, preferred_remote: Optional[str], checkout_branch_flag: bool, checkout_commit_flag: bool) -> tuple[CloneStatus, str]:
+    destination = ensure_destination(parent_dir=repo_spec["parentDir"], name=repo_spec["name"])
+    repo_path = destination.joinpath(".git")
+    remotes = repo_spec["remotes"]
+    if len(remotes) == 0:
+        return ("failed", f"No remotes configured for {destination}")
+    remote = choose_remote(remotes=remotes, preferred_remote=preferred_remote)
+    if remote is None:
+        return ("failed", f"No usable remote for {destination}")
+    repo = None
+    status: CloneStatus
+    message: str
+    if destination.exists() and repo_path.exists():
+        status = "skipped"
+        repo = GitRepo(str(destination))
+        message = f"Skipped cloning for {destination}; existing repository reused"
+    elif destination.exists() and not repo_path.exists():
+        return ("failed", f"Destination exists but is not a git repository: {destination}")
+    else:
+        try:
+            pprint(f"📥 Cloning {repo_spec['name']} from {remote['url']}")
+            repo = GitRepo.clone_from(url=remote["url"], to_path=str(destination))
+            status = "cloned"
+            message = f"Cloned {destination}"
+        except Exception as err:  # noqa: BLE001
+            return ("failed", f"Clone failed for {destination}: {err}")
+    assert repo is not None
+    checkout_summary: list[str] = []
+    try:
+        if checkout_branch_flag:
+            if checkout_branch(repo=repo, branch=repo_spec["version"]["branch"]):
+                checkout_summary.append(f"branch {repo_spec['version']['branch']}")
+        if checkout_commit_flag:
+            if checkout_commit(repo=repo, commit=repo_spec["version"]["commit"]):
+                checkout_summary.append(f"commit {repo_spec['version']['commit'][:8]}")
+    except GitCommandError as err:
+        return ("failed", f"Checkout failed for {destination}: {err}")
+    if len(checkout_summary) > 0:
+        message = f"{message} | Checked out {' & '.join(checkout_summary)}"
+    return (status, message)
+
+
+def clone_repos(spec_path: PathExtended, preferred_remote: Optional[str], checkout_branch_flag: bool, checkout_commit_flag: bool) -> list[tuple[CloneStatus, str]]:
+    data = cast(RepoRecordFile, read_json(path=spec_path))
+    repos = data["repos"]
+    results: list[tuple[CloneStatus, str]] = []
+    with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), BarColumn(), MofNCompleteColumn(), TimeElapsedColumn()) as progress:
+        task_id = progress.add_task("Processing repositories...", total=len(repos))
+        for repo_spec in repos:
+            progress.update(task_id, description=f"Processing {repo_spec['name']}")
+            try:
+                result = clone_single_repo(repo_spec=repo_spec, preferred_remote=preferred_remote, checkout_branch_flag=checkout_branch_flag, checkout_commit_flag=checkout_commit_flag)
+            except Exception as err:  # noqa: BLE001
+                result = ("failed", f"Unexpected error for {repo_spec['name']}: {err}")
+            results.append(result)
+            if result[0] == "failed":
+                pprint(f"❌ {result[1]}")
+            elif result[0] == "cloned":
+                pprint(f"✅ {result[1]}")
+            else:
+                pprint(f"⏭️ {result[1]}")
+            progress.update(task_id, advance=1)
+    success_count = len([status for status, _ in results if status == "cloned"])
+    skip_count = len([status for status, _ in results if status == "skipped"])
+    fail_count = len([status for status, _ in results if status == "failed"])
+    pprint(f"✅ Cloned: {success_count} | ⏭️ Skipped: {skip_count} | ❌ Failed: {fail_count}")
+    return results

machineconfig/scripts/python/repos_helper_record.py

@@ -1,9 +1,9 @@
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.schemas.repos.repos_types import GitVersionInfo, RepoRecordDict, RepoRemote
 
 from machineconfig.utils.schemas.repos.repos_types import RepoRecordFile
 from machineconfig.utils.source_of_truth import CONFIG_PATH
-from machineconfig.utils.io_save import save_json
+from machineconfig.utils.io import save_json
 
 from typing import Optional
 

machineconfig/scripts/python/start_slidev.py

@@ -4,7 +4,7 @@ slidev
 
 from machineconfig.utils.source_of_truth import CONFIG_PATH
 from machineconfig.utils.code import print_code
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.terminal import Terminal
 import subprocess
 import platform

machineconfig/scripts/python/start_terminals.py

@@ -1,6 +1,6 @@
 """Script to start terminals on windows and wsl"""
 
-from machineconfig.utils.options import display_options, get_ssh_hosts
+from machineconfig.utils.options import choose_from_options, get_ssh_hosts
 import platform
 from itertools import cycle
 from typing import Literal
@@ -98,7 +98,7 @@ def main():
     else:
         if args.hosts is None:
             print("🌐 No hosts provided. Displaying options...")
-            hosts = display_options(msg="Select hosts:", options=get_ssh_hosts() + [THIS_MACHINE], multi=True, fzf=True)
+            hosts = choose_from_options(msg="Select hosts:", options=get_ssh_hosts() + [THIS_MACHINE], multi=True, fzf=True)
         else:
             print("🌐 Using provided hosts:", args.hosts)
             hosts = args.hosts

machineconfig/scripts/python/wsl_windows_transfer.py

@@ -1,6 +1,6 @@
 """TWSL"""
 
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 import argparse
 import platform
 import getpass

machineconfig/settings/shells/ipy/profiles/default/startup/playext.py

@@ -26,8 +26,8 @@
 # @register_line_magic("codei")  # type: ignore
 # def print_code_interactive(_):
 #     res = get_names()
-#     from machineconfig.utils.utils import choose_one_option
-#     choice = choose_one_option(options=res["<class 'function'>"], msg="Choose a type to inspect", fzf=True)
+#     from machineconfig.utils.utils import choose_from_options
+#     choice = choose_from_options(multi=False, options=res["<class 'function'>"], msg="Choose a type to inspect", fzf=True)
 #     obj = eval(choice, globals(), locals())  # type: ignore  # pylint: disable=eval-used
 #     from rich.syntax import Syntax
 #     import inspect

machineconfig/setup_windows/wt_and_pwsh/install_nerd_fonts.py

@@ -4,7 +4,7 @@ https://glitchbone.github.io/vscode-base16-term/#/3024
 
 """
 
-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 LIBRARY_ROOT
 from machineconfig.utils.installer_utils.installer_class import Installer
 import subprocess

machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py

@@ -1,8 +1,8 @@
 """Set Windows Terminal Settings"""
 
-from machineconfig.utils.utils2 import randstr, read_json
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.io_save import save_json
+from machineconfig.utils.accessories import randstr
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.io import read_json, save_json
 import platform
 
 # from uuid import uuid4

machineconfig/utils/{utils2.py → accessories.py}

@@ -32,35 +32,6 @@ def split[T](iterable: list[T], every: int = 1, to: Optional[int] = None) -> lis
     return list(res)
 
 
-def read_ini(path: "Path", encoding: Optional[str] = None):
-    if not Path(path).exists() or Path(path).is_dir():
-        raise FileNotFoundError(f"File not found or is a directory: {path}")
-    import configparser
-
-    res = configparser.ConfigParser()
-    res.read(filenames=[str(path)], encoding=encoding)
-    return res
-
-
-def read_json(path: "Path", r: bool = False, **kwargs: Any) -> Any:  # return could be list or dict etc
-    import json
-
-    try:
-        mydict = json.loads(Path(path).read_text(encoding="utf-8"), **kwargs)
-    except Exception:
-        import pyjson5
-
-        mydict = pyjson5.loads(Path(path).read_text(encoding="utf-8"), **kwargs)  # file has C-style comments.
-    _ = r
-    return mydict
-
-
-def read_toml(path: "Path"):
-    import tomli
-
-    return tomli.loads(path.read_text(encoding="utf-8"))
-
-
 def pprint(obj: dict[Any, Any], title: str) -> None:
     from rich import inspect
 
@@ -86,3 +57,16 @@ def human_friendly_dict(d: dict[str, Any]) -> dict[str, Any]:
         else:
             result[k] = v
     return result
+
+
+def get_repo_root(path: Path) -> Optional[Path]:
+    from git import Repo, InvalidGitRepositoryError
+
+    try:
+        repo = Repo(str(path), search_parent_directories=True)
+        root = repo.working_tree_dir
+        if root is not None:
+            return Path(root)
+    except InvalidGitRepositoryError:
+        pass
+    return None

machineconfig/utils/code.py

@@ -5,9 +5,9 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.syntax import Syntax
 
-from machineconfig.utils.utils2 import randstr
+from machineconfig.utils.accessories import randstr
 from machineconfig.utils.ve import get_ve_activate_line
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 
 def get_shell_script_executing_python_file(python_file: str, func: Optional[str], ve_path: str, strict_execution: bool = True):

machineconfig/utils/installer.py

@@ -6,9 +6,9 @@ from machineconfig.utils.schemas.installer.installer_types import APP_INSTALLER_
 from rich.console import Console
 from rich.panel import Panel  # Added import
 
-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 INSTALL_VERSION_ROOT
-from machineconfig.utils.utils2 import read_json
+from machineconfig.utils.io import read_json
 
 from typing import Any
 import platform

machineconfig/utils/installer_utils/installer_abc.py

@@ -1,4 +1,4 @@
-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 WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH
 from typing import Optional
 import subprocess