machineconfig 4.93__py3-none-any.whl → 4.94__py3-none-any.whl

machineconfig/cluster/sessions_managers/wt_local.py

@@ -9,16 +9,21 @@ import subprocess
 import random
 import string
 import json
+import platform
 from typing import Dict, List, Optional, Any
 from pathlib import Path
 import logging
 
-from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig, TabConfig
+from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 TMP_LAYOUT_DIR = Path.home().joinpath("tmp_results", "session_manager", "wt", "layout_manager")
 
+# Check if we're on Windows
+IS_WINDOWS = platform.system().lower() == "windows"
+POWERSHELL_CMD = "powershell" if IS_WINDOWS else "pwsh"  # Use pwsh on non-Windows systems
+
 
 class WTLayoutGenerator:
     def __init__(self):
@@ -52,35 +57,7 @@ class WTLayoutGenerator:
             return f'"{text}"'
         return text
 
-    @staticmethod
-    def _create_tab_command(tab_config: TabConfig, is_first_tab: bool) -> str:
-        """Create a Windows Terminal tab command string from tab config."""
-        tab_name = tab_config["tabName"]
-        cwd = tab_config["startDir"]
-        command = tab_config["command"]
-
-        # Convert paths to Windows format if needed
-        if cwd.startswith("~/"):
-            cwd = cwd.replace("~/", f"{Path.home()}/")
-        elif cwd == "~":
-            cwd = str(Path.home())
-
-        # Build the wt command parts
-        tab_parts = []
-
-        if not is_first_tab:
-            tab_parts.append("new-tab")
-
-        # Add starting directory
-        tab_parts.extend(["-d", WTLayoutGenerator._escape_for_wt(cwd)])
-
-        # Add tab title
-        tab_parts.extend(["--title", WTLayoutGenerator._escape_for_wt(tab_name)])
 
-        # Add the command to execute
-        tab_parts.append(WTLayoutGenerator._escape_for_wt(command))
-
-        return " ".join(tab_parts)
 
     @staticmethod
     def _validate_layout_config(layout_config: LayoutConfig) -> None:
@@ -133,31 +110,39 @@ class WTLayoutGenerator:
 
     def _generate_wt_command_string(self, layout_config: LayoutConfig, window_name: str) -> str:
         """Generate complete Windows Terminal command string."""
-        # Start building the wt command
-        wt_parts = ["wt"]
-
-        # Add window name
-        wt_parts.extend(["-w", WTLayoutGenerator._escape_for_wt(window_name)])
-
-        # Add tabs
-        tab_commands = []
+        # Build the complete Windows Terminal command
+        command_parts = []
+        
         for i, tab in enumerate(layout_config["layoutTabs"]):
             is_first = i == 0
-            tab_cmd = self._create_tab_command(tab, is_first)
-            tab_commands.append(tab_cmd)
-
-        # Join all parts with semicolons (Windows Terminal command separator)
-        if tab_commands:
-            if len(tab_commands) == 1:
-                # Single tab - just add to the main command
-                wt_parts.extend(tab_commands[0].split())
+            
+            if is_first:
+                # First tab: start with wt command and window name
+                tab_parts = ["wt", "-w", WTLayoutGenerator._escape_for_wt(window_name)]
             else:
-                # Multiple tabs - join with semicolons
-                wt_parts.append(tab_commands[0])  # First tab
-                for tab_cmd in tab_commands[1:]:
-                    wt_parts.extend([";", tab_cmd])
-
-        return " ".join(wt_parts)
+                # Subsequent tabs: use new-tab
+                tab_parts = ["new-tab"]
+            
+            # Add common tab arguments
+            tab_name = tab["tabName"]
+            cwd = tab["startDir"]
+            command = tab["command"]
+            
+            # Convert paths to Windows format if needed
+            if cwd.startswith("~/"):
+                cwd = cwd.replace("~/", f"{Path.home()}/")
+            elif cwd == "~":
+                cwd = str(Path.home())
+            
+            # Add arguments in the correct order
+            tab_parts.extend(["-d", WTLayoutGenerator._escape_for_wt(cwd)])
+            tab_parts.extend(["--title", WTLayoutGenerator._escape_for_wt(tab_name)])
+            tab_parts.append(WTLayoutGenerator._escape_for_wt(command))
+            
+            command_parts.append(" ".join(tab_parts))
+        
+        # Join all tab commands with escaped semicolons for PowerShell
+        return " `; ".join(command_parts)
 
     def get_wt_layout_preview(self, layout_config: LayoutConfig) -> str:
         """Generate preview of the Windows Terminal command that would be created."""
@@ -179,29 +164,45 @@ class WTLayoutGenerator:
     @staticmethod
     def check_wt_session_status(session_name: str) -> Dict[str, Any]:
         try:
-            # Check for Windows Terminal processes
-            wt_check_cmd = ["powershell", "-Command", "Get-Process -Name 'WindowsTerminal' -ErrorAction SilentlyContinue | Select-Object Id, ProcessName, StartTime, MainWindowTitle | ConvertTo-Json -Depth 2"]
+            # Simplified Windows Terminal process check
+            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(wt_check_cmd, capture_output=True, text=True, timeout=10)
+            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:
-                        import json
-
                         processes = json.loads(output)
                         if not isinstance(processes, list):
                             processes = [processes]
 
