machineconfig 5.85__py3-none-any.whl → 5.87__py3-none-any.whl

machineconfig/jobs/installer/installer_data.json

@@ -245,14 +245,14 @@
       "doc": "🔗 Easy file sharing tool",
       "fileNamePattern": {
         "amd64": {
-          "linux": "npm install -g ezshare",
-          "windows": "npm install -g ezshare",
-          "macos": "npm install -g ezshare"
+          "linux": "npm i -g @ezshare/cli",
+          "windows": "npm i -g @ezshare/cli",
+          "macos": "npm i -g @ezshare/cli"
         },
         "arm64": {
-          "linux": "npm install -g ezshare",
-          "windows": "npm install -g ezshare",
-          "macos": "npm install -g ezshare"
+          "linux": "npm i -g @ezshare/cli",
+          "windows": "npm i -g @ezshare/cli",
+          "macos": "npm i -g @ezshare/cli"
         }
       }
     },

machineconfig/profile/create_links_export.py

@@ -1,12 +1,12 @@
 
 import typer
-from typing import Optional, Literal
+from typing import Optional, Literal, Annotated
 
 
-def main_public_from_parser(method: Literal["symlink", "copy"] = typer.Option(..., help="Method to use for setting up the config file."),
-                            on_conflict: Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option(..., help="Action to take on conflict"),
-                            which: Optional[str] = typer.Option(None, help="Specific items to process"),
-                            interactive: bool = typer.Option(False, help="Run in interactive mode")):
+def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for setting up the config file.")],
+                            on_conflict: Annotated[Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")],
+                            which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
+                            interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
     """Terminology:
     SOURCE = Self-Managed-Config-File-Path
     TARGET = Config-File-Default-Path
@@ -31,10 +31,10 @@ def main_public_from_parser(method: Literal["symlink", "copy"] = typer.Option(..
     apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)
 
 
-def main_private_from_parser(method: Literal["symlink", "copy"] = typer.Option(..., help="Method to use for linking files"),
-                             on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", help="Action to take on conflict"),
-                             which: Optional[str] = typer.Option(None, help="Specific items to process"),
-                             interactive: bool = typer.Option(False, help="Run in interactive mode")):
+def main_private_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for linking files")],
+                             on_conflict: Annotated[Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")] = "throwError",
+                             which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
+                             interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
     from machineconfig.profile.create_links import ConfigMapper, read_mapper
 
     mapper_full = read_mapper()["private"]

machineconfig/scripts/python/agents.py

@@ -3,25 +3,25 @@
 """
 
 from pathlib import Path
-from typing import cast, Optional, get_args
+from typing import cast, Optional, get_args, Annotated
 import typer
 from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS, HOST, MODEL, PROVIDER
 
 
 def create(
-    agent: AGENTS = typer.Option(..., "--agents", "-a", help=f"Agent type. One of {', '.join(get_args(AGENTS)[:3])}"),
-    host: HOST = typer.Option(..., "--host", "-h", help=f"Machine to run agents on. One of {', '.join(get_args(HOST))}"),
-    model: MODEL = typer.Option(..., "--model", "-m", help=f"Model to use (for crush agent). One of {', '.join(get_args(MODEL)[:3])}"),
-    provider: PROVIDER = typer.Option(..., "--provider", "-p", help=f"Provider to use (for crush agent). One of {', '.join(get_args(PROVIDER)[:3])}"),
-    context_path: Optional[Path] = typer.Option(None, "--context-path", "-c", help="Path to the context file/folder, defaults to .ai/todo/"),
-    separator: str = typer.Option("\n", "--separator", "-s", help="Separator for context"),
-    agent_load: int = typer.Option(13, "--agent-load", "-al", help="Number of tasks per prompt"),
-    prompt: Optional[str] = typer.Option(None, "--prompt", "-P", help="Prompt prefix as string"),
-    prompt_path: Optional[Path] = typer.Option(None, "--prompt-path", "-pp", help="Path to prompt file"),
-    job_name: str = typer.Option("AI_Agents", "--job-name", "-j", help="Job name"),
-    separate: bool = typer.Option(True, "--separate", "-S", help="Keep prompt material in separate file to the context."),
-    output_path: Optional[Path] = typer.Option(None, "--output-path", "-o", help="Path to write the layout.json file"),
-    agents_dir: Optional[Path] = typer.Option(None, "--agents-dir", "-ad", help="Directory to store agent files. If not provided, will be constructed automatically."),
+    agent: Annotated[AGENTS, typer.Option(..., "--agents", "-a", help=f"Agent type. One of {', '.join(get_args(AGENTS)[:3])}")],
+    host: Annotated[HOST, typer.Option(..., "--host", "-h", help=f"Machine to run agents on. One of {', '.join(get_args(HOST))}")],
+    model: Annotated[MODEL, typer.Option(..., "--model", "-m", help=f"Model to use (for crush agent). One of {', '.join(get_args(MODEL)[:3])}")],
+    provider: Annotated[PROVIDER, typer.Option(..., "--provider", "-p", help=f"Provider to use (for crush agent). One of {', '.join(get_args(PROVIDER)[:3])}")],
+    context_path: Annotated[Optional[Path], typer.Option(..., "--context-path", "-c", help="Path to the context file/folder, defaults to .ai/todo/")] = None,
+    separator: Annotated[str, typer.Option(..., "--separator", "-s", help="Separator for context")] = "\n",
+    agent_load: Annotated[int, typer.Option(..., "--agent-load", "-al", help="Number of tasks per prompt")] = 13,
+    prompt: Annotated[Optional[str], typer.Option(..., "--prompt", "-P", help="Prompt prefix as string")] = None,
+    prompt_path: Annotated[Optional[Path], typer.Option(..., "--prompt-path", "-pp", help="Path to prompt file")] = None,
+    job_name: Annotated[str, typer.Option(..., "--job-name", "-j", help="Job name")] = "AI_Agents",
+    separate: Annotated[bool, typer.Option(..., "--separate", "-S", help="Keep prompt material in separate file to the context.")] = True,
+    output_path: Annotated[Optional[Path], typer.Option(..., "--output-path", "-o", help="Path to write the layout.json file")] = None,
+    agents_dir: Annotated[Optional[Path], typer.Option(..., "--agents-dir", "-ad", help="Directory to store agent files. If not provided, will be constructed automatically.")] = None,
 ):
 
     from machineconfig.scripts.python.helpers_fire.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout
@@ -94,9 +94,9 @@ agents create "{context_path_resolved}" \\
 
 
 def collect(
-    agent_dir: str = typer.Argument(..., help="Path to the agent directory containing the prompts folder"),
-    output_path: str = typer.Argument(..., help="Path to write the concatenated material files"),
-    separator: str = typer.Option("\n", help="Separator to use when concatenating material files"),
+    agent_dir: Annotated[str, typer.Argument(..., help="Path to the agent directory containing the prompts folder")],
+    output_path: Annotated[str, typer.Argument(..., help="Path to write the concatenated material files")],
+    separator: Annotated[str, typer.Option(..., help="Separator to use when concatenating material files")] = "\n",
 ) -> None:
     """Collect all material files from an agent directory and concatenate them."""
     if not Path(agent_dir).exists() or not Path(agent_dir).is_dir():

machineconfig/scripts/python/croshell.py

@@ -149,7 +149,7 @@ from pathlib import Path
             else:
                 console.print(Panel("❌ Could not determine the local machineconfig repo root. Please ensure the `REPO_ROOT` in `source_of_truth.py` is correctly set to the local path of the machineconfig repo, or do not use the `--local` flag.", title="Error", border_style="red"))
                 return
-        else: ve_line = """--with "machineconfig[plot]>=5.84" """
+        else: ve_line = """--with "machineconfig[plot]>=5.87" """
         fire_line = f"uv run --python 3.14 {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     from machineconfig.utils.code import run_shell_script

machineconfig/scripts/python/devops.py

@@ -1,7 +1,7 @@
 """devops with emojis"""
 
 import typer
-from typing import Optional
+from typing import Optional, Annotated
 
 import machineconfig.scripts.python.devops_helpers.cli_repos as cli_repos
 import machineconfig.scripts.python.devops_helpers.cli_config as cli_config
@@ -10,15 +10,17 @@ import machineconfig.scripts.python.devops_helpers.cli_data as cli_data
 import machineconfig.scripts.python.devops_helpers.cli_nw as cli_network
 
 
-def get_app():
-    app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True, add_completion=True)
-    def install(which: Optional[str] = typer.Argument(None, help="Comma-separated list of program names to install, or group name if --group flag is set."),
-        group: bool = typer.Option(False, "--group", "-g", help="Treat 'which' as a group name. A group is bundle of apps."),
-        interactive: bool = typer.Option(False, "--interactive", "-ia", help="Interactive selection of programs to install."),
+def install(which: Annotated[Optional[str], typer.Argument(..., help="Comma-separated list of program names to install, or group name if --group flag is set.")],
+        group: Annotated[bool, typer.Option(..., "--group", "-g", help="Treat 'which' as a group name. A group is bundle of apps.")] = False,
+        interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Interactive selection of programs to install.")] = False,
     ) -> None:
         """📦 Install essential packages"""
         import machineconfig.utils.installer_utils.installer as installer_entry_point
         installer_entry_point.main(which=which, group=group, interactive=interactive)
+
+
+def get_app():
+    app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True, add_completion=True)
     _ = install
     app.command("install", no_args_is_help=True, help="🛠️ [i] Install essential packages")(install)
     app.command("i", no_args_is_help=True, help="Install essential packages", hidden=True)(install)

