machineconfig 3.81__tar.gz → 3.82__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.81
+Version: 3.82
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-3.81 → machineconfig-3.82}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "3.81"
+version = "3.82"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -58,13 +58,13 @@ cloud_mount = "machineconfig.scripts.python.cloud_mount:main"
 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"
-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"
 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"
 kill_process = "machineconfig.utils.procs:main"

{machineconfig-3.81 → machineconfig-3.82}/src/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-3.82/src/machineconfig/scripts/python/fire_jobs_args_helper.py

@@ -0,0 +1,48 @@
+from dataclasses import dataclass
+from typing import Optional, Annotated
+import typer
+
+
+@dataclass
+class FireJobArgs:
+    """Type-safe dataclass for fire_jobs command line arguments."""
+
+    path: str = "."
+    function: Optional[str] = None
+    ve: str = ""
+    cmd: bool = False
+    interactive: bool = False
+    debug: bool = False
+    choose_function: bool = False
+    loop: bool = False
+    jupyter: bool = False
+    submit_to_cloud: bool = False
+    remote: bool = False
+    module: bool = False
+    streamlit: bool = False
+    environment: str = ""
+    holdDirectory: bool = False
+    PathExport: bool = False
+    git_pull: bool = False
+    optimized: bool = False
+    Nprocess: int = 1
+    zellij_tab: Optional[str] = None
+    watch: bool = False
+    kw: Optional[list[str]] = None
+    layout: bool = False
+
+
+def extract_kwargs(args: FireJobArgs) -> dict[str, object]:
+    str2obj = {"True": True, "False": False, "None": None}
+    if args.kw is not None:
+        assert len(args.kw) % 2 == 0, f"args.kw must be a list of even length. Got {len(args.kw)}"
+        kwargs = dict(zip(args.kw[::2], args.kw[1::2]))
+        kwargs: dict[str, object]
+        for key, value in kwargs.items():
+            if value in str2obj:
+                kwargs[key] = str2obj[str(value)]
+        if args.function is None:  # if user passed arguments and forgot to pass function, then assume they want to run the main function.
+            args.choose_function = True
+    else:
+        kwargs = {}
+    return kwargs

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.81
+Version: 3.82
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-3.81 → machineconfig-3.82}/src/machineconfig.egg-info/SOURCES.txt

@@ -238,9 +238,6 @@ src/machineconfig/scripts/python/ai/solutions/gemini/settings.json
 src/machineconfig/scripts/python/ai/solutions/kilocode/privacy.md
 src/machineconfig/scripts/python/ai/solutions/opencode/opencode.json
 src/machineconfig/scripts/python/ai/solutions/opencode/opencode.py
-src/machineconfig/scripts/python/archive/im2text.py
-src/machineconfig/scripts/python/archive/tmate_conn.py
-src/machineconfig/scripts/python/archive/tmate_start.py
 src/machineconfig/scripts/python/helpers/__init__.py
 src/machineconfig/scripts/python/helpers/cloud_helpers.py
 src/machineconfig/scripts/python/helpers/helpers2.py

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

@@ -6,14 +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-3.81/src/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-3.81/src/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()