machineconfig 5.20__tar.gz → 5.21__tar.gz

{machineconfig-5.20/src/machineconfig.egg-info → machineconfig-5.21}/PKG-INFO

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

{machineconfig-5.20 → machineconfig-5.21}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.20"
+version = "5.21"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-5.20 → machineconfig-5.21}/src/machineconfig/cluster/sessions_managers/zellij_local.py

@@ -453,17 +453,15 @@ def created_zellij_layout(layout_config: LayoutConfig, output_dir: Optional[str]
 
 
 def run_zellij_layout(layout_config: LayoutConfig):
-    layout_path = created_zellij_layout(layout_config, None)
+    layout_path = created_zellij_layout(layout_config=layout_config, output_dir=None)
     session_name = layout_config["layoutName"]
     try:
         from machineconfig.cluster.sessions_managers.utils.enhanced_command_runner import enhanced_zellij_session_start
-
         enhanced_zellij_session_start(session_name, layout_path)
     except ImportError:
         # Fallback to original implementation
         cmd = f"zellij delete-session --force {session_name}; zellij --layout {layout_path} a -b {session_name}"
         import subprocess
-
         subprocess.run(cmd, shell=True, check=True)
         console.print(f"[bold green]🚀 Zellij layout is running[/bold green] [yellow]@[/yellow] [bold cyan]{session_name}[/bold cyan]")
 

{machineconfig-5.20 → machineconfig-5.21}/src/machineconfig/jobs/installer/custom_dev/brave.py

@@ -9,12 +9,6 @@ from rich.panel import Panel
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-# config_dict: InstallerData = {
-#     "appName": "Brave",
-#     "repoURL": "CMD",
-#     "doc": "Privacy-focused web browser with built-in ad blocking",
-# }
-
 
 def main(installer_data: InstallerData, version: Optional[str]) -> None:
     console = Console()

{machineconfig-5.20 → machineconfig-5.21}/src/machineconfig/scripts/python/devops.py

@@ -1,11 +1,11 @@
 """devops with emojis"""
 
+import typer
+from typing import Literal, Annotated, Optional, get_args
+
 import machineconfig.scripts.python.share_terminal as share_terminal
 import machineconfig.scripts.python.repos as repos
 from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS
-# import machineconfig.scripts.python.dotfile as dotfile_module
-import typer
-from typing import Literal, Annotated, Optional, get_args
 
 
 app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True)
@@ -75,10 +75,14 @@ def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-
     import machineconfig.profile.create_frontend as create_frontend
     create_frontend.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
-# @config_apps.command(no_args_is_help=True)
-# def dotfile():
-#     """🔗 Manage dotfiles."""
-#     dotfile_module.main()
+@config_apps.command(no_args_is_help=True)
+def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
+    overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="Overwrite.")] = False,
+    dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
+    ):
+    """🔗 Manage dotfiles."""
+    import machineconfig.scripts.python.dotfile as dotfile_module
+    dotfile_module.main(file=file, overwrite=overwrite, dest=dest)
 
 
 @config_apps.command(no_args_is_help=True)

{machineconfig-5.20 → machineconfig-5.21}/src/machineconfig/scripts/python/devops_update_repos.py

@@ -237,11 +237,9 @@ def main(verbose: bool = True, allow_password_prompt: bool = False) -> None:
                     padding=(1, 2),
                 )
             )
-
     # Run uv sync for repositories where pyproject.toml changed but sync wasn't run yet
     for repo_path in repos_with_changes:
         run_uv_sync(repo_path)
-
     # Generate and display summary
     _display_summary(results)
 

{machineconfig-5.20 → machineconfig-5.21}/src/machineconfig/scripts/python/fire_jobs.py

