machineconfig 7.68__tar.gz → 8.19__tar.gz

{machineconfig-7.68/src/machineconfig.egg-info → machineconfig-8.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 7.68
+Version: 8.19
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -21,7 +21,6 @@ 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: questionary>=2.1.1
 Requires-Dist: typer-slim>=0.19.2
@@ -51,14 +50,24 @@ Requires-Dist: python-magic>=0.4.27; extra == "plot"
 </p>
 
 
-# 🧠 Welcome to **Machineconfig**
+# 🗜 Welcome to **Machineconfig**
 
-**Machineconfig** is a cli-based **Digital Life Manager** — It's called so because no existing category of software fully captures its scope. At the same time, it is a *Package Manager*, *Configuration Manager*, *Automation Tool*, *Dotfiles Manager*, *Data Solution*, and *Code Manager*, among other functionalities covered, all rolled into one seamless experience.
+Your stack is awesome, but you need a stack manager, to have a tight grip over it, put it together and maintain it.
+Entering,  **Machineconfig**, a cli-based cross-platform **Stack Manager** — It is a swiss-army knife; a *Package Manager*, *Configuration Manager*, *Automation Tool*, *Dotfiles Manager*, *Data Solution*, and *Code Manager*, among other functionalities covered, all rolled into one seamless experience, that is consistent across different platforms.
 
 
-## 💡 Motivation
+## Workflow:
+What is your stack? Say you have a new computer/ VM, how do you go about setting it up with your stack?
+Surely, you have:
+* A bunch of CLI tools.
+* [Optional] A bunch of softwares (GUIs for desktop environment)
+* [Public] A bunch of configuration files for your tools.
+* [Private] A bunch of secrets, passowords, tokens, credentials etc, etc.
+* Data (Both highly sensitive and encrypted less serious unencrypted data)
+* Code (your repositories).
+
+Wouldn't be nice if you can set it all up in 2 minutes? This is a hackable tool to get it done.
 
-But why do we need such a tool to combine all those functionalities?? Because you need one tool to manager your stack and dev-environment, put it together and maintain it.
 Consider this concrete scenario: When setting up a new machine, VM, or Docker container, you often face dependency chains like this:
 
 ```mermaid
@@ -92,22 +101,28 @@ Machineconfig builds on shoulder of giants. A suite of best-in-class stack of pr
 # Install On Windows:
 
 ```powershell
-# install tool the tool only:
 powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
 uv tool install --upgrade --python 3.14 machineconfig
-# interactive install of machineconfig and following on to run it and make basic machine configuration (RECOMMENDED):
-iex (iwr bit.ly/cfgwindows).Content  # Or, if UV is installed: iex (uvx machineconfig define)
-# Quick install and configure (optionals are accepted by default):
-iex (iwr bit.ly/cfgwq).Content
 ```
 
 
 # Install On Linux and MacOS
 
 ```bash
-# install the tool only:
 curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
 uv tool install --upgrade --python 3.14 machineconfig
+```
+
+
+# Quickies ...
+```powershell
+# interactive install of machineconfig and following on to run it and make basic machine configuration (RECOMMENDED):
+iex (iwr bit.ly/cfgwindows).Content  # Or, if UV is installed: iex (uvx machineconfig define)
+# Quick install and configure (optionals are accepted by default):
+iex (iwr bit.ly/cfgwq).Content
+```
+
+```bash
 # interactive install of machineconfig and following on to run it and make basic machine configuration (RECOMMENDED):
 . <(curl -L bit.ly/cfglinux) # Or, if UV is installed: . <(uvx machineconfig define)
 ```

{machineconfig-7.68 → machineconfig-8.19}/README.md

@@ -8,14 +8,24 @@
 </p>
 
 
-# 🧠 Welcome to **Machineconfig**
+# 🗜 Welcome to **Machineconfig**
 
-**Machineconfig** is a cli-based **Digital Life Manager** — It's called so because no existing category of software fully captures its scope. At the same time, it is a *Package Manager*, *Configuration Manager*, *Automation Tool*, *Dotfiles Manager*, *Data Solution*, and *Code Manager*, among other functionalities covered, all rolled into one seamless experience.
+Your stack is awesome, but you need a stack manager, to have a tight grip over it, put it together and maintain it.
+Entering,  **Machineconfig**, a cli-based cross-platform **Stack Manager** — It is a swiss-army knife; a *Package Manager*, *Configuration Manager*, *Automation Tool*, *Dotfiles Manager*, *Data Solution*, and *Code Manager*, among other functionalities covered, all rolled into one seamless experience, that is consistent across different platforms.
 
 
-## 💡 Motivation
+## Workflow:
+What is your stack? Say you have a new computer/ VM, how do you go about setting it up with your stack?
+Surely, you have:
+* A bunch of CLI tools.
+* [Optional] A bunch of softwares (GUIs for desktop environment)
+* [Public] A bunch of configuration files for your tools.
+* [Private] A bunch of secrets, passowords, tokens, credentials etc, etc.
+* Data (Both highly sensitive and encrypted less serious unencrypted data)
+* Code (your repositories).
+
+Wouldn't be nice if you can set it all up in 2 minutes? This is a hackable tool to get it done.
 
-But why do we need such a tool to combine all those functionalities?? Because you need one tool to manager your stack and dev-environment, put it together and maintain it.
 Consider this concrete scenario: When setting up a new machine, VM, or Docker container, you often face dependency chains like this:
 
 ```mermaid
@@ -49,22 +59,28 @@ Machineconfig builds on shoulder of giants. A suite of best-in-class stack of pr
 # Install On Windows:
 
 ```powershell
-# install tool the tool only:
 powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
 uv tool install --upgrade --python 3.14 machineconfig
-# interactive install of machineconfig and following on to run it and make basic machine configuration (RECOMMENDED):
-iex (iwr bit.ly/cfgwindows).Content  # Or, if UV is installed: iex (uvx machineconfig define)
-# Quick install and configure (optionals are accepted by default):
-iex (iwr bit.ly/cfgwq).Content
 ```
 
 
 # Install On Linux and MacOS
 
 ```bash
-# install the tool only:
 curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
 uv tool install --upgrade --python 3.14 machineconfig
+```
+
+
+# Quickies ...
+```powershell
+# interactive install of machineconfig and following on to run it and make basic machine configuration (RECOMMENDED):
+iex (iwr bit.ly/cfgwindows).Content  # Or, if UV is installed: iex (uvx machineconfig define)
+# Quick install and configure (optionals are accepted by default):
+iex (iwr bit.ly/cfgwq).Content
+```
+
+```bash
 # interactive install of machineconfig and following on to run it and make basic machine configuration (RECOMMENDED):
 . <(curl -L bit.ly/cfglinux) # Or, if UV is installed: . <(uvx machineconfig define)
 ```

{machineconfig-7.68 → machineconfig-8.19}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "7.68"
+version = "8.19"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -30,7 +30,6 @@ dependencies = [
     "tenacity>=9.1.2",
     "psutil>=7.0.0",
     "gitpython>=3.1.44",
-    "pyfzf>=0.3.1",
     "rclone-python>=0.1.23",
     "questionary>=2.1.1",
     "typer-slim>=0.19.2",
@@ -72,9 +71,7 @@ utils = "machineconfig.scripts.python.utils:main"
 mcfg = "machineconfig.scripts.python.mcfg_entry:main"
 machineconfig = "machineconfig.scripts.python.mcfg_entry:main"
 terminal = "machineconfig.scripts.python.terminal:main"
-define = "machineconfig.scripts.python.define:main"
 msearch = "machineconfig.scripts.python.msearch:main"
-explore = "machineconfig.scripts.python.explore:main"
 
 [tool.setuptools]
 package-dir = {"" = "src"}
@@ -114,6 +111,7 @@ dev = [
     "pyright>=1.1.405",
     "pytest>=8.4.2",
     "python-lsp-server[all]>=1.13.1",
+    "qrcode>=8.2",
     "ruff>=0.13.1",
     "ruff-lsp>=0.0.62",
     "sqlalchemy>=2.0.43",
@@ -128,6 +126,7 @@ dev = [
     "types-sqlalchemy>=1.4.53.38",
     "types-toml>=0.10.8.20240310",
     "types-urllib3>=1.26.25.14",
+    "yapf>=0.43.0",
 ]
 
 other = [

{machineconfig-7.68 → machineconfig-8.19}/src/machineconfig/cluster/remote/cloud_manager.py

@@ -243,7 +243,7 @@
 #         The reason it is not automated for remotes is because even though the server might have failed, the processes therein might be running, so there is no automated way to tell."""
 #         log = self.read_log()
 #         jobs_all: list[str] = [p.name for p in self.base_path.expanduser().joinpath("jobs").iterdir()]
-#         jobs_selected = choose_from_options(options=jobs_all, msg="Select Jobs to Redo", multi=True, fzf=True)
+#         jobs_selected = choose_from_options(options=jobs_all, msg="Select Jobs to Redo", multi=True, tv=True)
 #         for a_job in jobs_selected:
 #             # find in which log list does this job live:
 #             found_log_type = None

{machineconfig-7.68 → machineconfig-8.19}/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -7,10 +7,10 @@ from pathlib import Path
 def get_fire_tab_using_uv(func: FunctionType, tab_weight: int, import_module: bool, uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> tuple[TabConfig, Path]:
     from machineconfig.utils.meta import lambda_to_python_script
     if func.__name__ == "<lambda>":
-        py_script =  lambda_to_python_script(lmb=func,
+        py_script =  lambda_to_python_script(func,
                                              in_global=True, import_module=import_module)
     else:
-        py_script =  lambda_to_python_script(lmb=lambda: func(),
+        py_script =  lambda_to_python_script(lambda: func(),
                                              in_global=True, import_module=import_module)
     from machineconfig.utils.code import get_uv_command_executing_python_script
     command_to_run, py_script_path = get_uv_command_executing_python_script(python_script=py_script, uv_with=uv_with, uv_project_dir=uv_project_dir)

{machineconfig-7.68 → machineconfig-8.19}/src/machineconfig/cluster/sessions_managers/wt_local_manager.py

@@ -4,7 +4,7 @@ import logging
 import subprocess
 from pathlib import Path
 from typing import Optional, Any
-from rich.console import Console
+# from rich.console import Console
 from machineconfig.utils.scheduler import Scheduler
 from machineconfig.cluster.sessions_managers.wt_local import WTLayoutGenerator
 from machineconfig.cluster.sessions_managers.wt_utils.wt_helpers import check_wt_session_status
@@ -20,9 +20,6 @@ from machineconfig.cluster.sessions_managers.wt_utils.status_reporting import (
 
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-console = Console()
 TMP_SERIALIZATION_DIR = Path.home() / "tmp_results" / "wt_sessions" / "serialized"
 
 
@@ -50,8 +47,12 @@ class WTLocalManager:
             manager.create_layout_file()
             self.managers.append(manager)
 
-        logger.info(f"Initialized WTLocalManager with {len(self.managers)} sessions")
 
+        logging.basicConfig(level=logging.INFO)
+        logger = logging.getLogger(__name__)
+        # console = Console()
+        self.logger = logger
+        self.logger.info(f"Initialized WTLocalManager with {len(self.managers)} sessions")
     def get_all_session_names(self) -> list[str]:
         """Get all managed session names."""
         return [manager.session_name for manager in self.managers]
@@ -71,19 +72,19 @@ class WTLocalManager:
                 # Execute the PowerShell script to start Windows Terminal
                 cmd = f'powershell -ExecutionPolicy Bypass -File "{script_path}"'
 
-                logger.info(f"Starting session '{session_name}' with script: {script_path}")
+                self.logger.info(f"Starting session '{session_name}' with script: {script_path}")
                 result = subprocess.run(cmd, shell=True, capture_output=True, text=True, timeout=30)
 
                 if result.returncode == 0:
                     results[session_name] = {"success": True, "message": f"Session '{session_name}' started successfully"}
-                    logger.info(f"✅ Session '{session_name}' started successfully")
+                    self.logger.info(f"✅ Session '{session_name}' started successfully")
                 else:
                     results[session_name] = {"success": False, "error": result.stderr or result.stdout}
-                    logger.error(f"❌ Failed to start session '{session_name}': {result.stderr}")
+                    self.logger.error(f"❌ Failed to start session '{session_name}': {result.stderr}")
 
             except Exception as e:
                 results[session_name] = {"success": False, "error": str(e)}
-                logger.error(f"❌ Exception starting session '{session_name}': {e}")
+                self.logger.error(f"❌ Exception starting session '{session_name}': {e}")
 
         return results
 
@@ -96,7 +97,7 @@ class WTLocalManager:
                 # Kill all Windows Terminal processes (Windows Terminal doesn't have session-specific killing)
                 cmd = "powershell -Command \"Get-Process -Name 'WindowsTerminal' -ErrorAction SilentlyContinue | Stop-Process -Force\""
 
-                logger.info(f"Killing Windows Terminal processes for session '{session_name}'")
+                self.logger.info(f"Killing Windows Terminal processes for session '{session_name}'")
                 result = subprocess.run(cmd, shell=True, capture_output=True, text=True, timeout=10)
 
                 results[session_name] = {"success": result.returncode == 0, "message": "Windows Terminal processes killed" if result.returncode == 0 else result.stderr}
@@ -211,8 +212,10 @@ class WTLocalManager:
                 global_summary = self.get_global_summary()
                 print(f"📊 Quick Summary: {global_summary['running_commands']}/{global_summary['total_commands']} commands running across {global_summary['healthy_sessions']}/{global_summary['total_sessions']} sessions")
 
-        logger.info(f"Starting monitoring routine with {wait_ms}ms intervals")
-        sched = Scheduler(routine=routine, wait_ms=wait_ms, logger=logger)
+        self.logger.info(f"Starting monitoring routine with {wait_ms}ms intervals")
+        from machineconfig.utils.scheduler import LoggerTemplate
+        from typing import cast
+        sched = Scheduler(routine=routine, wait_ms=wait_ms, logger=cast(LoggerTemplate, self.logger))
         sched.run(max_cycles=None)
 
     def save(self, session_id: Optional[str] = None) -> str:
@@ -228,11 +231,11 @@ class WTLocalManager:
         for i, manager in enumerate(self.managers):
             manager_data = {"session_name": manager.session_name, "layout_config": manager.layout_config, "script_path": manager.script_path}
             save_json_file(managers_dir / f"manager_{i}_{manager.session_name}.json", manager_data, f"manager {i}")
-        logger.info(f"✅ Saved WTLocalManager session to: {session_dir}")
+        self.logger.info(f"✅ Saved WTLocalManager session to: {session_dir}")
         return session_id
 
-    @classmethod
-    def load(cls, session_id: str) -> "WTLocalManager":
+    @staticmethod
+    def load(session_id: str) -> "WTLocalManager":
         session_dir = TMP_SERIALIZATION_DIR / session_id
         if not session_dir.exists():
             raise FileNotFoundError(f"Session directory not found: {session_dir}")
@@ -241,7 +244,7 @@ class WTLocalManager:
         metadata_data = load_json_file(session_dir / "metadata.json", "Metadata file") if (session_dir / "metadata.json").exists() else {}
         metadata = metadata_data if isinstance(metadata_data, dict) else {}  # type: ignore[arg-type]
         session_name_prefix = metadata.get("session_name_prefix", "LocalWTMgr")  # type: ignore[union-attr]
-        instance = cls(session_layouts=session_layouts, session_name_prefix=session_name_prefix)
+        instance = WTLocalManager(session_layouts=session_layouts, session_name_prefix=session_name_prefix)
         managers_dir = session_dir / "managers"
         if managers_dir.exists():
             instance.managers = []
@@ -253,8 +256,8 @@ class WTLocalManager:
                     manager.script_path = manager_data["script_path"]  # type: ignore[typeddict-item]
                     instance.managers.append(manager)
                 except Exception as e:
-                    logger.warning(f"Failed to load manager from {manager_file}: {e}")
-        logger.info(f"✅ Loaded WTLocalManager session from: {session_dir}")
+                    instance.logger.warning(f"Failed to load manager from {manager_file}: {e}")
+        instance.logger.info(f"✅ Loaded WTLocalManager session from: {session_dir}")
         return instance
 
     @staticmethod
@@ -299,7 +302,7 @@ class WTLocalManager:
                     )
 
         except Exception as e:
-            logger.error(f"Error listing active sessions: {e}")
+            self.logger.error(f"Error listing active sessions: {e}")
 
         return active_sessions
 

{machineconfig-7.68 → machineconfig-8.19}/src/machineconfig/cluster/sessions_managers/wt_remote_manager.py

@@ -68,7 +68,9 @@ class WTSessionManager:
             else:
                 statuses = collect_session_statuses(self.managers)
                 print_session_statuses(statuses)
-        sched = Scheduler(routine=routine, wait_ms=wait_ms, logger=logger)
+        from machineconfig.utils.scheduler import LoggerTemplate
+        from typing import cast
+        sched = Scheduler(routine=routine, wait_ms=wait_ms, logger=cast(LoggerTemplate, logger))
         sched.run()
 
     def save(self, session_id: Optional[str] = None) -> str:

{machineconfig-7.68 → machineconfig-8.19}/src/machineconfig/cluster/sessions_managers/zellij_local_manager.py

@@ -276,7 +276,9 @@ class ZellijLocalManager:
                 print(f"📊 Quick Summary: {global_summary['running_commands']}/{global_summary['total_commands']} commands running across {global_summary['healthy_sessions']}/{global_summary['total_sessions']} sessions")
 
         logger.info(f"Starting monitoring routine with {wait_ms}ms intervals")
-        sched = Scheduler(routine=routine, wait_ms=wait_ms, logger=logger)
+        from machineconfig.utils.scheduler import LoggerTemplate
+        from typing import cast
+        sched = Scheduler(routine=routine, wait_ms=wait_ms, logger=cast(LoggerTemplate, logger))
         sched.run()
 
     def save(self, session_id: Optional[str]) -> str:

{machineconfig-7.68 → machineconfig-8.19}/src/machineconfig/cluster/sessions_managers/zellij_remote_manager.py

@@ -88,8 +88,9 @@ class ZellijSessionManager:
                 # Print statuses
                 for i, status in enumerate(statuses):
                     print(f"Manager {i}: {status}")
-
-        sched = Scheduler(routine=routine, wait_ms=60_000, logger=logger)
+        from machineconfig.utils.scheduler import LoggerTemplate
+        from typing import cast
+        sched = Scheduler(routine=routine, wait_ms=60_000, logger=cast(LoggerTemplate, logger))
         sched.run()
 
     def save(self, session_id: Optional[str]) -> str:

{machineconfig-7.68 → machineconfig-8.19}/src/machineconfig/cluster/sessions_managers/zellij_utils/process_monitor.py

@@ -53,7 +53,7 @@ class ProcessMonitor:
         command = tab_config["command"]
         try:
             check_script = self._create_process_check_script(command)
-            remote_cmd = f"$HOME/.local/bin devops self run-python -c {shlex.quote(check_script)}"
+            remote_cmd = f"$HOME/.local/bin devops self python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
             if result.returncode == 0:
                 try:
@@ -139,7 +139,7 @@ if __name__ == "__main__":
             check_timestamp = timestamp_result.stdout.strip() if timestamp_result.returncode == 0 else "unknown"
 
             check_script = self._create_fresh_check_script(command)
-            remote_cmd = f"$HOME/.local/bin/devops self run-python -c {shlex.quote(check_script)}"
+            remote_cmd = f"$HOME/.local/bin/devops self python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
 
             if result.returncode == 0: