machineconfig 2.7__py3-none-any.whl → 2.9__py3-none-any.whl

machineconfig/scripts/python/repos_helper_update.py

@@ -0,0 +1,288 @@
+from pathlib import Path
+from typing import TypedDict
+import subprocess
+import git
+
+
+
+class RepositoryUpdateResult(TypedDict):
+    """Result of updating a single repository."""
+    repo_path: str
+    status: str  # "success", "error", "skipped", "auth_failed"
+    had_uncommitted_changes: bool
+    uncommitted_files: list[str]
+    commit_before: str
+    commit_after: str
+    commits_changed: bool
+    pyproject_changed: bool
+    uv_lock_changed: bool
+    dependencies_changed: bool
+    uv_sync_ran: bool
+    uv_sync_success: bool
+    remotes_processed: list[str]
+    remotes_skipped: list[str]
+    error_message: str | None
+    is_machineconfig_repo: bool
+    permissions_updated: bool
+
+
+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)
+        else:
+            path.chmod(0o644)
+    elif path.is_dir():
+        path.chmod(0o755)
+        for item in path.rglob("*"):
+            set_permissions_recursive(item, executable)
+
+
+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}")
+        # Run uv sync with output directly to terminal (no capture)
+        subprocess.run(["uv", "sync"], cwd=repo_path, check=True)
+        print("✅ uv sync completed successfully")
+        return True
+    except subprocess.CalledProcessError as e:
+        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 get_file_hash(file_path: Path) -> str | None:
+    """Get SHA256 hash of a file, return None if file doesn't exist."""
+    if not file_path.exists():
+        return None
+    import hashlib
+    return hashlib.sha256(file_path.read_bytes()).hexdigest()
+
+
+def update_repository(repo: git.Repo, auto_sync: bool, allow_password_prompt: bool) -> RepositoryUpdateResult:
+    """Update a single repository and return detailed information about what happened."""
+    repo_path = Path(repo.working_dir)
+    print(f"🔄 {'Updating ' + str(repo_path):.^80}")
+
+    # Initialize result dict
+    result: RepositoryUpdateResult = {
+        "repo_path": str(repo_path),
+        "status": "success",
+        "had_uncommitted_changes": False,
+        "uncommitted_files": [],
+        "commit_before": "",
+        "commit_after": "",
+        "commits_changed": False,
+        "pyproject_changed": False,
+        "uv_lock_changed": False,
+        "dependencies_changed": False,
+        "uv_sync_ran": False,
+        "uv_sync_success": False,
+        "remotes_processed": [],
+        "remotes_skipped": [],
+        "error_message": None,
+        "is_machineconfig_repo": "machineconfig" in str(repo_path),
+        "permissions_updated": False,
+    }
+
+    # 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))
+
+        result["had_uncommitted_changes"] = True
+        result["uncommitted_files"] = changed_files
+        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:
+                result["status"] = "error"
+                result["error_message"] = f"Failed to reset uv.lock: {e}"
+                print(f"❌ Failed to reset uv.lock: {e}")
+                return result
+        else:
+            # Multiple files or files other than uv.lock have changes
+            result["status"] = "error"
+            result["error_message"] = f"Cannot update repository - there are pending changes in: {', '.join(changed_files)}. Please commit or stash your changes first."
+            raise RuntimeError(result["error_message"])
+    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"
+
+    # Get hashes before pull
+    pyproject_hash_before = get_file_hash(pyproject_path)
+    uv_lock_hash_before = get_file_hash(uv_lock_path)
+
+    # Get current commit hash before pull
+    result["commit_before"] = repo.head.commit.hexsha
+
+    try:
+        # Use subprocess for git pull to get better output control
+
+        # Get list of remotes
+        remotes = list(repo.remotes)
+        if not remotes:
+            print("⚠️  No remotes configured for this repository")
+            result["status"] = "skipped"
+            result["error_message"] = "No remotes configured for this repository"
+            return result
+
+        for remote in remotes:
+            try:
+                print(f"📥 Fetching from {remote.name}...")
+
+                # Set up environment for git commands
+                env = None
+                if not allow_password_prompt:
+                    # Disable interactive prompts
+                    import os
+
+                    env = os.environ.copy()
+                    env["GIT_TERMINAL_PROMPT"] = "0"
+                    env["GIT_ASKPASS"] = "echo"  # Returns empty string for any credential request
+
+                # First fetch to see what's available
+                fetch_result = subprocess.run(
+                    ["git", "fetch", remote.name, "--verbose"],
+                    cwd=repo_path,
+                    capture_output=True,
+                    text=True,
+                    env=env,
+                    timeout=30,  # Add timeout to prevent hanging
+                )
+
+                # Check if fetch failed due to authentication
+                if fetch_result.returncode != 0 and not allow_password_prompt:
+                    auth_error_indicators = [
+                        "Authentication failed",
+                        "Password for",
+                        "Username for",
+                        "could not read Username",
+                        "could not read Password",
+                        "fatal: Authentication failed",
+                        "fatal: could not read Username",
+                        "fatal: could not read Password",
+                    ]
+
+                    error_output = (fetch_result.stderr or "") + (fetch_result.stdout or "")
+                    if any(indicator in error_output for indicator in auth_error_indicators):
+                        print(f"⚠️  Skipping {remote.name} - authentication required but password prompts are disabled")
+                        continue
+
+                if fetch_result.stdout:
+                    print(f"📡 Fetch output: {fetch_result.stdout.strip()}")
+                if fetch_result.stderr:
+                    print(f"📡 Fetch info: {fetch_result.stderr.strip()}")
+
+                # Now pull with verbose output
+                print(f"📥 Pulling from {remote.name}/{repo.active_branch.name}...")
+                pull_result = subprocess.run(["git", "pull", remote.name, repo.active_branch.name, "--verbose"], cwd=repo_path, capture_output=True, text=True, env=env, timeout=30)
+
+                # Check if pull failed due to authentication
+                if pull_result.returncode != 0 and not allow_password_prompt:
+                    auth_error_indicators = [
+                        "Authentication failed",
+                        "Password for",
+                        "Username for",
+                        "could not read Username",
+                        "could not read Password",
+                        "fatal: Authentication failed",
+                        "fatal: could not read Username",
+                        "fatal: could not read Password",
+                    ]
+
+                    error_output = (pull_result.stderr or "") + (pull_result.stdout or "")
+                    if any(indicator in error_output for indicator in auth_error_indicators):
+                        print(f"⚠️  Skipping pull from {remote.name} - authentication required but password prompts are disabled")
+                        continue
+
+                if pull_result.stdout:
+                    print(f"📦 Pull output: {pull_result.stdout.strip()}")
+                if pull_result.stderr:
+                    print(f"📦 Pull info: {pull_result.stderr.strip()}")
+
+                # Check if pull was successful
+                if pull_result.returncode == 0:
+                    result["remotes_processed"].append(remote.name)
+                    # Check if commits changed
+                    result["commit_after"] = repo.head.commit.hexsha
+                    if result["commit_before"] != result["commit_after"]:
+                        result["commits_changed"] = True
+                        print(f"✅ Repository updated: {result['commit_before'][:8]} → {result['commit_after'][:8]}")
+                    else:
+                        print("✅ Already up to date")
+                else:
+                    result["remotes_skipped"].append(remote.name)
+                    print(f"❌ Pull failed with return code {pull_result.returncode}")
+
+            except Exception as e:
+                result["remotes_skipped"].append(remote.name)
+                print(f"⚠️  Failed to pull from {remote.name}: {e}")
+                continue
+
+        # Check if pyproject.toml or uv.lock changed after pull
+        pyproject_hash_after = get_file_hash(pyproject_path)
+        uv_lock_hash_after = get_file_hash(uv_lock_path)
+
+        if pyproject_hash_before != pyproject_hash_after:
+            print("📋 pyproject.toml has changed")
+            result["pyproject_changed"] = True
+            result["dependencies_changed"] = True
+
+        if uv_lock_hash_before != uv_lock_hash_after:
+            print("🔒 uv.lock has changed")
+            result["uv_lock_changed"] = True
+            result["dependencies_changed"] = True
+
+        # Special handling for machineconfig repository
+        if result["is_machineconfig_repo"]:
+            print("🛠  Special handling for machineconfig repository...")
+            scripts_path = Path.home() / "scripts"
+            if scripts_path.exists():
+                set_permissions_recursive(scripts_path)
+                result["permissions_updated"] = True
+                print(f"✅ Set permissions for {scripts_path}")
+
+            linux_jobs_path = repo_path / "src" / "machineconfig" / "jobs" / "linux"
+            if linux_jobs_path.exists():
+                set_permissions_recursive(linux_jobs_path)
+                result["permissions_updated"] = True
+                print(f"✅ Set permissions for {linux_jobs_path}")
+
+            lf_exe_path = repo_path / "src" / "machineconfig" / "settings" / "lf" / "linux" / "exe"
+            if lf_exe_path.exists():
+                set_permissions_recursive(lf_exe_path)
+                result["permissions_updated"] = True
+                print(f"✅ Set permissions for {lf_exe_path}")
+
+        # Run uv sync if dependencies changed and auto_sync is enabled
+        if result["dependencies_changed"] and auto_sync:
+            result["uv_sync_ran"] = True
+            result["uv_sync_success"] = run_uv_sync(repo_path)
+
+        return result
+
+    except Exception as e:
+        result["status"] = "error"
+        result["error_message"] = str(e)
+        print(f"❌ Error updating repository {repo_path}: {e}")
+        return result