@@ -7,17 +7,13 @@ fire
 
 """
 
-from machineconfig.scripts.python.fire_jobs_route_helper import get_command_streamlit
-from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_interest
-from machineconfig.scripts.python.helpers.helpers4 import parse_pyfile
-from machineconfig.scripts.python.helpers.helpers4 import get_import_module_code
 from machineconfig.utils.ve import get_ve_activate_line, get_ve_path_and_ipython_profile
 from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.path_helper import match_file_name, sanitize_path
-
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.accessories import get_repo_root, randstr
 from machineconfig.scripts.python.fire_jobs_args_helper import FireJobArgs, extract_kwargs, parse_fire_args_from_context
+
 import platform
 from typing import Optional, Annotated
 from pathlib import Path
@@ -30,6 +26,7 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
         suffixes = {".py", ".sh", ".ps1"}
         choice_file = match_file_name(sub_string=args.path, search_root=PathExtended.cwd(), suffixes=suffixes)
     elif path_obj.is_dir():
+        from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_interest
         print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
         files = search_for_files_of_interest(path_obj)
         print(f"🔍 Got #{len(files)} results.")
@@ -37,12 +34,16 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
         choice_file = PathExtended(choice_file)
     else:
         choice_file = path_obj
+
+
     repo_root = get_repo_root(Path(choice_file))
     print(f"💾 Selected file: {choice_file}.\nRepo root: {repo_root}")
     ve_root_from_file, ipy_profile = get_ve_path_and_ipython_profile(choice_file)
     if ipy_profile is None:
         ipy_profile = "default"
 
+
+    # =========================  preparing kwargs_dict
     if choice_file.suffix == ".py":
         kwargs_dict = extract_kwargs(args)  # This now returns empty dict, but kept for compatibility
         activate_ve_line = get_ve_activate_line(ve_root=args.ve or ve_root_from_file or "$HOME/code/machineconfig/.venv")
@@ -50,41 +51,17 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
         activate_ve_line = ""
         kwargs_dict = {}
 
+
     # =========================  choosing function to run
     choice_function: Optional[str] = None  # Initialize to avoid unbound variable
-    if args.choose_function or args.submit_to_cloud:
-        if choice_file.suffix == ".py":
-            options, func_args = parse_pyfile(file_path=str(choice_file))
-            choice_function_tmp = choose_from_options(msg="Choose a function to run", options=options, fzf=True, multi=False)
-            assert isinstance(choice_function_tmp, str), f"choice_function must be a string. Got {type(choice_function_tmp)}"
-            choice_index = options.index(choice_function_tmp)
-            choice_function = choice_function_tmp.split(" -- ")[0]
-            choice_function_args = func_args[choice_index]
-
-            if choice_function == "RUN AS MAIN":
-                choice_function = None
-            if len(choice_function_args) > 0 and len(kwargs_dict) == 0:
-                for item in choice_function_args:
-                    kwargs_dict[item.name] = input(f"Please enter a value for argument `{item.name}` (type = {item.type}) (default = {item.default}) : ") or item.default
-        elif choice_file.suffix == ".sh":  # in this case, we choos lines.
-            options = []
-            for line in choice_file.read_text(encoding="utf-8").splitlines():
-                if line.startswith("#"):
-                    continue
-                if line == "":
-                    continue
-                if line.startswith("echo"):
-                    continue
-                options.append(line)
-            chosen_lines = choose_from_options(msg="Choose a line to run", options=options, fzf=True, multi=True)
-            choice_file = PathExtended.tmpfile(suffix=".sh")
-            choice_file.parent.mkdir(parents=True, exist_ok=True)
-            choice_file.write_text("\n".join(chosen_lines), encoding="utf-8")
-            choice_function = None
+    if args.choose_function:
+        from machineconfig.scripts.python.fire_jobs_route_helper import choose_function_or_lines
+        choice_function, choice_file, kwargs_dict = choose_function_or_lines(choice_file, kwargs_dict)
     else:
         choice_function = args.function
 
     if choice_file.suffix == ".py":
+        from machineconfig.scripts.python.fire_jobs_route_helper import get_command_streamlit
         if args.streamlit:  exe = get_command_streamlit(choice_file, args.environment, repo_root)
         elif args.interactive is False: exe = "python"
         elif args.jupyter: exe = "jupyter-lab"
@@ -95,6 +72,7 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
 
     if args.module or (args.debug and args.choose_function):  # because debugging tools do not support choosing functions and don't interplay with fire module. So the only way to have debugging and choose function options is to import the file as a module into a new script and run the function of interest there and debug the new script.
         assert choice_file.suffix == ".py", f"File must be a python file to be imported as a module. Got {choice_file}"
+        from machineconfig.scripts.python.helpers.helpers4 import get_import_module_code
         import_line = get_import_module_code(str(choice_file))
         if repo_root is not None:
             repo_root_add = f"""sys.path.append(r'{repo_root}')"""
@@ -160,11 +138,9 @@ except ImportError as _ex:
     elif args.cmd:
         command = rf""" cd /d {choice_file.parent} & {exe} {choice_file.name} """
     else:
-        if choice_file.suffix == "":
-            command = f"{exe} {choice_file} {fire_args}"
-        else:
-            # command = f"cd {choice_file.parent}\n{exe} {choice_file.name}\ncd {PathExtended.cwd()}"
-            command = f"{exe} {choice_file} "
+        if choice_file.suffix == "": command = f"{exe} {choice_file} {fire_args}"
+        else: command = f"{exe} {choice_file} "
+
     if not args.cmd: command = f"{activate_ve_line}\n{command}"
     else:
         new_line = "\n"
@@ -176,14 +152,6 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
         if choice_function is not None:
             command += f"--function {choice_function} "
 
-    if args.Nprocess > 1:
-        from machineconfig.cluster.sessions_managers.zellij_local import run_zellij_layout
-        from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
-        layout: LayoutConfig = {"layoutName": "fireNprocess", "layoutTabs": []}
-        for an_arg in range(args.Nprocess):
-            layout["layoutTabs"].append({"tabName": f"tab{an_arg}", "startDir": str(PathExtended.cwd()), "command": f"uv run -m fire {choice_file} {choice_function} --idx={an_arg} --idx_max={args.Nprocess}"})
-        run_zellij_layout(layout_config=layout)
-        return None
     if args.optimized:
         command = command.replace("python ", "python -OO ")
     from rich.panel import Panel
@@ -245,7 +213,6 @@ def main(
     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,
 ) -> None:
@@ -273,7 +240,6 @@ def main(
         PathExport=PathExport,
         git_pull=git_pull,
         optimized=optimized,
-        Nprocess=Nprocess,
         zellij_tab=zellij_tab,
         watch=watch,
     )
@@ -303,5 +269,4 @@ def main_from_parser():
 
 
 if __name__ == "__main__":
-    # options, func_args = parse_pyfile(file_path="C:/Users/aalsaf01/code/machineconfig/myresources/crocodile/core.py")
     main_from_parser()

{machineconfig-5.20 → machineconfig-5.21}/src/machineconfig/scripts/python/fire_jobs_route_helper.py

@@ -6,6 +6,52 @@ import tomllib
 from pathlib import Path
 from machineconfig.utils.accessories import randstr
 from machineconfig.utils.path_extended import PathExtended
+from machineconfig.utils.options import choose_from_options
+
+
+def choose_function_or_lines(choice_file: PathExtended, kwargs_dict: dict[str, object]) -> tuple[Optional[str], PathExtended, dict[str, object]]:
+    """
+    Choose a function to run from a Python file or lines from a shell script.
+    
+    Returns:
+        tuple: (choice_function, choice_file, kwargs_dict)
+        - choice_function: The selected function name or None
+        - choice_file: The file path (potentially modified for shell scripts)
+        - kwargs_dict: Updated kwargs dictionary with user-provided arguments
+    """
+    choice_function: Optional[str] = None
+    
+    if choice_file.suffix == ".py":
+        from machineconfig.scripts.python.helpers.helpers4 import parse_pyfile
+        options, func_args = parse_pyfile(file_path=str(choice_file))
+        choice_function_tmp = choose_from_options(msg="Choose a function to run", options=options, fzf=True, multi=False)
+        assert isinstance(choice_function_tmp, str), f"choice_function must be a string. Got {type(choice_function_tmp)}"
+        choice_index = options.index(choice_function_tmp)
+        choice_function = choice_function_tmp.split(" -- ")[0]
+        choice_function_args = func_args[choice_index]
+
+        if choice_function == "RUN AS MAIN":
+            choice_function = None
+        if len(choice_function_args) > 0 and len(kwargs_dict) == 0:
+            for item in choice_function_args:
+                kwargs_dict[item.name] = input(f"Please enter a value for argument `{item.name}` (type = {item.type}) (default = {item.default}) : ") or item.default
+    elif choice_file.suffix == ".sh":
+        options = []
+        for line in choice_file.read_text(encoding="utf-8").splitlines():
+            if line.startswith("#"):
+                continue
+            if line == "":
+                continue
+            if line.startswith("echo"):
+                continue
+            options.append(line)
+        chosen_lines = choose_from_options(msg="Choose a line to run", options=options, fzf=True, multi=True)
+        choice_file = PathExtended.tmpfile(suffix=".sh")
+        choice_file.parent.mkdir(parents=True, exist_ok=True)
+        choice_file.write_text("\n".join(chosen_lines), encoding="utf-8")
+        choice_function = None
+    
+    return choice_function, choice_file, kwargs_dict
 
 
 def get_command_streamlit(choice_file: Path, environment: str, repo_root: Optional[Path]) -> str:

{machineconfig-5.20 → machineconfig-5.21}/src/machineconfig/scripts/python/sessions.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Optional, Literal
 import typer
-
+from machineconfig.scripts.python.sessions_multiprocess import create_from_function
 
 def balance_load(layout_path: Path = typer.Argument(..., help="Path to the layout.json file"),
            max_thresh: int = typer.Option(..., help="Maximum tabs per layout"),
@@ -69,7 +69,7 @@ def find_layout_file(layout_path: str, ) -> Path:
     return choice_file
 
 
-def launch(ctx: typer.Context,
+def run(ctx: typer.Context,
            layout_path: Optional[str] = typer.Argument(None, help="Path to the layout.json file"),
         max_tabs: int = typer.Option(10, help="A Sanity checker that throws an error if any layout exceeds the maximum number of tabs to launch."),
         max_layouts: int = typer.Option(10, help="A Sanity checker that throws an error if the total number of layouts exceeds this number."),
@@ -133,14 +133,11 @@ def launch(ctx: typer.Context,
 
 
 def main_from_parser():
-    layouts_app = typer.Typer(help="Layouts management subcommands")
-    layouts_app.command("run")(launch)
-    layouts_app.command("balance-load")(balance_load)
-    import sys
-    if len(sys.argv) == 1:
-        layouts_app(["--help"])
-    else:
-        layouts_app()
+    layouts_app = typer.Typer(help="Layouts management subcommands", no_args_is_help=True)
+    layouts_app.command("create-from-function", no_args_is_help=True)(create_from_function)
+    layouts_app.command("run", no_args_is_help=True)(run)
+    layouts_app.command("balance-load", no_args_is_help=True)(balance_load)
+    layouts_app()
 
 
 if __name__ == "__main__":

machineconfig-5.21/src/machineconfig/scripts/python/sessions_multiprocess.py

@@ -0,0 +1,56 @@
+
+
+from typing import Optional
+from pathlib import Path
+import typer
+
+
+def create_from_function(
+        num_process: int = typer.Option(..., "--num-process", "-n", help="Number of parallel processes to run"),
+        path: str = typer.Option(".", "--path", "-p", help="Path to a Python or Shell script file or a directory containing such files"),
+        function: Optional[str] = typer.Option(None, "--function", "-f", help="Function to run from the Python file. If not provided, you will be prompted to choose."),
+):
+    from machineconfig.utils.ve import get_ve_activate_line, get_ve_path_and_ipython_profile
+    from machineconfig.utils.options import choose_from_options
+    from machineconfig.utils.path_helper import match_file_name, sanitize_path
+    from machineconfig.utils.path_extended import PathExtended
+    from machineconfig.utils.accessories import get_repo_root
+
+    path_obj = sanitize_path(path)
+    if not path_obj.exists():
+        suffixes = {".py"}
+        choice_file = match_file_name(sub_string=path, search_root=PathExtended.cwd(), suffixes=suffixes)
+    elif path_obj.is_dir():
+        from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_interest
+        print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
+        files = search_for_files_of_interest(path_obj)
+        print(f"🔍 Got #{len(files)} results.")
+        choice_file = choose_from_options(multi=False, options=files, fzf=True, msg="Choose one option")
+        choice_file = PathExtended(choice_file)
+    else:
+        choice_file = path_obj
+
+
+    repo_root = get_repo_root(Path(choice_file))
+    print(f"💾 Selected file: {choice_file}.\nRepo root: {repo_root}")
+    ve_root_from_file, ipy_profile = get_ve_path_and_ipython_profile(choice_file)
+    if ipy_profile is None:
+        ipy_profile = "default"
+
+    _activate_ve_line = get_ve_activate_line(ve_root=ve_root_from_file or "$HOME/code/machineconfig/.venv")
+
+    # =========================  choosing function to run
+    if function is None or function.strip() == "":
+        from machineconfig.scripts.python.fire_jobs_route_helper import choose_function_or_lines
+        choice_function, choice_file, _kwargs_dict = choose_function_or_lines(choice_file, kwargs_dict={})
+    else:
+        choice_function = function
+
+    from machineconfig.cluster.sessions_managers.zellij_local import run_zellij_layout
+    from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
+    layout: LayoutConfig = {"layoutName": "fireNprocess", "layoutTabs": []}
+    for an_arg in range(num_process):
+        layout["layoutTabs"].append({"tabName": f"tab{an_arg}", "startDir": str(PathExtended.cwd()), "command": f"uv run -m fire {choice_file} {choice_function} --idx={an_arg} --idx_max={num_process}"})
+    print(layout)
+    run_zellij_layout(layout_config=layout)
+

{machineconfig-5.20 → machineconfig-5.21/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-5.20 → machineconfig-5.21}/src/machineconfig.egg-info/SOURCES.txt

@@ -186,6 +186,7 @@ src/machineconfig/scripts/python/repos_helper_record.py
 src/machineconfig/scripts/python/repos_helper_update.py
 src/machineconfig/scripts/python/scheduler.py
 src/machineconfig/scripts/python/sessions.py
+src/machineconfig/scripts/python/sessions_multiprocess.py
 src/machineconfig/scripts/python/share_terminal.py
 src/machineconfig/scripts/python/snapshot.py
 src/machineconfig/scripts/python/start_slidev.py