machineconfig 2.6__py3-none-any.whl → 2.8__py3-none-any.whl

machineconfig/scripts/linux/cloud_copy

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.cloud_copy "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig cloud_copy "$@"

machineconfig/scripts/linux/cloud_mount

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.cloud_mount "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig cloud_mount "$@"

machineconfig/scripts/linux/cloud_repo_sync

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python $(dirname $(dirname $0))/python/cloud_repo_sync.py "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig cloud_repo_sync "$@"

machineconfig/scripts/linux/cloud_sync

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.cloud_sync "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig cloud_sync

machineconfig/scripts/linux/croshell

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.croshell "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig croshell "$@"
+

machineconfig/scripts/linux/devops

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig devops
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig devops

machineconfig/scripts/linux/fire

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig fire "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig fire "$@"

machineconfig/scripts/linux/fire_agents

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.fire_agents "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig fire_agents "$@"

machineconfig/scripts/linux/ftpx

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python $(dirname $(dirname $0))/python/ftpx.py "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig ftpx "$@"

machineconfig/scripts/linux/gh_models

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.gh_models "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig gh_models "$@"

machineconfig/scripts/linux/kill_process

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -c "from machineconfig.utils.procs import ProcessManager; ProcessManager().choose_and_kill()"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig kill_process "$@"

machineconfig/scripts/linux/mcinit

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.ai.mcinit "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig mcinit "$@"

machineconfig/scripts/linux/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

machineconfig/scripts/linux/mount_nw_drive

@@ -18,17 +18,7 @@ mount_point=''
 username=''
 password=''
 
-op_script=$HOME/tmp_results/shells/python_return_command.sh
-if [ -f "$op_script" ]; then
-  rm $op_script
-fi
-. activate_ve
-python -m machineconfig.scripts.python.mount_nw_drive
-#source $HOME/tmp_results/shells/python_return_command.sh
-if [ -f "$op_script" ]; then
-  chmod +x $op_script
-  source $op_script
-fi
+uv run --PYTHON 3.13 --no-dev --project $HOME/code/machineconfig python -m machineconfig.scripts.python.mount_nw_drive
 
 # Check if mount point directory exists, create if not
 if [ ! -d "$mount_point" ]; then

machineconfig/scripts/linux/repos

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.repos "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig repos "$@"

machineconfig/scripts/linux/scheduler

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.scheduler "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig scheduler "$@"

machineconfig/scripts/linux/start_slidev

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.start_slidev "$@"
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig start_slidev "$@"

machineconfig/scripts/linux/start_terminals

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python -m machineconfig.jobs.python.create_zellij_template
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig create_zellij_template
 zellij --layout $HOME/tmp_results/tmp_files/templates/zellij_template.kdl

machineconfig/scripts/linux/wifi_conn

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --with machineconfig python machineconfig.scripts.python.wifi_conn
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig wifi_conn

machineconfig/scripts/python/ai/mcinit.py

@@ -21,8 +21,7 @@ def get_repo_root(path: Path) -> Optional[Path]:
     return None
 
 
-def add_ai_configs():
-    repo_root: Path = Path.cwd()
+def add_ai_configs(repo_root: Path) -> None:
     import machineconfig as mc
 
     mc_root = Path(mc.__file__).parent
@@ -107,5 +106,20 @@ uv venv
             dot_git_ignore_path.write_text(data=dot_git_ignore_content + "\n" + "\n".join(to_add), encoding="utf-8")
 
 
+def main() -> None:
+    # import argparse
+
+    # parser = argparse.ArgumentParser(description="Add AI configurations to a Python project.")
+    # parser.add_argument(
+    #     "--repo-root",
+    #     type=str,
+    #     default=".",
+    #     help="Path to the root of the repository. Defaults to the current working directory.",
+    # )
+    # args = parser.parse_args()
+    # repo_root = Path(args.repo_root).resolve()
+    repo_root = Path.cwd()
+    add_ai_configs(repo_root=repo_root)
+
 if __name__ == "__main__":
     add_ai_configs(repo_root=Path.cwd())

