machineconfig 2.7__tar.gz → 2.8__tar.gz

{machineconfig-2.7/src/machineconfig.egg-info → machineconfig-2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 2.7
+Version: 2.8
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -30,7 +30,6 @@ Requires-Dist: rich>=14.0.0
 Requires-Dist: tenacity>=9.1.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

{machineconfig-2.7 → machineconfig-2.8}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "2.7"
+version = "2.8"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -39,7 +39,6 @@ dependencies = [
     "tenacity>=9.1.2",
     "toml>=0.10.2",
     "tomli>=2.2.1",
-    "tqdm>=4.67.1",
 ]
 
 [project.optional-dependencies]

{machineconfig-2.7 → machineconfig-2.8}/src/machineconfig/jobs/python/check_installations.py

@@ -11,8 +11,6 @@ import platform
 # # from rich.progress import track
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 # from machineconfig.utils.installer import get_installed_cli_apps
-
-# from tqdm import tqdm
 # from typing import Optional
 # from datetime import datetime
 # import csv

{machineconfig-2.7 → machineconfig-2.8}/src/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-2.7 → machineconfig-2.8}/src/machineconfig/scripts/python/repos_helper_record.py

@@ -9,6 +9,7 @@ from machineconfig.utils.io_save import save_json
 from typing import Optional
 
 from rich import print as pprint
+from rich.progress import Progress, TaskID, SpinnerColumn, TextColumn, BarColumn, TimeElapsedColumn, MofNCompleteColumn
 
 
 def build_tree_structure(repos: list[RepoRecordDict], repos_root: PathExtended) -> str:
@@ -82,7 +83,7 @@ def build_tree_structure(repos: list[RepoRecordDict], repos_root: PathExtended)
     return "\n".join(tree_lines)
 
 
-def record_a_repo(path: PathExtended, search_parent_directories: bool = False, preferred_remote: Optional[str] = None) -> RepoRecordDict:
+def record_a_repo(path: PathExtended, search_parent_directories: bool, preferred_remote: Optional[str]) -> RepoRecordDict:
     from git.repo import Repo
 
     repo = Repo(path, search_parent_directories=search_parent_directories)  # get list of remotes using git python
@@ -126,27 +127,103 @@ def record_a_repo(path: PathExtended, search_parent_directories: bool = False, p
     return res
 
 
-def record_repos_recursively(repos_root: str, r: bool = True) -> list[RepoRecordDict]:
+def count_git_repositories(repos_root: str, r: bool) -> int:
+    """Count total git repositories for accurate progress tracking."""
+    path_obj = PathExtended(repos_root).expanduser().absolute()
+    if path_obj.is_file():
+        return 0
+    
+    search_res = path_obj.search("*", files=False, folders=True)
+    count = 0
+    
+    for a_search_res in search_res:
+        if a_search_res.joinpath(".git").exists():
+            count += 1
+        elif r:
+            count += count_git_repositories(str(a_search_res), r=r)
+    
+    return count
+
+
+def count_total_directories(repos_root: str, r: bool) -> int:
+    """Count total directories to scan for accurate progress tracking."""
+    path_obj = PathExtended(repos_root).expanduser().absolute()
+    if path_obj.is_file():
+        return 0
+    
+    search_res = path_obj.search("*", files=False, folders=True)
+    count = len(search_res)
+    
+    if r:
+        for a_search_res in search_res:
+            if not a_search_res.joinpath(".git").exists():
+                count += count_total_directories(str(a_search_res), r=r)
+    
+    return count
+
+
+def record_repos_recursively(repos_root: str, r: bool, progress: Progress | None, scan_task_id: TaskID | None, process_task_id: TaskID | None) -> list[RepoRecordDict]:
     path_obj = PathExtended(repos_root).expanduser().absolute()
     if path_obj.is_file():
         return []
+    
     search_res = path_obj.search("*", files=False, folders=True)
     res: list[RepoRecordDict] = []
+    
     for a_search_res in search_res:
+        if progress and scan_task_id:
+            progress.update(scan_task_id, description=f"Scanning: {a_search_res.name}")
+        
         if a_search_res.joinpath(".git").exists():
             try:
-                res.append(record_a_repo(a_search_res))
+                if progress and process_task_id:
+                    progress.update(process_task_id, description=f"Recording: {a_search_res.name}")
+                    
+                repo_record = record_a_repo(a_search_res, search_parent_directories=False, preferred_remote=None)
+                res.append(repo_record)
+                
+                if progress and process_task_id:
+                    progress.update(process_task_id, advance=1, description=f"Recorded: {repo_record['name']}")
             except Exception as e:
                 print(f"⚠️ Failed to record {a_search_res}: {e}")
         else:
             if r:
-                res += record_repos_recursively(str(a_search_res), r=r)
+                res += record_repos_recursively(str(a_search_res), r=r, progress=progress, scan_task_id=scan_task_id, process_task_id=process_task_id)
+        
+        if progress and scan_task_id:
+            progress.update(scan_task_id, advance=1)
+    
     return res
 
 
 def main(repos_root: PathExtended):
     print("\n📝 Recording repositories...")
-    repo_records = record_repos_recursively(repos_root=str(repos_root))
+    
+    # Count total directories and repositories for accurate progress tracking
+    print("🔍 Analyzing directory structure...")
+    total_dirs = count_total_directories(str(repos_root), r=True)
+    total_repos = count_git_repositories(str(repos_root), r=True)
+    print(f"📊 Found {total_dirs} directories to scan and {total_repos} git repositories to record")
+    
+    # Setup progress bars
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+        BarColumn(),
+        MofNCompleteColumn(),
+        TimeElapsedColumn(),
+    ) as progress:
+        scan_task = progress.add_task("Scanning directories...", total=total_dirs)
+        process_task = progress.add_task("Recording repositories...", total=total_repos)
+        
+        repo_records = record_repos_recursively(
+            repos_root=str(repos_root), 
+            r=True,
+            progress=progress, 
+            scan_task_id=scan_task, 
+            process_task_id=process_task
+        )
+    
     res: RepoRecordFile = {"version": "0.1", "repos": repo_records}
     
     # Summary with warnings

{machineconfig-2.7 → machineconfig-2.8}/src/machineconfig/utils/procs.py

@@ -1,7 +1,7 @@
 """Procs"""
 
 import psutil
-from tqdm import tqdm
+from rich.progress import Progress, SpinnerColumn, TextColumn
 from pytz import timezone
 from machineconfig.utils.options import display_options
 from typing import Optional, Any
@@ -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(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
 
         # Sort by memory usage (descending)
         process_info.sort(key=lambda x: x["memory_usage_mb"], reverse=True)

{machineconfig-2.7 → machineconfig-2.8}/src/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 → machineconfig-2.8/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 2.7
+Version: 2.8
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -30,7 +30,6 @@ Requires-Dist: rich>=14.0.0
 Requires-Dist: tenacity>=9.1.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

{machineconfig-2.7 → machineconfig-2.8}/src/machineconfig.egg-info/requires.txt

@@ -17,7 +17,6 @@ rich>=14.0.0
 tenacity>=9.1.2
 toml>=0.10.2
 tomli>=2.2.1
-tqdm>=4.67.1
 
 [docs]
 pdoc>=15.0.2