machineconfig 3.8__tar.gz → 3.81__tar.gz

{machineconfig-3.8/src/machineconfig.egg-info → machineconfig-3.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.8
+Version: 3.81
 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 → machineconfig-3.81}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "3.8"
+version = "3.81"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -33,6 +33,7 @@ dependencies = [
     "pyfzf>=0.3.1",
     "rclone-python>=0.1.23",
     "pyjson5>=1.6.9",
+    "typer-slim>=0.19.2",
 ]
 
 [project.optional-dependencies]
@@ -50,7 +51,7 @@ docs = [
 
 [project.scripts]
 devops = "machineconfig.scripts.python.devops:args_parser"
-# machineconfig.scripts.python.devops_devapps_install
+install = "machineconfig.scripts.python.devops_devapps_install:main_with_parser"
 choose_wezterm_theme = "machineconfig.scripts.python.choose_wezterm_theme:main"
 cloud_copy = "machineconfig.scripts.python.cloud_copy:arg_parser"
 cloud_mount = "machineconfig.scripts.python.cloud_mount:main"

{machineconfig-3.8 → machineconfig-3.81}/src/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-3.8 → machineconfig-3.81}/src/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-3.8 → machineconfig-3.81}/src/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-3.8 → machineconfig-3.81}/src/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-3.8 → machineconfig-3.81/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.8
+Version: 3.81
 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 → machineconfig-3.81}/src/machineconfig.egg-info/SOURCES.txt

@@ -42,7 +42,6 @@ src/machineconfig/cluster/sessions_managers/zellij_utils/remote_executor.py
 src/machineconfig/cluster/sessions_managers/zellij_utils/session_manager.py
 src/machineconfig/cluster/sessions_managers/zellij_utils/status_reporter.py
 src/machineconfig/cluster/templates/__init__.py
-src/machineconfig/cluster/templates/cli_click.py
 src/machineconfig/cluster/templates/cli_gooey.py
 src/machineconfig/cluster/templates/cli_trogon.py
 src/machineconfig/cluster/templates/run_cloud.py

{machineconfig-3.8 → machineconfig-3.81}/src/machineconfig.egg-info/entry_points.txt

@@ -10,6 +10,7 @@ fire = machineconfig.scripts.python.fire_jobs:main
 fire_agents = machineconfig.scripts.python.fire_agents:main
 ftpx = machineconfig.scripts.python.ftpx:main
 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

{machineconfig-3.8 → machineconfig-3.81}/src/machineconfig.egg-info/requires.txt

@@ -11,6 +11,7 @@ gitpython>=3.1.44
 pyfzf>=0.3.1
 rclone-python>=0.1.23
 pyjson5>=1.6.9
+typer-slim>=0.19.2
 
 [docs]
 pdoc>=15.0.2

machineconfig-3.8/src/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