machineconfig 5.37__py3-none-any.whl → 5.38__py3-none-any.whl

machineconfig/scripts/python/helpers_fire/fire_agents_help_launch.py

@@ -66,14 +66,14 @@ sleep 0.1
                 assert provider == "google", "Gemini agent only works with google provider."
                 api_keys = get_api_keys(provider="google")
                 api_key = api_keys[idx % len(api_keys)] if len(api_keys) > 0 else None
-                from machineconfig.scripts.python.helpers_fire.fire_gemini import fire_gemini
-                cmd = fire_gemini(api_key=api_key, prompt_path=prompt_path, machine=machine)
+                from machineconfig.scripts.python.helpers_fire.agentic_frameworks.fire_gemini import fire_gemini
+                cmd = fire_gemini(api_key=api_key, prompt_path=prompt_path, machine=machine, model="gemini-2.5-pro", provider="google", repo_root=repo_root)
             case "cursor-agent":
-                from machineconfig.scripts.python.helpers_fire.fire_cursor_agents import fire_cursor
+                from machineconfig.scripts.python.helpers_fire.agentic_frameworks.fire_cursor_agents import fire_cursor
                 cmd = fire_cursor(prompt_path=prompt_path, machine=machine, api_key=None)
                 raise NotImplementedError("Cursor agent is not implemented yet, api key missing")
             case "crush":
-                from machineconfig.scripts.python.helpers_fire.fire_crush import fire_crush
+                from machineconfig.scripts.python.helpers_fire.agentic_frameworks.fire_crush import fire_crush
                 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)

machineconfig/scripts/python/helpers_fire/template.ps1

@@ -0,0 +1,29 @@
+#Requires -Version 5.1
+
+$JOB_NAME = "outpatient_mapping"
+$REPO_ROOT = "$HOME/code/machineconfig"
+$CONTEXT_PATH = "$REPO_ROOT/src/machineconfig/scripts/python/fire_jobs.py"
+$PROMPT_PATH = "$REPO_ROOT/src/machineconfig/scripts/python/helpers_fire/prompt.txt"
+
+$AGENTS_DIR = "$REPO_ROOT/.ai/agents/$JOB_NAME"
+$LAYOUT_PATH_UNBALANCED = "$REPO_ROOT/.ai/agents/$JOB_NAME/layout_unbalanced.json"
+
+agents create `
+  --context-path "$CONTEXT_PATH" `
+  --tasks-per-prompt 1 `
+  --machine docker `
+  --agent crush `
+  --model "zai/glm-4.6" `
+  --provider openrouter `
+  --separator 'def ' `
+  --prompt-path "$PROMPT_PATH" `
+  --output-path "$LAYOUT_PATH_UNBALANCED" `
+  --agents-dir "$AGENTS_DIR"
+
+# $LAYOUT_BALANCED_PATH = "$REPO_ROOT/.ai/agents/$JOB_NAME/layout_balanced.json"
+# sessions balance-load $LAYOUT_PATH --max-thresh 6 --breaking-method moreLayouts --thresh-type number  --output-path $LAYOUT_BALANCED_PATH
+# sessions run $LAYOUT_BALANCED_PATH --kill-upon-completion
+
+sessions run $LAYOUT_PATH_UNBALANCED
+
+# agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"

machineconfig/scripts/python/interactive.py