machineconfig/scripts/python/devops_helpers/cli_config.py

@@ -6,18 +6,18 @@ import typer
 
 
 
-def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for linking files"),
-                             on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
-                             which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
-                             interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
+def private(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")],
+                             on_conflict: Annotated[Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throwError",
+                             which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = None,
+                             interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Run in interactive mode")] = False):
     """🔗 Manage private configuration files."""
     import machineconfig.profile.create_links_export as create_links_export
     create_links_export.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
-def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for setting up the config file."),
-                            on_conflict: Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
-                            which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
-                            interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
+def public(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for setting up the config file.")],
+                            on_conflict: Annotated[Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throwError",
+                            which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = None,
+                            interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Run in interactive mode")] = False):
     """🔗 Manage public configuration files."""
     import machineconfig.profile.create_links_export as create_links_export
     create_links_export.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
@@ -42,7 +42,7 @@ def path():
     from pathlib import Path
     path = Path(navigator.__file__).resolve().parent.joinpath("path_manager_tui.py")
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(f"""uv run --with "machineconfig>=5.84,textual" {path}""")
+    run_shell_script(f"""uv run --with "machineconfig>=5.87,textual" {path}""")
 
 def pwsh_theme():
     """🔗 Select powershell prompt theme."""
@@ -51,7 +51,7 @@ def pwsh_theme():
     import subprocess
     subprocess.run(["pwsh", "-File", str(file)])
 
-def copy_assets(which: Literal["scripts", "settings", "both"] = typer.Argument(..., help="Which assets to copy")):
+def copy_assets(which: Annotated[Literal["scripts", "settings", "both"], typer.Argument(..., help="Which assets to copy")]):
     """🔗 Copy asset files from library to machine."""
     import machineconfig.profile.create_helper as create_helper
     match which:

machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -2,7 +2,7 @@
 import machineconfig.scripts.python.devops_helpers.cli_terminal as cli_terminal
 import machineconfig.scripts.python.devops_helpers.cli_share_server as cli_share_server
 import typer
-from typing import Optional
+from typing import Optional, Annotated
 
 
 
@@ -19,10 +19,10 @@ def install_ssh_server():
     run_shell_script(script=SSH_SERVER.read_text(encoding="utf-8"))
 
 
-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")
+def add_ssh_key(path: Annotated[Optional[str], typer.Option(..., help="Path to the public key file")] = None,
+         choose: Annotated[bool, typer.Option(..., "--choose", "-c", help="Choose from available public keys in ~/.ssh/*.pub")] = False,
+         value: Annotated[bool, typer.Option(..., "--value", "-v", help="Paste the public key content manually")] = False,
+         github: Annotated[Optional[str], typer.Option(..., "--github", "-g", help="Fetch public keys from a GitHub username")] = None
 ):
     """🔑 SSH add pub key to this machine so its accessible by owner of corresponding private key."""
     import machineconfig.scripts.python.nw.devops_add_ssh_key as helper
@@ -49,7 +49,8 @@ def debug_ssh():
         import machineconfig.scripts.python.nw.ssh_debug_linux as helper
         helper.ssh_debug_linux()
     elif system() == "Windows":
-        raise NotImplementedError("SSH debug for Windows is not implemented yet.")
+        import machineconfig.scripts.python.nw.ssh_debug_windows as helper
+        helper.ssh_debug_windows()
     else:
         raise NotImplementedError(f"Platform {system()} is not supported.")
 

machineconfig/scripts/python/devops_helpers/cli_repos.py

@@ -87,26 +87,26 @@ def analyze(directory: DirectoryArgument = None) -> None:
 
 
 def viz(
-    repo: str = typer.Option(Path.cwd().__str__(), "--repo", "-r", help="Path to git repository to visualize"),
-    output_file: Optional[Path] = typer.Option(None, "--output", "-o", help="Output video file (e.g., output.mp4). If specified, gource will render to video."),
-    resolution: str = typer.Option("1920x1080", "--resolution", "-res", help="Video resolution (e.g., 1920x1080, 1280x720)"),
-    seconds_per_day: float = typer.Option(0.1, "--seconds-per-day", "-spd", help="Speed of simulation (lower = faster)"),
-    auto_skip_seconds: float = typer.Option(1.0, "--auto-skip-seconds", "-as", help="Skip to next entry if nothing happens for X seconds"),
-    title: Optional[str] = typer.Option(None, "--title", "-t", help="Title for the visualization"),
-    hide_items: list[str] = typer.Option([], "--hide", "-h", help="Items to hide: bloom, date, dirnames, files, filenames, mouse, progress, root, tree, users, usernames"),
-    key_items: bool = typer.Option(False, "--key", "-k", help="Show file extension key"),
-    fullscreen: bool = typer.Option(False, "--fullscreen", "-f", help="Run in fullscreen mode"),
-    viewport: Optional[str] = typer.Option(None, "--viewport", "-v", help="Camera viewport (e.g., '1000x1000')"),
-    start_date: Optional[str] = typer.Option(None, "--start-date", help="Start date (YYYY-MM-DD)"),
-    stop_date: Optional[str] = typer.Option(None, "--stop-date", help="Stop date (YYYY-MM-DD)"),
-    user_image_dir: Optional[Path] = typer.Option(None, "--user-image-dir", help="Directory with user avatar images"),
-    max_files: int = typer.Option(0, "--max-files", help="Maximum number of files to show (0 = no limit)"),
-    max_file_lag: float = typer.Option(5.0, "--max-file-lag", help="Max time files remain on screen after last change"),
-    file_idle_time: int = typer.Option(0, "--file-idle-time", help="Time in seconds files remain idle before being removed"),
-    framerate: int = typer.Option(60, "--framerate", help="Frames per second for video output"),
-    background_color: str = typer.Option("000000", "--background-color", help="Background color in hex (e.g., 000000 for black)"),
-    font_size: int = typer.Option(22, "--font-size", help="Font size"),
-    camera_mode: str = typer.Option("overview", "--camera-mode", help="Camera mode: overview or track"),
+    repo: Annotated[str, typer.Option(..., "--repo", "-r", help="Path to git repository to visualize")] = Path.cwd().__str__(),
+    output_file: Annotated[Optional[Path], typer.Option(..., "--output", "-o", help="Output video file (e.g., output.mp4). If specified, gource will render to video.")] = None,
+    resolution: Annotated[str, typer.Option(..., "--resolution", "-res", help="Video resolution (e.g., 1920x1080, 1280x720)")] = "1920x1080",
+    seconds_per_day: Annotated[float, typer.Option(..., "--seconds-per-day", "-spd", help="Speed of simulation (lower = faster)")] = 0.1,
+    auto_skip_seconds: Annotated[float, typer.Option(..., "--auto-skip-seconds", "-as", help="Skip to next entry if nothing happens for X seconds")] = 1.0,
+    title: Annotated[Optional[str], typer.Option(..., "--title", "-t", help="Title for the visualization")] = None,
+    hide_items: Annotated[list[str], typer.Option(..., "--hide", "-h", help="Items to hide: bloom, date, dirnames, files, filenames, mouse, progress, root, tree, users, usernames")] = [],
+    key_items: Annotated[bool, typer.Option(..., "--key", "-k", help="Show file extension key")] = False,
+    fullscreen: Annotated[bool, typer.Option(..., "--fullscreen", "-f", help="Run in fullscreen mode")] = False,
+    viewport: Annotated[Optional[str], typer.Option(..., "--viewport", "-v", help="Camera viewport (e.g., '1000x1000')")] = None,
+    start_date: Annotated[Optional[str], typer.Option(..., "--start-date", help="Start date (YYYY-MM-DD)")] = None,
+    stop_date: Annotated[Optional[str], typer.Option(..., "--stop-date", help="Stop date (YYYY-MM-DD)")] = None,
+    user_image_dir: Annotated[Optional[Path], typer.Option(..., "--user-image-dir", help="Directory with user avatar images")] = None,
+    max_files: Annotated[int, typer.Option(..., "--max-files", help="Maximum number of files to show (0 = no limit)")] = 0,
+    max_file_lag: Annotated[float, typer.Option(..., "--max-file-lag", help="Max time files remain on screen after last change")] = 5.0,
+    file_idle_time: Annotated[int, typer.Option(..., "--file-idle-time", help="Time in seconds files remain idle before being removed")] = 0,
+    framerate: Annotated[int, typer.Option(..., "--framerate", help="Frames per second for video output")] = 60,
+    background_color: Annotated[str, typer.Option(..., "--background-color", help="Background color in hex (e.g., 000000 for black)")] = "000000",
+    font_size: Annotated[int, typer.Option(..., "--font-size", help="Font size")] = 22,
+    camera_mode: Annotated[str, typer.Option(..., "--camera-mode", help="Camera mode: overview or track")] = "overview",
         ) -> None:
     """🎬 Visualize repository activity using Gource."""
     from machineconfig.scripts.python.helpers_repos.grource import visualize

machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -1,6 +1,6 @@
 
 import typer
-from typing import Optional
+from typing import Optional, Annotated
 
 
 def update():
@@ -41,9 +41,9 @@ def install():
     # main_public_from_parser()
     import platform
     if platform.system() == "Windows":
-        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.84""")
+        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.87""")
     else:
-        run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.84""")
+        run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.87""")
 
 def navigate():
     """📚 NAVIGATE command structure with TUI"""
@@ -51,11 +51,11 @@ def navigate():
     from pathlib import Path
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(f"""uv run --with "machineconfig>=5.84,textual" {path}""")
+    run_shell_script(f"""uv run --with "machineconfig>=5.87,textual" {path}""")
 
 
-def run_python(ip: str = typer.Argument(..., help="Python command to run in the machineconfig environment"),
-               command: Optional[bool] = typer.Option(False, "--command", "-c", help="Run as command")):
+def run_python(ip: Annotated[str, typer.Argument(..., help="Python command to run in the machineconfig environment")],
+               command: Annotated[Optional[bool], typer.Option(..., "--command", "-c", help="Run as command")] = False):
     """🐍 RUN python command/file in the machineconfig environment"""
     if command:
         exec(ip)

machineconfig/scripts/python/devops_helpers/cli_share_server.py

@@ -1,19 +1,15 @@
 from pathlib import Path
 from typing import Optional, Annotated
 import typer
-# import typer
-
 
 
 def display_share_url(local_ip_v4: str, port: int, protocol: str = "http") -> None:
     """Display a flashy, unmissable share URL announcement."""
-
     from rich.console import Console
     from rich.panel import Panel
     from rich.text import Text
     from rich.align import Align
     console = Console()
-    
     # Create the main message with styling
     url_text = Text(f"{protocol}://{local_ip_v4}:{port}", style="bold bright_cyan underline")
     message = Text.assemble(
@@ -22,7 +18,6 @@ def display_share_url(local_ip_v4: str, port: int, protocol: str = "http") -> No
         url_text,
         (" 🚀", "bright_red")
     )
-    
     # Create a fancy panel with borders and styling
     panel = Panel(
         Align.center(message),
@@ -32,7 +27,6 @@ def display_share_url(local_ip_v4: str, port: int, protocol: str = "http") -> No
         padding=(1, 2),
         expand=False
     )
-    
     # Print with extra spacing and attention-grabbing elements
     console.print(panel)
 
@@ -45,9 +39,8 @@ def main(
     over_internet: Annotated[bool, typer.Option("--over-internet", "-i", help="Expose the share server over the internet using ngrok")] = False
 ) -> None:
     from machineconfig.utils.installer_utils.installer import install_if_missing
-    install_if_missing("ezshare")
-    if over_internet: install_if_missing("ngrok")
-
+    install_if_missing(which="ezshare")
+    if over_internet: install_if_missing(which="ngrok", )
     if username is None:
         import getpass
         username = getpass.getuser()

machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -10,18 +10,18 @@ from machineconfig.utils.code import get_shell_file_executing_python_script, wri
 
 import platform
 import subprocess
-from typing import Optional, Literal
+from typing import Optional, Literal, Annotated
 
 
 console = Console()
 
 
 def main(
-    cloud: Optional[str] = typer.Option(None, "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config."),
-    repo: Optional[str] = typer.Option(None, "--repo", "-r", help="Path to the local repository. Defaults to current working directory."),
-    message: Optional[str] = typer.Option(None, "--message", "-m", help="Commit message for local changes."),
-    on_conflict: Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"] = typer.Option("ask", "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'."),
-    pwd: Optional[str] = typer.Option(None, "--password", help="Password for encryption/decryption of the remote repository."),
+    cloud: Annotated[Optional[str], typer.Option(..., "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config.")] = None,
+    repo: Annotated[Optional[str], typer.Option(..., "--repo", "-r", help="Path to the local repository. Defaults to current working directory.")] = None,
+    message: Annotated[Optional[str], typer.Option(..., "--message", "-m", help="Commit message for local changes.")] = None,
+    on_conflict: Annotated[Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"], typer.Option(..., "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
+    pwd: Annotated[Optional[str], typer.Option(..., "--password", help="Password for encryption/decryption of the remote repository.")] = None,
 ):
     if cloud is None:
         try:
@@ -101,7 +101,7 @@ git pull originEnc master
             return "done"
         from machineconfig.utils.meta import function_to_script
         program_1_py = function_to_script(func=func2, call_with_args=None, call_with_kwargs={"remote_repo": str(repo_remote_root), "local_repo": str(repo_local_root), "cloud": cloud_resolved})
-        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable="""uv run --with "machineconfig>=5.84" """)
+        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable="""uv run --with "machineconfig>=5.87" """)
         # ================================================================================
         option2 = "Delete local repo and replace it with remote copy:"
         program_2 = f"""
@@ -122,7 +122,7 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
             inspect_repos(repo_local_root=repo_local_root, repo_remote_root=repo_remote_root)
             return "done"
         program_3_py = function_to_script(func=func, call_with_args=None, call_with_kwargs={"repo_local_root": str(repo_local_root), "repo_remote_root": str(repo_remote_root)})
-        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable="""uv run --with "machineconfig>=5.84" """)
+        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable="""uv run --with "machineconfig>=5.87" """)
         # ================================================================================
 
         option4 = "Remove problematic rclone file from repo and replace with remote:"

machineconfig/scripts/python/helpers_repos/grource.py

@@ -319,7 +319,7 @@ def visualize(
 
 
 def install(
-    version: Optional[str] = typer.Option("0.53", "--version", "-v", help="Gource version to install"),
+    version: Annotated[Optional[str], typer.Option(..., "--version", "-v", help="Gource version to install")] = "0.53",
 ) -> None:
     """Install portable Gource on Windows (no admin privileges required)."""
     if platform.system() == "Windows":

machineconfig/scripts/python/helpers_repos/secure_repo.py

@@ -1,15 +1,15 @@
 
 import typer
-from typing import Optional, Literal
+from typing import Optional, Literal, Annotated
 from pathlib import Path
 
 
 def main(
-    cloud: Optional[str] = typer.Option(None, "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config."),
-    repo: Optional[str] = typer.Option(Path.cwd().as_posix(), "--repo", "-r", help="Path to the local repository. Defaults to cwd."),
-    message: Optional[str] = typer.Option(None, "--message", "-m", help="Commit message for local changes."),
-    on_conflict: Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"] = typer.Option("ask", "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'."),
-    pwd: Optional[str] = typer.Option(None, "--password", help="Password for encryption/decryption of the remote repository."),
+    cloud: Annotated[Optional[str], typer.Option(..., "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config.")] = None,
+    repo: Annotated[Optional[str], typer.Option(..., "--repo", "-r", help="Path to the local repository. Defaults to cwd.")] = Path.cwd().as_posix(),
+    message: Annotated[Optional[str], typer.Option(..., "--message", "-m", help="Commit message for local changes.")] = None,
+    on_conflict: Annotated[Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"], typer.Option(..., "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
+    pwd: Annotated[Optional[str], typer.Option(..., "--password", help="Password for encryption/decryption of the remote repository.")] = None,
 ):
     from machineconfig.scripts.python.helpers_repos.cloud_repo_sync import main as program_content
     program_content(cloud=cloud, repo=repo, message=message, on_conflict=on_conflict, pwd=pwd)

machineconfig/scripts/python/interactive.py

@@ -130,9 +130,9 @@ def execute_installations(selected_options: list[str]) -> None:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.84""")
+            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.87""")
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.84""")
+            run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.87""")
     if "install_ssh_server" in selected_options:
         console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
         import platform

machineconfig/scripts/python/nw/add_ssh_key.py

@@ -6,7 +6,7 @@ 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
+from typing import Optional, Annotated
 import typer
 
 
@@ -77,10 +77,10 @@ sudo service ssh --full-restart
 """
 
 
-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")
+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()

machineconfig/scripts/python/nw/devops_add_ssh_key.py

@@ -6,7 +6,7 @@ from machineconfig.utils.path_extended import PathExtended
 from rich.console import Console
 from rich.panel import Panel
 from rich import box
-from typing import Optional
+from typing import Optional, Annotated
 import typer
 
 
@@ -66,10 +66,10 @@ sudo service ssh --full-restart
     return program
 
 
-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")
+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:

machineconfig/scripts/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.14 --with "machineconfig>=5.84" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=5.87" 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."