machineconfig 3.8__py3-none-any.whl → 3.82__py3-none-any.whl

machineconfig/scripts/python/cloud_repo_sync.py

@@ -5,14 +5,12 @@ import git
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.terminal import Terminal
-from machineconfig.utils.accessories import randstr
 
 from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
 from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
 import platform
-import argparse
 from typing import Optional, Literal
 from rich.console import Console
 from rich.panel import Panel
@@ -171,21 +169,17 @@ git commit -am "finished merging"
 
 
 def args_parser():
-    console.print(Panel("🔄 Repository Synchronization Utility", title_align="left", border_style="blue"))
-
-    parser = argparse.ArgumentParser(description="Secure Repo CLI.")
-    # parser.add_argument("cmd", help="command to run", choices=["pull", "push"])
-    parser.add_argument("path", nargs="?", type=str, help="Repository path, defaults to cwd.", default=None)
-    # parser.add_argument("--share", help="Repository path, defaults to cwd.", action="store_true", default=False)
-    parser.add_argument("--cloud", "-c", help="rclone cloud profile name.", default=None)
-    parser.add_argument("--message", "-m", help="Commit Message", default=f"new message {randstr()}")
-    # parser.add_argument("--skip_confirmation", "-s", help="Skip confirmation.", action="store_true", default=False)
-    # parser.add_argument("--key", "-k", help="Key for encryption", default=None)
-    parser.add_argument("--pwd", "-p", help="Password for encryption", default=None)
-    # parser.add_argument("--no_push", "-u", help="push to reomte.", action="store_true")  # default is False
-    parser.add_argument("--action", "-a", help="Action to take if merge fails.", choices=["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"], default="ask")
-    args = parser.parse_args()
-    main(cloud=args.cloud, path=args.path, message=args.message, action=args.action)
+    # console.print(Panel("🔄 Repository Synchronization Utility", title_align="left", border_style="blue"))
+    # parser = argparse.ArgumentParser(description="Secure Repo CLI.")
+    # parser.add_argument("path", nargs="?", type=str, help="Repository path, defaults to cwd.", default=None)
+    # parser.add_argument("--cloud", "-c", help="rclone cloud profile name.", default=None)
+    # parser.add_argument("--message", "-m", help="Commit Message", default=f"new message {randstr()}")
+    # parser.add_argument("--pwd", "-p", help="Password for encryption", default=None)
+    # parser.add_argument("--action", "-a", help="Action to take if merge fails.", choices=["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"], default="ask")
+    # args = parser.parse_args()
+    # main(cloud=args.cloud, path=args.path, message=args.message, action=args.action)
+    import typer
+    typer.run(main)
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/croshell.py

@@ -13,8 +13,7 @@ from machineconfig.utils.ve import get_ve_activate_line
 from typing import Optional
 from rich.console import Console
 from rich.panel import Panel
-from rich.text import Text  # Added import for rich.text
-# from machineconfig.utils.utils2 import pprint
+from rich.text import Text
 
 console = Console()
 
@@ -24,7 +23,7 @@ def add_print_header_pycode(path: str, title: str):
 try:
     from crocodile.file_management import P as PathExtended
 except ImportError:
-    from machineconfig.utils.path_reduced import PathExtended
+    from machineconfig.utils.path_extended import PathExtended
 pycode = PathExtended(r'{path}').read_text(encoding="utf-8")
 pycode = pycode.split("except Exception: print(pycode)")[2]
 

machineconfig/scripts/python/devops.py

@@ -3,8 +3,7 @@
 from machineconfig.utils.options import choose_from_options
 
 from platform import system
-from enum import Enum
-from typing import Optional
+from typing import Optional, Literal, TypeAlias
 from rich.console import Console
 from rich.panel import Panel
 
@@ -13,36 +12,20 @@ console = Console()
 BOX_WIDTH = 150  # width for box drawing
 
 
-class Options(Enum):
-    update = "🔄 UPDATE essential repos"
-    cli_install = "⚙️ DEVAPPS install"
-    sym_path_shell = "🔗 SYMLINKS, SHELL PROFILE, FONT, TERMINAL SETTINGS."
-    sym_new = "🆕 SYMLINKS new"
-    ssh_add_pubkey = "🔑 SSH add pub key to this machine"
-    ssh_add_id = "🗝️ SSH add identity (private key) to this machine"
-    ssh_use_pair = "🔐 SSH use key pair to connect two machines"
-    ssh_setup = "📡 SSH setup"
-    ssh_setup_wsl = "🐧 SSH setup wsl"
-    backup = "💾 BACKUP"
-    retreive = "📥 RETRIEVE"
-    scheduler = "⏰ SCHEDULER"
+Options: TypeAlias = Literal["🔄 UPDATE essential repos", "⚙️ DEVAPPS install", "🔗 SYMLINKS, SHELL PROFILE, FONT, TERMINAL SETTINGS.", "🆕 SYMLINKS new", "🔑 SSH add pub key to this machine", "🗝️ SSH add identity (private key) to this machine", "🔐 SSH use key pair to connect two machines", "📡 SSH setup", "🐧 SSH setup wsl", "💾 BACKUP", "📥 RETRIEVE", "⏰ SCHEDULER"]
 
+options_list = list(Options.__args__)
 
-def args_parser():
-    console.print(Panel("🛠️  DevOps Tool Suite", title_align="left", border_style="blue", width=BOX_WIDTH))
-    import argparse
 
-    parser = argparse.ArgumentParser()
-    new_line = "\n\n"
-    parser.add_argument("-w", "--which", help=f"""which option to run\nChoose one of those:\n{new_line.join([f"{item.name}: {item.value}" for item in list(Options)])}""", type=str, default=None)  # , choices=[op.value for op in Options]
-    args = parser.parse_args()
-    main(which=args.which)
+def args_parser():
+    import typer
+    typer.run(main)
 
 
-def main(which: Optional[str] = None):
+def main(which: Optional[Options] = None):
     # PathExtended(_program_PATH).delete(sure=True, verbose=False)
     console.print(Panel("🚀 Initializing DevOps operation...", width=BOX_WIDTH, border_style="blue"))
-    options = [op.value for op in Options]
+    options = options_list
     if which is None:
         try:
             choice_key = choose_from_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0], multi=False)
@@ -50,51 +33,51 @@ def main(which: Optional[str] = None):
             console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
             return
     else:
-        choice_key = Options[which].value
+        choice_key = which
 
     console.print(Panel(f"🔧 SELECTED OPERATION\n{choice_key}", title_align="left", border_style="green", width=BOX_WIDTH))
 