@@ -51,8 +51,9 @@ def display_header() -> None:
     ╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
     """
 
+    import machineconfig
     version = get_machineconfig_version()
-    title = f"✨ MACHINE CONFIGURATION v{version} ✨"
+    title = f"✨ MACHINE CONFIGURATION v{version}, @ {machineconfig.__file__} ✨"
     subtitle = "🎯 Your digital life manager. Dotfiles, data, code and more."
     bug_report = "🐛 Please report bugs to Alex Al-Saffar @ https://github.com/thisismygitrepo/machineconfig"
 
@@ -108,7 +109,7 @@ def get_installation_choices() -> list[str]:
     ]
     # Add Windows-specific options
     if platform.system() == "Windows":
-        choices.append(Choice(value="install_windows_desktop", title="💻 Install Windows Desktop Apps   - Brave, Windows Terminal, PowerShell, VSCode (Windows only)", checked=False))
+        choices.append(Choice(value="install_windows_desktop", title="💻 Install Windows Desktop Apps   - Install nerd fonts and set WT config.", checked=False))
     selected = questionary.checkbox("Select the installation options you want to execute:", choices=choices, show_description=True).ask()
     return selected or []
 

machineconfig/scripts/python/nw/mount_nw_drive

@@ -17,8 +17,7 @@ drive_location=''
 mount_point=''
 username=''
 password=''
-
-uv run --PYTHON 3.13 --no-dev --project $HOME/code/machineconfig python -m machineconfig.scripts.python.mount_nw_drive
+machineconfig.scripts.python.mount_nw_drive
 
 # Check if mount point directory exists, create if not
 if [ ! -d "$mount_point" ]; then

machineconfig/settings/lf/linux/lfrc

@@ -116,10 +116,8 @@ map jc cd ~/code
 map jd cd ~/data
 map jD cd ~/Downloads
 map jx cd ~/dotfiles
-# map jm cd ~/code/machineconfig/src/machineconfig
 map jh cd ~
 map jj $~/scripts/croshell -j --read $f
-# map jj $lvim ~/code/machineconfig/src/machineconfig/settings/lf/linux/lfrc
 
 # from https://github.com/gokcehan/lf/wiki/Integrations#zoxide
 cmd zi ${{

machineconfig/settings/lf/windows/lfrc

@@ -127,7 +127,3 @@ map Z $~/code/machineconfig/src/machineconfig/settings/lf/windows/cd_zoxide2.ps1
 
 cmd doc $lf -doc | bat
 
-# cmd pre-cd $~/code/machineconfig/src/machineconfig/settings/lf/windows/precd.ps1
-# cmd on-cd $~/code/machineconfig/src/machineconfig/settings/lf/windows/oncd.ps1
-# cmd on-quit ~/code/machineconfig/src/machineconfig/settings/lf/windows/onquit.ps1
-

machineconfig/settings/shells/bash/commands.sh

@@ -0,0 +1,24 @@
+devops() {
+    "$HOME/.local/bin/uv" run --python 3.13 --no-dev --project $HOME/code/machineconfig devops "$@"
+}
+agents() {
+    "$HOME/.local/bin/uv" run --python 3.13 --no-dev --project $HOME/code/machineconfig agents "$@"
+}
+cloud() {
+    "$HOME/.local/bin/uv" run --python 3.13 --no-dev --project $HOME/code/machineconfig cloud "$@"
+}
+croshell() {
+    "$HOME/.local/bin/uv" run --python 3.13 --no-dev --project $HOME/code/machineconfig croshell "$@"
+}
+fire() {
+    "$HOME/.local/bin/uv" run --python 3.13 --no-dev --project $HOME/code/machineconfig fire "$@"
+}
+ftpx() {
+    "$HOME/.local/bin/uv" run --python 3.13 --no-dev --project $HOME/code/machineconfig ftpx "$@"
+}
+kill_process() {
+    "$HOME/.local/bin/uv" run --python 3.13 --no-dev --project $HOME/code/machineconfig kill_process "$@"
+}
+sessions() {
+    "$HOME/.local/bin/uv" run --python 3.13 --no-dev --project $HOME/code/machineconfig sessions "$@"
+}

machineconfig/settings/shells/bash/init.sh

@@ -31,6 +31,11 @@ machineconfig_path=$HOME/code/machineconfig/src/machineconfig
 . $machineconfig_path/settings/lf/linux/exe/lfcd.sh
 . $machineconfig_path/settings/tere/terecd.sh
 
+# Check if $HOME/code/machineconfig directory exists and source commands.sh
+if [ -d "$HOME/code/machineconfig" ]; then
+    source $HOME/code/machineconfig/src/machineconfig/settings/shells/bash/commands.sh
+fi
+
 # set alias l to lsd -la
 alias l='lsd -la'
 alias gcs='gh copilot suggest -t shell'

machineconfig/settings/shells/pwsh/commands.ps1

@@ -0,0 +1,33 @@
+
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig devops $args
+}
+
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig cloud $args
+}
+
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig croshell $args
+}
+
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig agents $args
+}
+
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig fire $args
+}
+
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig ftpx $args
+}
+
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig sessions $args
+}
+
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig kill_process $args
+}
+

machineconfig/settings/shells/pwsh/init.ps1

@@ -31,6 +31,10 @@ Add-ToPathIfNotAlready -Directories @(
 . $HOME/code/machineconfig/src/machineconfig/settings/lf/windows/lfcd.ps1
 . $HOME/code/machineconfig/src/machineconfig/settings/tere/terecd.ps1
 
+if (Test-Path "$HOME/code/machineconfig" -PathType Container) {
+    . "$HOME/code/machineconfig/src/machineconfig/settings/shells/pwsh/commands.ps1"
+}
+
 function lsdla { lsd -la }
 Set-Alias -Name l -Value lsdla -Option AllScope
 

machineconfig/setup_windows/machineconfig.ps1

@@ -25,3 +25,5 @@ if (Test-Path "machineconfig") {
 cd $HOME\code\machineconfig
 & "$HOME\.local\bin\uv.exe" sync --no-dev
 echo "Finished setting up repos"
+
+# uv tool install machineconfig

machineconfig/utils/files/dbms.py

@@ -167,7 +167,10 @@ class DBMS:
             url = path
         else:
             path_str = str(P(path))
-            url = f'sqlite:///{path_str}'
+            if path_str.endswith('.duckdb'):
+                url = f'duckdb:///{path_str}'
+            else:
+                url = f'sqlite:///{path_str}'
         connect_args = {}
         if share_across_threads and 'sqlite' in url:
             connect_args['check_same_thread'] = False

machineconfig/utils/installer_utils/installer.py

@@ -180,6 +180,18 @@ def install_clis(clis_names: list[str]):
     return None
 
 
+def install_if_missing(which: str):
+    # uv run --python 3.13 --with machineconfig devops install ttyd
+    from machineconfig.utils.installer_utils.installer_abc import check_tool_exists
+    exists = check_tool_exists(which)
+    if exists:
+        print(f"✅ {which} is already installed.")
+        return
+    print(f"⏳ {which} not found. Installing...")
+    from machineconfig.utils.installer_utils.installer import main
+    main(which=which)
+
+
 if __name__ == "__main__":
     from machineconfig.utils.schemas.installer.installer_types import InstallerData
     from machineconfig.utils.installer_utils.installer_class import Installer

machineconfig/utils/installer_utils/installer_abc.py

@@ -1,4 +1,3 @@
-
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.source_of_truth import WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH, INSTALL_VERSION_ROOT
 
@@ -9,7 +8,7 @@ import platform
 
 
 def find_move_delete_windows(downloaded_file_path: PathExtended, exe_name: Optional[str] = None, delete: bool = True, rename_to: Optional[str] = None):
-    print(f"🔍 PROCESSING WINDOWS EXECUTABLE 🔍")
+    print("🔍 PROCESSING WINDOWS EXECUTABLE 🔍")
     if exe_name is not None and ".exe" in exe_name:
         exe_name = exe_name.replace(".exe", "")
     if downloaded_file_path.is_file():
@@ -54,7 +53,7 @@ def find_move_delete_windows(downloaded_file_path: PathExtended, exe_name: Optio
 
 
 def find_move_delete_linux(downloaded: PathExtended, tool_name: str, delete: Optional[bool] = True, rename_to: Optional[str] = None):
-    print(f"🔍 PROCESSING LINUX EXECUTABLE 🔍")
+    print("🔍 PROCESSING LINUX EXECUTABLE 🔍")
     if downloaded.is_file():
         exe = downloaded
         print(f"📄 Found direct executable file: {exe}")
@@ -114,14 +113,32 @@ def find_move_delete_linux(downloaded: PathExtended, tool_name: str, delete: Opt
 
 def check_tool_exists(tool_name: str) -> bool:
     if platform.system() == "Windows":
-        tool_name = tool_name.replace(".exe", "") + ".exe"
-        res1 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
-        tool_name = tool_name.replace(".exe", "") + ".exe"
-        res2 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
-        return res1 or res2
+        tool_name_exe = tool_name.replace(".exe", "") + ".exe"
+        res1 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name_exe).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name_exe).is_file()])
+        if res1:
+            return True
+        tool_name_no_exe = tool_name.replace(".exe", "")
+        res2 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name_no_exe).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name_no_exe).is_file()])
+        return res2
     elif platform.system() in ["Linux", "Darwin"]:
         root_path = Path(LINUX_INSTALL_PATH)
-        return any([Path("/usr/local/bin").joinpath(tool_name).is_file(), Path("/usr/bin").joinpath(tool_name).is_file(), root_path.joinpath(tool_name).is_file()])
+        standard_checks = [
+            Path("/usr/local/bin").joinpath(tool_name).is_file(),
+            Path("/usr/bin").joinpath(tool_name).is_file(),
+            root_path.joinpath(tool_name).is_file()
+        ]
+        if any(standard_checks):
+            return True
+        # Check for npm packages via nvm
+        npm_check = False
+        try:
+            result = subprocess.run(["node", "--version"], capture_output=True, text=True, check=True)
+            version = result.stdout.strip().lstrip('v')
+            nvm_bin_path = Path.home() / ".nvm" / "versions" / "node" / f"v{version}" / "bin" / tool_name
+            npm_check = nvm_bin_path.is_file()
+        except subprocess.CalledProcessError:
+            pass
+        return npm_check
     else:
         raise NotImplementedError(f"platform {platform.system()} not implemented")
 def is_executable_in_path(executable_name: str) -> bool:

machineconfig/utils/installer_utils/installer_class.py

@@ -30,7 +30,7 @@ class Installer:
     
     def _get_exe_name(self) -> str:
         """Derive executable name from app name by converting to lowercase and removing spaces."""
-        return self.installer_data["appName"].lower().replace(" ", "").replace("-", "")
+        return self.installer_data["appName"].lower().replace(" ", "")  # .replace("-", "")
 
     def install_robust(self, version: Optional[str]) -> str:
         try:

machineconfig/utils/io.py

@@ -35,24 +35,6 @@ def save_json(obj: Any, path: PathLike, indent: Optional[int] = None, verbose: b
     return Path(path_obj)
 
 
-# def save_toml(obj: Mapping[str, Any], path: PathLike, verbose: bool = False) -> Path:
-#     path_obj = _ensure_parent(path)
-#     with open(path_obj, "w", encoding="utf-8") as fh:
-#         toml.dump(obj, fh)
-#     if verbose:
-#         print(f"Saved toml -> {path_obj}")
-#     return Path(path_obj)
-
-
-# def save_yaml(obj: Any, path: PathLike, verbose: bool = False) -> Path:
-#     path_obj = _ensure_parent(path)
-#     with open(path_obj, "w", encoding="utf-8") as fh:
-#         yaml.safe_dump(obj, fh, sort_keys=False)
-#     if verbose:
-#         print(f"Saved yaml -> {path_obj}")
-#     return Path(path_obj)
-
-
 def save_ini(path: PathLike, obj: Mapping[str, Mapping[str, Any]], verbose: bool = False) -> Path:
     cp = configparser.ConfigParser()
     for section, values in obj.items():

machineconfig/utils/scheduler.py

@@ -1,6 +1,6 @@
 
 from pathlib import Path
-from typing import Callable, Optional, Union, Any, TypeVar, Protocol, List, Generic
+from typing import Callable, Optional, Union, Any, Protocol, List, TypeVar
 import logging
 import time
 from datetime import datetime, timezone, timedelta
@@ -144,18 +144,17 @@ class Scheduler:
         raise ex
 
 
-T = TypeVar("T")
+# T = TypeVar("T")
 T2 = TypeVar("T2")
 
 
 def to_pickle(obj: Any, path: Path) -> None:
     import pickle
-
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_bytes(pickle.dumps(obj))
 
 
-class Cache(Generic[T]):  # This class helps to accelrate access to latest data coming from expensive function. The class has two flavours, memory-based and disk-based variants."""
+class Cache[T]():  # This class helps to accelrate access to latest data coming from expensive function. The class has two flavours, memory-based and disk-based variants."""
     def __init__(
         self, source_func: Callable[[], T], expire: timedelta, logger: LoggerTemplate, path: Optional[Path] = None, saver: Callable[[T, Path], Any] = to_pickle, reader: Callable[[Path], T] = from_pickle, name: Optional[str] = None
     ) -> None:

{machineconfig-5.37.dist-info → machineconfig-5.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.37
+Version: 5.38
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -9,7 +9,7 @@ Project-URL: Bug Tracker, https://github.com/thisismygitrepo/machineconfig/issue
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.13
+Requires-Python: <3.14,>=3.13
 Description-Content-Type: text/markdown
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: fire>=0.7.0
@@ -24,9 +24,8 @@ 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
 Requires-Dist: questionary>=2.1.1
-Requires-Dist: typer>=0.19.2
+Requires-Dist: typer-slim>=0.19.2
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: plot
@@ -86,5 +85,9 @@ iex (iwr bit.ly/cfgwindows).Content
 # Author
 Alex Al-Saffar. [email](mailto:programmer@usa.com)
 
+# Contributor
+Ruby Chan. [email](mailto:ruby.chan@sa.gov.au)
+
+
 [![Alex's github activity graph](https://github-readme-activity-graph.vercel.app/graph?username=thisismygitrepo)](https://github.com/ashutosh00710/github-readme-activity-graph)