-                        # Look for windows that might belong to our session
-                        session_windows = []
-                        for proc in processes:
-                            window_title = proc.get("MainWindowTitle", "")
-                            if session_name in window_title or not window_title:
-                                session_windows.append(proc)
-
-                        return {"wt_running": True, "session_exists": len(session_windows) > 0, "session_name": session_name, "all_windows": processes, "session_windows": session_windows}
+                        # For simplicity, assume session exists if WT is running
+                        return {
+                            "wt_running": True, 
+                            "session_exists": len(processes) > 0, 
+                            "session_name": session_name, 
+                            "all_windows": processes, 
+                            "session_windows": processes  # Simplified - assume all windows could be session windows
+                        }
                     except Exception as e:
                         return {"wt_running": True, "session_exists": False, "error": f"Failed to parse process info: {e}", "session_name": session_name}
                 else:
@@ -212,7 +213,7 @@ class WTLayoutGenerator:
         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": "PowerShell not found in PATH", "session_name": session_name}
+            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}
 
@@ -232,55 +233,31 @@ class WTLayoutGenerator:
         command = tab_config["command"]
 
         try:
-            # Create PowerShell script to check for processes
-            cmd_parts = [part for part in command.split() if len(part) > 2]
-            primary_cmd = cmd_parts[0] if cmd_parts else ""
+            # Extract the primary executable name from command
+            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}
 
+            # Use a much simpler PowerShell script that just checks for process names
             ps_script = f"""
-$targetCommand = '{command.replace("'", "''")}'
-$cmdParts = @({", ".join([f"'{part}'" for part in cmd_parts])})
-$primaryCmd = '{primary_cmd}'
-$currentPid = $PID
-$matchingProcesses = @()
-
-Get-Process | ForEach-Object {{
-    try {{
-        if ($_.Id -eq $currentPid) {{ return }}
-
-        $cmdline = ""
-        try {{
-            $cmdline = (Get-WmiObject Win32_Process -Filter "ProcessId = $($_.Id)").CommandLine
-        }} catch {{
-            $cmdline = $_.ProcessName
-        }}
-
-        if ($cmdline -and $cmdline -ne "") {{
-            if ($cmdline -like "*PowerShell*" -and $cmdline -like "*Get-Process*") {{ return }}
-
-            $matchesPrimary = $cmdline -like "*$primaryCmd*" -and $primaryCmd -ne "powershell"
-            $matchCount = 0
-            foreach ($part in $cmdParts[1..($cmdParts.Length-1)]) {{
-                if ($cmdline -like "*$part*") {{ $matchCount++ }}
-            }}
-
-            if ($matchesPrimary -and $matchCount -ge 1) {{
-                $procInfo = @{{
-                    "pid" = $_.Id
-                    "name" = $_.ProcessName
-                    "cmdline" = $cmdline
-                    "status" = $_.Status
-                    "start_time" = $_.StartTime
-                }} | ConvertTo-Json -Compress
-                Write-Output $procInfo
+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 {{
-        # Ignore processes we can't access
     }}
+}} catch {{
+    # No processes found or other error
 }}
 """
 