machineconfig/utils/installer_utils/installer_class.py

@@ -94,14 +94,14 @@ class Installer:
 
             if old_version_cli == new_version_cli:
                 print(f"ℹ️  Same version detected: {old_version_cli}")
-                return f"""echo "📦️ 😑 {self.exe_name}, same version: {old_version_cli}" """
+                return f"""📦️ 😑 {self.exe_name}, same version: {old_version_cli}"""
             else:
                 print(f"🚀 Update successful: {old_version_cli} ➡️ {new_version_cli}")
-                return f"""echo "📦️ 🤩 {self.exe_name} updated from {old_version_cli} ➡️ TO ➡️  {new_version_cli}" """
+                return f"""📦️ 🤩 {self.exe_name} updated from {old_version_cli} ➡️ TO ➡️  {new_version_cli}"""
 
         except Exception as ex:
             print(f"❌ ERROR: Installation failed for {self.exe_name}: {ex}")
-            return f"""echo "📦️ ❌ Failed to install `{self.name}` with error: {ex}" """
+            return f"""📦️ ❌ Failed to install `{self.name}` with error: {ex}"""
 
     def install(self, version: Optional[str]):
         print(f"\n{'=' * 80}\n🔧 INSTALLATION PROCESS: {self.exe_name} 🔧\n{'=' * 80}")