machineconfig/scripts/python/ai/scripts/lint_and_type_check.sh

@@ -24,7 +24,7 @@ uv run -m cleanpy .
 uv run -m ruff clean
 # uv run -m ruff format .
 uv run -m ruff check . --fix
-uv run --with machineconfig -m machineconfig.scripts.python.ai.generate_files
+uv run --no-dev --project $HOME/code/machineconfig -m machineconfig.scripts.python.ai.generate_files
 
 mkdir .linters
 

machineconfig/scripts/python/croshell.py

@@ -140,7 +140,6 @@ def build_parser():
             #             py_file_path = run(data_path=args.read, data=None, get_figure=None)
             #             final_program = f"""
             # #!/bin/bash
-            # . $HOME/scripts/activate_ve '.venv'
             # streamlit run {py_file_path}
             # """
             #             PROGRAM_PATH.write_text(data=final_program, encoding="utf-8")

machineconfig/scripts/python/devops.py

@@ -18,14 +18,13 @@ BOX_WIDTH = 150  # width for box drawing
 class Options(Enum):
     update = "🔄 UPDATE essential repos"
     cli_install = "⚙️ DEVAPPS install"
-    sym_path_shell = "🔗 SYMLINKS, PATH & SHELL PROFILE"
+    sym_path_shell = "🔗 SYMLINKS, SHELL PROFILE, FONT, TERMINAL SETTINGS."
     sym_new = "🆕 SYMLINKS new"
     ssh_add_pubkey = "🔑 SSH add pub key to this machine"
     ssh_add_id = "🗝️ SSH add identity (private key) to this machine"
     ssh_use_pair = "🔐 SSH use key pair to connect two machines"
     ssh_setup = "📡 SSH setup"
     ssh_setup_wsl = "🐧 SSH setup wsl"
-    dot_files_sync = "🔗 DOTFILES sync"
     backup = "💾 BACKUP"
     retreive = "📥 RETRIEVE"
     scheduler = "⏰ SCHEDULER"
@@ -73,11 +72,8 @@ def display_task_success(success: str) -> None:
 
 
 def main(which: Optional[str] = None):
-    from machineconfig.utils.path_reduced import PathExtended
-
     # PathExtended(PROGRAM_PATH).delete(sure=True, verbose=False)
     console.print(Panel("🚀 Initializing DevOps operation...", width=BOX_WIDTH, border_style="blue"))
-
     options = [op.value for op in Options]
     if which is None:
         try:
