machineconfig 5.33__py3-none-any.whl → 5.35__py3-none-any.whl

machineconfig/jobs/installer/installer_data.json

@@ -2059,6 +2059,23 @@
         }
       }
     },
+    {
+      "appName": "qwen-code",
+      "repoURL": "CMD",
+      "doc": "Terminal-based CLI agents and tools for productivity and coding.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "npm install -g @qwen-code/qwen-code@latest",
+          "windows": "npm install -g @qwen-code/qwen-code@latest",
+          "macos": "npm install -g @qwen-code/qwen-code@latest"
+        },
+        "arm64": {
+          "linux": "npm install -g @qwen-code/qwen-code@latest",
+          "windows": "npm install -g @qwen-code/qwen-code@latest",
+          "macos": "npm install -g @qwen-code/qwen-code@latest"
+        }
+      }
+    },
     {
       "appName": "github-copilot-cli",
       "repoURL": "CMD",

machineconfig/jobs/installer/package_groups.py

@@ -11,6 +11,7 @@ PACKAGES_AI_TOOLS = [
     "chatgpt",
     "mods",
     "q",
+    "qwen-code",
     "cursor-cli",
     "droid",
     "auggie",

machineconfig/scripts/python/agents.py

@@ -188,14 +188,18 @@ def init_config():
     from machineconfig.scripts.python.ai.initai import add_ai_configs
     add_ai_configs(repo_root=Path.cwd())
 
+def generate_files():
+    from machineconfig.scripts.python.ai.generate_files import main
+    main()
 
 def main_from_parser():
     import sys
     agents_app = typer.Typer(help="🤖 AI Agents management subcommands")
-    agents_app.command("create", no_args_is_help=True)(create)
-    agents_app.command("collect", no_args_is_help=True)(collect)
-    agents_app.command("create-template", no_args_is_help=False, help="Create a template for fire agents")(template)
-    agents_app.command("init-config", no_args_is_help=False, help="Initialize AI configurations in the current repository")(init_config)
+    agents_app.command("create", no_args_is_help=True, help="Create agents layout file, ready to run.")(create)
+    agents_app.command("collect", no_args_is_help=True, help="Collect all agent materials into a single file.")(collect)
+    agents_app.command("make-template", no_args_is_help=False, help="Create a template for fire agents")(template)
+    agents_app.command("make-config", no_args_is_help=False, help="Initialize AI configurations in the current repository")(init_config)
+    agents_app.command("make-todo", no_args_is_help=False, help="Generate a markdown file listing all Python files in the repo")(generate_files)
     if len(sys.argv) == 1:
         agents_app(["--help"])
     else:

machineconfig/scripts/python/croshell.py

@@ -144,7 +144,7 @@ from pathlib import Path
         fire_line = f"uv run --python 3.13 --with machineconfig[plot] {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(fire_line, clean_env=True)
+    run_shell_script(fire_line, clean_env=False)
 
 
 def arg_parser() -> None:

machineconfig/scripts/python/devops_helpers/cli_config.py

@@ -1,7 +1,7 @@
 
 
 from typing import Literal, Annotated, Optional
-
+from pathlib import Path
 import typer
 
 config_apps = typer.Typer(help="⚙️ Configuration subcommands", no_args_is_help=True)
@@ -41,3 +41,12 @@ def shell(method: Annotated[Literal["copy", "reference"], typer.Argument(help="C
     from machineconfig.profile.shell import create_default_shell_profile
     create_default_shell_profile(method=method)
 
+
+@config_apps.command(no_args_is_help=False)
+def pwsh_theme():
+    """🔗 Configure your shell profile."""
+    import machineconfig.scripts.python.devops_helpers.themes as themes
+    file = Path(themes.__file__).parent / "choose_pwsh_theme.ps1"
+    import subprocess
+    # subprocess.run(["pwsh", "-File", str(file)])
+    subprocess.run(["pwsh", "-File", str(file)])

machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -1,6 +1,8 @@
 
 import machineconfig.scripts.python.devops_helpers.cli_terminal as cli_terminal
 import typer
+from typing import Optional
+
 nw_apps = typer.Typer(help="🔐 Network subcommands", no_args_is_help=True)
 
 
@@ -8,32 +10,29 @@ nw_apps.command(name="share-terminal", help="📡 Share terminal via web browser
 
 
 @nw_apps.command()
-def add_key():
-    """🔑 SSH add pub key to this machine"""
-    import machineconfig.scripts.python.devops_helpers.devops_add_ssh_key as helper
-    helper.main()
-@nw_apps.command()
-def add_identity():
-    """🗝️ SSH add identity (private key) to this machine"""
-    import machineconfig.scripts.python.devops_helpers.devops_add_identity as helper
-    helper.main()
-@nw_apps.command()
-def connect():
-    """🔐 SSH use key pair to connect two machines"""
-    raise NotImplementedError
-
-@nw_apps.command()
-def setup():
-    """📡 SSH setup"""
+def install_ssh_server():
+    """📡 SSH install server"""
     import platform
     if platform.system() == "Windows":
         from machineconfig.setup_windows import SSH_SERVER
-        program = SSH_SERVER.read_text(encoding="utf-8")
     elif platform.system() == "Linux" or platform.system() == "Darwin":
         from machineconfig.setup_linux import SSH_SERVER
-        program = SSH_SERVER.read_text(encoding="utf-8")
     else:
         raise NotImplementedError(f"Platform {platform.system()} is not supported.")
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(script=program)
+    run_shell_script(script=SSH_SERVER.read_text(encoding="utf-8"))
 
+@nw_apps.command(no_args_is_help=True)
+def add_ssh_key(path: Optional[str] = typer.Option(None, help="Path to the public key file"),
+         choose: bool = typer.Option(False, "--choose", "-c", help="Choose from available public keys in ~/.ssh/*.pub"),
+         value: bool = typer.Option(False, "--value", "-v", help="Paste the public key content manually"),
+         github: Optional[str] = typer.Option(None, "--github", "-g", help="Fetch public keys from a GitHub username")
+):
+    """🔑 SSH add pub key to this machine so its accessible by owner of corresponding private key."""
+    import machineconfig.scripts.python.devops_helpers.devops_add_ssh_key as helper
+    helper.main(pub_path=path, pub_choose=choose, pub_val=value, from_github=github)
+@nw_apps.command()
+def add_ssh_identity():
+    """🗝️ SSH add identity (private key) to this machine"""
+    import machineconfig.scripts.python.devops_helpers.devops_add_identity as helper
+    helper.main()

machineconfig/scripts/python/devops_helpers/devops_add_ssh_key.py

@@ -7,14 +7,27 @@ from machineconfig.utils.path_extended import PathExtended
 from rich.console import Console
 from rich.panel import Panel
 from rich import box  # Import box
+from typing import Optional
+import typer
 
 
 console = Console()
 
+"""
+if (!$pubkey_string) {
+    $pubkey_url = 'https://github.com/thisismygitrepo.keys'  # (CHANGE APPROPRIATELY)
+    $pubkey_string = (Invoke-WebRequest $pubkey_url).Content
+} else {
+    Write-Output "pubkey_string is already defined."
+}
+echo $null >> $HOME/.ssh/authorized_keys  # powershell way of touching a file if it doesn't exist
+echo $pubkey_string >> $HOME/.ssh/authorized_keys
+echo $pubkey_string > $HOME/.ssh/pubkey.pub
+"""
+
 
 def get_add_ssh_key_script(path_to_key: PathExtended):
     console.print(Panel("🔑 SSH KEY CONFIGURATION", title="[bold blue]SSH Setup[/bold blue]"))
-
     if system() == "Linux":
         authorized_keys = PathExtended.home().joinpath(".ssh/authorized_keys")
         console.print(Panel(f"🐧 Linux SSH configuration\n📄 Authorized keys file: {authorized_keys}", title="[bold blue]System Info[/bold blue]"))
@@ -30,7 +43,6 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
         keys_text = authorized_keys.read_text(encoding="utf-8").split(split)
         key_count = len([k for k in keys_text if k.strip()])
         console.print(Panel(f"🔍 Current SSH authorization status\n✅ Found {key_count} authorized key(s)", title="[bold blue]Status[/bold blue]"))
-
         if path_to_key.read_text(encoding="utf-8") in authorized_keys.read_text(encoding="utf-8"):
             console.print(Panel(f"⚠️  Key already authorized\nKey: {path_to_key.name}\nStatus: Already present in authorized_keys file\nNo action required", title="[bold yellow]Warning[/bold yellow]"))
             program = ""
@@ -39,7 +51,7 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
             if system() == "Linux":
                 program = f"cat {path_to_key} >> ~/.ssh/authorized_keys"
             elif system() == "Windows":
-                program_path = LIBRARY_ROOT.joinpath("setup_windows/openssh-server_add-sshkey.ps1")
+                program_path = LIBRARY_ROOT.joinpath("setup_windows/add-sshkey.ps1")
                 program = program_path.expanduser().read_text(encoding="utf-8")
                 place_holder = r'$sshfile = "$env:USERPROFILE\.ssh\pubkey.pub"'
                 assert place_holder in program, f"This section performs string manipulation on the script {program_path} to add the key to the authorized_keys file. The script has changed and the string {place_holder} is not found."
@@ -58,7 +70,6 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
 
     if system() == "Linux":
         program += """
-
 sudo chmod 700 ~/.ssh
 sudo chmod 644 ~/.ssh/authorized_keys
 sudo chmod 644 ~/.ssh/*.pub
@@ -68,51 +79,64 @@ sudo service ssh --full-restart
     return program
 
 
-def main() -> None:
-    console.print(Panel("🔐 SSH PUBLIC KEY AUTHORIZATION TOOL", box=box.DOUBLE_EDGE, title_align="left"))
-
-    console.print(Panel("🔍 Searching for public keys...", title="[bold blue]SSH Setup[/bold blue]", border_style="blue"))
-
-    pub_keys = PathExtended.home().joinpath(".ssh").search("*.pub")
-
-    if pub_keys:
-        console.print(Panel(f"✅ Found {len(pub_keys)} public key(s)", title="[bold green]Status[/bold green]", border_style="green"))
-    else:
-        console.print(Panel("⚠️  No public keys found", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
-
-    all_keys_option = f"all pub keys available ({len(pub_keys)})"
-    i_have_path_option = "I have the path to the key file"
-    i_paste_option = "I want to paste the key itself"
-
-    res = choose_from_options("Which public key to add? ", options=[str(x) for x in pub_keys] + [all_keys_option, i_have_path_option, i_paste_option], multi=False)
-    if res == all_keys_option:
+def main(pub_path: Optional[str] = typer.Argument(None, help="Path to the public key file"),
+         pub_choose: bool = typer.Option(False, "--choose", "-c", help="Choose from available public keys in ~/.ssh"),
+         pub_val: bool = typer.Option(False, "--paste", "-p", help="Paste the public key content manually"),
+         from_github: Optional[str] = typer.Option(None, "--from-github", "-g", help="Fetch public keys from a GitHub username")
+         ) -> None:
+    
+    if pub_path:
+        key_path = PathExtended(pub_path).expanduser().absolute()
+        if not key_path.exists():
+            console.print(Panel(f"❌ ERROR: Provided key path does not exist\nPath: {key_path}", title="[bold red]Error[/bold red]"))
+            raise FileNotFoundError(f"Provided key path does not exist: {key_path}")
+        console.print(Panel(f"📄 Using provided public key file: {key_path}", title="[bold blue]Info[/bold blue]"))
+        program = get_add_ssh_key_script(key_path)
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script=program)
+        console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))
+        return
+    elif pub_choose:
+        console.print(Panel("🔐 SSH PUBLIC KEY AUTHORIZATION TOOL", box=box.DOUBLE_EDGE, title_align="left"))
+        console.print(Panel("🔍 Searching for public keys...", title="[bold blue]SSH Setup[/bold blue]", border_style="blue"))
+        pub_keys = PathExtended.home().joinpath(".ssh").search("*.pub")
+        if pub_keys:
+            console.print(Panel(f"✅ Found {len(pub_keys)} public key(s)", title="[bold green]Status[/bold green]", border_style="green"))
+        else:
+            console.print(Panel("⚠️  No public keys found", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+            return
         console.print(Panel(f"🔄 Processing all {len(pub_keys)} public keys...", title="[bold blue]Processing[/bold blue]", border_style="blue"))
         program = "\n\n\n".join([get_add_ssh_key_script(key) for key in pub_keys])
 
-    elif res == i_have_path_option:
-        console.print(Panel("📂 Please provide the path to your public key", title="[bold blue]Input Required[/bold blue]", border_style="blue"))
-        key_path = PathExtended(input("📋 Path: ")).expanduser().absolute()
-        console.print(Panel(f"📄 Using key from path: {key_path}", title="[bold blue]Info[/bold blue]", border_style="blue"))
-        program = get_add_ssh_key_script(key_path)
-
-    elif res == i_paste_option:
+    elif pub_val:
         console.print(Panel("📋 Please provide a filename and paste the public key content", title="[bold blue]Input Required[/bold blue]", border_style="blue"))
         key_filename = input("📝 File name (default: my_pasted_key.pub): ") or "my_pasted_key.pub"
         key_path = PathExtended.home().joinpath(f".ssh/{key_filename}")
         key_path.write_text(input("🔑 Paste the public key here: "), encoding="utf-8")
         console.print(Panel(f"💾 Key saved to: {key_path}", title="[bold green]Success[/bold green]", border_style="green"))
         program = get_add_ssh_key_script(key_path)
-
+    elif from_github:
+        console.print(Panel(f"🌐 Fetching public keys from GitHub user: {from_github}", title="[bold blue]GitHub Fetch[/bold blue]", border_style="blue"))
+        import requests
+        response = requests.get(f"https://api.github.com/users/{from_github}/keys")
+        if response.status_code != 200:
+            console.print(Panel(f"❌ ERROR: Failed to fetch keys from GitHub user {from_github}\nStatus Code: {response.status_code}", title="[bold red]Error[/bold red]", border_style="red"))
+            raise RuntimeError(f"Failed to fetch keys from GitHub user {from_github}: Status Code {response.status_code}")
+        keys = response.json()
+        if not keys:
+            console.print(Panel(f"⚠️  No public keys found for GitHub user: {from_github}", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+            return
+        console.print(Panel(f"✅ Found {len(keys)} public key(s) for user: {from_github}", title="[bold green]Success[/bold green]", border_style="green"))
+        key_path = PathExtended.home().joinpath(f".ssh/{from_github}_github_keys.pub")
+        key_path.write_text("\n".join([key["key"] for key in keys]), encoding="utf-8")
+        console.print(Panel(f"💾 Keys saved to: {key_path}", title="[bold green]Success[/bold green]", border_style="green"))
+        program = get_add_ssh_key_script(key_path)
     else:
-        console.print(Panel(f"🔑 Using selected key: {PathExtended(res).name}", title="[bold blue]Info[/bold blue]", border_style="blue"))
-        program = get_add_ssh_key_script(PathExtended(res))
-
+        console.print(Panel("❌ ERROR: No method provided to add SSH key\nUse --help for options", title="[bold red]Error[/bold red]", border_style="red"))
+        raise ValueError("No method provided to add SSH key. Use --help for options.")
     console.print(Panel("🚀 SSH KEY AUTHORIZATION READY\nRun the generated script to apply changes", box=box.DOUBLE_EDGE, title_align="left"))
-
-    # return program
-    import subprocess
-
-    subprocess.run(program, shell=True, check=True)
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script=program)
     console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))
 
 

machineconfig/scripts/python/devops_helpers/{choose_pwsh_theme.ps1 → themes/choose_pwsh_theme.ps1}

@@ -37,8 +37,44 @@ if ($selectedThemeName) {
     oh-my-posh init pwsh --config $selectedThemeName | Invoke-Expression
     
     Write-Host "`nTheme applied to current session!" -ForegroundColor Green
-    Write-Host "To make this permanent, add this line to your PowerShell profile:" -ForegroundColor Cyan
-    Write-Host "oh-my-posh init pwsh --config '$selectedThemeName' | Invoke-Expression" -ForegroundColor Yellow
+    
+    # Safely update the PowerShell profile
+    $profilePath = $PROFILE
+    $ompLine = "oh-my-posh init pwsh --config '$selectedThemeName' | Invoke-Expression"
+    
+    # Create profile directory if it doesn't exist
+    $profileDir = Split-Path $profilePath -Parent
+    if (-not (Test-Path $profileDir)) {
+        New-Item -ItemType Directory -Path $profileDir -Force | Out-Null
+    }
+    
+    # Read existing profile content or create empty array
+    $profileContent = @()
+    if (Test-Path $profilePath) {
+        $profileContent = Get-Content $profilePath
+    }
+    
+    # Check if oh-my-posh line already exists and replace it, or add it
+    $found = $false
+    for ($i = 0; $i -lt $profileContent.Count; $i++) {
+        if ($profileContent[$i] -match "oh-my-posh init pwsh") {
+            $profileContent[$i] = $ompLine
+            $found = $true
+            break
+        }
+    }
+    
+    if (-not $found) {
+        # Add the line at the end with a blank line before it
+        $profileContent += ""
+        $profileContent += $ompLine
+    }
+    
+    # Write back to profile
+    $profileContent | Set-Content $profilePath -Encoding UTF8
+    
+    Write-Host "Profile updated successfully!" -ForegroundColor Green
+    Write-Host "The theme will be applied automatically in future PowerShell sessions." -ForegroundColor Cyan
 } else {
     Write-Host "`nNo theme selected." -ForegroundColor DarkGray
 }

machineconfig/scripts/python/interactive.py

@@ -19,7 +19,7 @@ for better user experience with checkbox selections.
 
 import sys
 from pathlib import Path
-from typing import cast
+# from typing import cast
 import platform
 
 import questionary
@@ -29,7 +29,7 @@ from rich.panel import Panel
 from rich.text import Text
 from machineconfig.utils.code import run_shell_script
 
-_ = cast
+# _ = cast
 console = Console()
 
 

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
-$HOME/.local/bin/uv run --python 3.13 --with machineconfig devops self interactive
+$HOME/.local/bin/uv run --python 3.13 --with machineconfig devops "$@"

machineconfig/setup_windows/ssh/{openssh-server_add-sshkey.ps1 → add-sshkey.ps1}

@@ -7,16 +7,13 @@
 
 $ErrorActionPreference = "Stop"
 $sshd_dir = "$env:ProgramData\ssh"
-
 $sshfile = "$env:USERPROFILE\.ssh\pubkey.pub"  # this directory is for normal users, not admins.
 # Once they are populated, we can create administrators_authorized_keys
 
 Get-Content $sshfile >> "$sshd_dir\administrators_authorized_keys"
-
 # set appropirate persmissions for this file
 Set-Location $sshd_dir
 icacls administrators_authorized_keys /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F"
-
 # Lastly, enabling public key authentication.
 $sshd_config = "$sshd_dir\sshd_config"
 (Get-Content $sshd_config) -replace '#PubkeyAuthentication', 'PubkeyAuthentication' | Out-File -encoding ASCII $sshd_config

machineconfig/setup_windows/ssh/openssh-server.ps1

@@ -20,9 +20,7 @@ Add-WindowsCapability -Online -Name OpenSSH.Client
 $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
 
 Set-Service -Name sshd -StartupType Automatic
-
 #Get-Service -Name ssh-agent | Set-Service -StartupType Automatic
-
 #Set-Service -Name ssh-agent -StartupType Automatic
 #Start-Service ssh-agent
 # Starting the service for the first time will populate the directory with config files.

machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -1,4 +1,4 @@
 
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
-& "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig devops self interactive
+& "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig devops $args

machineconfig/utils/files/dbms.py

@@ -3,11 +3,9 @@ from typing import Optional, Any, Callable
 
 import polars as pl
 
-from sqlalchemy.orm import sessionmaker, Session
-from sqlalchemy import text, inspect as inspect__
-from sqlalchemy.engine import Engine, Connection, create_engine
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlalchemy.engine import Inspector
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy import create_engine, text, inspect as inspect__
+from sqlalchemy.engine import Engine
 from sqlalchemy.sql.schema import MetaData
 from pathlib import Path as P
 
@@ -15,75 +13,23 @@ OPLike = Optional[P] | str | None
 
 
 class DBMS:
-    def __init__(self, engine: Engine, sch: Optional[str] = None, vws: bool = False):
+    def __init__(self, engine: Engine):
         self.eng: Engine = engine
-        self.con: Optional[Connection] = None
-        self.ses: Optional[Session] = None
-        self.insp: Optional[Inspector] = None
-        self.meta: Optional[MetaData] = None
-        db_path = P(self.eng.url.database) if self.eng.url.database else None
-        if db_path and db_path.exists():
-            self.path: Optional[P] = db_path
-        else: self.path = None
 
-        # self.db = db
-        self.sch = sch
-        self.vws: bool = vws
-        self.schema: list[str] = []
-
-        self.sch_tab: dict[str, list[str]]
-        self.sch_vws: dict[str, list[str]]
-        self.description: Optional[pl.DataFrame] = None
-        # self.tables = None
-        # self.views = None
-        # self.sch_tab: Optional[Struct] = None
-        # self.sch_vws: Optional[Struct] = None
-        # if inspect: self.refresh()
-        # self.ip_formatter: Optional[Any] = None
-        # self.db_specs: Optional[Any] = None
-        if self.path is not None:
-            if self.path.is_file():
-                path_repr = self.path.as_uri()
-            else:
-                path_repr = self.path
-            print(f"Database at {path_repr} is ready.")
-
-    def refresh(self, sch: Optional[str] = None) -> 'DBMS':  # fails if multiple schemas are there and None is specified
-        self.con = self.eng.connect()
-        self.ses = sessionmaker()(bind=self.eng)  # ORM style
-        self.meta = MetaData()
-        self.meta.reflect(bind=self.eng, schema=sch or self.sch)
-        insp = inspect__(subject=self.eng)
-        self.insp = insp
-        assert self.insp is not None
-        self.schema = self.insp.get_schema_names()
-        print(f"Inspecting tables of schema `{self.schema}` {self.eng}")
-        self.sch_tab = {k: v for k, v in zip(self.schema, [insp.get_table_names(schema=x) for x in self.schema])}  # dict(zip(self.schema, self.schema.apply(lambda x: self.insp.get_table_names(schema=x))))  #
-        print(f"Inspecting views of schema `{self.schema}` {self.eng}")
-        self.sch_vws = {k: v for k, v in zip(self.schema, [insp.get_view_names(schema=x) for x in self.schema])}
-        return self
-
-    @classmethod
-    def from_local_db(cls, path: OPLike = None, echo: bool = False, share_across_threads: bool = False, pool_size: int = 5, **kwargs: Any):
-        return cls(engine=cls.make_sql_engine(path=path, echo=echo, share_across_threads=share_across_threads, pool_size=pool_size, **kwargs))
+    @staticmethod
+    def from_local_db(path: OPLike = None, echo: bool = False, share_across_threads: bool = False, pool_size: int = 5, **kwargs: Any):
+        return DBMS(engine=DBMS.make_sql_engine(path=path, echo=echo, share_across_threads=share_across_threads, pool_size=pool_size, **kwargs))
 
     def __repr__(self): return f"DataBase @ {self.eng}"
-    def get_columns(self, table: str, sch: Optional[str] = None):
-        assert self.meta is not None
-        return self.meta.tables[self._get_table_identifier(table=table, sch=sch)].exported_columns.keys()
     def close(self, sleep: int = 2):
-        if self.path:
-            print(f"Terminating database `{self.path.as_uri() if self.path.is_file() and 'memory' not in str(self.path) else self.path}`")
-        if self.con: self.con.close()
-        if self.ses: self.ses.close()
         self.eng.pool.dispose()
         self.eng.dispose()
         time.sleep(sleep)
-    def _get_table_identifier(self, table: str, sch: Optional[str]):
-        if sch is None: sch = self.sch
+    @staticmethod
+    def _get_table_identifier(engine: Engine, table: str, sch: Optional[str]):
         if sch is not None:
             # Handle DuckDB schema names that contain dots (e.g., "klines.main")
-            if self.eng.url.drivername == 'duckdb' and '.' in sch and sch.endswith('.main'):
+            if engine.url.drivername == 'duckdb' and '.' in sch and sch.endswith('.main'):
                 # For DuckDB schemas like "klines.main", just use the table name without schema
                 return f'"{table}"'
             else:
@@ -91,83 +37,6 @@ class DBMS:
         else:
             return f'"{table}"'
 
-    @staticmethod
-    def make_sql_engine(path: OPLike = None, echo: bool = False, dialect: str = "sqlite", driver: str = ["pysqlite", "DBAPI"][0], pool_size: int = 5, share_across_threads: bool = True, **kwargs: Any):
-        """Establish lazy initialization with database"""
-        from sqlalchemy.pool import StaticPool, NullPool
-        _ = NullPool
-        _ = driver
-        if str(path) == "memory":
-            print("Linking to in-memory database.")
-            if share_across_threads:
-                # see: https://docs.sqlalchemy.org/en/14/dialects/sqlite.html#using-a-memory-database-in-multiple-threads
-                return create_engine(url=f"{dialect}+{driver}:///:memory:", echo=echo, future=True, poolclass=StaticPool, connect_args={"check_same_thread": False})
-            else:
-                return create_engine(url=f"{dialect}+{driver}:///:memory:", echo=echo, future=True, pool_size=pool_size, **kwargs)
-        if path is None:
-            tmp_dir = P.home().joinpath(".tmp").joinpath("tmp_dbs")
-            tmp_dir.mkdir(parents=True, exist_ok=True)
-            import tempfile
-            with tempfile.NamedTemporaryFile(suffix=".sqlite", dir=str(tmp_dir), delete=False) as tmp_file:
-                path = P(tmp_file.name)
-        else:
-            path = P(path).expanduser().resolve()
-            path.parent.mkdir(parents=True, exist_ok=True)
-        path_repr = path.as_uri() if path.is_file() else path
-        dialect = path.suffix.removeprefix('.')
-        print(f"Linking to database at {path_repr}")
-        connect_args = kwargs.pop("connect_args", {}) or {}
-        try:
-            if path.suffix == ".duckdb":  # only apply for duckdb files
-                # don't overwrite user's explicit setting if already provided
-                connect_args.setdefault("read_only", True)
-                print(" - Opening DuckDB in read-only mode.")
-        except Exception:
-            pass
-        if pool_size == 0:
-            res = create_engine(url=f"{dialect}:///{path}", echo=echo, future=True, poolclass=NullPool, connect_args=connect_args, **kwargs)  # echo flag is just a short for the more formal way of logging sql commands.
-        else:
-            res = create_engine(url=f"{dialect}:///{path}", echo=echo, future=True, pool_size=pool_size, connect_args=connect_args, **kwargs)  # echo flag is just a short for the more formal way of logging sql commands.
-        return res
-    @staticmethod
-    def make_sql_async_engine(path: OPLike = None, echo: bool = False, dialect: str = "sqlite", driver: str = "aiosqlite", pool_size: int = 5, share_across_threads: bool = True, **kwargs: Any):
-        """Establish lazy initialization with database"""
-        from sqlalchemy.pool import StaticPool, NullPool
-        _ = NullPool
-        if str(path) == "memory":
-            print("Linking to in-memory database.")
-            if share_across_threads:
-                # see: https://docs.sqlalchemy.org/en/14/dialects/sqlite.html#using-a-memory-database-in-multiple-threads
-                return create_async_engine(url=f"{dialect}+{driver}://", echo=echo, future=True, poolclass=StaticPool, connect_args={"mode": "memory", "cache": "shared"})
-            else:
-                return create_async_engine(url=f"{dialect}+{driver}:///:memory:", echo=echo, future=True, pool_size=pool_size, **kwargs)
-        if path is None:
-            tmp_dir = P.home().joinpath(".tmp").joinpath("tmp_dbs")
-            tmp_dir.mkdir(parents=True, exist_ok=True)
-            import tempfile
-            with tempfile.NamedTemporaryFile(suffix=".sqlite", dir=str(tmp_dir), delete=False) as tmp_file:
-                path = P(tmp_file.name)
-        else:
-            path = P(path).expanduser().resolve()
-            path.parent.mkdir(parents=True, exist_ok=True)
-        path_repr = path.as_uri() if path.is_file() else path
-        dialect = path.suffix.removeprefix('.')
-        print(f"Linking to database at {path_repr}")
-        # Add DuckDB-specific read-only flag automatically when pointing to an existing .duckdb file
-        connect_args = kwargs.pop("connect_args", {}) or {}
-        try:
-            if path.suffix == ".duckdb":  # only apply for duckdb files
-                # don't overwrite user's explicit setting if already provided
-                connect_args.setdefault("read_only", True)
-                print(" - Opening DuckDB in read-only mode.")
-        except Exception:
-            pass
-        if pool_size == 0:
-            res = create_async_engine(url=f"{dialect}+{driver}:///{path}", echo=echo, future=True, poolclass=NullPool, connect_args=connect_args, **kwargs)  # echo flag is just a short for the more formal way of logging sql commands.
-        else:
-            res = create_async_engine(url=f"{dialect}+{driver}:///{path}", echo=echo, future=True, pool_size=pool_size, connect_args=connect_args, **kwargs)  # echo flag is just a short for the more formal way of logging sql commands.
-        return res
-
     # ==================== QUERIES =====================================
     def execute_as_you_go(self, *commands: str, res_func: Callable[[Any], Any] = lambda x: x.all(), df: bool = False):
         with self.eng.begin() as conn:
@@ -194,17 +63,41 @@ class DBMS:
     #     return result if not df else pl.DataFrame(result)
 
     # ========================== TABLES =====================================
-    def read_table(self, table: Optional[str] = None, sch: Optional[str] = None, size: int = 5):
+    def insert_dicts(self, table: str, *mydicts: dict[str, Any]) -> None:
+        cmd = f"""INSERT INTO {table} VALUES """
+        for mydict in mydicts: cmd += f"""({tuple(mydict)}), """
+        self.execute_begin_once(cmd)
+
+    def refresh(self, sch: Optional[str] = None) -> dict[str, Any]:
+        con = self.eng.connect()
+        ses = sessionmaker()(bind=self.eng)
+        meta = MetaData()
+        meta.reflect(bind=self.eng, schema=sch)
+        insp = inspect__(subject=self.eng)
+        schema = insp.get_schema_names()
+        sch_tab = {k: v for k, v in zip(schema, [insp.get_table_names(schema=x) for x in schema])}
+        sch_vws = {k: v for k, v in zip(schema, [insp.get_view_names(schema=x) for x in schema])}
+        return {'con': con, 'ses': ses, 'meta': meta, 'insp': insp, 'schema': schema, 'sch_tab': sch_tab, 'sch_vws': sch_vws}
+
+    def get_columns(self, table: str, sch: Optional[str] = None) -> list[str]:
+        meta = MetaData()
+        meta.reflect(bind=self.eng, schema=sch)
+        return list(meta.tables[self._get_table_identifier(self.eng, table, sch)].exported_columns.keys())
+
+    def read_table(self, table: Optional[str] = None, sch: Optional[str] = None, size: int = 5) -> pl.DataFrame:
+        insp = inspect__(self.eng)
+        schema = insp.get_schema_names()
+        sch_tab = {k: v for k, v in zip(schema, [insp.get_table_names(schema=x) for x in schema])}
         if sch is None:
             # First try to find schemas that have tables (excluding system schemas)
             schemas_with_tables = []
-            for schema_name in self.schema:
+            for schema_name in schema:
                 if schema_name not in ["information_schema", "pg_catalog", "system"]:
-                    if schema_name in self.sch_tab and len(self.sch_tab[schema_name]) > 0:
+                    if schema_name in sch_tab and len(sch_tab[schema_name]) > 0:
                         schemas_with_tables.append(schema_name)
 
             if len(schemas_with_tables) == 0:
-                raise ValueError(f"No schemas with tables found. Available schemas: {self.schema}")
+                raise ValueError(f"No schemas with tables found. Available schemas: {schema}")
 
             # Prefer non-"main" schemas if available, otherwise use main
             if len(schemas_with_tables) > 1 and "main" in schemas_with_tables:
@@ -214,64 +107,71 @@ class DBMS:
             print(f"Auto-selected schema: `{sch}` from available schemas: {schemas_with_tables}")
 
         if table is None:
-            if sch not in self.sch_tab:
-                raise ValueError(f"Schema `{sch}` not found. Available schemas: {list(self.sch_tab.keys())}")
-            tables = self.sch_tab[sch]
+            if sch not in sch_tab:
+                raise ValueError(f"Schema `{sch}` not found. Available schemas: {list(sch_tab.keys())}")
+            tables = sch_tab[sch]
             assert len(tables) > 0, f"No tables found in schema `{sch}`"
             import random
             table = random.choice(tables)
             print(f"Reading table `{table}` from schema `{sch}`")
-        if self.con:
+        with self.eng.connect() as conn:
             try:
-                res = self.con.execute(text(f'''SELECT * FROM {self._get_table_identifier(table, sch)} '''))
+                res = conn.execute(text(f'''SELECT * FROM {self._get_table_identifier(self.eng, table, sch)} '''))
                 return pl.DataFrame(res.fetchmany(size))
             except Exception:
                 print(f"Error executing query for table `{table}` in schema `{sch}`")
-                print(f"Available schemas and tables: {self.sch_tab}")
+                print(f"Available schemas and tables: {sch_tab}")
                 raise
 
-    def insert_dicts(self, table: str, *mydicts: dict[str, Any]) -> None:
-        cmd = f"""INSERT INTO {table} VALUES """
-        for mydict in mydicts: cmd += f"""({tuple(mydict)}), """
-        self.execute_begin_once(cmd)
-
-    def describe_db(self):
-        self.refresh()
-        assert self.meta is not None
+    def describe_db(self, sch: Optional[str] = None) -> pl.DataFrame:
+        meta = MetaData()
+        meta.reflect(bind=self.eng, schema=sch)
+        ses = sessionmaker()(bind=self.eng)
         res_all = []
-        assert self.ses is not None
         from rich.progress import Progress
         with Progress() as progress:
-            task = progress.add_task("Inspecting tables", total=len(self.meta.sorted_tables))
-            for tbl in self.meta.sorted_tables:
+            task = progress.add_task("Inspecting tables", total=len(meta.sorted_tables))
+            for tbl in meta.sorted_tables:
                 table = tbl.name
-                if self.sch is not None:
-                    table = f"{self.sch}.{table}"
-                count = self.ses.query(tbl).count()
+                if sch is not None:
+                    table = f"{sch}.{table}"
+                count = ses.query(tbl).count()
                 res = dict(table=table, count=count, size_mb=count * len(tbl.exported_columns) * 10 / 1e6,
-                           columns=len(tbl.exported_columns), schema=self.sch)
+                           columns=len(tbl.exported_columns), schema=sch)
                 res_all.append(res)
                 progress.update(task, advance=1)
-        self.description = pl.DataFrame(res_all)
-        return self.description
+        return pl.DataFrame(res_all)
 
     def describe_table(self, table: str, sch: Optional[str] = None, dtype: bool = True) -> None:
         print(table.center(100, "="))
-        self.refresh()
-        assert self.meta is not None
-        tbl = self.meta.tables[table]
-        assert self.ses is not None
-        count = self.ses.query(tbl).count()
+        meta = MetaData()
+        meta.reflect(bind=self.eng, schema=sch)
+        tbl = meta.tables[self._get_table_identifier(self.eng, table, sch)]
+        ses = sessionmaker()(bind=self.eng)
+        count = ses.query(tbl).count()
         res = dict(name=table, count=count, size_mb=count * len(tbl.exported_columns) * 10 / 1e6)
         from machineconfig.utils.accessories import pprint
         pprint(res, title="TABLE DETAILS")
         dat = self.read_table(table=table, sch=sch, size=2)
-        df = dat  # dat is already a polars DataFrame
+        df = dat
         print("SAMPLE:\n", df)
-        assert self.insp is not None
-        if dtype: print("\nDETAILED COLUMNS:\n", pl.DataFrame(self.insp.get_columns(table)))
+        insp = inspect__(self.eng)
+        if dtype: print("\nDETAILED COLUMNS:\n", pl.DataFrame(insp.get_columns(self._get_table_identifier(self.eng, table, sch))))
         print("\n" * 3)
 
+    @staticmethod
+    def make_sql_engine(path: OPLike = None, echo: bool = False, share_across_threads: bool = False, pool_size: int = 5, **kwargs: Any) -> Engine:
+        if path is None:
+            url = 'sqlite:///:memory:'
+        elif isinstance(path, str) and path.startswith(('sqlite://', 'postgresql://', 'mysql://', 'duckdb://')):
+            url = path
+        else:
+            path_str = str(P(path))
+            url = f'sqlite:///{path_str}'
+        connect_args = {}
+        if share_across_threads and 'sqlite' in url:
+            connect_args['check_same_thread'] = False
+        return create_engine(url, echo=echo, pool_size=pool_size, connect_args=connect_args, **kwargs)
 
 DB_TMP_PATH = P.home().joinpath(".tmp").joinpath("tmp_dbs").joinpath("results").joinpath("data.sqlite")
 
@@ -290,7 +190,6 @@ def to_db(table: str, idx: int, idx_max: int, data: Any):
             text(insert_row),
             {'time': time_now, 'idx': idx, 'idx_max': idx_max, 'data': data_blob}
         )
-        # conn.commit()
     db.close()
 
 

{machineconfig-5.33.dist-info → machineconfig-5.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.33
+Version: 5.35
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -29,8 +29,19 @@ Requires-Dist: questionary>=2.1.1
 Requires-Dist: typer>=0.19.2
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
-Provides-Extra: docs
-Requires-Dist: pdoc>=15.0.2; extra == "docs"
+Provides-Extra: plot
+Requires-Dist: duckdb-engine>=0.17.0; extra == "plot"
+Requires-Dist: sqlalchemy>=2.0.43; extra == "plot"
+Requires-Dist: ipykernel>=6.30.1; extra == "plot"
+Requires-Dist: ipython>=9.5.0; extra == "plot"
+Requires-Dist: jupyterlab>=4.4.9; extra == "plot"
+Requires-Dist: kaleido>=1.1.0; extra == "plot"
+Requires-Dist: matplotlib>=3.10.6; extra == "plot"
+Requires-Dist: nbformat>=5.10.4; extra == "plot"
+Requires-Dist: numpy>=2.3.3; extra == "plot"
+Requires-Dist: plotly>=6.3.0; extra == "plot"
+Requires-Dist: polars>=1.33.1; extra == "plot"
+Requires-Dist: python-magic>=0.4.27; extra == "plot"
 
 
 <p align="center">

{machineconfig-5.33.dist-info → machineconfig-5.35.dist-info}/RECORD

@@ -46,8 +46,8 @@ machineconfig/cluster/templates/cli_trogon.py,sha256=PFWGy8SFYIhT9r3ZV4oIEYfImsQ
 machineconfig/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/installer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/installer/check_installations.py,sha256=wOtvWzyJSxbuFueFfcOc4gX_UbTRWv6tWpRcG-3Ml_8,10780
-machineconfig/jobs/installer/installer_data.json,sha256=ExwnBwbnk_RzBa-aIqk5JTPdO_qWpuLuV6gMALQ1b4w,72527
-machineconfig/jobs/installer/package_groups.py,sha256=IuF6FBVMs4jGsoSZZZdzaBO0wfA3ef2ZmgP8gFdBAl8,5361
+machineconfig/jobs/installer/installer_data.json,sha256=py5S8uf0RscDXDZWIsnrFoG2x90zt4XGhpW5w16CGpU,73161
+machineconfig/jobs/installer/package_groups.py,sha256=lS8uG-gGLLodJm4grhGuhAJl7shTWfwKB2wGSD0PHzY,5378
 machineconfig/jobs/installer/custom/gh.py,sha256=gn7TUSrsLx7uqFqj1Z-iYglS0EYBSgtJ9jWHxaJIfXM,4119
 machineconfig/jobs/installer/custom/hx.py,sha256=YQClQXqWtGvon8BLFGf1Fp20JPkHgZeEZ6ebmCJQQfI,5838
 machineconfig/jobs/installer/custom_dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -127,14 +127,14 @@ machineconfig/scripts/linux/switch_ip,sha256=NQfeKMBSbFY3eP6M-BadD-TQo5qMP96DTp7
 machineconfig/scripts/linux/warp-cli.sh,sha256=shFFZ9viet_DSEEHT8kxlGRHoJpO6o85pKYnc3rIkaA,3868
 machineconfig/scripts/linux/z_ls,sha256=ATZtu0ccN3AKvAOxkwLq1xgQjJ3en5byEWJ3Q8afnNg,3340
 machineconfig/scripts/python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/scripts/python/agents.py,sha256=KVMf9lL1xAiFb0QfM9hV_GwUWzOymt_ALE8VG81aBJo,10200
+machineconfig/scripts/python/agents.py,sha256=Bu2_my11RpvgOqUZuY8E0U8rlaKNL1IwBALIH8dYelU,10549
 machineconfig/scripts/python/cloud.py,sha256=kRH9Pt1yEkASFskIVEgRmkidrksdkgv2-bBmjLSxzSo,814
-machineconfig/scripts/python/croshell.py,sha256=4XIqEFmYCGn_CpeeAaN-1hBAwwWLQR0PKxBFNRvP2j0,6475
+machineconfig/scripts/python/croshell.py,sha256=VRRf8oyh2DIkIv5sK7eV6thIglXa3tDD_FYlPc0NA2k,6476
 machineconfig/scripts/python/devops.py,sha256=3mG-4RlF9vzcfXO7ISsxwRICQpJRR8JMqxtxKLE70fs,1822
 machineconfig/scripts/python/devops_navigator.py,sha256=iR6HAYt0TA7efV_g6Lr9gPczN6mqvS0V5hShD1x-9R8,29537
 machineconfig/scripts/python/fire_jobs.py,sha256=UxMkQ8WqxmZx_u1gn9LV_Cn4FjbCAtuWUWupZl1UkUI,13486
 machineconfig/scripts/python/ftpx.py,sha256=17oCDB59C9z1RIpEoBTgmv8NFDTqhWzKWew9TqbP8vM,9406
-machineconfig/scripts/python/interactive.py,sha256=Rd406f3WpdTzDv7-dY1xbB90YHBk-EUBpsViX3QDGZM,11773
+machineconfig/scripts/python/interactive.py,sha256=Zghe-b2Y6WIDPEhzsO1NDheTv4PAz4357SeL5AXJfh0,11777
 machineconfig/scripts/python/sessions.py,sha256=lO_aTnh7T05XoCa8Ox-ROAWBKMtbo-DZzlFDUqzSipM,8716
 machineconfig/scripts/python/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/ai/generate_files.py,sha256=Vfjgd0skJu-WTgqUxmOVFzaNMfSFBaFmY5oGGVY7MZY,2860
@@ -177,20 +177,21 @@ machineconfig/scripts/python/croshell_helpers/start_slidev.py,sha256=FAJ1_WkAQ7K
 machineconfig/scripts/python/croshell_helpers/viewer.py,sha256=heQNjB9fwn3xxbPgMofhv1Lp6Vtkl76YjjexWWBM0pM,2041
 machineconfig/scripts/python/croshell_helpers/viewer_template.py,sha256=ve3Q1-iKhCLc0VJijKvAeOYp2xaFOeIOC_XW956GWCc,3944
 machineconfig/scripts/python/devops_helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/scripts/python/devops_helpers/choose_pwsh_theme.ps1,sha256=bl27f8XAeLrm6WggorGmPR5uhsNwj5ayWsxus4UrKI8,1843
-machineconfig/scripts/python/devops_helpers/choose_wezterm_theme.py,sha256=pRXAGe2IpysYshsaF8CKEwHI8EGPtLcM8PtiAqM7vmM,3425
-machineconfig/scripts/python/devops_helpers/cli_config.py,sha256=LObo-YBjpfCB0_0CYQlYBqTtApM1RUOE_H28gEcH7PY,2870
+machineconfig/scripts/python/devops_helpers/cli_config.py,sha256=hoQXU44kCdvYMxLXZErC1xcExRmb1EMgSi7IUDQl7KA,3262
 machineconfig/scripts/python/devops_helpers/cli_config_dotfile.py,sha256=9W9i8Qbs6i2NfTq0knywB3StvE_sHaZYZ0RslTyoVz8,2734
 machineconfig/scripts/python/devops_helpers/cli_data.py,sha256=f_2espL92n6SoNb5sFVMvrK7LA29HzfrFAKhxKaud1M,510
-machineconfig/scripts/python/devops_helpers/cli_nw.py,sha256=J3_ugdGrEhuL-4sEOTHrlZR4WYvQOYR9ALXNjxBWIlA,1397
+machineconfig/scripts/python/devops_helpers/cli_nw.py,sha256=S4_6OwH_lZ73BPP6dY_InrB2rmwif6_h6DFLy8hlihY,1821
 machineconfig/scripts/python/devops_helpers/cli_repos.py,sha256=n8UnFjFIgTro-OMf47y5PAdYzqVYCSM6-5P90MvJOpw,9683
 machineconfig/scripts/python/devops_helpers/cli_self.py,sha256=XGWPZVZmwKaDOY_5IYj2l_Ke0ocjhfXP9NK5-nFwFSg,1467
 machineconfig/scripts/python/devops_helpers/cli_terminal.py,sha256=-SNCDrQHBDUZw2cNNrEw3K3owzmZASBjd5deBKB49YY,5358
 machineconfig/scripts/python/devops_helpers/devops_add_identity.py,sha256=wvjNgqsLmqD2SxbNCW_usqfp0LI-TDvcJJKGOWt2oFw,3775
-machineconfig/scripts/python/devops_helpers/devops_add_ssh_key.py,sha256=BXB-9RvuSZO0YTbnM2azeABW2ngLW4SKhhAGAieMzfw,6873
+machineconfig/scripts/python/devops_helpers/devops_add_ssh_key.py,sha256=MwyHbpRP9r6DajARCdjEKVNrhEdv_yjd0lXxgEwjwsA,9179
 machineconfig/scripts/python/devops_helpers/devops_backup_retrieve.py,sha256=nK47Rc7gQuDCnkk6_sW1y82gBnDJ9TdHU8XwMPFBK9c,5591
 machineconfig/scripts/python/devops_helpers/devops_status.py,sha256=C1akn6mGteBVV9CiQnUX6H32ehnCgMdCyNgojXVQeqA,23287
 machineconfig/scripts/python/devops_helpers/devops_update_repos.py,sha256=dtBh9mNNJEukyV47Cug98S0hvG9e1U43B0EQSeNtvvs,9394
+machineconfig/scripts/python/devops_helpers/themes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+machineconfig/scripts/python/devops_helpers/themes/choose_pwsh_theme.ps1,sha256=BrJNDHoSK_fHjHwbJqRf3sufSa7SKseBS2kT0qxibJQ,2958
+machineconfig/scripts/python/devops_helpers/themes/choose_wezterm_theme.py,sha256=pRXAGe2IpysYshsaF8CKEwHI8EGPtLcM8PtiAqM7vmM,3425
 machineconfig/scripts/python/helpers_fire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/helpers_fire/fire_agents_help_launch.py,sha256=RAee8ethEIxyQpRKqe6u9NwIOKWTspAF-nzmPap6a5k,5506
 machineconfig/scripts/python/helpers_fire/fire_agents_help_search.py,sha256=qIfSS_su2YJ1Gb0_lu4cbjlJlYMBw0v52NTGiSrGjk8,2991
@@ -376,7 +377,7 @@ machineconfig/setup_linux/others/mint_keyboard_shortcuts.sh,sha256=F5dbg0n9RHsKG
 machineconfig/setup_linux/ssh/openssh_all.sh,sha256=3dg6HEUFbHQOzLfSAtzK_D_GB8rGCCp_aBnxNdnidVc,824
 machineconfig/setup_linux/ssh/openssh_wsl.sh,sha256=1eeRGrloVB34K5z8yWVUMG5b9pV-WBfHgV9jqXiYgCQ,1398
 machineconfig/setup_linux/web_shortcuts/android.sh,sha256=gzep6bBhK7FCBvGcXK0fdJCtkSfBOftt0aFyDZq_eMs,68
-machineconfig/setup_linux/web_shortcuts/interactive.sh,sha256=NwrHKEPHW1PIkl3Yi7BEQL8Mdsfs7_FX5Ci7cKOrGZg,219
+machineconfig/setup_linux/web_shortcuts/interactive.sh,sha256=cFfIhRRGGHprXkZptfKdVG7XExbJqAXL7CHkQvn5I6A,207
 machineconfig/setup_windows/__init__.py,sha256=wVpUqoLqXl-_-bRd7gZw_PJ7WZ2GtOqfFMzo_lIwieg,454
 machineconfig/setup_windows/apps.ps1,sha256=G5GqZ9G0aiQr_A-HaahtRdzpaTTdW6n3DRKMZWDTSPc,11214
 machineconfig/setup_windows/machineconfig.ps1,sha256=gIQBOLIh65oUXgSjYMeYeD6lU1Bu80LZ59xqRc3T3BA,918
@@ -384,11 +385,10 @@ machineconfig/setup_windows/uv.ps1,sha256=mzkFJUQ57dukVQtY7WqAQIVUDMcixnkir8aNM_
 machineconfig/setup_windows/others/docker.ps1,sha256=M8NfsSxH8YlmY92J4rSe1xWOwTW8IFrdgb8cI8Riu2E,311
 machineconfig/setup_windows/others/obs.ps1,sha256=2andchcXpxS3rqZjGaMpY5VShxTAKWvw6eCrayjuaLo,30
 machineconfig/setup_windows/others/power_options.ps1,sha256=c7Hn94jBD5GWF29CxMhmNpuM0hgXTQgVJmIRR_7sdcY,182
-machineconfig/setup_windows/ssh/openssh-server.ps1,sha256=7FopRdNn8hQbst4Cq_T1qoU_Q397Q_O6B2JgH2FdZxE,2531
-machineconfig/setup_windows/ssh/openssh-server_add-sshkey.ps1,sha256=qiNC02kzUZi6KBV7O-nRQ7pQ0OGixbq-rUvSCQ7TVxc,1656
-machineconfig/setup_windows/ssh/openssh-server_add_identity.ps1,sha256=b8ZXpmNUSw3IMYvqSY7ClpdWPG39FS7MefoWnRhWN2U,506
-machineconfig/setup_windows/ssh/openssh_all.ps1,sha256=-mBGNRJSxsY6Z3gFMwIoL_3poj943acjfzXwGo2YFu4,864
-machineconfig/setup_windows/web_shortcuts/interactive.ps1,sha256=47KY5sr8Cy3bfzFCszwnGeQpIHpjh7r8_znv3TZhqWY,221
+machineconfig/setup_windows/ssh/add-sshkey.ps1,sha256=qfPdqCpd9KP3VhH4ifsUm1Xvec7c0QVl4Wt8JIAm9HQ,1653
+machineconfig/setup_windows/ssh/add_identity.ps1,sha256=b8ZXpmNUSw3IMYvqSY7ClpdWPG39FS7MefoWnRhWN2U,506
+machineconfig/setup_windows/ssh/openssh-server.ps1,sha256=OMlYQdvuJQNxF5EILLPizB6BZAT3jAmDsv1WcVVxpFQ,2529
+machineconfig/setup_windows/web_shortcuts/interactive.ps1,sha256=2thf2ONXtwOLEDRpg0tX_dj-P74hZMfk7s9MUm7J2jA,210
 machineconfig/setup_windows/wt_and_pwsh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py,sha256=ogxJnwpdcpH7N6dFJu95UCNoGYirZKQho_3X0F_hmXs,6791
 machineconfig/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -414,7 +414,7 @@ machineconfig/utils/ai/generate_file_checklist.py,sha256=ajbmhcBToRugl75c_KZRq2X
 machineconfig/utils/cloud/onedrive/setup_oauth.py,sha256=ZTVkqgrwbV_EoPvyT8dyOTUE0ur3BW4sa9o6QYtt5Bo,2341
 machineconfig/utils/cloud/onedrive/transaction.py,sha256=m-aNcnWj_gfZVvJOSpkdIqjZxU_3nXx2CA-qKbQgP3I,26232
 machineconfig/utils/files/ascii_art.py,sha256=cNJaJC07vx94fS44-tzgfbfBeCwXVrgpnWGBLUnfC38,5212
-machineconfig/utils/files/dbms.py,sha256=xJTg6H_AvZWsduuDaSs4_KdUu__rO8LXrE_hrcXTgNM,17203
+machineconfig/utils/files/dbms.py,sha256=oXDIqWLDiSO2icdeTMgTfd84yq6beDk89FCC8OZ8NcI,11277
 machineconfig/utils/files/headers.py,sha256=F-sudsZ1JyAcmZNO4FdcyhoClbCdb2vMlqceT36zfhE,3717
 machineconfig/utils/files/read.py,sha256=R1bvIIdiFX9N0JyzUISqVfewYFq30cY3z0kqSlKGtuA,4566
 machineconfig/utils/files/ouch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -428,8 +428,8 @@ machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=Xbi59rU35AzR
 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-5.33.dist-info/METADATA,sha256=HrFrUFDbEj0yvarH5SepTjuBvN6gS2RV5J_-E_JeteQ,2495
-machineconfig-5.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-5.33.dist-info/entry_points.txt,sha256=z7b9guivf0GSKUG6b8ALgbDoRg2LuPfkGP_p-PxgX9g,469
-machineconfig-5.33.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-5.33.dist-info/RECORD,,
+machineconfig-5.35.dist-info/METADATA,sha256=1L8ZKnBEELZm81pwox26G8qLNAQVewvC1I2nyfIVS1g,3040
+machineconfig-5.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-5.35.dist-info/entry_points.txt,sha256=z7b9guivf0GSKUG6b8ALgbDoRg2LuPfkGP_p-PxgX9g,469
+machineconfig-5.35.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-5.35.dist-info/RECORD,,

machineconfig/setup_windows/ssh/openssh_all.ps1

@@ -1,22 +0,0 @@
-
-# install server (sshd).
-Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh-server.ps1 | Invoke-Expression
-
-if (!$pubkey_string) {
-    $pubkey_url = 'https://github.com/thisismygitrepo.keys'  # (CHANGE APPROPRIATELY)
-    $pubkey_string = (Invoke-WebRequest $pubkey_url).Content
-} else {
-    Write-Output "pubkey_string is already defined."
-}
-
-
-echo $null >> $HOME/.ssh/authorized_keys  # powershell way of touching a file if it doesn't exist
-echo $pubkey_string >> $HOME/.ssh/authorized_keys
-echo $pubkey_string > $HOME/.ssh/pubkey.pub
-
-Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh-server_add-sshkey.ps1 | Invoke-Expression
-ipconfig.exe
-
-echo "Done"
-echo "USE: ssh $env:USERNAME@$env:COMPUTERNAME -p 22"
-