machineconfig 6.23__py3-none-any.whl → 8.12__py3-none-any.whl

machineconfig/cluster/sessions_managers/wt_utils/wt_helpers.py

@@ -0,0 +1,199 @@
+import subprocess
+import random
+import string
+import json
+import shlex
+import logging
+from typing import Any
+from pathlib import Path
+
+from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
+
+logger = logging.getLogger(__name__)
+
+POWERSHELL_CMD = "powershell" if __import__("platform").system().lower() == "windows" else "pwsh"
+
+
+def generate_random_suffix(length: int) -> str:
+    """Generate a random string suffix for unique PowerShell script names."""
+    return "".join(random.choices(string.ascii_lowercase + string.digits, k=length))
+
+
+def parse_command(command: str) -> tuple[str, list[str]]:
+    try:
+        parts = shlex.split(command)
+        if not parts:
+            raise ValueError("Empty command provided")
+        return parts[0], parts[1:] if len(parts) > 1 else []
+    except ValueError as e:
+        logger.error(f"Error parsing command '{command}': {e}")
+        parts = command.split()
+        return parts[0] if parts else "", parts[1:] if len(parts) > 1 else []
+
+
+def escape_for_wt(text: str) -> str:
+    """Escape text for use in Windows Terminal commands."""
+    text = text.replace('"', '""')
+    if " " in text or ";" in text or "&" in text or "|" in text:
+        return f'"{text}"'
+    return text
+
+
+def validate_layout_config(layout_config: LayoutConfig) -> None:
+    """Validate layout configuration format and content."""
+    if not layout_config["layoutTabs"]:
+        raise ValueError("Layout must contain at least one tab")
+    for tab in layout_config["layoutTabs"]:
+        if not tab["tabName"].strip():
+            raise ValueError(f"Invalid tab name: {tab['tabName']}")
+        if not tab["command"].strip():
+            raise ValueError(f"Invalid command for tab '{tab['tabName']}': {tab['command']}")
+        if not tab["startDir"].strip():
+            raise ValueError(f"Invalid startDir for tab '{tab['tabName']}': {tab['startDir']}")
+
+
+def generate_wt_command_string(layout_config: LayoutConfig, window_name: str) -> str:
+    """Generate complete Windows Terminal command string."""
+    command_parts = []
+    
+    for i, tab in enumerate(layout_config["layoutTabs"]):
+        is_first = i == 0
+        
+        if is_first:
+            tab_parts = ["wt", "-w", escape_for_wt(window_name)]
+        else:
+            tab_parts = ["new-tab"]
+        
+        tab_name = tab["tabName"]
+        cwd = tab["startDir"]
+        command = tab["command"]
+        
+        if cwd.startswith("~/"):
+            cwd = cwd.replace("~/", f"{Path.home()}/")
+        elif cwd == "~":
+            cwd = str(Path.home())
+        
+        tab_parts.extend(["-d", escape_for_wt(cwd)])
+        tab_parts.extend(["--title", escape_for_wt(tab_name)])
+        tab_parts.append("--")
+        
+        # Split the command into arguments
+        command_args = shlex.split(command)
+        tab_parts.extend(command_args)
+        
+        command_parts.append(" ".join(tab_parts))
+    
+    return " `; ".join(command_parts)
+
+
+def check_wt_session_status(session_name: str) -> dict[str, Any]:
+    try:
+        ps_script = """
+try {
+    $wtProcesses = Get-Process -Name 'WindowsTerminal' -ErrorAction SilentlyContinue
+    if ($wtProcesses) {
+        $processInfo = @()
+        $wtProcesses | ForEach-Object {
+            $info = @{
+                "Id" = $_.Id
+                "ProcessName" = $_.ProcessName
+                "StartTime" = $_.StartTime.ToString()
+            }
+            $processInfo += $info
+        }
+        $processInfo | ConvertTo-Json -Depth 2
+    }
+} catch {
+    # No Windows Terminal processes found
+}
+"""
+
+        result = subprocess.run([POWERSHELL_CMD, "-Command", ps_script], capture_output=True, text=True, timeout=5)
+
+        if result.returncode == 0:
+            output = result.stdout.strip()
+            if output and output != "":
+                try:
+                    processes = json.loads(output)
+                    if not isinstance(processes, list):
+                        processes = [processes]
+
+                    return {"wt_running": True, "session_exists": len(processes) > 0, "session_name": session_name, "all_windows": processes, "session_windows": processes}
+                except Exception as e:
+                    return {"wt_running": True, "session_exists": False, "error": f"Failed to parse process info: {e}", "session_name": session_name}
+            else:
+                return {"wt_running": False, "session_exists": False, "session_name": session_name, "all_windows": []}
+        else:
+            return {"wt_running": False, "error": result.stderr, "session_name": session_name}
+
+    except subprocess.TimeoutExpired:
+        return {"wt_running": False, "error": "Timeout while checking Windows Terminal processes", "session_name": session_name}
+    except FileNotFoundError:
+        return {"wt_running": False, "error": f"PowerShell ({POWERSHELL_CMD}) not found in PATH", "session_name": session_name}
+    except Exception as e:
+        return {"wt_running": False, "error": str(e), "session_name": session_name}
+
+
+def check_command_status(tab_name: str, layout_config: LayoutConfig) -> dict[str, Any]:
+    """Check if a command is running by looking for processes."""
+    tab_config = None
+    for tab in layout_config["layoutTabs"]:
+        if tab["tabName"] == tab_name:
+            tab_config = tab
+            break
+
+    if tab_config is None:
+        return {"status": "unknown", "error": f"Tab '{tab_name}' not found in layout config", "running": False, "pid": None, "command": None}
+
+    command = tab_config["command"]
+
+    try:
+        primary_cmd = command.split()[0] if command.strip() else ""
+        if not primary_cmd:
+            return {"status": "error", "error": "Empty command", "running": False, "command": command, "tab_name": tab_name}
+
+        ps_script = f"""
+try {{
+    $processes = Get-Process -Name '{primary_cmd}' -ErrorAction SilentlyContinue
+    if ($processes) {{
+        $processes | ForEach-Object {{
+            $procInfo = @{{
+                "pid" = $_.Id
+                "name" = $_.ProcessName
+                "start_time" = $_.StartTime.ToString()
+            }}
+            Write-Output ($procInfo | ConvertTo-Json -Compress)
+        }}
+    }}
+}} catch {{
+    # No processes found or other error
+}}
+"""
+
+        result = subprocess.run([POWERSHELL_CMD, "-Command", ps_script], capture_output=True, text=True, timeout=5)
+
+        if result.returncode == 0:
+            output_lines = [line.strip() for line in result.stdout.strip().split("\n") if line.strip()]
+            matching_processes = []
+
+            for line in output_lines:
+                if line.startswith("{") and line.endswith("}"):
+                    try:
+                        proc_info = json.loads(line)
+                        matching_processes.append(proc_info)
+                    except json.JSONDecodeError:
+                        continue
+
+            if matching_processes:
+                return {"status": "running", "running": True, "processes": matching_processes, "command": command, "tab_name": tab_name}
+            else:
+                return {"status": "not_running", "running": False, "processes": [], "command": command, "tab_name": tab_name}
+        else:
+            return {"status": "error", "error": f"Command failed: {result.stderr}", "running": False, "command": command, "tab_name": tab_name}
+
+    except subprocess.TimeoutExpired:
+        logger.error(f"Timeout checking command status for tab '{tab_name}'")
+        return {"status": "timeout", "error": "Timeout checking process status", "running": False, "command": command, "tab_name": tab_name}
+    except Exception as e:
+        logger.error(f"Error checking command status for tab '{tab_name}': {e}")
+        return {"status": "error", "error": str(e), "running": False, "command": command, "tab_name": tab_name}

