machineconfig 5.31__tar.gz → 5.33__tar.gz

{machineconfig-5.31/src/machineconfig.egg-info → machineconfig-5.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.31
+Version: 5.33
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -27,7 +27,6 @@ Requires-Dist: pyjson5>=1.6.9
 Requires-Dist: typer-slim>=0.19.2
 Requires-Dist: questionary>=2.1.1
 Requires-Dist: typer>=0.19.2
-Requires-Dist: textual>=6.1.0
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: docs

{machineconfig-5.31 → machineconfig-5.33}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.31"
+version = "5.33"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -36,7 +36,6 @@ dependencies = [
     "typer-slim>=0.19.2",
     "questionary>=2.1.1",
     "typer>=0.19.2",
-    "textual>=6.1.0",
 ]
 
 [project.optional-dependencies]
@@ -55,25 +54,15 @@ docs = [
 [project.scripts]
 devops = "machineconfig.scripts.python.devops:app"
 fire = "machineconfig.scripts.python.fire_jobs:main_from_parser"
-initai = "machineconfig.scripts.python.ai.initai:main"
 agents = "machineconfig.scripts.python.agents:main_from_parser"
 sessions = "machineconfig.scripts.python.sessions:main_from_parser"
-commands = "machineconfig.scripts.python.command_navigator:main_from_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:arg_parser"
-cloud_sync = "machineconfig.scripts.python.cloud_sync:arg_parser"
+croshell = "machineconfig.scripts.python.croshell:arg_parser"
+cloud = "machineconfig.scripts.python.cloud:app"
 ftpx = "machineconfig.scripts.python.ftpx:main_from_parser"
 
-start_slidev = "machineconfig.scripts.python.start_slidev:arg_parser"
+# commands = "machineconfig.scripts.python.command_navigator:main_from_parser"
 kill_process = "machineconfig.utils.procs:main"
 
-wifi_conn = "machineconfig.scripts.python.wifi_conn:arg_parser"
-mount_nfs = "machineconfig.scripts.python.mount_nfs:main"
-mount_nw_drive = "machineconfig.scripts.python.mount_nw_drive:main"
-
-croshell = "machineconfig.scripts.python.croshell:arg_parser"
 
 [tool.setuptools]
 package-dir = {"" = "src"}
@@ -99,6 +88,7 @@ dev = [
     "pyrefly>=0.33.1",
     "pyright>=1.1.405",
     "ruff>=0.13.1",
+    "textual>=6.1.0",
     "trogon>=0.6.0",
     "twine>=6.2.0",
     "ty>=0.0.1a21",
@@ -112,9 +102,11 @@ dev = [
     "types-urllib3>=1.26.25.14",
     "vt-py>=0.21.0",
 ]
+
 docs = [
     "pdoc>=15.0.2",
 ]
+
 plot = [
     "duckdb-engine>=0.17.0",
     "ipykernel>=6.30.1",

machineconfig-5.33/src/machineconfig/jobs/installer/custom_dev/dubdb_adbc.py

@@ -0,0 +1,30 @@
+
+
+
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+from typing import Optional
+
+installer_data: InstallerData = {
+      "appName": "libduckdb.so",
+      "repoURL": "https://github.com/duckdb/duckdb",
+      "doc": "🗃️ An in-process SQL OLAP database management system",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "libduckdb-linux-amd64.zip",
+          "macos": None,
+          "windows": None
+        },
+        "arm64": {
+          "linux": "libduckdb-linux-arm64.zip",
+          "macos": None,
+          "windows": None
+        }
+      }
+    }
+
+
+def main(installer_data: InstallerData, version: Optional[str]) -> None:
+    _ = version
+    from machineconfig.utils.installer import Installer
+    installer = Installer(installer_data)
+    installer.install(version=None)

machineconfig-5.31/src/machineconfig/scripts/linux/wifi_conn → machineconfig-5.33/src/machineconfig/scripts/linux/cloud

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-uv run --python 3.13 --no-dev --project $HOME/code/machineconfig wifi_conn
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig cloud $@

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/agents.py

@@ -184,12 +184,18 @@ def template():
     typer.echo(f"Template bash script written to {save_path}")
 
 
+def init_config():
+    from machineconfig.scripts.python.ai.initai import add_ai_configs
+    add_ai_configs(repo_root=Path.cwd())
+
+
 def main_from_parser():
     import sys
     agents_app = typer.Typer(help="🤖 AI Agents management subcommands")
     agents_app.command("create", no_args_is_help=True)(create)
     agents_app.command("collect", no_args_is_help=True)(collect)
     agents_app.command("create-template", no_args_is_help=False, help="Create a template for fire agents")(template)
+    agents_app.command("init-config", no_args_is_help=False, help="Initialize AI configurations in the current repository")(init_config)
     if len(sys.argv) == 1:
         agents_app(["--help"])
     else:

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/ai/initai.py

@@ -47,12 +47,3 @@ uv add --upgrade-package pytest --dev
     crush.build_configuration(repo_root=repo_root)
     cline.build_configuration(repo_root=repo_root)
 
-
-
-def main() -> None:
-    repo_root = Path.cwd()
-    add_ai_configs(repo_root=repo_root)
-
-
-if __name__ == "__main__":
-    add_ai_configs(repo_root=Path.cwd())

machineconfig-5.33/src/machineconfig/scripts/python/cloud.py

@@ -0,0 +1,12 @@
+
+import typer
+from machineconfig.scripts.python.cloud_helpers.cloud_sync import main
+from machineconfig.scripts.python.cloud_helpers.cloud_copy import main as copy_main
+from machineconfig.scripts.python.cloud_helpers.cloud_mount import main as mount_main
+
+
+app = typer.Typer(add_completion=False, no_args_is_help=True)
+app.command(name="sync", no_args_is_help=True, help="""🔄 Synchronize files/folders between local and cloud storage.""")(main)
+app.command(name="copy", no_args_is_help=True, short_help="""📤 Upload or 📥 Download files/folders to/from cloud storage services like Google Drive, Dropbox, OneDrive, etc.""")(copy_main)
+app.command(name="mount", no_args_is_help=True, short_help="""🔗 Mount cloud storage services like Google Drive, Dropbox, OneDrive, etc. as local drives.""")(mount_main)
+

{machineconfig-5.31/src/machineconfig/scripts/python → machineconfig-5.33/src/machineconfig/scripts/python/cloud_helpers}/cloud_copy.py

@@ -10,8 +10,8 @@ from typing import Optional, Annotated
 
 import typer
 
-from machineconfig.scripts.python.helpers.helpers2 import parse_cloud_source_target
-from machineconfig.scripts.python.helpers.cloud_helpers import ArgsDefaults, Args
+from machineconfig.scripts.python.cloud_helpers.helpers2 import parse_cloud_source_target
+from machineconfig.scripts.python.cloud_helpers.cloud_helpers import ArgsDefaults, Args
 from rich.console import Console
 from rich.panel import Panel
 from rich.progress import Progress
@@ -76,8 +76,8 @@ def main(
     os_specific: Annotated[bool, typer.Option(help="💻 choose path specific for this OS.")] = ArgsDefaults.os_specific,
     config: Annotated[Optional[str], typer.Option(help="⚙️ path to cloud.json file.")] = None,
 ) -> None:
+    """📤 Upload or 📥 Download files/folders to/from cloud storage services like Google Drive, Dropbox, OneDrive, etc."""
     console.print(Panel("☁️  Cloud Copy Utility", title="[bold blue]Cloud Copy[/bold blue]", border_style="blue", width=152))
-
     args_obj = Args(
         overwrite=overwrite,
         share=share,

{machineconfig-5.31/src/machineconfig/scripts/python → machineconfig-5.33/src/machineconfig/scripts/python/cloud_helpers}/cloud_sync.py

@@ -2,9 +2,9 @@
 TODO: use typer or typed-argument-parser to parse args
 """
 
-from machineconfig.scripts.python.helpers.helpers2 import parse_cloud_source_target
-from machineconfig.scripts.python.helpers.cloud_helpers import Args
-from machineconfig.scripts.python.cloud_mount import get_mprocs_mount_txt
+from machineconfig.scripts.python.cloud_helpers.helpers2 import parse_cloud_source_target
+from machineconfig.scripts.python.cloud_helpers.cloud_helpers import Args
+from machineconfig.scripts.python.cloud_helpers.cloud_mount import get_mprocs_mount_txt
 
 from typing import Annotated, Optional
 import typer
@@ -78,10 +78,3 @@ def main(
 
     subprocess.run(txt, shell=True, check=True)
 
-
-def arg_parser() -> None:
-    typer.run(main)
-
-
-if __name__ == "__main__":
-    arg_parser()

{machineconfig-5.31/src/machineconfig/scripts/python/helpers → machineconfig-5.33/src/machineconfig/scripts/python/cloud_helpers}/helpers2.py

@@ -1,4 +1,4 @@
-from machineconfig.scripts.python.helpers.cloud_helpers import Args, ArgsDefaults, absolute, find_cloud_config, get_secure_share_cloud_config
+from machineconfig.scripts.python.cloud_helpers.cloud_helpers import Args, ArgsDefaults, absolute, find_cloud_config, get_secure_share_cloud_config
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 from machineconfig.utils.accessories import pprint

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/croshell.py

@@ -144,7 +144,7 @@ from pathlib import Path
         fire_line = f"uv run --python 3.13 --with machineconfig[plot] {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(fire_line)
+    run_shell_script(fire_line, clean_env=True)
 
 
 def arg_parser() -> None:

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/devops_helpers/cli_repos.py

@@ -25,7 +25,7 @@ CloudOption = Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁
 @app.command(no_args_is_help=True)
 def push(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """🚀 Push changes across repositories."""
-    from machineconfig.scripts.python.repos_helpers.repos_helper import git_operations
+    from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
 
     git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, no_sync=no_sync)
 
@@ -33,7 +33,7 @@ def push(directory: DirectoryArgument = None, recursive: RecursiveOption = False
 @app.command(no_args_is_help=True)
 def pull(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """⬇️ Pull changes across repositories."""
-    from machineconfig.scripts.python.repos_helpers.repos_helper import git_operations
+    from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
 
     git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, no_sync=no_sync)
 
@@ -41,7 +41,7 @@ def pull(directory: DirectoryArgument = None, recursive: RecursiveOption = False
 @app.command(no_args_is_help=True)
 def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """💾 Commit changes across repositories."""
-    from machineconfig.scripts.python.repos_helpers.repos_helper import git_operations
+    from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
 
     git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, no_sync=no_sync)
 
@@ -49,16 +49,16 @@ def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = Fal
 @app.command(no_args_is_help=True)
 def sync(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """🔄 Pull, commit, and push changes across repositories."""
-    from machineconfig.scripts.python.repos_helpers.repos_helper import git_operations
+    from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
     git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, no_sync=no_sync)
 
 
 @sync_app.command(no_args_is_help=True)
 def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """📝 Record repositories into a repos.json specification."""
-    from machineconfig.scripts.python.repos_helpers.repos_helper import resolve_directory
+    from machineconfig.scripts.python.repos_helpers.entrypoint import resolve_directory
     repos_root = resolve_directory(directory)
-    from machineconfig.scripts.python.repos_helpers.repos_helper_record import main as record_repos
+    from machineconfig.scripts.python.repos_helpers.record import main as record_repos
 
     save_path = record_repos(repos_root=repos_root)
     from machineconfig.utils.path_extended import PathExtended
@@ -70,7 +70,7 @@ def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> N
 @sync_app.command(no_args_is_help=True)
 def clone(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """📥 Clone repositories described by a repos.json specification."""
-    from machineconfig.scripts.python.repos_helpers.repos_helper import clone_from_specs
+    from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
 
     
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=False)
@@ -79,7 +79,7 @@ def clone(directory: DirectoryArgument = None, cloud: CloudOption = None) -> Non
 @sync_app.command(name="checkout-to-commit", no_args_is_help=True)
 def checkout_command(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """🔀 Check out specific commits listed in the specification."""
-    from machineconfig.scripts.python.repos_helpers.repos_helper import clone_from_specs
+    from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
 
     
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=True)
@@ -88,7 +88,7 @@ def checkout_command(directory: DirectoryArgument = None, cloud: CloudOption = N
 @sync_app.command(name="checkout-to-branch", no_args_is_help=True)
 def checkout_to_branch_command(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """🔀 Check out to the main branch defined in the specification."""
-    from machineconfig.scripts.python.repos_helpers.repos_helper import clone_from_specs
+    from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
     clone_from_specs(directory, cloud, checkout_branch_flag=True, checkout_commit_flag=False)
 
 

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/devops_helpers/devops_backup_retrieve.py

@@ -6,7 +6,7 @@ from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, DEFAULTS_PATH
 from machineconfig.utils.code import print_code
 from machineconfig.utils.options import choose_cloud_interactively, choose_from_options
-from machineconfig.scripts.python.helpers.helpers2 import ES
+from machineconfig.scripts.python.cloud_helpers.helpers2 import ES
 from platform import system
 from typing import Any, Literal, Optional
 from rich.console import Console

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/devops_helpers/devops_update_repos.py

@@ -8,7 +8,7 @@ from rich.panel import Panel
 from rich.table import Table
 from rich.text import Text
 
-from machineconfig.scripts.python.repos_helpers.repos_helper_update import RepositoryUpdateResult, run_uv_sync, update_repository
+from machineconfig.scripts.python.repos_helpers.update import RepositoryUpdateResult, run_uv_sync, update_repository
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/fire_jobs.py

@@ -26,7 +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
+        from machineconfig.scripts.python.helpers_fire.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.")
@@ -72,7 +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
+        from machineconfig.scripts.python.helpers_fire.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}')"""

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/ftpx.py

@@ -13,7 +13,7 @@ from rich.panel import Panel
 
 from machineconfig.utils.ssh import SSH
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.scripts.python.helpers.helpers2 import ES
+from machineconfig.scripts.python.cloud_helpers.helpers2 import ES
 from machineconfig.utils.accessories import pprint
 
 

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/helpers_fire/fire_agents_help_launch.py

@@ -77,9 +77,9 @@ sleep 0.1
                 api_keys = get_api_keys(provider=provider)
                 api_key = api_keys[idx % len(api_keys)] if len(api_keys) > 0 else None
                 cmd = fire_crush(api_key=api_key, prompt_path=prompt_path, machine=machine, repo_root=repo_root, model=model, provider=provider)
-            case "q":
-                from machineconfig.scripts.python.helpers_fire.fire_q import fire_q
-                cmd = fire_q(api_key="", prompt_path=prompt_path, machine=machine)
+            # case "q":
+            #     from machineconfig.scripts.python.helpers_fire.fire_q import fire_q
+            #     cmd = fire_q(api_key="", prompt_path=prompt_path, machine=machine)
             case _:
                 raise ValueError(f"Unsupported agent type: {agent}")
 

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/helpers_fire_command/fire_jobs_route_helper.py

@@ -22,7 +22,7 @@ def choose_function_or_lines(choice_file: PathExtended, kwargs_dict: dict[str, o
     choice_function: Optional[str] = None
     
     if choice_file.suffix == ".py":
-        from machineconfig.scripts.python.helpers.helpers4 import parse_pyfile
+        from machineconfig.scripts.python.helpers_fire.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)}"

machineconfig-5.31/src/machineconfig/scripts/python/repos_helpers/repos_helper_action.py → machineconfig-5.33/src/machineconfig/scripts/python/repos_helpers/action.py

@@ -1,6 +1,6 @@
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.accessories import randstr
-from machineconfig.scripts.python.repos_helpers.repos_helper_update import update_repository
+from machineconfig.scripts.python.repos_helpers.update import update_repository
 
 from typing import Optional
 from dataclasses import dataclass

machineconfig-5.31/src/machineconfig/scripts/python/repos_helpers/repos_helper.py → machineconfig-5.33/src/machineconfig/scripts/python/repos_helpers/entrypoint.py

@@ -25,7 +25,7 @@ def git_operations(
     
     repos_root = resolve_directory(directory)
     auto_sync = not no_sync
-    from machineconfig.scripts.python.repos_helpers.repos_helper_action import perform_git_operations
+    from machineconfig.scripts.python.repos_helpers.action import perform_git_operations
     from machineconfig.utils.path_extended import PathExtended
     perform_git_operations(
         repos_root=PathExtended(repos_root),
@@ -68,7 +68,7 @@ def clone_from_specs(
     
     typer.echo("\n📥 Cloning or checking out repositories...")
     spec_path = resolve_spec_path(directory, cloud)
-    from machineconfig.scripts.python.repos_helpers.repos_helper_clone import clone_repos
+    from machineconfig.scripts.python.repos_helpers.clone import clone_repos
     clone_repos(
         spec_path=spec_path,
         preferred_remote=None,

machineconfig-5.31/src/machineconfig/scripts/python/helpers/repo_sync_helpers.py → machineconfig-5.33/src/machineconfig/scripts/python/repos_helpers/sync.py

@@ -64,23 +64,3 @@ def inspect_repos(repo_local_root: str, repo_remote_root: str):
         return None
     else:
         raise NotImplementedError(f"Platform {platform.system()} not implemented.")
-
-
-def check_dotfiles_version_is_beyond(commit_dtm: str, update: bool) -> bool:
-    dotfiles_path = str(PathExtended.home().joinpath("dotfiles"))
-    from git import Repo
-
-    repo = Repo(path=dotfiles_path)
-    last_commit = repo.head.commit
-    dtm = last_commit.committed_datetime
-    from datetime import datetime  # make it tz unaware
-
-    dtm = datetime(dtm.year, dtm.month, dtm.day, dtm.hour, dtm.minute, dtm.second)
-    res = dtm > datetime.fromisoformat(commit_dtm)
-    if res is False and update is True:
-        console = Console()
-        console.print(Panel(f"🔄 UPDATE REQUIRED | Updating dotfiles because {dtm} < {datetime.fromisoformat(commit_dtm)}", border_style="bold blue", expand=False))
-        from machineconfig.scripts.python.helpers_repos.cloud_repo_sync import main
-
-        main(cloud=None, repo=dotfiles_path)
-    return res

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/sessions.py

@@ -52,7 +52,7 @@ def select_layout(layouts_json_file: Path, selected_layouts_names: Optional[list
 
 def find_layout_file(layout_path: str, ) -> Path:
     from machineconfig.utils.path_extended import PathExtended
-    from machineconfig.scripts.python.helpers.helpers4 import search_for_files_of_interest
+    from machineconfig.scripts.python.helpers_fire.helpers4 import search_for_files_of_interest
     from machineconfig.utils.options import choose_from_options
     from machineconfig.utils.path_helper import match_file_name, sanitize_path
     path_obj = sanitize_path(layout_path)

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/scripts/python/sessions_helpers/sessions_multiprocess.py

@@ -21,7 +21,7 @@ def create_from_function(
         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
+        from machineconfig.scripts.python.helpers_fire.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.")

machineconfig-5.33/src/machineconfig/scripts/windows/cloud.ps1

@@ -0,0 +1 @@
+uv run --python 3.13 --no-dev --project $HOME/code/machineconfig cloud $args

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/utils/code.py

@@ -98,7 +98,7 @@ def print_code(code: str, lexer: str, desc: str, subtitle: str = ""):
     console.print(Panel(Syntax(code=code, lexer=lexer), title=f"📄 {desc}", subtitle=subtitle), style="bold red")
 
 
-def run_shell_script(script: str, display_script: bool = True):
+def run_shell_script(script: str, display_script: bool = True, clean_env: bool = False):
     import tempfile
     if platform.system() == "Windows":
         suffix = ".ps1"
@@ -114,12 +114,14 @@ def run_shell_script(script: str, display_script: bool = True):
         from rich.syntax import Syntax
         console.print(Panel(Syntax(code=script, lexer=lexer), title=f"📄 shell script @ {temp_script_path}", subtitle="shell script being executed"), style="bold red")
 
+    env = {} if clean_env else None
+
     if platform.system() == "Windows":
         import subprocess
-        proc = subprocess.run(f'powershell -ExecutionPolicy Bypass -File "{temp_script_path}"', check=True, shell=True)
+        proc = subprocess.run(f'powershell -ExecutionPolicy Bypass -File "{temp_script_path}"', check=True, shell=True, env=env)
     elif platform.system() == "Linux" or platform.system() == "Darwin":
         import subprocess
-        proc = subprocess.run(f"bash {str(temp_script_path)}", check=True, shell=True)
+        proc = subprocess.run(f"bash {str(temp_script_path)}", check=True, shell=True, env=env)
     else:
         raise NotImplementedError(f"Platform {platform.system()} not supported.")
     # console.print(f"✅  [green]Script executed successfully:[/green] [blue]{temp_script_path}[/blue]")

{machineconfig-5.31 → machineconfig-5.33}/src/machineconfig/utils/files/headers.py

@@ -55,9 +55,11 @@ def print_logo(logo: str):
         avail_boxes = is_executable_in_path("boxes")
         avail_figlet = is_executable_in_path("figlet")
         if avail_cowsay and avail_lolcat and avail_boxes and avail_figlet:
-            _dynamic_art = random.choice([True, True, True, True, False])
-            if _dynamic_art: character_or_box_color(logo=logo)
-            else: print(Path(random.choice(glob.glob(str(Path(__file__).parent.joinpath("art", "*"))))).read_text())
+            # _dynamic_art = random.choice([True, True, True, True, False])
+            # if _dynamic_art: character_or_box_color(logo=logo)
+            # else:
+            #     print(Path(random.choice(glob.glob(str(Path(__file__).parent.joinpath("art", "*"))))).read_text())
+            character_or_box_color(logo=logo)
         else:
             print("\n" + "🚫 " + "-" * 70 + " 🚫")
             install_cmd = "devops install --group TerminalEyeCandy" if platform.system() == "Linux" else "brew install cowsay lolcat boxes figlet"

{machineconfig-5.31 → machineconfig-5.33/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.31
+Version: 5.33
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -27,7 +27,6 @@ Requires-Dist: pyjson5>=1.6.9
 Requires-Dist: typer-slim>=0.19.2
 Requires-Dist: questionary>=2.1.1
 Requires-Dist: typer>=0.19.2
-Requires-Dist: textual>=6.1.0
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: docs