-            result = subprocess.run(["powershell", "-Command", ps_script], capture_output=True, text=True, timeout=15)
+            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()]
@@ -301,6 +278,9 @@ Get-Process | ForEach-Object {{
             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}
@@ -400,29 +380,22 @@ wt new-tab --title "{tab_name}" {cwd_part} "{command}"
 
 
 if __name__ == "__main__":
-    # Example usage with new schema
-    sample_layout: LayoutConfig = {"layoutName": "TestLayout", "layoutTabs": [{"tabName": "Frontend", "startDir": "~/code", "command": "btm"}, {"tabName": "Monitor", "startDir": "~", "command": "lf"}]}
-
+    sample_layout: LayoutConfig = {"layoutName": "TestLayout",
+                                   "layoutTabs": [
+            {"tabName": "Frontend", "startDir": "~/code", "command": "btm"},
+            {"tabName": "Monitor", "startDir": "~", "command": "lf"}
+            ]}
     try:
-        # Create layout using the generator
         generator = WTLayoutGenerator()
-        script_path = generator.create_wt_layout(sample_layout, None)
+        script_path = generator.create_wt_layout(layout_config=sample_layout, output_dir=None)
         print(f"✅ Windows Terminal layout created: {script_path}")
-
-        # Show preview
-        preview = generator.get_wt_layout_preview(sample_layout)
-        print(f"\n📋 Command Preview:\n{preview}")
-
-        # Check status (won't find anything since we haven't run it)
-        print("\n🔍 Current status:")
+        preview = generator.get_wt_layout_preview(layout_config=sample_layout)
+        print(f"📋 Command Preview:\n{preview}")
+        print("🔍 Current status:")
         generator.print_status_report()
-
-        # Show how to run the layout
-        print("\n▶️  To run this layout, execute:")
+        print("▶️  To run this layout, execute:")
         print(f'   powershell -ExecutionPolicy Bypass -File "{script_path}"')
-
     except Exception as e:
         print(f"❌ Error: {e}")
         import traceback
-
         traceback.print_exc()

machineconfig/scripts/python/devops_devapps_install.py

@@ -5,7 +5,6 @@ import typer
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
-from platform import system
 from typing import Optional, cast, get_args
 from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS
 
@@ -45,15 +44,12 @@ def _handle_installer_not_found(search_term: str, all_installers: list["Installe
         if len(all_installers) > 10:
             console.print(f"   [dim]... and {len(all_installers) - 10} more[/dim]")
 
-    panel = Panel(
-        f"[bold blue]💡 Use 'ia' to interactively browse all available installers.[/bold blue]\n[bold blue]💡 Use one of the categories: {list(get_args(PACKAGE_GROUPS))}[/bold blue]", title="[yellow]Helpful Tips[/yellow]", border_style="yellow"
-    )
+    panel = Panel(f"[bold blue]💡 Use 'ia' to interactively browse all available installers.[/bold blue]\n[bold blue]💡 Use one of the categories: {list(get_args(PACKAGE_GROUPS))}[/bold blue]", title="[yellow]Helpful Tips[/yellow]", border_style="yellow")
     console.print(panel)
 
 
 def main_with_parser():
     import typer
-
     app = typer.Typer()
     app.command()(main)
     app()
@@ -122,11 +118,12 @@ def get_programs_by_category(package_group: PACKAGE_GROUPS):
         case "DEV_SYSTEM" | "ESSENTIAL_SYSTEM":
             options_system = get_installers_system_groups()
             from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
+            from machineconfig.utils.code import run_script
             for an_item in options_system:
                 if an_item["appName"] == package_group:
                     program = an_item["fileNamePattern"][get_normalized_arch()][get_os_name()]
                     if program is not None:
-                        install_terminal_packages(program)
+                        run_script(program)
 
 
 def choose_from_system_package_groups(options_system: dict[str, tuple[str, str]]) -> str:
@@ -150,33 +147,6 @@ def choose_from_system_package_groups(options_system: dict[str, tuple[str, str]]
     return program
 
 
-def install_terminal_packages(program: str):
-    from pathlib import Path
-
-    if system() == "Windows":
-        temp_script_path = Path("C:/Windows/Temp/temp_install_script.ps1")
-        lexer = "powershell"
-    else:
-        temp_script_path = Path("/tmp/temp_install_script.sh")
-        lexer = "bash"
-    temp_script_path.write_text(program, encoding="utf-8")
-    console.print(f"📝 [blue]Temporary script written to:[/blue] [green]{temp_script_path}[/green]")
-    from rich.syntax import Syntax
-
-    console.print(Panel(Syntax(code=program, lexer=lexer), title="📄 Installation Program", subtitle="shell code"), style="bold red")
-    console.print("🚀 [bold yellow]Starting installation...[/bold yellow]")
-    if system() == "Windows":
-        import subprocess
-
-        subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-File", str(temp_script_path)], check=True)
-    elif system() == "Linux":
-        import subprocess
-
-        subprocess.run(["bash", str(temp_script_path)], check=True)
-    console.print("✅ [bold green]Installation completed.[/bold green]")
-    temp_script_path.unlink(missing_ok=True)
-
-
 def install_clis(clis_names: list[str]):
     from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
     from machineconfig.utils.installer import get_installers

machineconfig/scripts/python/fire_jobs.py

@@ -7,6 +7,7 @@ fire
 
 """
 
+from machineconfig.scripts.python.fire_jobs_route_helper import get_command_streamlit
 from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_interest
 from machineconfig.scripts.python.helpers.helpers4 import parse_pyfile
 from machineconfig.scripts.python.helpers.helpers4 import get_import_module_code
@@ -20,9 +21,7 @@ from machineconfig.scripts.python.fire_jobs_args_helper import FireJobArgs, extr
 import platform
 from typing import Optional, Annotated
 from pathlib import Path
-import tomllib
 import typer
-# import os
 
 
 def route(args: FireJobArgs, fire_args: str = "") -> None:
@@ -86,73 +85,13 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
         choice_function = args.function
 
     if choice_file.suffix == ".py":
-        if args.streamlit:
-            import socket
-
-            s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-            try:
-                s.connect(("8.8.8.8", 1))
-                local_ip_v4 = s.getsockname()[0]
-            except Exception:
-                local_ip_v4 = socket.gethostbyname(socket.gethostname())
-            finally:
-                s.close()
-            computer_name = platform.node()
-            port = 8501
-            toml_path: Optional[PathExtended] = None
-            toml_path_maybe = choice_file.parent.joinpath(".streamlit/config.toml")
-            if toml_path_maybe.exists():
-                toml_path = toml_path_maybe
-            elif choice_file.parent.name == "pages":
-                toml_path_maybe = choice_file.parent.parent.joinpath(".streamlit/config.toml")
-                if toml_path_maybe.exists():
-                    toml_path = toml_path_maybe
-            if toml_path is not None:
-                print(f"📄 Reading config.toml @ {toml_path}")
-                config = tomllib.loads(toml_path.read_text(encoding="utf-8"))
-                if "server" in config:
-                    if "port" in config["server"]:
-                        port = config["server"]["port"]
-                secrets_path = toml_path.with_name("secrets.toml")
-                if repo_root is not None:
-                    secrets_template_path = PathExtended.home().joinpath(f"dotfiles/creds/streamlit/{PathExtended(repo_root).name}/{choice_file.name}/secrets.toml")
-                    if args.environment != "" and not secrets_path.exists() and secrets_template_path.exists():
-                        secrets_template = tomllib.loads(secrets_template_path.read_text(encoding="utf-8"))
-                        if args.environment == "ip":
-                            host_url = f"http://{local_ip_v4}:{port}/oauth2callback"
-                        elif args.environment == "localhost":
-                            host_url = f"http://localhost:{port}/oauth2callback"
-                        elif args.environment == "hostname":
-                            host_url = f"http://{computer_name}:{port}/oauth2callback"
-                        else:
-                            host_url = f"http://{args.environment}:{port}/oauth2callback"
-                        try:
-                            secrets_template["auth"]["redirect_uri"] = host_url
-                            secrets_template["auth"]["cookie_secret"] = randstr(35)
-                            secrets_template["auth"]["auth0"]["redirect_uri"] = host_url
-                            # save_toml(obj=secrets_template, path=secrets_path)
-                        except Exception as ex:
-                            print(ex)
-                            raise ex
-            message = f"🚀 Streamlit app is running @:\n1- http://{local_ip_v4}:{port}\n2- http://{computer_name}:{port}\n3- http://localhost:{port}"
-            from rich.panel import Panel
-            from rich import print as rprint
-
-            rprint(Panel(message))
-            exe = f"streamlit run --server.address 0.0.0.0 --server.headless true --server.port {port}"
-            # exe = f"cd '{choice_file.parent}'; " + exe
-        elif args.interactive is False:
-            exe = "python"
-        elif args.jupyter:
-            exe = "jupyter-lab"
-        else:
-            exe = f"ipython -i --no-banner --profile {ipy_profile} "
-    elif choice_file.suffix == ".ps1" or choice_file.suffix == ".sh":
-        exe = "."
-    elif choice_file.suffix == "":
-        exe = ""
-    else:
-        raise NotImplementedError(f"File type {choice_file.suffix} not supported, in the sense that I don't know how to fire it.")
+        if args.streamlit:  exe = get_command_streamlit(choice_file, args.environment, repo_root)
+        elif args.interactive is False: exe = "python"
+        elif args.jupyter: exe = "jupyter-lab"
+        else: exe = f"ipython -i --no-banner --profile {ipy_profile} "
+    elif choice_file.suffix == ".ps1" or choice_file.suffix == ".sh": exe = "."
+    elif choice_file.suffix == "": exe = ""
+    else: raise NotImplementedError(f"File type {choice_file.suffix} not supported, in the sense that I don't know how to fire it.")
 
     if args.module or (args.debug and args.choose_function):  # because debugging tools do not support choosing functions and don't interplay with fire module. So the only way to have debugging and choose function options is to import the file as a module into a new script and run the function of interest there and debug the new script.
         assert choice_file.suffix == ".py", f"File must be a python file to be imported as a module. Got {choice_file}"
@@ -226,21 +165,10 @@ except ImportError as _ex:
         else:
             # command = f"cd {choice_file.parent}\n{exe} {choice_file.name}\ncd {PathExtended.cwd()}"
             command = f"{exe} {choice_file} "
-    if not args.cmd:
-        if "ipdb" in command:
-            command = f"pip install ipdb\n{command}"
-        if "pudb" in command:
-            command = f"pip install pudb\n{command}"
-        command = f"{activate_ve_line}\n{command}"
+    if not args.cmd: command = f"{activate_ve_line}\n{command}"
     else:
-        # CMD equivalent
-        if "ipdb" in command:
-            command = f"pip install ipdb & {command}"
-        if "pudb" in command:
-            command = f"pip install pudb & {command}"
         new_line = "\n"
         command = rf"""start cmd -Argument "/k {activate_ve_line.replace(".ps1", ".bat").replace(". ", "")} & {command.replace(new_line, " & ")} " """  # this works from powershell
-
     if args.submit_to_cloud:
         command = f"""
 {activate_ve_line}
@@ -251,39 +179,28 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
     if args.Nprocess > 1:
         from machineconfig.cluster.sessions_managers.zellij_local import run_zellij_layout
         from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
-
         layout: LayoutConfig = {"layoutName": "fireNprocess", "layoutTabs": []}
         for an_arg in range(args.Nprocess):
             layout["layoutTabs"].append({"tabName": f"tab{an_arg}", "startDir": str(PathExtended.cwd()), "command": f"uv run -m fire {choice_file} {choice_function} --idx={an_arg} --idx_max={args.Nprocess}"})
         run_zellij_layout(layout_config=layout)
         return None
-
     if args.optimized:
-        # note that in ipython, optimization is meaningless.
         command = command.replace("python ", "python -OO ")
-    # if platform.system() == "Linux":
-    #     command = "timeout 1s aafire -driver slang\nclear\n" + command
-
     from rich.panel import Panel
     from rich.console import Console
     from rich.syntax import Syntax
-
     console = Console()
-
     if args.zellij_tab is not None:
         comman_path__ = PathExtended.tmpfile(suffix=".sh")
         comman_path__.parent.mkdir(parents=True, exist_ok=True)
         comman_path__.write_text(command, encoding="utf-8")
         console.print(Panel(Syntax(command, lexer="shell"), title=f"🔥 fire command @ {comman_path__}: "), style="bold red")
         import subprocess
-
         existing_tab_names = subprocess.run(["zellij", "action", "query-tab-names"], capture_output=True, text=True, check=True).stdout.splitlines()
         if args.zellij_tab in existing_tab_names:
             print(f"⚠️ Tab name `{args.zellij_tab}` already exists. Please choose a different name.")
-            # args.zellij_tab = input("Please enter a new tab name: ")
             args.zellij_tab += f"_{randstr(3)}"
         from machineconfig.cluster.sessions_managers.zellij_local import run_command_in_zellij_tab
-
         command = run_command_in_zellij_tab(command=str(comman_path__), tab_name=args.zellij_tab, cwd=None)
     if args.watch:
         command = "watchexec --restart --exts py,sh,ps1 " + command
@@ -293,31 +210,19 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
         if platform.system() in ["Linux", "Darwin"]:
             export_line = f"""export PYTHONPATH="{repo_root}""" + """:${PYTHONPATH}" """
         elif platform.system() == "Windows":
-            # export_line = f"""set PYTHONPATH="{repo_root}""" + """:%PYTHONPATH%" """
-            # powershell equivalent
             export_line = f"""$env:PYTHONPATH="{repo_root}""" + """:$env:PYTHONPATH" """
         else:
             raise NotImplementedError(f"Platform {platform.system()} not supported.")
         command = export_line + "\n" + command
-
-    # program_path = os.environ.get("op_script", None)
-    # program_path = PathExtended(program_path) if program_path is not None else PROGRAM_PATH
     if args.loop:
         if platform.system() in ["Linux", "Darwin"]:
             command = command + "\nsleep 0.5"
         elif platform.system() == "Windows":
-            # command = command + "timeout 0.5\n"
-            # pwsh equivalent
             command = "$ErrorActionPreference = 'SilentlyContinue';\n" + command + "\nStart-Sleep -Seconds 0.5"
         else:
             raise NotImplementedError(f"Platform {platform.system()} not supported.")
-        # command = command + f"\n. {program_path}"
-    console.print(Panel(Syntax(command, lexer="shell"), title=f"🔥 fire command @ {command}: "), style="bold red")
-    # program_path.parent.mkdir(parents=True, exist_ok=True)
-    # program_path.write_text(command, encoding="utf-8")
-    import subprocess
-
-    subprocess.run(command, shell=True, check=True)
+    from machineconfig.utils.code import run_script
+    run_script(command)
 
 
 def main(

machineconfig/scripts/python/fire_jobs_route_helper.py

@@ -0,0 +1,65 @@
+
+
+import platform
+from typing import Optional
+import tomllib
+from pathlib import Path
+from machineconfig.utils.accessories import randstr
+from machineconfig.utils.path_extended import PathExtended
+
+
+def get_command_streamlit(choice_file: Path, environment: str, repo_root: Optional[Path]) -> str:
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    try:
+        s.connect(("8.8.8.8", 1))
+        local_ip_v4 = s.getsockname()[0]
+    except Exception:
+        local_ip_v4 = socket.gethostbyname(socket.gethostname())
+    finally:
+        s.close()
+    computer_name = platform.node()
+    port = 8501
+    toml_path: Optional[Path] = None
+    toml_path_maybe = choice_file.parent.joinpath(".streamlit/config.toml")
+    if toml_path_maybe.exists():
+        toml_path = toml_path_maybe
+    elif choice_file.parent.name == "pages":
+        toml_path_maybe = choice_file.parent.parent.joinpath(".streamlit/config.toml")
+        if toml_path_maybe.exists():
+            toml_path = toml_path_maybe
+    if toml_path is not None:
+        print(f"📄 Reading config.toml @ {toml_path}")
+        config = tomllib.loads(toml_path.read_text(encoding="utf-8"))
+        if "server" in config:
+            if "port" in config["server"]:
+                port = config["server"]["port"]
+        secrets_path = toml_path.with_name("secrets.toml")
+        if repo_root is not None:
+            secrets_template_path = Path.home().joinpath(f"dotfiles/creds/streamlit/{PathExtended(repo_root).name}/{choice_file.name}/secrets.toml")
+            if environment != "" and not secrets_path.exists() and secrets_template_path.exists():
+                secrets_template = tomllib.loads(secrets_template_path.read_text(encoding="utf-8"))
+                if environment == "ip":
+                    host_url = f"http://{local_ip_v4}:{port}/oauth2callback"
+                elif environment == "localhost":
+                    host_url = f"http://localhost:{port}/oauth2callback"
+                elif environment == "hostname":
+                    host_url = f"http://{computer_name}:{port}/oauth2callback"
+                else:
+                    host_url = f"http://{environment}:{port}/oauth2callback"
+                try:
+                    secrets_template["auth"]["redirect_uri"] = host_url
+                    secrets_template["auth"]["cookie_secret"] = randstr(35)
+                    secrets_template["auth"]["auth0"]["redirect_uri"] = host_url
+                    # save_toml(obj=secrets_template, path=secrets_path)
+                except Exception as ex:
+                    print(ex)
+                    raise ex
+    message = f"🚀 Streamlit app is running @:\n1- http://{local_ip_v4}:{port}\n2- http://{computer_name}:{port}\n3- http://localhost:{port}"
+    from rich.panel import Panel
+    from rich import print as rprint
+
+    rprint(Panel(message))
+    exe = f"streamlit run --server.address 0.0.0.0 --server.headless true --server.port {port}"
+    # exe = f"cd '{choice_file.parent}'; " + exe
+    return exe

machineconfig/scripts/windows/agents.ps1

@@ -0,0 +1 @@
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig agents $args

machineconfig/scripts/windows/sessions.ps1

@@ -0,0 +1 @@
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig sessions $args

machineconfig/utils/code.py

@@ -21,13 +21,11 @@ echo "Executing `{exec_line}`"
 {exec_line}
 deactivate || true
 """
-
     if strict_execution:
         if platform.system() == "Windows":
             shell_script = """$ErrorActionPreference = "Stop" """ + "\n" + shell_script
         if platform.system() in ["Linux", "Darwin"]:
             shell_script = "set -e" + "\n" + shell_script
-
     if platform.system() in ["Linux", "Darwin"]:
         shell_script = "#!/bin/bash" + "\n" + shell_script  # vs #!/usr/bin/env bash
     return shell_script
@@ -35,10 +33,8 @@ deactivate || true
 
 def get_shell_file_executing_python_script(python_script: str, ve_path: str, verbose: bool = True):
     if verbose:
-        python_script = (
-            f"""
-code = r'''{python_script}''' """
-            + """
+        python_script = f"""
+code = r'''{python_script}'''
 try:
     from machineconfig.utils.utils import print_code
     print_code(code=code, lexer="python", desc="Python Script")
@@ -47,9 +43,7 @@ except ImportError:
     from rich.panel import Panel
     console = Console()
     console.print(Panel(f'''📜 PYTHON SCRIPT:\n\n{{code}}''', title="Python Script", expand=False))
-"""
-            + python_script
-        )
+""" + python_script
     python_file = PathExtended.tmp().joinpath("tmp_scripts", "python", randstr() + ".py")
     python_file.parent.mkdir(parents=True, exist_ok=True)
     python_file.write_text(python_script, encoding="utf-8")
@@ -71,11 +65,6 @@ def write_shell_script_to_file(shell_script: str):
     return shell_file
 
 
-# Enhanced print/log/error/exception statements for better clarity and consistency
-# Improved formatting and language of messages
-# Ensured consistent use of f-strings with triple quotes where applicable
-
-
 def write_shell_script_to_default_program_path(program: str, desc: str, preserve_cwd: bool, display: bool, execute: bool):
     if preserve_cwd:
         if platform.system() == "Windows":
@@ -84,8 +73,6 @@ def write_shell_script_to_default_program_path(program: str, desc: str, preserve
             program = 'orig_path=$(cd -- "." && pwd)\n' + program + '\ncd "$orig_path" || exit'
     if display:
         print_code(code=program, lexer="shell", desc=desc, subtitle="PROGRAM")
-    # PROGRAM_PATH.parent.mkdir(parents=True, exist_ok=True)
-    # PROGRAM_PATH.write_text(program, encoding="utf-8")
     if execute:
         result = subprocess.run(program, shell=True, capture_output=True, text=True)
         success = result.returncode == 0 and result.stderr == ""
@@ -109,3 +96,27 @@ def print_code(code: str, lexer: str, desc: str, subtitle: str = ""):
             raise NotImplementedError(f"Platform {platform.system()} not supported for lexer {lexer}")
     console = Console()
     console.print(Panel(Syntax(code=code, lexer=lexer), title=f"📄 {desc}", subtitle=subtitle), style="bold red")
+
+
+def run_script(program: str):
+    import tempfile
+    if platform.system() == "Windows":
+        suffix = ".ps1"
+        lexer = "powershell"
+    else:
+        suffix = ".sh"
+        lexer = "bash"
+    with tempfile.NamedTemporaryFile(mode='w', suffix=suffix, delete=False, encoding='utf-8') as temp_file:
+        temp_file.write(program)
+        temp_script_path = PathExtended(temp_file.name)
+    console = Console()
+    # console.print(f"📝 [blue]Temporary script written to:[/blue] [green]{temp_script_path}[/green]")
+    from rich.syntax import Syntax
+    console.print(Panel(Syntax(code=program, lexer=lexer), title=f"📄script @ {temp_script_path}", subtitle="shell code"), style="bold red")
+    if platform.system() == "Windows":
+        import subprocess
+        subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-File", str(temp_script_path)], check=True, shell=True)
+    elif platform.system() == "Linux" or platform.system() == "Darwin":
+        import subprocess
+        subprocess.run(["bash", str(temp_script_path)], check=True, shell=True)
+    temp_script_path.unlink(missing_ok=True)

machineconfig/utils/ve.py

@@ -1,10 +1,10 @@
-from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.io import read_ini
 import platform
 from typing import Optional
+from pathlib import Path
 
 
-def get_ve_path_and_ipython_profile(init_path: PathExtended) -> tuple[Optional[str], Optional[str]]:
+def get_ve_path_and_ipython_profile(init_path: Path) -> tuple[Optional[str], Optional[str]]:
     """Works with .ve.ini .venv and .ve_path"""
     ve_path: Optional[str] = None
     ipy_profile: Optional[str] = None
@@ -40,7 +40,8 @@ def get_ve_path_and_ipython_profile(init_path: PathExtended) -> tuple[Optional[s
 
 def get_ve_activate_line(ve_root: str):
     if platform.system() == "Windows":
-        activate_ve_line = f". {ve_root}/Scripts/activate.ps1"
+        q = Path(ve_root).expanduser().relative_to(Path.home()).as_posix()
+        activate_ve_line = f". $HOME/{q}/Scripts/activate.ps1"
     elif platform.system() in ["Linux", "Darwin"]:
         activate_ve_line = f". {ve_root}/bin/activate"
     else:

{machineconfig-4.93.dist-info → machineconfig-4.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 4.93
+Version: 4.94
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-4.93.dist-info → machineconfig-4.94.dist-info}/RECORD

@@ -11,7 +11,7 @@ machineconfig/cluster/remote/remote_machine.py,sha256=xRuoHKNsIT0-FTFSvF1q7scnGK
 machineconfig/cluster/remote/script_execution.py,sha256=4U70FDtjOh6A6C2Ei-Xh90S888q64VhRPbExoEbdepk,9980
 machineconfig/cluster/remote/script_notify_upon_completion.py,sha256=GRxnnbnOl1-hTovTN-zI_M9wdV7x293yA77_mou9I1o,2032
 machineconfig/cluster/sessions_managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/cluster/sessions_managers/wt_local.py,sha256=-e4yNxvu6ytI-u1Kihhtn_wd_qNKZMzN_WrZ9ab1qYA,18220
+machineconfig/cluster/sessions_managers/wt_local.py,sha256=cnLAcyVUr2d2ZPh0dEEr-LHrLiwTMVu7YWXM21IS7_4,17507
 machineconfig/cluster/sessions_managers/wt_local_manager.py,sha256=BaJNOOY5rAfssreJm8Nmr4we_PCxMkmQqzUMdimNwaM,24565
 machineconfig/cluster/sessions_managers/wt_remote.py,sha256=XmZV9rLubwxND5UYAS15mAcpzDdXvm4KyubVGYkVBmo,8743
 machineconfig/cluster/sessions_managers/wt_remote_manager.py,sha256=CnnOtPiwLx0pIfs_KlcKnclLSqiDTNzfm8t8sW6nXf0,19764
@@ -151,15 +151,16 @@ machineconfig/scripts/python/devops.py,sha256=fTEut6gTDfmNqzS8-gRyRAsmWJYPGGIt8X
 machineconfig/scripts/python/devops_add_identity.py,sha256=JfN3ZrYMCgmt4ks_VCfnV9BIIHAsOYO3E0W0wZ15FR8,3791
 machineconfig/scripts/python/devops_add_ssh_key.py,sha256=KaoX83KltBsmutfKhSfZjd7nP_R1hJ2OLAWRhbswO7o,6889
 machineconfig/scripts/python/devops_backup_retrieve.py,sha256=jZe5Vki7E2GCMG8hvqUZeOONFC4cNzISoGzq_dMG4GA,5601
-machineconfig/scripts/python/devops_devapps_install.py,sha256=U3Kl8QCHKmQg3o7c2IRsmFM25fGMX1CoH9wvkf2tdeU,10234
+machineconfig/scripts/python/devops_devapps_install.py,sha256=T4h1ydHljQJrNBrye2q-FHUX9iAZnkCa889GgBjHZCE,9103
 machineconfig/scripts/python/devops_update_repos.py,sha256=c5qBc9cuTGDEqDHufkjDT4d_vvJsswv3tlqk9MAulYk,8063
 machineconfig/scripts/python/dotfile.py,sha256=SRcX-9Ak1jRvF-killBTTm2IWcsNxfiLucH6ZsytAFA,2202
 machineconfig/scripts/python/fire_agents_help_launch.py,sha256=1ymWiszfjCyPv3ofinWzfOmbzLEt3d7ntac_afLh-V4,5017
 machineconfig/scripts/python/fire_agents_help_search.py,sha256=qIfSS_su2YJ1Gb0_lu4cbjlJlYMBw0v52NTGiSrGjk8,2991
 machineconfig/scripts/python/fire_agents_helper_types.py,sha256=zKu8Vr6iucaGSkCm_Tkt_WrYU7-6Nript3coYyzTXzY,295
 machineconfig/scripts/python/fire_agents_load_balancer.py,sha256=mpqx3uaQdBXYieuvhdK-qsvLepf9oIMo3pwPj9mSEDI,1079
-machineconfig/scripts/python/fire_jobs.py,sha256=bad66rJK0_hsSzInXpXp_R-eXNyDMRvVV14zA5nANMg,20271
+machineconfig/scripts/python/fire_jobs.py,sha256=CqtFt4VGtdEP0tbmRRZ-qU5G232jQj0umlS8C_qtQRM,15911
 machineconfig/scripts/python/fire_jobs_args_helper.py,sha256=VZIQ6ShZBt2WLcqa1fpl1419AGa0k7Xg-EzzrKpDIqw,4029
+machineconfig/scripts/python/fire_jobs_route_helper.py,sha256=EFWsg6F9TeSAtYQec57WtPopUbm2euGZTUZv6J4RhNE,3026
 machineconfig/scripts/python/fire_jobs_streamlit_helper.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/ftpx.py,sha256=l_gdJS0QB2wVZErubtZvm4HJD9HZAJxSP68sbY73xwo,10278
 machineconfig/scripts/python/get_zellij_cmd.py,sha256=e35-18hoXM9N3PFbvbizfkNY_-63iMicieWE3TbGcCQ,576
@@ -219,6 +220,7 @@ machineconfig/scripts/python/helpers/helpers2.py,sha256=ZdqeF1MLlaBRwoqsQAqnHi4b
 machineconfig/scripts/python/helpers/helpers4.py,sha256=Iot8Pb9LeaxpSw1uZzx0m3Aswa30QV-tGLrtJtwiGmQ,7635
 machineconfig/scripts/python/helpers/helpers5.py,sha256=dPBvA9Tcyx9TMgM6On49A1CueGMhBdRzikDnlJGf3J0,1123
 machineconfig/scripts/python/helpers/repo_sync_helpers.py,sha256=39Q3XV8Zx0Y6_iWUtbwDIQI8riqLPSZ008zjqx-Gd-g,5328
+machineconfig/scripts/windows/agents.ps1,sha256=DqdrC_Xc2rwQ6kGzT0xh5CJz4B_0p5ZwB7s8XE6rPCM,77
 machineconfig/scripts/windows/choose_wezterm_theme.ps1,sha256=LiXJ0a4LKjb6E-oH_bAg6DjegV4SqDUdiMp_svGCFlI,95
 machineconfig/scripts/windows/cloud_copy.ps1,sha256=llTFhN2uInZTcoZYZuuhJcf5Ifo5MF226I5MpOzvc3A,82
 machineconfig/scripts/windows/cloud_mount.ps1,sha256=wSQO5II8DbqktexRIuI-RUn8kVCEk-SWT7imZqd7Qdk,82
@@ -245,6 +247,7 @@ machineconfig/scripts/windows/pomodoro.ps1,sha256=9r61cwRy4M2_1A-NFb0fxUuUONxXBL
 machineconfig/scripts/windows/reload_path.ps1,sha256=81hQY18LFApVZWFiUfgMzzPH2pJ1WD1fHInfmicBZFA,217
 machineconfig/scripts/windows/repos.ps1,sha256=sjUcrURmYuxdcrdhwLHeWxwByyLgY4k13i8VYSFDKuo,76
 machineconfig/scripts/windows/scheduler.ps1,sha256=YfOlBxCkPfeQPeyCiNw0g3kIpdbjjf6daLEWuyHSaXY,81
+machineconfig/scripts/windows/sessions.ps1,sha256=cQdgSS3rVWvhthsUi5lyFI05_GKiRGI-j4FB1SZNKpM,80
 machineconfig/scripts/windows/share_cloud.cmd,sha256=exD7JCdxw2LqVjw2MKCYHbVZlEqmelXtwnATng-dhJ4,1028
 machineconfig/scripts/windows/share_nfs.ps1,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/windows/share_smb.ps1,sha256=_iJLdgm4pK6Qhz9MpgJlDKHOul38pT8F_VQXqPNBZDE,543
@@ -376,7 +379,7 @@ machineconfig/setup_windows/wt_and_pwsh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py,sha256=rZZJamy3YxAeJhdMIFR6IWtjgn1u1HUdbk1J24NtryE,6116
 machineconfig/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/utils/accessories.py,sha256=W_9dLzjwNTW5JQk_pe3B2ijQ1nA2-8Kdg2r7VBtzgQs,4340
-machineconfig/utils/code.py,sha256=pKPHInKgXJWeACVbxuE7sMdYeZCbNttaYCsfonGhFfc,4464
+machineconfig/utils/code.py,sha256=zsJ8jG6ESC6cAiHJHdEDso_V0wFuXtGpYtb0zRBxv4c,5197
 machineconfig/utils/installer.py,sha256=Aoq93RMOQFmv1iYJS90sxrBHeG_K6N5DtIthYffcIOU,9743
 machineconfig/utils/io.py,sha256=ZXB3aataS1IZ_0WMcCRSmoN1nbkvEO-bWYcs-TpngqU,2872
 machineconfig/utils/links.py,sha256=riNUrG8aGElRszdOPOic4M2AyOcpdcth_-y8JEiZpJ4,10253
@@ -391,7 +394,7 @@ machineconfig/utils/source_of_truth.py,sha256=GnjcVkKm11RyZFHGnPbne5YDEBYoZ5yryB
 machineconfig/utils/ssh.py,sha256=zkNUGeijrdoZYkp56DDC8m8LFqPmxQCDNTv5Ns5B7rk,21096
 machineconfig/utils/terminal.py,sha256=IXYhZ5a0qA6X9CdMT9S7IEKQtJXrDzmiDUGd4C85-oE,12436
 machineconfig/utils/upgrade_packages.py,sha256=H96zVJEWXJW07nh5vhjuSCrPtXGqoUb7xeJsFYYdmCI,3330
-machineconfig/utils/ve.py,sha256=qSUnRto6NI4-Hru0tuz4YzCZzaWAce5Xc__DV0sxsrc,2397
+machineconfig/utils/ve.py,sha256=L-6PBXnQGXThiwWgheJMQoisAZOZA6SVCbGw2J-GFnI,2414
 machineconfig/utils/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/utils/ai/generate_file_checklist.py,sha256=ajbmhcBToRugl75c_KZRq2XJumxKgIqQhyf7_YtF5q4,2729
 machineconfig/utils/cloud/onedrive/setup_oauth.py,sha256=ZTVkqgrwbV_EoPvyT8dyOTUE0ur3BW4sa9o6QYtt5Bo,2341
@@ -404,8 +407,8 @@ machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=pTxvLzIpD5RF
 machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoSpdmTIdgS9LS-RvE-QZ-D260tD3o,1214
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-4.93.dist-info/METADATA,sha256=04GF2cymQW0SDxwA0oGIroHpIP-TFvPJyz6zmgaCTrI,7061
-machineconfig-4.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-4.93.dist-info/entry_points.txt,sha256=LcwklRJPY_uKBvStgtOJn5G_pmFCEdpgRNzUUc6twAQ,1134
-machineconfig-4.93.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-4.93.dist-info/RECORD,,
+machineconfig-4.94.dist-info/METADATA,sha256=1OGor4zIf7weP_BjiCtbh8ObObGacnY9kMIMYUeakIA,7061
+machineconfig-4.94.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-4.94.dist-info/entry_points.txt,sha256=LcwklRJPY_uKBvStgtOJn5G_pmFCEdpgRNzUUc6twAQ,1134
+machineconfig-4.94.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-4.94.dist-info/RECORD,,