machineconfig/cluster/sessions_managers/zellij_local.py

@@ -7,8 +7,8 @@ from rich.console import Console
 
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
 from machineconfig.cluster.sessions_managers.zellij_utils.monitoring_types import ComprehensiveStatus, CommandStatus
-from machineconfig.cluster.sessions_managers.helpers.zellij_local_helper import validate_layout_config, create_tab_section, check_command_status, check_zellij_session_status
-from machineconfig.cluster.sessions_managers.helpers.zellij_local_helper_restart import restart_tab_process
+from machineconfig.cluster.sessions_managers.zellij_utils.zellij_local_helper import validate_layout_config, create_tab_section, check_command_status, check_zellij_session_status
+from machineconfig.cluster.sessions_managers.zellij_utils.zellij_local_helper_restart import restart_tab_process
 
 
 logging.basicConfig(level=logging.INFO)
@@ -170,7 +170,7 @@ class ZellijLayoutGenerator:
         return restart_tab_process(tab_name=tab_name, layout_config=self.layout_config, session_name=self.session_name)
 
     def run(self):
-        from machineconfig.cluster.sessions_managers.utils.enhanced_command_runner import enhanced_zellij_session_start
+        from machineconfig.cluster.sessions_managers.helpers.enhanced_command_runner import enhanced_zellij_session_start
         enhanced_zellij_session_start(session_name=self.session_name, layout_path=str(self.layout_path))
 
 

machineconfig/cluster/sessions_managers/zellij_local_manager.py

@@ -11,7 +11,7 @@ from machineconfig.cluster.sessions_managers.zellij_utils.monitoring_types impor
 from machineconfig.utils.scheduler import Scheduler
 from machineconfig.cluster.sessions_managers.zellij_local import ZellijLayoutGenerator
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
-from machineconfig.cluster.sessions_managers.helpers import zellij_local_manager_helper as helper
+from machineconfig.cluster.sessions_managers.zellij_utils import zellij_local_manager_helper as helper
 
 
 logging.basicConfig(level=logging.INFO)
