machineconfig 3.99__py3-none-any.whl → 7.66__py3-none-any.whl

machineconfig/scripts/python/msearch.py

@@ -0,0 +1,21 @@
+
+import typer
+
+
+def machineconfig_find():
+    from machineconfig.scripts.python.helpers_msearch import FZFG_LINUX_PATH, FZFG_WINDOWS_PATH
+    import platform
+    if platform.system() == "Linux":
+        script_path = FZFG_LINUX_PATH
+    elif platform.system() == "Windows":
+        script_path = FZFG_WINDOWS_PATH
+    else:
+        raise RuntimeError("Unsupported platform")
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(script=script_path.read_text(encoding="utf-8"), strict=False)
+
+
+def main():
+    app = typer.Typer(add_completion=False, no_args_is_help=True)
+    app.command(name="msearch", help="machineconfig search helper", no_args_is_help=False)(machineconfig_find)
+    app()

machineconfig/scripts/python/{devops_add_identity.py → nw/devops_add_identity.py}

@@ -1,7 +1,7 @@
 """ID"""
 
 # from platform import system
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.options import choose_from_options
 from rich.panel import Panel
 from rich.text import Text
@@ -12,9 +12,7 @@ BOX_WIDTH = 150  # width for box drawing
 def main() -> None:
     title = "🔑 SSH IDENTITY MANAGEMENT"
     print(Panel(Text(title, justify="center"), expand=False))
-
     print(Panel("🔍 Searching for existing SSH keys...", expand=False))
-
     private_keys = [x.with_name(x.stem) for x in PathExtended.home().joinpath(".ssh").search("*.pub")]
     private_keys = [x for x in private_keys if x.exists()]
     if private_keys:

machineconfig/scripts/python/{devops_add_ssh_key.py → nw/devops_add_ssh_key.py}

@@ -2,20 +2,20 @@
 
 from platform import system
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-from machineconfig.utils.options import choose_from_options
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from rich.console import Console
 from rich.panel import Panel
-from rich import box  # Import box
+from rich import box
+from typing import Optional, Annotated
+import typer
 
 
 console = Console()
 
 
-def get_add_ssh_key_script(path_to_key: PathExtended):
+def get_add_ssh_key_script(path_to_key: PathExtended) -> str:
     console.print(Panel("🔑 SSH KEY CONFIGURATION", title="[bold blue]SSH Setup[/bold blue]"))
-
-    if system() == "Linux":
+    if system() == "Linux" or system() == "Darwin":
         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]"))
     elif system() == "Windows":