machineconfig/utils/notifications.py

@@ -14,7 +14,8 @@ import imaplib
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from typing import Optional, Any, Union
-from markdown import markdown
+from rich.console import Console
+from rich.markdown import Markdown
 
 
 def download_to_memory(path: Path, allow_redirects: bool = True, timeout: Optional[float] = None, params: Any = None) -> "Any":
@@ -30,8 +31,27 @@ def get_github_markdown_css() -> str:
     return download_to_memory(Path(pp)).text
 
 
-def md2html(body: str):
-    gh_style = Path(__file__).parent.joinpath("gh_style.css").read_text()
+def md2html(body: str) -> str:
+    """Convert markdown to HTML using Rich library."""
+    # Use Rich's HTML export functionality to convert markdown to HTML
+    console = Console(record=True, width=120)
+    markdown_obj = Markdown(body)
+    console.print(markdown_obj)
+    html_output = console.export_html(inline_styles=True)
+    
+    # Try to load GitHub CSS style, fallback to basic style if not found
+    gh_style_path = Path(__file__).parent.joinpath("gh_style.css")
+    if gh_style_path.exists():
+        gh_style = gh_style_path.read_text()
+    else:
+        # Fallback basic styling
+        gh_style = """
+        body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; }
+        h1, h2, h3, h4, h5, h6 { color: #0366d6; }
+        code { background-color: #f6f8fa; padding: 2px 4px; border-radius: 3px; }
+        pre { background-color: #f6f8fa; padding: 16px; border-radius: 6px; overflow: auto; }
+        """
+    
     return f"""
 <!DOCTYPE html>
 <html>
@@ -51,7 +71,7 @@ def md2html(body: str):
 </style>
 <body>
 <div class="markdown-body">
-{markdown(body)}
+{html_output}
 </div>
 </body>
 </html>"""

machineconfig/utils/path.py

@@ -1,5 +1,6 @@
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.options import choose_one_option
+from machineconfig.utils.source_of_truth import EXCLUDE_DIRS
 from rich.console import Console
 from rich.panel import Panel
 import platform
