machineconfig 2.0__tar.gz → 2.2__tar.gz

{machineconfig-2.0/src/machineconfig.egg-info → machineconfig-2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 2.0
+Version: 2.2
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -11,25 +11,26 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
-Requires-Dist: rich>=14.0.0
+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: fire>=0.7.0
 Requires-Dist: pydantic>=2.11.3
-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: pytz>=2025.2
-Requires-Dist: tomli>=2.2.1
-Requires-Dist: toml>=0.10.2
 Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: pyjson5>=1.6.9
-Requires-Dist: requests>=2.32.5
-Requires-Dist: tqdm>=4.67.1
-Requires-Dist: joblib>=1.5.2
 Requires-Dist: randomname>=0.2.1
-Requires-Dist: cryptography>=44.0.2
+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: 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
@@ -98,7 +99,7 @@ iwr https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/mac
 (iwr bit.ly/cfgwt).Content | iex
 . $HOME/code/machineconfig/src/machineconfig/setup_windows/symlinks.ps1
 
-& "$HOME\venvs\ve\Scripts\activate.ps1"
+& "$HOME\code\machineconfig\.venv\Scripts\activate.ps1"
 python -m fire machineconfig.profile.create main2 --choice=all
 deactivate
 

{machineconfig-2.0 → machineconfig-2.2}/README.md

@@ -61,7 +61,7 @@ iwr https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/mac
 (iwr bit.ly/cfgwt).Content | iex
 . $HOME/code/machineconfig/src/machineconfig/setup_windows/symlinks.ps1
 
-& "$HOME\venvs\ve\Scripts\activate.ps1"
+& "$HOME\code\machineconfig\.venv\Scripts\activate.ps1"
 python -m fire machineconfig.profile.create main2 --choice=all
 deactivate
 

{machineconfig-2.0 → machineconfig-2.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "2.0"
+version = "2.2"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -20,25 +20,26 @@ classifiers = [
 ]
 requires-python = ">=3.13"
 dependencies = [
-    "rich>=14.0.0",
+    "cryptography>=44.0.2",
+    "fire>=0.7.0",
+    "gitpython>=3.1.44",
+    "joblib>=1.5.2",
+    "markdown>=3.9",
     "paramiko>=3.5.1",
     "psutil>=7.0.0",
-    "fire>=0.7.0",
     "pydantic>=2.11.3",
-    "gitpython>=3.1.44",
     "pyfzf>=0.3.1",
-    "rclone-python>=0.1.23",
+    "pyjson5>=1.6.9",
     "pytz>=2025.2",
-    "tomli>=2.2.1",
-    "toml>=0.10.2",
     "pyyaml>=6.0.2",
-    "pyjson5>=1.6.9",
-    "requests>=2.32.5",
-    "tqdm>=4.67.1",
-    "joblib>=1.5.2",
     "randomname>=0.2.1",
-    "cryptography>=44.0.2",
+    "rclone-python>=0.1.23",
+    "requests>=2.32.5",
+    "rich>=14.0.0",
     "tenacity>=9.1.2",
+    "toml>=0.10.2",
+    "tomli>=2.2.1",
+    "tqdm>=4.67.1",
 ]
 
 [project.optional-dependencies]
@@ -66,17 +67,26 @@ crocodile = { path = "../crocodile", editable = true }
 
 [dependency-groups]
 dev = [
+    "cleanpy>=0.5.1",
+    "ipdb>=0.13.13",
     "ipykernel>=6.30.1",
     "ipython>=9.5.0",
-    "mypy>=1.17.1",
+    "mypy>=1.18.2",
     "pudb>=2025.1",
     "pylint>=3.3.8",
-    "pyrefly>=0.31.0",
-    "pyright>=1.1.404",
-    "ty>=0.0.1a20",
+    "pyrefly>=0.33.1",
+    "pyright>=1.1.405",
+    "ruff>=0.13.1",
+    "ty>=0.0.1a21",
+    "types-mysqlclient>=2.2.0.20250915",
     "types-paramiko>=4.0.0.20250822",
     "types-pytz>=2025.2.0.20250809",
-    "types-pyyaml>=6.0.12.20250822",
-    "types-requests>=2.32.4.20250809",
+    "types-pyyaml>=6.0.12.20250915",
+    "types-requests>=2.32.4.20250913",
+    "types-sqlalchemy>=1.4.53.38",
     "types-toml>=0.10.8.20240310",
+    "types-urllib3>=1.26.25.14",
+]
+docs = [
+    "pdoc>=15.0.2",
 ]

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/cloud_manager.py

@@ -1,6 +1,3 @@
-
-
-
 # from machineconfig.utils.utils2 import read_ini
 # from machineconfig.utils.io_save import save_pickle
 

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/data_transfer.py

@@ -2,7 +2,6 @@
 # """
 
 
-
 # from machineconfig.cluster.remote_machine import RemoteMachine, FileManager
 
 

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/file_manager.py

@@ -1,4 +1,3 @@
-
 # from rich.console import Console
 # from machineconfig.utils.utils2 import pprint
 # from datetime import datetime

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/job_params.py

@@ -1,6 +1,3 @@
-
-
-
 # import git
 
 # from typing import Optional, Callable, Union, Any

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/loader_runner.py

@@ -1,4 +1,3 @@
-
 # """
 # Runner
 # """
@@ -124,7 +123,6 @@
 #         )
 
 
-
 # @dataclass
 # class RemoteMachineConfig:
 #     # conn
@@ -179,6 +177,5 @@
 #             except (FileNotFoundError, KeyError, IndexError) as err: raise ValueError(f"Email config name is not provided. 🤷‍♂️ & default could not be read @ `{DEFAULTS_PATH}`") from err
 
 
-
 # if __name__ == '__main__':
 #     pass

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/remote_machine.py

@@ -144,7 +144,6 @@
 # echo "~~~~~~~~~~~~~~~~SHELL START~~~~~~~~~~~~~~~"
 # {'~/scripts/devops -w update' if self.config.update_essential_repos else ''}
 # {f'cd {P(self.job_params.repo_path_rh).collapseuser().as_posix()}'}
-# . activate_ve {ve_name}
 # {'git pull' if self.config.update_repo else ''}
 # {'pip install -e .' if self.config.install_repo else ''}
 # echo "~~~~~~~~~~~~~~~~SHELL  END ~~~~~~~~~~~~~~~"

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/script_notify_upon_completion.py

@@ -1,4 +1,3 @@
-
 # """
 # Notify User Upon Completion
 # """

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/sessions_managers/archive/create_zellij_template.py

@@ -1,10 +1,9 @@
-
-"""ZT
-"""
+"""ZT"""
 
 import socket
-from machineconfig.utils.utils import choose_ssh_host, write_shell_script_to_default_program_path
-from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.options import choose_ssh_host
+from machineconfig.utils.code import write_shell_script_to_default_program_path
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 
 prefix = """
 
@@ -57,5 +56,5 @@ def launch_from_ssh_config():
     return None
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     launch_from_ssh_config()

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/sessions_managers/archive/session_managers.py

@@ -1,4 +1,3 @@
-
 # """
 # Session Manager
 # """

{machineconfig-2.0 → machineconfig-2.2}/src/machineconfig/cluster/sessions_managers/enhanced_command_runner.py

@@ -13,12 +13,8 @@ from rich import box
 
 console = Console()
 
-def run_enhanced_command(
-    command: str,
-    description: Optional[str] = None,
-    show_progress: bool = True,
-    timeout: Optional[int] = None
-) -> Dict[str, Any]:
+
+def run_enhanced_command(command: str, description: Optional[str] = None, show_progress: bool = True, timeout: Optional[int] = None) -> Dict[str, Any]:
     """
     Run a command with enhanced Rich formatting and user feedback.
 
@@ -37,31 +33,14 @@ def run_enhanced_command(
 
     try:
         if show_progress:
-            with Progress(
-                SpinnerColumn(),
-                TextColumn("[progress.description]{task.description}"),
-                console=console,
-                transient=True
-            ) as progress:
+            with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), console=console, transient=True) as progress:
                 task = progress.add_task(f"[cyan]{description}[/cyan]", total=None)
 
-                result = subprocess.run(
-                    command,
-                    shell=True,
-                    capture_output=True,
-                    text=True,
-                    timeout=timeout
-                )
+                result = subprocess.run(command, shell=True, capture_output=True, text=True, timeout=timeout)
 
                 progress.update(task, completed=True)
         else:
-            result = subprocess.run(
-                command,
-                shell=True,
-                capture_output=True,
-                text=True,
-                timeout=timeout
-            )
+            result = subprocess.run(command, shell=True, capture_output=True, text=True, timeout=timeout)
 
         # Enhanced output processing
         stdout = result.stdout.strip() if result.stdout else ""
@@ -75,8 +54,7 @@ def run_enhanced_command(
                 console.print(f"[bold red]🗑️  Session[/bold red] [yellow]'{session_name}'[/yellow] [red]successfully deleted[/red]")
 
         if "zellij layout is running" in stdout:
-            console.print(stdout.replace("zellij layout is running @",
-                                       "[bold green]🚀 Zellij layout is running[/bold green] [yellow]@[/yellow]"))
+            console.print(stdout.replace("zellij layout is running @", "[bold green]🚀 Zellij layout is running[/bold green] [yellow]@[/yellow]"))
 
         # Handle pseudo-terminal warnings with less alarming appearance
         if "Pseudo-terminal will not be allocated" in stderr:
@@ -86,43 +64,26 @@ def run_enhanced_command(
         if result.returncode == 0:
             if stdout and not any(msg in stdout for msg in ["Session:", "zellij layout is running"]):
                 console.print(f"[green]{stdout}[/green]")
-            return {
-                "success": True,
-                "returncode": result.returncode,
-                "stdout": stdout,
-                "stderr": stderr
-            }
+            return {"success": True, "returncode": result.returncode, "stdout": stdout, "stderr": stderr}
         else:
             if stderr:
                 console.print(f"[bold red]Error:[/bold red] [red]{stderr}[/red]")
-            return {
-                "success": False,
-                "returncode": result.returncode,
-                "stdout": stdout,
-                "stderr": stderr
-            }
+            return {"success": False, "returncode": result.returncode, "stdout": stdout, "stderr": stderr}
 
     except subprocess.TimeoutExpired:
         console.print(f"[bold red]⏰ Command timed out after {timeout} seconds[/bold red]")
-        return {
-            "success": False,
-            "error": "Timeout",
-            "timeout": timeout
-        }
+        return {"success": False, "error": "Timeout", "timeout": timeout}
     except Exception as e:
         console.print(f"[bold red]💥 Unexpected error:[/bold red] [red]{str(e)}[/red]")
-        return {
-            "success": False,
-            "error": str(e)
-        }
+        return {"success": False, "error": str(e)}
+
 
 def enhanced_zellij_session_start(session_name: str, layout_path: str) -> Dict[str, Any]:
     """
     Start a Zellij session with enhanced visual feedback.
     """
     console.print()
-    console.print(Panel.fit(f"🚀 Starting Zellij Session: [bold cyan]{session_name}[/bold cyan]",
-                          style="green", box=box.ROUNDED))
+    console.print(Panel.fit(f"🚀 Starting Zellij Session: [bold cyan]{session_name}[/bold cyan]", style="green", box=box.ROUNDED))
 
     # Delete existing session first (suppress normal output)
     delete_cmd = f"zellij delete-session --force {session_name}"
@@ -130,7 +91,7 @@ def enhanced_zellij_session_start(session_name: str, layout_path: str) -> Dict[s
         delete_cmd,
         f"Cleaning up existing session '{session_name}'",
         show_progress=False,
-        timeout=5  # Quick timeout for cleanup
+        timeout=5,  # Quick timeout for cleanup
     )
 
     # Start new session (use -b for background to avoid hanging)
@@ -139,18 +100,17 @@ def enhanced_zellij_session_start(session_name: str, layout_path: str) -> Dict[s
         start_cmd,
         f"Starting session '{session_name}' with layout",
         show_progress=False,
-        timeout=10  # Add timeout to prevent hanging
+        timeout=10,  # Add timeout to prevent hanging
     )
 
     if start_result["success"]:
-        console.print(Panel(f"[bold green]✅ Session '{session_name}' is now running![/bold green]\n[dim]Layout: {layout_path}[/dim]",
-                           style="green", title="🎉 Success"))
+        console.print(Panel(f"[bold green]✅ Session '{session_name}' is now running![/bold green]\n[dim]Layout: {layout_path}[/dim]", style="green", title="🎉 Success"))
     else:
-        console.print(Panel(f"[bold red]❌ Failed to start session '{session_name}'[/bold red]\n[red]{start_result.get('stderr', 'Unknown error')}[/red]",
-                           style="red", title="💥 Error"))
+        console.print(Panel(f"[bold red]❌ Failed to start session '{session_name}'[/bold red]\n[red]{start_result.get('stderr', 'Unknown error')}[/red]", style="red", title="💥 Error"))
 
     return start_result
 
+
 if __name__ == "__main__":
     # Demo the enhanced command execution
     console.print(Panel.fit("🎨 Enhanced Command Execution Demo", style="bold cyan"))