@@ -93,9 +89,7 @@ def main(which: Optional[str] = None):
     if choice_key == Options.update.value:
         console.print(Panel("🔄 Updating essential repositories...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_update_repos as helper
-
         program = helper.main()
-
     elif choice_key == Options.cli_install.value:
         console.print(Panel("⚙️  Installing development applications...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_devapps_install as helper
@@ -159,12 +153,6 @@ def main(which: Optional[str] = None):
         # program = helper()
         program = ""
 
-    elif choice_key == Options.dot_files_sync.value:
-        console.print(Panel("🔗 Synchronizing dotfiles...", width=BOX_WIDTH, border_style="blue"))
-        from machineconfig.scripts.python.cloud_repo_sync import main as helper, PathExtended
-
-        program = helper(cloud=None, path=str(PathExtended.home() / "dotfiles"), pwd=None, action="ask")
-
     else:
         console.print(Panel("❌ ERROR: Invalid choice", title_align="left", border_style="red", width=BOX_WIDTH))
         raise ValueError(f"Unimplemented choice: {choice_key}")

machineconfig/scripts/python/devops_devapps_install.py

@@ -2,7 +2,7 @@
 
 # import subprocess
 from machineconfig.utils.installer_utils.installer_class import Installer
-from tqdm import tqdm
+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.installer import get_installers, install_all, get_all_dicts
@@ -38,7 +38,19 @@ def main(which: Optional[WHICH_CAT | str] = None):
 
     # interactive installation
     installers = [Installer.from_dict(d=vd, name=name) for __kat, vds in get_all_dicts(system=system()).items() for name, vd in vds.items()]
-    options = [x.get_description() for x in tqdm(installers, desc="✅ Checking installed programs")] + list(get_args(WHICH_CAT))
+    
+    # Check installed programs with progress indicator
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+    ) as progress:
+        task = progress.add_task("✅ Checking installed programs...", total=len(installers))
+        options = []
+        for x in installers:
+            options.append(x.get_description())
+            progress.update(task, advance=1)
+    
+    options += list(get_args(WHICH_CAT))
     # print("s"*1000)
     program_names = choose_multiple_options(msg="", options=options, header="🚀 CHOOSE DEV APP", default="AllEssentials")
 

machineconfig/scripts/python/devops_update_repos.py

@@ -20,7 +20,6 @@ def set_permissions_recursive(path: Path, executable: bool = True) -> None:
     """Set permissions recursively for a directory."""
     if not path.exists():
         return
-
     if path.is_file():
         if executable:
             path.chmod(0o755)
@@ -36,26 +35,50 @@ def run_uv_sync(repo_path: Path) -> bool:
     """Run uv sync in the given repository path. Returns True if successful."""
     try:
         print(f"🔄 Running uv sync in {repo_path}")
-        result = subprocess.run(["uv", "sync"], cwd=repo_path, capture_output=True, text=True, check=True)
+        # Run uv sync with output directly to terminal (no capture)
+        subprocess.run(["uv", "sync"], cwd=repo_path, check=True)
         print("✅ uv sync completed successfully")
-        if result.stdout:
-            print(f"📝 Output: {result.stdout}")
         return True
     except subprocess.CalledProcessError as e:
-        print(f"❌ uv sync failed: {e}")
-        if e.stderr:
-            print(f"📝 Error: {e.stderr}")
+        print(f"❌ uv sync failed with return code {e.returncode}")
         return False
     except FileNotFoundError:
         print("⚠️  uv command not found. Please install uv first.")
         return False
 
 
-def update_repository(repo: git.Repo, auto_sync: bool = True, allow_password_prompt: bool = False) -> bool:
+def update_repository(repo: git.Repo, auto_sync: bool, allow_password_prompt: bool) -> bool:
     """Update a single repository and return True if pyproject.toml or uv.lock changed."""
     repo_path = Path(repo.working_dir)
     print(f"🔄 {'Updating ' + str(repo_path):.^80}")
 
+    # Check git status first
+    print("📊 Checking git status...")
+    if repo.is_dirty():
+        # Get the list of modified files
+        changed_files_raw = [item.a_path for item in repo.index.diff(None)]
+        changed_files_raw.extend([item.a_path for item in repo.index.diff("HEAD")])
+        # Filter out None values and remove duplicates
+        changed_files = list(set(file for file in changed_files_raw if file is not None))
+        
+        print(f"⚠️  Repository has uncommitted changes: {', '.join(changed_files)}")
+        
+        # Check if the only change is uv.lock
+        if len(changed_files) == 1 and changed_files[0] == "uv.lock":
+            print("🔒 Only uv.lock has changes, resetting it...")
+            try:
+                # Reset uv.lock file
+                subprocess.run(["git", "checkout", "HEAD", "--", "uv.lock"], cwd=repo_path, check=True)
+                print("✅ uv.lock has been reset")
+            except subprocess.CalledProcessError as e:
+                print(f"❌ Failed to reset uv.lock: {e}")
+                return False
+        else:
+            # Multiple files or files other than uv.lock have changes
+            raise RuntimeError(f"❌ Cannot update repository - there are pending changes in: {', '.join(changed_files)}. Please commit or stash your changes first.")
+    else:
+        print("✅ Repository is clean")
+
     # Check if this repo has pyproject.toml or uv.lock
     pyproject_path = repo_path / "pyproject.toml"
     uv_lock_path = repo_path / "uv.lock"
@@ -210,12 +233,15 @@ def update_repository(repo: git.Repo, auto_sync: bool = True, allow_password_pro
 def main(verbose: bool = True, allow_password_prompt: bool = False) -> str:
     """Main function to update all configured repositories."""
     _ = verbose
-    repos: list[str] = ["~/code/machineconfig", "~/code/crocodile"]
+    repos: list[PathExtended] = [PathExtended.home() / "code/machineconfig", PathExtended.home() / "code/crocodile"]
     try:
         tmp = read_ini(DEFAULTS_PATH)["general"]["repos"].split(",")
         if tmp[-1] == "":
             tmp = tmp[:-1]
-        repos += tmp
+        for item in tmp:
+            item_obj = PathExtended(item).expanduser()
+            if item_obj not in repos:
+                repos.append(item_obj)
     except (FileNotFoundError, KeyError, IndexError):
         print(f"""
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -235,26 +261,20 @@ def main(verbose: bool = True, allow_password_prompt: bool = False) -> str:
 
     # Process repositories
     repos_with_changes = []
-    for a_package_path in repos:
+    for expanded_path in repos:
         try:
-            expanded_path = PathExtended(a_package_path).expanduser()
             repo = git.Repo(str(expanded_path), search_parent_directories=True)
-
             # Update repository and check if dependencies changed
-            dependencies_changed = update_repository(repo, allow_password_prompt=allow_password_prompt)
-
+            dependencies_changed = update_repository(repo, allow_password_prompt=allow_password_prompt, auto_sync=True)
             if dependencies_changed:
                 repos_with_changes.append(Path(repo.working_dir))
-
         except Exception as ex:
-            print(f"""❌ Repository Error: Path: {a_package_path}
+            print(f"""❌ Repository Error: Path: {expanded_path}
 Exception: {ex}
 {"-" * 50}""")
-
     # Run uv sync for repositories where pyproject.toml or uv.lock changed
     for repo_path in repos_with_changes:
         run_uv_sync(repo_path)
-
     # print("\n🎉 All repositories updated successfully!")
     return """echo "🎉 All repositories updated successfully!" """
 

machineconfig/scripts/python/fire_agents.py

@@ -15,7 +15,7 @@ from math import ceil
 from typing import Literal, TypeAlias, get_args, Iterable
 
 from machineconfig.cluster.sessions_managers.zellij_local_manager import ZellijLocalManager
-from machineconfig.cluster.sessions_managers.layout_types import TabConfig, LayoutConfig
+from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
 from machineconfig.utils.utils2 import randstr
 import random
 # import time

machineconfig/scripts/python/fire_jobs.py

@@ -24,7 +24,7 @@ from typing import Optional
 # import os
 
 
-def main(args: FireJobArgs) -> None:
+def route(args: FireJobArgs) -> None:
     if args.layout:
         from machineconfig.scripts.python.fire_jobs_layout_helper import handle_layout_args
 
@@ -257,7 +257,7 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
 
     if args.Nprocess > 1:
         from machineconfig.cluster.sessions_managers.zellij_local import run_zellij_layout
-        from machineconfig.cluster.sessions_managers.layout_types import LayoutConfig
+        from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
 
         layout: LayoutConfig = {"layoutName": "fireNprocess", "layoutTabs": []}
         for an_arg in range(args.Nprocess):
@@ -326,7 +326,12 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
     subprocess.run(command, shell=True, check=True)
 
 
+def main():
+    args = get_args()
+    route(args)
+
+
 if __name__ == "__main__":
     # options, func_args = parse_pyfile(file_path="C:/Users/aalsaf01/code/machineconfig/myresources/crocodile/core.py")
     args = get_args()
-    main(args)
+    route(args)

machineconfig/scripts/python/fire_jobs_layout_helper.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from machineconfig.cluster.sessions_managers.layout_types import LayoutConfig, LayoutsFile
+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