@@ -133,7 +133,7 @@ class ZellijLocalManager:
             session_name = manager.session_name
 
             # Get session status using the helper function
-            from machineconfig.cluster.sessions_managers.helpers.zellij_local_helper import check_zellij_session_status
+            from machineconfig.cluster.sessions_managers.zellij_utils.zellij_local_helper import check_zellij_session_status
             session_status = check_zellij_session_status(session_name)
 
             # Get commands status for this session
@@ -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/cluster/sessions_managers/zellij_remote.py

@@ -141,8 +141,8 @@ if __name__ == "__main__":
     sample_layout: LayoutConfig = {
         "layoutName": "RemoteBots",
         "layoutTabs": [
-            {"tabName": "🤖Bot1", "startDir": "~/code/bytesense/bithence", "command": "~/scripts/fire -mO go1.py bot1 -- --create_new_bot=True"},
-            {"tabName": "🤖Bot2", "startDir": "~/code/bytesense/bithence", "command": "~/scripts/fire -mO go2.py bot2 -- --create_new_bot=True"},
+            {"tabName": "🤖Bot1", "startDir": "~/code/bytesense/bithence", "command": "fire -mO go1.py bot1 -- --create_new_bot=True"},
+            {"tabName": "🤖Bot2", "startDir": "~/code/bytesense/bithence", "command": "fire -mO go2.py bot2 -- --create_new_bot=True"},
             {"tabName": "📊Monitor", "startDir": "~", "command": "htop"},
             {"tabName": "📝Logs", "startDir": "/var/log", "command": "tail -f /var/log/app.log"},
         ],

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/cluster/sessions_managers/zellij_utils/example_usage.py

@@ -17,8 +17,8 @@ def example_usage():
     sample_layout: LayoutConfig = {
         "layoutName": "ExampleRemoteSession",
         "layoutTabs": [
-            {"tabName": "🤖Bot1", "startDir": "~/code/bytesense/bithence", "command": "~/scripts/fire -mO go1.py bot1 -- --create_new_bot=True"},
-            {"tabName": "🤖Bot2", "startDir": "~/code/bytesense/bithence", "command": "~/scripts/fire -mO go2.py bot2 -- --create_new_bot=True"},
+            {"tabName": "🤖Bot1", "startDir": "~/code/bytesense/bithence", "command": "fire -mO go1.py bot1 -- --create_new_bot=True"},
+            {"tabName": "🤖Bot2", "startDir": "~/code/bytesense/bithence", "command": "fire -mO go2.py bot2 -- --create_new_bot=True"},
             {"tabName": "📊Monitor", "startDir": "~", "command": "htop"},
             {"tabName": "📝Logs", "startDir": "/var/log", "command": "tail -f /var/log/app.log"},
         ],

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:
@@ -125,16 +125,12 @@ if __name__ == "__main__":
 
     def force_fresh_process_check(self, tab_name: str, layout_config: LayoutConfig) -> CommandStatus:
         """Force a fresh process check with additional validation."""
-        # Find the tab with the given name
-        tab_config = None
         for tab in layout_config["layoutTabs"]:
             if tab["tabName"] == tab_name:
                 tab_config = tab
                 break
-
-        if tab_config is None:
+        else:
             return {"status": "unknown", "error": f"Tab '{tab_name}' not found in layout config", "running": False, "command": "", "tab_name": tab_name, "processes": [], "remote": self.remote_executor.remote_name}
-
         command = tab_config["command"]
 
         try:
@@ -143,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:

machineconfig/cluster/sessions_managers/{helpers → zellij_utils}/zellij_local_helper_with_panes.py

@@ -224,5 +224,5 @@ if __name__ == "__main__":
     layout_path_3 = create_zellij_layout_with_panes(layout_config=sample_layout, output_path="/tmp/zellij_test_12345.kdl", panes_per_tab=3, split_direction="horizontal")
     print(f"✅ Layout created: {layout_path_3}")
 
-    from machineconfig.cluster.sessions_managers.utils.enhanced_command_runner import enhanced_zellij_session_start
+    from machineconfig.cluster.sessions_managers.helpers.enhanced_command_runner import enhanced_zellij_session_start
     enhanced_zellij_session_start(session_name="tmp", layout_path=layout_path_3)

machineconfig/jobs/installer/check_installations.py

@@ -221,7 +221,6 @@ APP_SUMMARY_PATH = CONFIG_ROOT.joinpath(f"profile/records/{platform.system().low
 #         #     cli_installers = get_cli_py_installers()
 #         # else: raise NotImplementedError(f"Platform {platform.system().lower()} is not supported yet.")
 
-#         if name == "essentials":
 #             print(f"""
 # {'=' * 150}
 # 📥 DOWNLOAD | Downloading {len(self.data)} apps...