@@ -54,7 +55,7 @@ def find_scripts(root: Path, name_substring: str, suffixes: set[str]) -> tuple[l
     partial_path_matches = []
     for entry in root.iterdir():
         if entry.is_dir():
-            if entry.name in {".links", ".venv", ".git", ".idea", ".vscode", "node_modules", "__pycache__", ".mypy_cache"}:
+            if entry.name in set(EXCLUDE_DIRS):
                 # prune this entire subtree
                 continue
             tmp1, tmp2 = find_scripts(entry, name_substring, suffixes)

machineconfig/utils/procs.py

@@ -1,13 +1,13 @@
 """Procs"""
 
 import psutil
-from tqdm import tqdm
-from pytz import timezone
+from rich.progress import Progress, SpinnerColumn, TextColumn
+from zoneinfo import ZoneInfo
 from machineconfig.utils.options import display_options
 from typing import Optional, Any
 from rich.console import Console
 from rich.panel import Panel
-from datetime import datetime
+from datetime import datetime, timezone
 from machineconfig.utils.utils2 import pprint
 
 console = Console()
@@ -20,14 +20,22 @@ def get_processes_accessing_file(path: str):
     title = "🔍  SEARCHING FOR PROCESSES ACCESSING FILE"
     console.print(Panel(title, title="[bold blue]Process Info[/bold blue]", border_style="blue"))
     res: dict[int, list[str]] = {}
-    for proc in tqdm(psutil.process_iter(), desc="🔎 Scanning processes"):
-        try:
-            files = proc.open_files()
-        except psutil.AccessDenied:
-            continue
-        tmp = [file.path for file in files if path in file.path]
-        if len(tmp) > 0:
-            res[proc.pid] = tmp
+    
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+    ) as progress:
+        progress.add_task("🔎 Scanning processes...", total=None)
+        
+        for proc in psutil.process_iter():
+            try:
+                files = proc.open_files()
+            except psutil.AccessDenied:
+                continue
+            tmp = [file.path for file in files if path in file.path]
+            if len(tmp) > 0:
+                res[proc.pid] = tmp
+                
     # Convert to list of dictionaries for consistent data structure
     result_data = [{"pid": pid, "files": files} for pid, files in res.items()]
     console.print(Panel(f"✅ Found {len(res)} processes accessing the specified file", title="[bold blue]Process Info[/bold blue]", border_style="blue"))
@@ -53,27 +61,34 @@ class ProcessManager:
         title = "📊  INITIALIZING PROCESS MANAGER"
         console.print(Panel(title, title="[bold blue]Process Info[/bold blue]", border_style="blue"))
         process_info = []
-        for proc in tqdm(psutil.process_iter(), desc="🔍 Reading system processes"):
-            try:
-                mem_usage_mb = proc.memory_info().rss / (1024 * 1024)
-                # Convert create_time to local timezone
-                create_time_utc = datetime.fromtimestamp(proc.create_time(), tz=timezone("UTC"))
-                create_time_local = create_time_utc.astimezone(timezone("Australia/Adelaide"))
-
-                process_info.append(
-                    {
-                        "pid": proc.pid,
-                        "name": proc.name(),
-                        "username": proc.username(),
-                        "cpu_percent": proc.cpu_percent(),
-                        "memory_usage_mb": mem_usage_mb,
-                        "status": proc.status(),
-                        "create_time": create_time_local,
-                        "command": " ".join(proc.cmdline()),
-                    }
-                )
-            except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
-                pass
+        
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+        ) as progress:
+            progress.add_task("🔍 Reading system processes...", total=None)
+            
+            for proc in psutil.process_iter():
+                try:
+                    mem_usage_mb = proc.memory_info().rss / (1024 * 1024)
+                    # Convert create_time to local timezone
+                    create_time_utc = datetime.fromtimestamp(proc.create_time(), tz=timezone.utc)
+                    create_time_local = create_time_utc.astimezone(ZoneInfo("Australia/Adelaide"))
+
+                    process_info.append(
+                        {
+                            "pid": proc.pid,
+                            "name": proc.name(),
+                            "username": proc.username(),
+                            "cpu_percent": proc.cpu_percent(),
+                            "memory_usage_mb": mem_usage_mb,
+                            "status": proc.status(),
+                            "create_time": create_time_local,
+                            "command": " ".join(proc.cmdline()),
+                        }
+                    )
+                except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+                    pass
 
         # Sort by memory usage (descending)
         process_info.sort(key=lambda x: x["memory_usage_mb"], reverse=True)