@@ -30,16 +30,15 @@ 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 = ""
         else:
             console.print(Panel(f"➕ Adding new SSH key to authorized keys\n🔑 Key file: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
-            if system() == "Linux":
+            if system() == "Linux" or system() == "Darwin":
                 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."
@@ -49,16 +48,15 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
                 raise NotImplementedError
     else:
         console.print(Panel(f"📝 Creating new authorized_keys file\n🔑 Using key: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
-        if system() == "Linux":
+        if system() == "Linux" or system() == "Darwin":
             program = f"cat {path_to_key} > ~/.ssh/authorized_keys"
         else:
             program_path = LIBRARY_ROOT.joinpath("setup_windows/openssh-server_add-sshkey.ps1")
             program = PathExtended(program_path).expanduser().read_text(encoding="utf-8").replace('$sshfile=""', f'$sshfile="{path_to_key}"')
             console.print(Panel("🔧 Configured PowerShell script for Windows\n📝 Set key path in script", title="[bold blue]Configuration[/bold blue]"))
 
-    if system() == "Linux":
+    if system() == "Linux" or system() == "Darwin":
         program += """
-
 sudo chmod 700 ~/.ssh
 sudo chmod 644 ~/.ssh/authorized_keys
 sudo chmod 644 ~/.ssh/*.pub
@@ -68,51 +66,83 @@ 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"))
+"""
+Common pitfalls: 
+🚫 Wrong line endings (LF/CRLF) in config files
+🌐 Network port conflicts (try 2222 -> 2223) between WSL and Windows
+sudo service ssh restart
+sudo service ssh status
+sudo nano /etc/ssh/sshd_config
+"""
 
-    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: Annotated[Optional[str], typer.Argument(..., help="Path to the public key file")] = None,
+         pub_choose: Annotated[bool, typer.Option(..., "--choose", "-c", help="Choose from available public keys in ~/.ssh")] = False,
+         pub_val: Annotated[bool, typer.Option(..., "--paste", "-p", help="Paste the public key content manually")] = False,
+         from_github: Annotated[Optional[str], typer.Option(..., "--from-github", "-g", help="Fetch public keys from a GitHub username")] = None
+         ) -> None:
+    
+    if pub_path:
+        key_path = PathExtended(pub_path).expanduser().absolute()
+        key_path.parent.mkdir(parents=True, exist_ok=True)
+        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.parent.mkdir(parents=True, exist_ok=True)
         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.parent.mkdir(parents=True, exist_ok=True)
+        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)
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(('8.8.8.8', 80))
+    local_ip_v4 = s.getsockname()[0]
+    s.close()
+    console.print(Panel(f"🌐 This computer is accessible at: {local_ip_v4}", title="[bold green]Network Info[/bold green]", border_style="green"))
     console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))
 
 

machineconfig/scripts/{linux → python/nw}/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.13 --no-dev --project $HOME/code/machineconfig python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=7.32" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

machineconfig/scripts/python/{mount_nfs.py → nw/mount_nfs.py}

@@ -1,11 +1,12 @@
 """NFS mounting script"""
 
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from pathlib import Path
+
 from machineconfig.utils.ssh import SSH
-from machineconfig.utils.terminal import Terminal
 from machineconfig.utils.options import choose_from_options, choose_ssh_host
 
 import platform
+import subprocess
 
 
 def main():
@@ -18,9 +19,9 @@ def main():
         print("\n🔍 Interactive mode selected for choosing share path.")
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
-        ssh = SSH(tmp)
-        default = f"{ssh.hostname}:{ssh.run('echo $HOME').op}/data/share_nfs"
-        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run("cat /etc/exports").op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
+        ssh = SSH(host=tmp, username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
+        default = f"{ssh.hostname}:{ssh.run_shell(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_nfs"
+        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run_shell(command="cat /etc/exports", verbose_output=False, description='Get NFS exports', strict_stderr=False, strict_return_code=False).op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
         assert isinstance(share_info, str), f"❌ share_info must be a string. Got {type(share_info)}"
 
     remote_server = share_info.split(":")[0]
@@ -30,17 +31,22 @@ def main():
     print(f"📁 Share Path: {share_path}\n")
 
     if platform.system() in ["Linux", "Darwin"]:
-        mount_path_1 = PathExtended(share_path)
-        mount_path_2 = PathExtended.home().joinpath(f"data/mount_nfs/{remote_server}")
+        mount_path_1 = Path(share_path)
+        mount_path_2 = Path.home().joinpath("data/mount_nfs", remote_server)
         if str(mount_path_1).startswith("/home"):
-            mount_path_3 = PathExtended.home().joinpath(*mount_path_1.parts[3:])
+            mount_path_3 = Path.home().joinpath(*mount_path_1.parts[3:])
         else:
             mount_path_3 = mount_path_2
 
         print("🔧 Preparing mount paths...")
-        local_mount_point = choose_from_options(msg="📂 Choose mount path OR input custom one:", options=[mount_path_1, mount_path_2, mount_path_3], default=mount_path_2, custom_input=True, multi=False)
-        assert isinstance(local_mount_point, PathExtended), f"❌ local_mount_point must be a pathlib.Path. Got {type(local_mount_point)}"
-        local_mount_point = PathExtended(local_mount_point).expanduser()
+        local_mount_point_choice = choose_from_options(
+            msg="📂 Choose mount path OR input custom one:",
+            options=[mount_path_1, mount_path_2, mount_path_3],
+            default=mount_path_2,
+            custom_input=True,
+            multi=False,
+        )
+        local_mount_point = Path(local_mount_point_choice).expanduser()
 
         txt = f"""
 share_info={share_info}
@@ -49,15 +55,14 @@ share_path={share_path}
 local_mount_point={local_mount_point}
         """
         # PROGRAM_PATH.write_text(txt)
-        import subprocess
-
         subprocess.run(txt, shell=True, check=True)
 
         print("✅ Mount paths prepared successfully!\n")
 
     elif platform.system() == "Windows":
         print("\n🔍 Checking existing drives...")
-        print(Terminal().run("Get-PSDrive -PSProvider 'FileSystem'", shell="powershell").op)
+        completed = subprocess.run(["powershell", "-Command", "Get-PSDrive -PSProvider 'FileSystem'"], capture_output=True, check=False, text=True)
+        print((completed.stdout or "").strip())
         driver_letter = input(r"🖥️ Choose driver letter (e.g., Z:\\) [Avoid already used ones]: ") or "Z:\\"
         txt = f"""
 $server = "{remote_server}"
@@ -65,8 +70,6 @@ $sharePath = "{share_path}"
 $driveLetter = "{driver_letter}"
 """
         # PROGRAM_PATH.write_text(txt)
-        import subprocess
-
         subprocess.run(txt, shell=True, check=True)
         print("✅ Drive letter selected and configuration saved!\n")
 

machineconfig/scripts/{linux → python/nw}/mount_nw_drive

@@ -17,8 +17,7 @@ drive_location=''
 mount_point=''
 username=''
 password=''
-
-uv run --PYTHON 3.13 --no-dev --project $HOME/code/machineconfig python -m machineconfig.scripts.python.mount_nw_drive
+machineconfig.scripts.python.mount_nw_drive
 
 # Check if mount point directory exists, create if not
 if [ ! -d "$mount_point" ]; then

machineconfig/scripts/python/{mount_ssh.py → nw/mount_ssh.py}

@@ -1,9 +1,9 @@
 """Mount a remote SSHFS share on a local directory"""
 
 from platform import system
+import subprocess
 from machineconfig.utils.ssh import SSH
-from machineconfig.utils.terminal import Terminal
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 
 from machineconfig.utils.options import choose_ssh_host
 
@@ -18,16 +18,17 @@ def main():
         print("\n🔍 Interactive mode selected for choosing share path.")
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
-        ssh = SSH(host=tmp)
-        share_info = f"{ssh.username}@{ssh.hostname}:{ssh.run('echo $HOME').op}/data/share_ssh"
+        ssh = SSH(host=tmp, username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
+        share_info = f"{ssh.username}@{ssh.hostname}:{ssh.run_shell(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_ssh"
     else:
-        ssh = SSH(share_info.split(":")[0])
+        ssh = SSH(host=share_info.split(":")[0], username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
 
     print(f"\n🌐 Share Info: {share_info}")
 
     if system() == "Windows":
         print("\n🔍 Checking existing drives...")
-        print(Terminal().run("net use", shell="powershell").op)
+        completed = subprocess.run(["powershell", "-Command", "net use"], capture_output=True, check=False, text=True)
+        print((completed.stdout or "").strip())
         driver_letter = input(r"🖥️ Choose driver letter (e.g., Z:\\) [Avoid already used ones]: ") or "Z:\\"
     else:
         driver_letter = None
@@ -53,8 +54,6 @@ fusermount -u /mnt/dbhdd
         raise ValueError(f"❌ Not implemented for this system: {system()}")
 
     # PROGRAM_PATH.write_text(txt, encoding="utf-8")
-    import subprocess
-
     subprocess.run(txt, shell=True, check=True)
     print("✅ Configuration saved successfully!\n")
 

machineconfig/scripts/python/{onetimeshare.py → nw/onetimeshare.py}

@@ -6,7 +6,6 @@
 # # or use ots executable to do this job
 
 # import requests
-# import crocodile.file_management as fm
 # import base64
 # from typing import Optional