-    if choice_key == Options.update.value:
+    if choice_key == "🔄 UPDATE essential repos":
         console.print(Panel("🔄 Updating essential repositories...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_update_repos as helper
 
         helper.main()
-    elif choice_key == Options.cli_install.value:
+    elif choice_key == "⚙️ DEVAPPS install":
         console.print(Panel("⚙️  Installing development applications...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_devapps_install as helper
 
         helper.main(which=None)
 
-    elif choice_key == Options.sym_new.value:
+    elif choice_key == "🆕 SYMLINKS new":
         console.print(Panel("🔄 Creating new symlinks...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.jobs.python.python_ve_symlink as helper
 
         helper.main()
 
-    elif choice_key == Options.sym_path_shell.value:
+    elif choice_key == "🔗 SYMLINKS, SHELL PROFILE, FONT, TERMINAL SETTINGS.":
         console.print(Panel("🔗 Setting up symlinks, PATH, and shell profile...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.profile.create as helper
 
         helper.main()
         "echo '✅ done with symlinks'"
 
-    elif choice_key == Options.ssh_add_pubkey.value:
+    elif choice_key == "🔑 SSH add pub key to this machine":
         console.print(Panel("🔑 Adding public SSH key to this machine...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_add_ssh_key as helper
 
         helper.main()
 
-    elif choice_key == Options.ssh_use_pair.value:
+    elif choice_key == "🔐 SSH use key pair to connect two machines":
         console.print(Panel("❌ ERROR: Not Implemented\nSSH key pair connection feature is not yet implemented", title_align="left", border_style="red", width=BOX_WIDTH))
         raise NotImplementedError
 
-    elif choice_key == Options.ssh_add_id.value:  # so that you can SSH directly withuot pointing to identity key.
+    elif choice_key == "🗝️ SSH add identity (private key) to this machine":  # so that you can SSH directly withuot pointing to identity key.
         console.print(Panel("🗝️  Adding SSH identity (private key) to this machine...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_add_identity as helper
 
         helper.main()
 
-    elif choice_key == Options.ssh_setup.value:
+    elif choice_key == "📡 SSH setup":
         console.print(Panel("📡 Setting up SSH...", width=BOX_WIDTH, border_style="blue"))
         _program_windows = """Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
         _program_linux = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
@@ -103,23 +86,23 @@ def main(which: Optional[str] = None):
 
         subprocess.run(_program_linux if system() == "Linux" else _program_windows, shell=True, check=True)
 
-    elif choice_key == Options.ssh_setup_wsl.value:
+    elif choice_key == "🐧 SSH setup wsl":
         console.print(Panel("🐧 Setting up SSH for WSL...", width=BOX_WIDTH, border_style="blue"))
         """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash"""
 
-    elif choice_key == Options.backup.value:
+    elif choice_key == "💾 BACKUP":
         console.print(Panel("💾 Creating backup...", width=BOX_WIDTH, border_style="blue"))
         from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
 
         main_backup_retrieve(direction="BACKUP")
 
-    elif choice_key == Options.retreive.value:
+    elif choice_key == "📥 RETRIEVE":
         console.print(Panel("📥 Retrieving backup...", width=BOX_WIDTH, border_style="blue"))
         from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
 
         main_backup_retrieve(direction="RETRIEVE")
 
-    elif choice_key == Options.scheduler.value:
+    elif choice_key == "⏰ SCHEDULER":
         console.print(Panel("⏰ Setting up scheduler...", width=BOX_WIDTH, border_style="blue"))
         # from machineconfig.scripts.python.scheduler import main as helper
         # helper()

machineconfig/scripts/python/devops_devapps_install.py

@@ -1,18 +1,25 @@
 """Devops Devapps Install"""
 
 # import subprocess
+import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.installer import get_installers, install_all
 from platform import system
-from typing import Any, Optional, Literal, TypeAlias, get_args
-
+from typing import Any, Optional, Literal, TypeAlias, get_args, Annotated
 
 WHICH_CAT: TypeAlias = Literal["AllEssentials", "EssentialsAndOthers", "SystemInstallers", "PrecheckedCloudInstaller"]
 
 
-def main(which: Optional[WHICH_CAT | str]) -> None:
+def main_with_parser():
+    import typer
+    app = typer.Typer()
+    app.command()(main)
+    app()
+
+
+def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category or program to install, {list(get_args(WHICH_CAT))} or <program_name>")]) -> None:
     if which is not None and which in get_args(WHICH_CAT):  # install by category
         return get_programs_by_category(program_name=which)  # type: ignore
 
@@ -123,7 +130,7 @@ def get_programs_by_category(program_name: WHICH_CAT):
                 if sub_program.startswith("#winget"):
                     sub_program = sub_program[1:]
                 program += "\n" + sub_program
-
+        # case "CHOOSE": raise NotImplementedError("CHOOSE is not implemented yet.")
         # case "OtherDevApps":
         #     installers = get_installers(dev=True, system=system())
         #     options__: list[str] = [x.get_description() for x in tqdm(installers, desc="Checking installed programs")]

machineconfig/scripts/python/fire_jobs.py

@@ -17,11 +17,12 @@ from machineconfig.utils.path_helper import match_file_name, sanitize_path
 
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.accessories import get_repo_root, randstr
-from machineconfig.scripts.python.fire_jobs_args_helper import get_args, FireJobArgs, extract_kwargs
+from machineconfig.scripts.python.fire_jobs_args_helper import FireJobArgs, extract_kwargs
 import platform
-from typing import Optional
+from typing import Optional, Annotated
 from pathlib import Path
 import tomllib
+import typer
 # import os
 
 
@@ -328,12 +329,64 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
     subprocess.run(command, shell=True, check=True)
 
 
-def main():
-    args = get_args()
+def main(
+    path: Annotated[str, typer.Argument(help="The directory containing the jobs")] = ".",
+    function: Annotated[Optional[str], typer.Argument(help="Function to run")] = None,
+    ve: Annotated[str, typer.Option("--ve", "-v", help="Virtual environment name")] = "",
+    cmd: Annotated[bool, typer.Option("--cmd", "-B", help="Create a cmd fire command to launch the job asynchronously")] = False,
+    interactive: Annotated[bool, typer.Option("--interactive", "-i", help="Whether to run the job interactively using IPython")] = False,
+    debug: Annotated[bool, typer.Option("--debug", "-d", help="Enable debug mode")] = False,
+    choose_function: Annotated[bool, typer.Option("--choose_function", "-c", help="Choose function interactively")] = False,
+    loop: Annotated[bool, typer.Option("--loop", "-l", help="Infinite recursion (runs again after completion/interruption)")] = False,
+    jupyter: Annotated[bool, typer.Option("--jupyter", "-j", help="Open in a jupyter notebook")] = False,
+    submit_to_cloud: Annotated[bool, typer.Option("--submit_to_cloud", "-C", help="Submit to cloud compute")] = False,
+    remote: Annotated[bool, typer.Option("--remote", "-r", help="Launch on a remote machine")] = False,
+    module: Annotated[bool, typer.Option("--module", "-m", help="Launch the main file")] = False,
+    streamlit: Annotated[bool, typer.Option("--streamlit", "-S", help="Run as streamlit app")] = False,
+    environment: Annotated[str, typer.Option("--environment", "-E", help="Choose ip, localhost, hostname or arbitrary url")] = "",
+    holdDirectory: Annotated[bool, typer.Option("--holdDirectory", "-D", help="Hold current directory and avoid cd'ing to the script directory")] = False,
+    PathExport: Annotated[bool, typer.Option("--PathExport", "-P", help="Augment the PYTHONPATH with repo root")] = False,
+    git_pull: Annotated[bool, typer.Option("--git_pull", "-g", help="Start by pulling the git repo")] = False,
+    optimized: Annotated[bool, typer.Option("--optimized", "-O", help="Run the optimized version of the function")] = False,
+    Nprocess: Annotated[int, typer.Option("--Nprocess", "-p", help="Number of processes to use")] = 1,
+    zellij_tab: Annotated[Optional[str], typer.Option("--zellij_tab", "-z", help="Open in a new zellij tab")] = None,
+    watch: Annotated[bool, typer.Option("--watch", "-w", help="Watch the file for changes")] = False,
+    kw: Annotated[Optional[list[str]], typer.Option("--kw", help="Keyword arguments to pass to the function in the form of k1 v1 k2 v2 ... (meaning k1=v1, k2=v2, etc)")] = None,
+    layout: Annotated[bool, typer.Option("--layout", "-L", help="Use layout configuration (Zellij Or WindowsTerminal)")] = False,
+) -> None:
+    """Main function to process fire jobs arguments."""
+    args = FireJobArgs(
+        path=path,
+        function=function,
+        ve=ve,
+        cmd=cmd,
+        interactive=interactive,
+        debug=debug,
+        choose_function=choose_function,
+        loop=loop,
+        jupyter=jupyter,
+        submit_to_cloud=submit_to_cloud,
+        remote=remote,
+        module=module,
+        streamlit=streamlit,
+        environment=environment,
+        holdDirectory=holdDirectory,
+        PathExport=PathExport,
+        git_pull=git_pull,
+        optimized=optimized,
+        Nprocess=Nprocess,
+        zellij_tab=zellij_tab,
+        watch=watch,
+        kw=kw,
+        layout=layout,
+    )
     route(args)
 
 
+def main_from_parser():
+    typer.run(main)
+
+
 if __name__ == "__main__":
     # options, func_args = parse_pyfile(file_path="C:/Users/aalsaf01/code/machineconfig/myresources/crocodile/core.py")
-    args = get_args()
-    route(args)
+    pass

machineconfig/scripts/python/fire_jobs_args_helper.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
-from typing import Optional
-import argparse
+from typing import Optional, Annotated
+import typer
 
 
 @dataclass
@@ -32,42 +32,6 @@ class FireJobArgs:
     layout: bool = False
 
 
-def get_args() -> FireJobArgs:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("path", nargs="?", type=str, help="The directory containing the jobs", default=".")
-    parser.add_argument("function", nargs="?", type=str, help="Fuction to run", default=None)
-    parser.add_argument("--ve", "-v", type=str, help="virtual enviroment name", default="")
-    parser.add_argument("--cmd", "-B", action="store_true", help="Create a cmd fire command to launch the the job asynchronously.")
-    parser.add_argument("--interactive", "-i", action="store_true", help="Whether to run the job interactively using IPython")
-    parser.add_argument("--debug", "-d", action="store_true", help="debug")
-    parser.add_argument("--choose_function", "-c", action="store_true", help="debug")
-    parser.add_argument("--loop", "-l", action="store_true", help="infinite recusion (runs again after completion/interruption)")
-    parser.add_argument("--jupyter", "-j", action="store_true", help="open in a jupyter notebook")
-    parser.add_argument("--submit_to_cloud", "-C", action="store_true", help="submit to cloud compute")
-    parser.add_argument("--remote", "-r", action="store_true", help="launch on a remote machine")
-    parser.add_argument("--module", "-m", action="store_true", help="launch the main file")
-    parser.add_argument("--streamlit", "-S", action="store_true", help="run as streamlit app")
-    parser.add_argument("--environment", "-E", type=str, help="Choose ip, localhost, hostname or arbitrary url", default="")
-    parser.add_argument("--holdDirectory", "-D", action="store_true", help="hold current directory and avoid cd'ing to the script directory")
-    parser.add_argument("--PathExport", "-P", action="store_true", help="augment the PYTHONPATH with repo root.")
-    parser.add_argument("--git_pull", "-g", action="store_true", help="Start by pulling the git repo")
-    parser.add_argument("--optimized", "-O", action="store_true", help="Run the optimized version of the function")
-    parser.add_argument("--Nprocess", "-p", type=int, help="Number of processes to use", default=1)
-    parser.add_argument("--zellij_tab", "-z", type=str, dest="zellij_tab", help="open in a new zellij tab")
-    parser.add_argument("--watch", "-w", action="store_true", help="watch the file for changes")
-    parser.add_argument("--kw", nargs="*", default=None, help="keyword arguments to pass to the function in the form of k1 v1 k2 v2 ... (meaning k1=v1, k2=v2, etc)")
-    parser.add_argument("--layout", "-L", action="store_true", help="use layout configuration (Zellij Or WindowsTerminal)")
-
-    try:
-        args_raw = parser.parse_args()
-    except Exception as ex:
-        print(f"❌ Failed to parse arguments: {ex}")
-        parser.print_help()
-        raise ex
-    args = FireJobArgs(**vars(args_raw))
-    return args
-
-
 def extract_kwargs(args: FireJobArgs) -> dict[str, object]:
     str2obj = {"True": True, "False": False, "None": None}
     if args.kw is not None:

machineconfig/scripts/python/ftpx.py

@@ -6,39 +6,40 @@ Currently, the only way to work around this is to predifine the host in ~/.ssh/c
 
 """
 
-import argparse
+import typer
+from typing_extensions import Annotated
 from machineconfig.utils.ssh import SSH
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.scripts.python.helpers.helpers2 import ES
 from machineconfig.utils.accessories import pprint
 
 
-def main():
+def main(
+    source: Annotated[str, typer.Argument(help="Source path (machine:path)")],
+    target: Annotated[str, typer.Argument(help="Target path (machine:path)")],
+    recursive: Annotated[bool, typer.Option("--recursive", "-r", help="Send recursively.")] = False,
+    zipFirst: Annotated[bool, typer.Option("--zipFirst", "-z", help="Zip before sending.")] = False,
+    cloud: Annotated[bool, typer.Option("--cloud", "-c", help="Transfer through the cloud.")] = False,
+) -> None:
     print("""
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ┃ 🚀 FTP File Transfer
 ┃ 📋 Starting transfer process...
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━""")
-    parser = argparse.ArgumentParser(description="FTP client")
-
-    parser.add_argument("source", help="source path (machine:path)")
-    parser.add_argument("target", help="target path (machine:path)")
-
-    # FLAGS
-    parser.add_argument("--recursive", "-r", help="Send recursively.", action="store_true")  # default is False
-    parser.add_argument("--zipFirst", "-z", help="Zip before sending.", action="store_true")  # default is False
-    parser.add_argument("--cloud", "-c", help="Transfer through the cloud.", action="store_true")  # default is False
-
-    args = parser.parse_args()
-
-    if ":" in args.source and (args.source[1] != ":" if len(args.source) > 1 else True):  # avoid the case of "C:/":
+    
+    # Initialize variables
+    resolved_source: str | None = None
+    resolved_target: str | None = None
+    machine: str = ""
+    
+    if ":" in source and (source[1] != ":" if len(source) > 1 else True):  # avoid the case of "C:/":
         source_is_remote = True
 
         # calculating source:
-        source_parts = args.source.split(":")
+        source_parts = source.split(":")
         machine = source_parts[0]
         if len(source_parts) > 1 and source_parts[1] == ES:  # the source path is to be inferred from target.
-            if args.target == ES:
+            if target == ES:
                 raise ValueError(f"""
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ┃ ❌ Configuration Error
@@ -46,21 +47,22 @@ def main():
 ┃    This creates a cyclical inference dependency
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━""")
             else:
-                target = PathExtended(args.target).expanduser().absolute()
-            source = target.collapseuser().as_posix()
+                target_path_obj = PathExtended(target).expanduser().absolute()
+            resolved_source = target_path_obj.collapseuser().as_posix()
+            resolved_target = target
         else:
-            source = ":".join(args.source.split(":")[1:])
-            if args.target == ES:
-                target = None
+            resolved_source = ":".join(source.split(":")[1:])
+            if target == ES:
+                resolved_target = None
             else:
-                target = PathExtended(args.target).expanduser().absolute().as_posix()
+                resolved_target = PathExtended(target).expanduser().absolute().as_posix()
 
-    elif ":" in args.target and (args.target[1] != ":" if len(args.target) > 1 else True):  # avoid the case of "C:/":
+    elif ":" in target and (target[1] != ":" if len(target) > 1 else True):  # avoid the case of "C:/":
         source_is_remote = False
-        target_parts = args.target.split(":")
+        target_parts = target.split(":")
         machine = target_parts[0]
         if len(target_parts) > 1 and target_parts[1] == ES:
-            if args.source == ES:
+            if source == ES:
                 raise ValueError(f"""
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ┃ ❌ Configuration Error
@@ -68,14 +70,14 @@ def main():
 ┃    This creates a cyclical inference dependency
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━""")
             else:
-                source = args.source
-            target = None
+                resolved_source = source
+            resolved_target = None
         else:
-            target = ":".join(args.target.split(":")[1:])
-            if args.source == ES:
-                source = None
+            resolved_target = ":".join(target.split(":")[1:])
+            if source == ES:
+                resolved_source = None
             else:
-                source = PathExtended(args.source).expanduser().absolute()
+                resolved_source = PathExtended(source).expanduser().absolute().as_posix()
 
     else:
         raise ValueError("""
@@ -85,7 +87,7 @@ def main():
 ┃    Format should be: machine:path
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━""")
 
-    pprint({"source": str(source), "target": str(target), "machine": machine}, "CLI Resolution")
+    pprint({"source": str(resolved_source), "target": str(resolved_target), "machine": machine}, "CLI Resolution")
 
     from paramiko.ssh_exception import AuthenticationException  # type: ignore
 
@@ -105,43 +107,43 @@ def main():
         pwd = getpass.getpass()
         ssh = SSH(rf"{machine}", pwd=pwd)
 
-    if args.cloud:
+    if cloud:
         print("""
 ┌────────────────────────────────────────────────────────────────
 │ ☁️  Cloud Transfer Mode
 │    Uploading from remote to cloud...
 └────────────────────────────────────────────────────────────────""")
-        ssh.run(f"cloud_copy {source} :^", desc="Uploading from remote to the cloud.").print()
+        ssh.run(f"cloud_copy {resolved_source} :^", desc="Uploading from remote to the cloud.").print()
         print("""
 ┌────────────────────────────────────────────────────────────────
 │ ⬇️  Cloud Transfer Mode
 │    Downloading from cloud to local...
 └────────────────────────────────────────────────────────────────""")
-        ssh.run_locally(f"cloud_copy :^ {target}").print()
-        received_file = PathExtended(target)  # type: ignore
+        ssh.run_locally(f"cloud_copy :^ {resolved_target}").print()
+        received_file = PathExtended(resolved_target)  # type: ignore
     else:
         if source_is_remote:
-            assert source is not None, """
+            assert resolved_source is not None, """
 ❌ Path Error: Source must be a remote path (machine:path)"""
             print(f"""
 ┌────────────────────────────────────────────────────────────────
 │ 📥 Transfer Mode: Remote → Local
-│    Source: {source}
-│    Target: {target}
-│    Options: {"ZIP compression" if args.zipFirst else "No compression"}, {"Recursive" if args.recursive else "Non-recursive"}
+│    Source: {resolved_source}
+│    Target: {resolved_target}
+│    Options: {"ZIP compression" if zipFirst else "No compression"}, {"Recursive" if recursive else "Non-recursive"}
 └────────────────────────────────────────────────────────────────""")
-            received_file = ssh.copy_to_here(source=source, target=target, z=args.zipFirst, r=args.recursive)
+            received_file = ssh.copy_to_here(source=resolved_source, target=resolved_target, z=zipFirst, r=recursive)
         else:
-            assert source is not None, """
+            assert resolved_source is not None, """
 ❌ Path Error: Target must be a remote path (machine:path)"""
             print(f"""
 ┌────────────────────────────────────────────────────────────────
 │ 📤 Transfer Mode: Local → Remote
-│    Source: {source}
-│    Target: {target}
-│    Options: {"ZIP compression" if args.zipFirst else "No compression"}, {"Recursive" if args.recursive else "Non-recursive"}
+│    Source: {resolved_source}
+│    Target: {resolved_target}
+│    Options: {"ZIP compression" if zipFirst else "No compression"}, {"Recursive" if recursive else "Non-recursive"}
 └────────────────────────────────────────────────────────────────""")
-            received_file = ssh.copy_from_here(source=source, target=target, z=args.zipFirst, r=args.recursive)
+            received_file = ssh.copy_from_here(source=resolved_source, target=resolved_target, z=zipFirst, r=recursive)
 
     if source_is_remote and isinstance(received_file, PathExtended):
         print(f"""
@@ -157,5 +159,10 @@ def main():
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━""")
 
 
+def main_from_parser() -> None:
+    """Entry point function that uses typer to parse arguments and call main."""
+    typer.run(main)
+
+
 if __name__ == "__main__":
-    main()
+    main_from_parser()

machineconfig/scripts/python/repos.py

@@ -13,9 +13,9 @@ from machineconfig.scripts.python.repos_helper_update import update_repository
 from machineconfig.scripts.python.repos_helper_record import main as record_repos
 from machineconfig.scripts.python.repos_helper_clone import clone_repos
 
-import argparse
+import typer
 from enum import Enum
-from typing import Optional
+from typing import Annotated, Optional
 
 from rich import print as pprint
 
@@ -83,69 +83,64 @@ def git_action(path: PathExtended, action: GitAction, mess: Optional[str] = None
     return True
 
 
-def main():
+def main(
+    directory: Annotated[str, typer.Argument(help="📁 Folder containing repos to record or a specs JSON file to follow.")] = "",
+    push: Annotated[bool, typer.Option("--push", help="🚀 Push changes.")] = False,
+    pull: Annotated[bool, typer.Option("--pull", help="⬇️ Pull changes.")] = False,
+    commit: Annotated[bool, typer.Option("--commit", help="💾 Commit changes.")] = False,
+    all: Annotated[bool, typer.Option("--all", help="🔄 Pull, commit, and push changes.")] = False,
+    record: Annotated[bool, typer.Option("--record", help="📝 Record repositories.")] = False,
+    clone: Annotated[bool, typer.Option("--clone", help="📥 Clone repositories from record.")] = False,
+    checkout: Annotated[bool, typer.Option("--checkout", help="🔀 Check out to versions provided in a JSON file.")] = False,
+    checkout_to_branch: Annotated[bool, typer.Option("--checkout-to-branch", help="🔀 Check out to the main branch.")] = False,
+    recursive: Annotated[bool, typer.Option("--recursive", "-r", help="🔍 Recursive flag.")] = False,
+    no_sync: Annotated[bool, typer.Option("--no-sync", help="🚫 Disable automatic uv sync after pulls.")] = False,
+    cloud: Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️ Cloud storage option.")] = None,
+) -> None:
     print("\n" + "=" * 50)
     print("📂 Welcome to the Repository Manager")
     print("=" * 50 + "\n")
 
-    parser = argparse.ArgumentParser(description="REPO MANAGER")
-    # POSITIONAL
-    parser.add_argument("directory", help="📁 Folder containing repos to record or a specs JSON file to follow.", default="")
-    # FLAGS
-    parser.add_argument("--push", help="🚀 Push changes.", action="store_true")
-    parser.add_argument("--pull", help="⬇️ Pull changes.", action="store_true")
-    parser.add_argument("--commit", help="💾 Commit changes.", action="store_true")
-    parser.add_argument("--all", help="🔄 Pull, commit, and push changes.", action="store_true")
-    parser.add_argument("--record", help="📝 Record repositories.", action="store_true")
-    parser.add_argument("--clone", help="📥 Clone repositories from record.", action="store_true")
-    parser.add_argument("--checkout", help="🔀 Check out to versions provided in a JSON file.", action="store_true")
-    parser.add_argument("--checkout_to_branch", help="🔀 Check out to the main branch.", action="store_true")
-    parser.add_argument("--recursive", "-r", help="🔍 Recursive flag.", action="store_true")
-    parser.add_argument("--no-sync", help="🚫 Disable automatic uv sync after pulls.", action="store_true")
-    # OPTIONAL
-    parser.add_argument("--cloud", "-c", help="☁️ Cloud storage option.", default=None)
-    args = parser.parse_args()
-
-    if args.directory == "":
+    if directory == "":
         repos_root = PathExtended.home().joinpath("code")  # it is a positional argument, can never be empty.
     else:
-        repos_root = PathExtended(args.directory).expanduser().absolute()
+        repos_root = PathExtended(directory).expanduser().absolute()
 
-    auto_sync = not args.no_sync  # Enable auto sync by default, disable with --no-sync
+    auto_sync = not no_sync  # Enable auto sync by default, disable with --no-sync
 
-    if args.record:
+    if record:
         save_path = record_repos(repos_root=repos_root)
-        if args.cloud is not None:
-            PathExtended(save_path).to_cloud(rel2home=True, cloud=args.cloud)
+        if cloud is not None:
+            PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
 
-    elif args.clone or args.checkout or args.checkout_to_branch:
+    elif clone or checkout or checkout_to_branch:
         print("\n📥 Cloning or checking out repositories...")
         print(">>>>>>>>> Cloning Repos")
         if not repos_root.exists() or repos_root.name != "repos.json":
             repos_root = PathExtended(CONFIG_PATH).joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
             if not repos_root.exists():
-                if args.cloud is None:
-                    cloud: str = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
-                    print(f"⚠️ Using default cloud: {cloud}")
+                if cloud is None:
+                    cloud_name: str = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
+                    print(f"⚠️ Using default cloud: {cloud_name}")
                 else:
-                    cloud = args.cloud
-                    assert cloud is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
-                repos_root.from_cloud(cloud=cloud, rel2home=True)
-        assert (repos_root.exists() and repos_root.name == "repos.json") or args.cloud is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
-        clone_repos(spec_path=repos_root, preferred_remote=None, checkout_branch_flag=args.checkout_to_branch, checkout_commit_flag=args.checkout)
+                    cloud_name = cloud
+                    assert cloud_name is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
+                repos_root.from_cloud(cloud=cloud_name, rel2home=True)
+        assert (repos_root.exists() and repos_root.name == "repos.json") or cloud is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
+        clone_repos(spec_path=repos_root, preferred_remote=None, checkout_branch_flag=checkout_to_branch, checkout_commit_flag=checkout)
 
-    elif args.all or args.commit or args.pull or args.push:
+    elif all or commit or pull or push:
         print(f"\n🔄 Performing Git actions on repositories @ `{repos_root}`...")
         overall_success = True
         for a_path in repos_root.search("*"):
             print(f"{('Handling ' + str(a_path)).center(80, '-')}")
             path_success = True
-            if args.pull or args.all:
-                path_success = git_action(path=a_path, action=GitAction.pull, r=args.recursive, auto_sync=auto_sync) and path_success
-            if args.commit or args.all:
-                path_success = git_action(a_path, action=GitAction.commit, r=args.recursive, auto_sync=auto_sync) and path_success
-            if args.push or args.all:
-                path_success = git_action(a_path, action=GitAction.push, r=args.recursive, auto_sync=auto_sync) and path_success
+            if pull or all:
+                path_success = git_action(path=a_path, action=GitAction.pull, r=recursive, auto_sync=auto_sync) and path_success
+            if commit or all:
+                path_success = git_action(a_path, action=GitAction.commit, r=recursive, auto_sync=auto_sync) and path_success
+            if push or all:
+                path_success = git_action(a_path, action=GitAction.push, r=recursive, auto_sync=auto_sync) and path_success
             overall_success = overall_success and path_success
 
         if overall_success:
@@ -156,5 +151,9 @@ def main():
         print("❌ No action specified. Try passing --push, --pull, --commit, or --all.")
 
 
+def main_from_parser() -> None:
+    typer.run(main)
+
+
 if __name__ == "__main__":
-    main()
+    main_from_parser()

{machineconfig-3.8.dist-info → machineconfig-3.82.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.8
+Version: 3.82
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -24,6 +24,7 @@ Requires-Dist: gitpython>=3.1.44
 Requires-Dist: pyfzf>=0.3.1
 Requires-Dist: rclone-python>=0.1.23
 Requires-Dist: pyjson5>=1.6.9
+Requires-Dist: typer-slim>=0.19.2
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: docs

{machineconfig-3.8.dist-info → machineconfig-3.82.dist-info}/RECORD

@@ -33,7 +33,6 @@ machineconfig/cluster/sessions_managers/zellij_utils/remote_executor.py,sha256=I
 machineconfig/cluster/sessions_managers/zellij_utils/session_manager.py,sha256=7JLq8HY-NWbJfzHfxaok_o1KrIwzMCK_PUnsdZYfzuA,4929
 machineconfig/cluster/sessions_managers/zellij_utils/status_reporter.py,sha256=AtpIoko_ghhOXENGAfgiS2jA4IYBFRMjEbyIy_P6HIM,3758
 machineconfig/cluster/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/cluster/templates/cli_click.py,sha256=7v6w-dj1whBd9ydKeOAQFuD5kF7_6ivyPAqNl8BEvc0,5084
 machineconfig/cluster/templates/cli_gooey.py,sha256=KUiZDuqmHDkGS7NqwBTzZUbxysgasq-M0DWmwd44vOE,5534
 machineconfig/cluster/templates/cli_trogon.py,sha256=PFWGy8SFYIhT9r3ZV4oIEYfImsQwzAHH_04stPuV5bY,647
 machineconfig/cluster/templates/run_cloud.py,sha256=0o4-v5yFEqvlHzoKDXljRCR5ikx_r5w4oYE5OCtVIK8,2378
@@ -166,25 +165,25 @@ machineconfig/scripts/python/choose_wezterm_theme.py,sha256=Hlu_EOQhLM6wYdAdY25j
 machineconfig/scripts/python/cloud_copy.py,sha256=d3gBSPBCtNCRDANpzUoCJBM3kHBarwizyZo8dkL_BXQ,8553
 machineconfig/scripts/python/cloud_manager.py,sha256=MAVOKqXGxnlMaQGEv6k-q_PrgN0at6J8qQDhPiH2lI8,3488
 machineconfig/scripts/python/cloud_mount.py,sha256=PLTPC9aH6v5g9lTJ8jFBBxz8ZGAuWo4sRU4FXfd1koA,6816
-machineconfig/scripts/python/cloud_repo_sync.py,sha256=wXrCgZyPldFZAbK4cUsTHID7XIujz-eXdzgc0w6nkfE,10023
+machineconfig/scripts/python/cloud_repo_sync.py,sha256=GBhdUu9BJwhLYmhxxtvqJGLy7xKdQcnH9kkL4jcbzEE,9502
 machineconfig/scripts/python/cloud_sync.py,sha256=RfgrEPGg_LrIaY3hfLDHsK8blrZvyPsoN66X0Z3WeCw,3859
-machineconfig/scripts/python/croshell.py,sha256=8ywivKgbg-2iaeAqrVWx4bKu6jM05pClGB5vCKghoMA,9638
-machineconfig/scripts/python/devops.py,sha256=VJWrRniX2suOi_E4x-6KU4x97TwbfvgXrNm47gjiXfg,6223
+machineconfig/scripts/python/croshell.py,sha256=tDQaG4yxs_53Mvr9Fzc-HLuG-XVIBgcR3RRfJ4mxJhY,9561
+machineconfig/scripts/python/devops.py,sha256=ws9AzqD-poLndODMFTe5bii3JNsPMsi0BuJJ11ZbPSw,5658
 machineconfig/scripts/python/devops_add_identity.py,sha256=JfN3ZrYMCgmt4ks_VCfnV9BIIHAsOYO3E0W0wZ15FR8,3791
 machineconfig/scripts/python/devops_add_ssh_key.py,sha256=KaoX83KltBsmutfKhSfZjd7nP_R1hJ2OLAWRhbswO7o,6889
 machineconfig/scripts/python/devops_backup_retrieve.py,sha256=jZe5Vki7E2GCMG8hvqUZeOONFC4cNzISoGzq_dMG4GA,5601
-machineconfig/scripts/python/devops_devapps_install.py,sha256=QBwBF9EC6kFj-93kNC1YS8N3P4g-eT9yCu0i0OrjYrY,9653
+machineconfig/scripts/python/devops_devapps_install.py,sha256=Q2suPkfwwdtIN3mjxH6tGZLYC7tZVxdxrGW7d9phiPA,9972
 machineconfig/scripts/python/devops_update_repos.py,sha256=c5qBc9cuTGDEqDHufkjDT4d_vvJsswv3tlqk9MAulYk,8063
 machineconfig/scripts/python/dotfile.py,sha256=1a4THWmfGXiJHjWGFf1Qbp6vrMEGIkonIofOcUVic90,2260
 machineconfig/scripts/python/fire_agents.py,sha256=_k1CcPaAp3B7h72tSczFDbLsqTg6FmPDgxxU-GjRHWA,9179
 machineconfig/scripts/python/fire_agents_help_launch.py,sha256=sTdjNz2pDinDMMjUAMN7OqH-KAUeHh6Aihr_zUvtM6k,6128
 machineconfig/scripts/python/fire_agents_help_search.py,sha256=qIfSS_su2YJ1Gb0_lu4cbjlJlYMBw0v52NTGiSrGjk8,2991
 machineconfig/scripts/python/fire_agents_load_balancer.py,sha256=QPiCbQq9j5REHStPdYqQcGNkz_rp5CjotqOpMY3v5TM,2099
-machineconfig/scripts/python/fire_jobs.py,sha256=Ny0AdZE_ZX-Nq9wAY3T1gfa8Y_aOIR-I21q_Ulk7EcM,16713
-machineconfig/scripts/python/fire_jobs_args_helper.py,sha256=TfCKSExGZhYrZ6JmXIHsd0wpNSWcKeLeRh9gFR3FG-M,4330
+machineconfig/scripts/python/fire_jobs.py,sha256=W7JDckAWrpHlB3WHpULpZP3M22ORxvLO-6lcnRloHX8,20119
+machineconfig/scripts/python/fire_jobs_args_helper.py,sha256=CeXmx0FJZlUSsQHcUmvHM2dQBmKcTNtTkha5PHaQQhc,1505
 machineconfig/scripts/python/fire_jobs_layout_helper.py,sha256=Hj77uKgmNKSEBtnW0oCdRBwdKEuhzPxX1p81mRTBibo,3314
 machineconfig/scripts/python/fire_jobs_streamlit_helper.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/scripts/python/ftpx.py,sha256=VyvfdSa6ee0bMMG24HtBk7ooYeYSZuDUOJ7IkgJkdaU,9920
+machineconfig/scripts/python/ftpx.py,sha256=vqwhfkg3jVaAdjlWvrcPms2pUD7_c370jn2W6o5XArM,10269
 machineconfig/scripts/python/get_zellij_cmd.py,sha256=e35-18hoXM9N3PFbvbizfkNY_-63iMicieWE3TbGcCQ,576
 machineconfig/scripts/python/gh_models.py,sha256=3BLfW25mBRiPO5VKtVm-nMlKLv-PaZDw7mObajq6F6M,5538
 machineconfig/scripts/python/mount_nfs.py,sha256=c8pWXimDWdgCkSskcnPgT-8ESPosil6Cvy2hGSaIBJE,3359
@@ -192,7 +191,7 @@ machineconfig/scripts/python/mount_nw_drive.py,sha256=iru6AtnTyvyuk6WxlK5R4lDkul
 machineconfig/scripts/python/mount_ssh.py,sha256=rGY2pgtlnWMi0Rrge1aCdjtfbULrj2cyaStDoX-y2w4,2236
 machineconfig/scripts/python/onetimeshare.py,sha256=bmGsNnskym5OWfIhpOfZG5jq3m89FS0a6dF5Sb8LaZM,2539
 machineconfig/scripts/python/pomodoro.py,sha256=SPkfeoZGv8rylGiOyzQ7UK3aXZ3G2FIOuGkSuBUggOI,2019
-machineconfig/scripts/python/repos.py,sha256=yaoUKJNq_xnXk8-2unH4OvoP5gw7sYR9ha2ajm76SBE,7451
+machineconfig/scripts/python/repos.py,sha256=gU1gmYmiGTGDlZyIj3b1bC78yV5XZSXEkDD95WRqUnM,7376
 machineconfig/scripts/python/repos_helper_clone.py,sha256=xW5YZEoNt3k7h9NIULhUhOnh53-B63eiXF2FjOl1IKQ,5535
 machineconfig/scripts/python/repos_helper_record.py,sha256=YEEQORfEiLddOIIgePo5eEkyQUFruFg3kc8npMvRL-o,10927
 machineconfig/scripts/python/repos_helper_update.py,sha256=AYyKIB7eQ48yoYmFjydIhRI1lV39TBv_S4_LCa-oKuQ,11042
@@ -230,9 +229,6 @@ machineconfig/scripts/python/ai/solutions/gemini/settings.json,sha256=hv0POw6ySh
 machineconfig/scripts/python/ai/solutions/kilocode/privacy.md,sha256=oKOXnfFOdUuMlKwVf5MqeqCc24hZcjKE_e1MEXpijJI,117
 machineconfig/scripts/python/ai/solutions/opencode/opencode.json,sha256=nahHKRw1dNzkUCS_vCX_fy2TisRtfg8DXH-D4N1iUVU,99
 machineconfig/scripts/python/ai/solutions/opencode/opencode.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-machineconfig/scripts/python/archive/im2text.py,sha256=WLyic89vxi_pqQMzo-MOrGf39JEZjCdvDrXYUMVvZNY,1163
-machineconfig/scripts/python/archive/tmate_conn.py,sha256=BiZQmYabl4K4-mbOpcb_R1JzYfEwxuAnk5FOciqGHFo,1231
-machineconfig/scripts/python/archive/tmate_start.py,sha256=Hp7xv32u-fRuCG_f-Cy6qg0VemoaPOP-Pxs_gsFYcyg,1518
 machineconfig/scripts/python/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/helpers/cloud_helpers.py,sha256=GA-bxXouUmknk9fyQAsPT-Xl3RG9-yBed71a2tu9Pig,4914
 machineconfig/scripts/python/helpers/helpers2.py,sha256=ZdqeF1MLlaBRwoqsQAqnHi4b8rW0byFCBnbyCrPKkoA,7336
@@ -425,8 +421,8 @@ machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=CCs5ebomW1ac
 machineconfig/utils/schemas/installer/installer_types.py,sha256=iAzcALc9z_FAQE9iuGHfX6Z0B1_n3Gt6eC0d6heYik0,599
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=OmiOX9xtakPz4l6IobWnpFHpbn95fitEE9q0YL1WxjQ,617
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-3.8.dist-info/METADATA,sha256=eMF7Wf25jy644UorB76cz5tokYUdYvgwHmo4Q2RMS9M,6963
-machineconfig-3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-3.8.dist-info/entry_points.txt,sha256=gFSet9HBtk9WbSZcZ8Scv1k3CKibx_mKjySBGZ2tqbU,1023
-machineconfig-3.8.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-3.8.dist-info/RECORD,,
+machineconfig-3.82.dist-info/METADATA,sha256=lBIY_Ul0cOylp78PYNbNbIlXyzPRfyYGrWbBtFsrGiI,6998
+machineconfig-3.82.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-3.82.dist-info/entry_points.txt,sha256=RwV4BmImYKp4GrXGqb_YDEI25O2_5mhsbvjUD6a0hps,1138
+machineconfig-3.82.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-3.82.dist-info/RECORD,,

{machineconfig-3.8.dist-info → machineconfig-3.82.dist-info}/entry_points.txt

@@ -6,13 +6,14 @@ cloud_repo_sync = machineconfig.scripts.python.cloud_repo_sync:args_parser
 cloud_sync = machineconfig.scripts.python.cloud_sync:args_parser
 croshell = machineconfig.scripts.python.croshell:build_parser
 devops = machineconfig.scripts.python.devops:args_parser
-fire = machineconfig.scripts.python.fire_jobs:main
+fire = machineconfig.scripts.python.fire_jobs:main_from_parser
 fire_agents = machineconfig.scripts.python.fire_agents:main
-ftpx = machineconfig.scripts.python.ftpx:main
+ftpx = machineconfig.scripts.python.ftpx:main_from_parser
 initai = machineconfig.scripts.python.ai.initai:main
+install = machineconfig.scripts.python.devops_devapps_install:main_with_parser
 kill_process = machineconfig.utils.procs:main
 mount_nfs = machineconfig.scripts.python.mount_nfs:main
 mount_nw_drive = machineconfig.scripts.python.mount_nw_drive:main
-repos = machineconfig.scripts.python.repos:main
+repos = machineconfig.scripts.python.repos:main_from_parser
 start_slidev = machineconfig.scripts.python.start_slidev:main
 wifi_conn = machineconfig.scripts.python.wifi_conn:main

machineconfig/cluster/templates/cli_click.py

@@ -1,102 +0,0 @@
-# """Trogon
-# """
-
-# #
-# # from machineconfig.cluster.distribute import Cluster, WorkloadParams
-# from machineconfig.cluster.remote_machine import RemoteMachineConfig, RemoteMachine, CloudManager
-# from machineconfig.cluster.templates.run_cloud import to_email_default, email_config_name_default, default_cloud
-# import click
-# # from trogon import tui
-# from typing import Any, Optional
-
-
-# @click.command()
-# @click.option('--file', prompt="Py File: ", help="The file to run.", default="")
-# @click.option('--function', prompt="Function: ", help="The function to run.", default=None)
-# @click.pass_context
-# def main2(ctx: Any, file: str, function: Optional[str] = None):
-#     ctx.obj = {'file': file, 'function': function}
-
-
-# # @tui()
-# # @click.group("gg")
-# @click.command()
-# @click.option('--file', prompt="Py File: ", help="The file to run.", default="")
-# @click.option('--function', prompt="Function: ", help="The function to run.", default=None)
-# @click.option('--description', prompt="Description of the job: ", default=f"Description of running func on remotes", help="Write something that describes what this job is about.")
-# @click.option('--update_repo', prompt="Update repo: ", default=False, help="Update the repo on the remote machine.")
-# @click.option('--update_essential_repos', prompt="Update essential repos: ", default=True, help="Update essential repos on the remote machine.")
-# @click.option('--cloud_name', prompt="Cloud name: ", default=default_cloud, help="The name of the cloud to use.")
-# @click.option('--notify_upon_completion', prompt="Notify upon completion: ", default=False, help="Send an email upon completion.")
-# @click.option('--to_email', prompt="To email: ", default=to_email_default, help="The email to send to.")
-# @click.option('--email_config_name', prompt="Email config name: ", default=email_config_name_default, help="The name of the email config to use.")
-# @click.option('--kill_on_completion', prompt="Kill on completion: ", default=False)
-# @click.option('--ipython', prompt="Use ipython: ", default=False)
-# @click.option('--interactive', prompt="Interactive: ", default=False)
-# @click.option('--pdb', prompt="Use pdb: ", default=False)
-# @click.option('--pudb', prompt="Use pudb: ", default=False)
-# @click.option('--wrap_in_try_except', prompt="Wrap in try except: ", default=False)
-# @click.option('--lock_resources', prompt="Lock resources: ", default=False)
-# @click.option('--max_simulataneous_jobs', prompt="Max simultaneous jobs: ", default=2)
-# @click.option('--split', prompt="Split: ", default=1)
-# @click.option('--reset_cloud', prompt="Reset cloud: ", default=False)
-# @click.option('--reset_local', prompt="Reset local: ", default=False)
-# # @click.pass_context
-# def main(
-#          file: str, function: Optional[str],
-#          description: str, update_repo: bool, update_essential_repos: bool, cloud_name: str,
-#          notify_upon_completion: bool, to_email: str, email_config_name: str, kill_on_completion: bool, ipython: bool, interactive: bool,
-#          pdb: bool, pudb: bool, wrap_in_try_except: bool, lock_resources: bool, max_simulataneous_jobs: bool,
-#          split: int, reset_cloud: bool, reset_local: bool,
-#           ) -> Any:
-
-#     # function = ctx.obj['function']
-#     # description = ctx.obj['file']
-#     from machineconfig.cluster.self_ssh import SelfSSH
-#     config = RemoteMachineConfig(
-#         # connection
-#         ssh_obj=SelfSSH(),
-#         # ssh_params=None,
-#         description=description,
-#         # job_id=, base_dir="",
-#         # data
-#         copy_repo=False,  # copy_repo,
-#         update_repo=update_repo,
-#         install_repo=True,  # install_repo,
-#         update_essential_repos=update_essential_repos,
-#         data=[],
-#         transfer_method="cloud",  # "transfer_method,
-#         cloud_name=cloud_name,
-#         # remote machine behaviour
-#         # open_console=open_console,
-#         notify_upon_completion=notify_upon_completion,
-#         to_email=to_email,
-#         email_config_name=email_config_name,
-#         kill_on_completion=kill_on_completion,
-#         workload_params=None,
-#         launch_method="cloud_manager",
-#         # execution behaviour
-#         ipython=ipython,
-#         interactive=interactive,
-#         pdb=pdb,
-#         pudb=pudb,
-#         wrap_in_try_except=wrap_in_try_except,
-#         # resources
-#         lock_resources=lock_resources,
-#         max_simulataneous_jobs=max_simulataneous_jobs,
-#         parallelize=False,  # parallelize,
-#     )
-
-#     if function is not None:
-#         module: dict[str, Any] = Read.py(file)
-#         func = module[function]
-#     else: func = file
-#     m = RemoteMachine(func=func, func_kwargs=None, config=config)
-#     res = m.submit_to_cloud(split=split, cm=CloudManager(max_jobs=0, reset_local=reset_local), reset_cloud=reset_cloud)
-#     return res
-
-
-# if __name__ == '__main__':
-#     # conf = get_options(standalone_mode=False)  # type: ignore  # pylint: disable=no-value-for-parameter
-#     # main2()  # type: ignore
-#     main()  # type: ignore

machineconfig/scripts/python/archive/im2text.py

@@ -1,34 +0,0 @@
-# """Convert image to text.
-# """
-
-
-# # import sys
-# from rich.console import Console
-# from rich.panel import Panel
-# import pytesseract
-# from PIL import Image
-
-# console = Console()
-
-# console.print(Panel("📸 Image to Text Converter", title="Status", expand=False))
-
-# print("📷 Capturing image from webcam...")
-# img_path = capture_from_webcam(show=False, wait=False, save=True)
-# print(f"✅ Image captured and saved to: {img_path}")
-
-# # img_rgb = cv2.cvtColor(img_cv, cv2.COLOR_BGR2RGB)
-# # import cv2
-# # img_cv = cv2.imread(r'C:\Users\alex\Downloads\name.jpg')
-
-# # sys.path.insert(0, PathExtended.home().joinpath("AppData/Local/Tesseract-OCR").str)
-# # import pytesseract
-# # print(pytesseract.image_to_string(img_cv))
-
-# print("\n🔍 Processing image with Tesseract OCR...")
-# q = Terminal().run(f"cd ~/AppData/Local/Tesseract-OCR; pytesseract '{img_path}'", shell="pwsh").capture().op
-
-# try:
-#     text = pytesseract.image_to_string(Image.open(img_path))
-#     console.print(Panel(text, title="📄 Extracted Text Result:", title_align="left", expand=False))
-# except FileNotFoundError:
-#     print(f"Error: Image file not found at {img_path}")

machineconfig/scripts/python/archive/tmate_conn.py

@@ -1,41 +0,0 @@
-import argparse
-import configparser
-from pathlib import Path
-import random
-import string
-import os
-from rich.console import Console
-from rich.panel import Panel
-
-
-console = Console()
-
-
-def get_conn_string(sess_name: str) -> str:
-    creds = configparser.ConfigParser()
-    creds.read(Path.home().joinpath("dotfiles/creds/tmate/creds.ini"))
-    sess_name = creds["sessions_names"][sess_name]
-    user_name = creds["keys"]["username"]
-    return f"{user_name}/{sess_name}@sgp1.tmate.io"
-
-
-def main():
-    console.print(Panel("🔌 Tmate Connection Manager", title="[bold]Welcome[/bold]"))
-
-    parser = argparse.ArgumentParser(description="Tmate launcher")
-    parser.add_argument("sess_name", help="session name", default=random.choices(list(string.digits + string.ascii_letters), k=20))
-    args = parser.parse_args()
-
-    console.print(f"🔍 Looking up session: {args.sess_name}")
-    conn_string = get_conn_string(args.sess_name)
-
-    console.print(Panel(f"SSH Connection String: ssh {conn_string}", title="[bold green]SSH Connection[/bold green]"))
-
-    console.print("🚀 Connecting to tmate session...")
-    os.system(f"ssh {conn_string}")
-
-    console.print("✅ Connection closed")
-
-
-if __name__ == "__main__":
-    main()

machineconfig/scripts/python/archive/tmate_start.py

@@ -1,44 +0,0 @@
-"""Tmate"""
-
-import argparse
-import configparser
-from pathlib import Path
-import random
-import string
-import os
-from rich.console import Console
-from rich.panel import Panel
-
-
-def main():
-    console = Console()
-
-    console.print(Panel("📡 Tmate Session Launcher", title="[bold blue]Welcome[/bold blue]", subtitle="Manage your tmate sessions effortlessly"))
-
-    console.print("[bold yellow]Loading credentials...[/bold yellow]")
-    creds = configparser.ConfigParser()
-    creds.read(Path.home().joinpath("dotfiles/creds/tmate/creds.ini"))
-    console.print("[green]Credentials loaded[/green]")
-
-    parser = argparse.ArgumentParser(description="Tmate launcher")
-    random_sess = random.choices(list(string.digits + string.ascii_letters), k=20)
-    _ = random_sess
-    parser.add_argument("sess_name", help="session name (new only with random string will be chosen if not passed)", default=None)
-
-    args = parser.parse_args()
-
-    console.print(f"🔍 Looking up session configuration: {args.sess_name}")
-    sess_name = creds["sessions_names"][args.sess_name]
-    api_key = creds["keys"]["api_key"]
-
-    console.print(Panel(f"🚀 Starting tmate session: {sess_name}", title="[bold green]Session Info[/bold green]"))
-
-    res = f"tmate -a ~/.ssh/authorized_keys -k {api_key} -n {sess_name} -F"
-    console.print("[bold cyan]Running:[/bold cyan] tmate with configured API key and session name")
-    os.system(res)
-
-    console.print("[green]Tmate session ended[/green]")
-
-
-if __name__ == "__main__":
-    main()