@@ -207,13 +222,13 @@ def get_age(create_time: Any) -> str:
     try:
         if isinstance(create_time, (int, float)):
             # Handle timestampz
-            create_time_utc = datetime.fromtimestamp(create_time, tz=timezone("UTC"))
-            create_time_local = create_time_utc.astimezone(timezone("Australia/Adelaide"))
+            create_time_utc = datetime.fromtimestamp(create_time, tz=timezone.utc)
+            create_time_local = create_time_utc.astimezone(ZoneInfo("Australia/Adelaide"))
         else:
             # Already a datetime object
             create_time_local = create_time
 
-        now_local = datetime.now(tz=timezone("Australia/Adelaide"))
+        now_local = datetime.now(tz=ZoneInfo("Australia/Adelaide"))
         age = now_local - create_time_local
         return str(age)
     except Exception as e:

machineconfig/utils/source_of_truth.py

@@ -5,6 +5,8 @@ Utils
 import machineconfig
 from pathlib import Path
 
+EXCLUDE_DIRS = [".links", ".ai", ".scripts", ".venv", ".git", ".idea", ".vscode", "node_modules", "__pycache__", ".mypy_cache"]
+
 LIBRARY_ROOT = Path(machineconfig.__file__).resolve().parent
 REPO_ROOT = LIBRARY_ROOT.parent.parent
 

machineconfig/utils/ssh.py

@@ -116,13 +116,35 @@ class SSH:  # inferior alternative: https://github.com/fabric/fabric
             print(f"""⚠️  WARNING: Failed to open SFTP connection to {hostname}.
    Error Details: {err}\nData transfer may be affected!""")
 
-        def view_bar(slf: Any, a: Any, b: Any):
-            slf.total = int(b)
-            slf.update(int(a - slf.n))  # update pbar with increment
-
-        from tqdm import tqdm
-
-        self.tqdm_wrap = type("TqdmWrap", (tqdm,), {"view_bar": view_bar})
+        from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, FileSizeColumn, TransferSpeedColumn
+
+        class RichProgressWrapper:
+            def __init__(self, **kwargs: Any):
+                self.kwargs = kwargs
+                self.progress: Optional[Progress] = None
+                self.task: Optional[Any] = None
+                
+            def __enter__(self) -> "RichProgressWrapper":
+                self.progress = Progress(
+                    SpinnerColumn(),
+                    TextColumn("[bold blue]{task.description}"),
+                    BarColumn(),
+                    FileSizeColumn(),
+                    TransferSpeedColumn(),
+                )
+                self.progress.start()
+                self.task = self.progress.add_task("Transferring...", total=0)
+                return self
+                
+            def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
+                if self.progress:
+                    self.progress.stop()
+                    
+            def view_bar(self, transferred: int, total: int) -> None:
+                if self.progress and self.task is not None:
+                    self.progress.update(self.task, completed=transferred, total=total)
+
+        self.tqdm_wrap = RichProgressWrapper
         self._local_distro: Optional[str] = None
         self._remote_distro: Optional[str] = None
         self._remote_machine: Optional[MACHINE] = None

{machineconfig-2.7.dist-info → machineconfig-2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 2.7
+Version: 2.9
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -13,24 +13,20 @@ Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: fire>=0.7.0
-Requires-Dist: gitpython>=3.1.44
 Requires-Dist: joblib>=1.5.2
-Requires-Dist: markdown>=3.9
 Requires-Dist: paramiko>=3.5.1
-Requires-Dist: psutil>=7.0.0
-Requires-Dist: pydantic>=2.11.3
-Requires-Dist: pyfzf>=0.3.1
-Requires-Dist: pyjson5>=1.6.9
-Requires-Dist: pytz>=2025.2
-Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: randomname>=0.2.1
-Requires-Dist: rclone-python>=0.1.23
 Requires-Dist: requests>=2.32.5
 Requires-Dist: rich>=14.0.0
 Requires-Dist: tenacity>=9.1.2
+Requires-Dist: psutil>=7.0.0
+Requires-Dist: gitpython>=3.1.44
+Requires-Dist: pyfzf>=0.3.1
+Requires-Dist: rclone-python>=0.1.23
+Requires-Dist: pyjson5>=1.6.9
+Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: toml>=0.10.2
 Requires-Dist: tomli>=2.2.1
-Requires-Dist: tqdm>=4.67.1
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: docs