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

machineconfig/scripts/python/repos_helpers/count_lines_frontend.py

@@ -6,7 +6,7 @@ def analyze_repo_development(repo_path: str = typer.Argument(..., help="Path to
     from machineconfig.scripts.python.repos_helpers import count_lines
     from pathlib import Path
     count_lines_path = Path(count_lines.__file__)
-    # --project $HOME/code/machineconfig --group plot
+    # --project $HOME/code/ machineconfig --group plot
     cmd = f"""uv run --python 3.13 --with machineconfig[plot] {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)

machineconfig/scripts/python/repos_helpers/entrypoint.py

@@ -3,7 +3,7 @@
 
 from typing import Optional
 from pathlib import Path
-from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
+from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH
 
 import typer
 
@@ -39,7 +39,7 @@ def resolve_spec_path(directory: Optional[str], cloud: Optional[str]) -> Path:
     repos_root = resolve_directory(directory)
     from machineconfig.utils.path_extended import PathExtended
     if not repos_root.exists() or repos_root.name != "repos.json":
-        candidate = Path(CONFIG_PATH).joinpath("repos").joinpath(PathExtended(repos_root).rel2home()).joinpath("repos.json")
+        candidate = Path(CONFIG_ROOT).joinpath("repos").joinpath(PathExtended(repos_root).rel2home()).joinpath("repos.json")
         repos_root = candidate
         if not repos_root.exists():
             cloud_name: Optional[str]

machineconfig/scripts/python/repos_helpers/record.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from machineconfig.utils.schemas.repos.repos_types import GitVersionInfo, RepoRecordDict, RepoRemote
 
 from machineconfig.utils.schemas.repos.repos_types import RepoRecordFile
-from machineconfig.utils.source_of_truth import CONFIG_PATH
+from machineconfig.utils.source_of_truth import CONFIG_ROOT
 from machineconfig.utils.io import save_json
 
 from typing import Optional
@@ -242,7 +242,7 @@ def main(repos_root: Path):
     tree_structure = build_tree_structure(repo_records, repos_root)
     print(tree_structure)
 
-    save_path = CONFIG_PATH.joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
+    save_path = CONFIG_ROOT.joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
     save_json(obj=res, path=save_path, indent=4)
     pprint(f"📁 Result saved at {PathExtended(save_path)}")
     print(">>>>>>>>> Finished Recording")

machineconfig/scripts/python/sessions_helpers/sessions_multiprocess.py

@@ -36,8 +36,10 @@ def create_from_function(
     ve_root_from_file, ipy_profile = get_ve_path_and_ipython_profile(choice_file)
     if ipy_profile is None:
         ipy_profile = "default"
+    if ve_root_from_file is None:
+        raise ValueError(f"Could not determine virtual environment for file {choice_file}. Please ensure it is within a recognized project structure.")
 
-    _activate_ve_line = get_ve_activate_line(ve_root=ve_root_from_file or "$HOME/code/machineconfig/.venv")
+    _activate_ve_line = get_ve_activate_line(ve_root=ve_root_from_file)
 
     # =========================  choosing function to run
     if function is None or function.strip() == "":

machineconfig/scripts/windows/{mount_nfs.ps1 → mounts/mount_nfs.ps1}

@@ -17,10 +17,8 @@ $sharePath=''
 $driveLetter=''
 $options = "rw,sec=sys,no_subtree_check"
 
-# . activate_ve
-. $HOME/code/machineconfig/.venv/Scripts/activate.ps1
 
-python -m machineconfig.scripts.python.mount_nfs
+uv run python -m machineconfig.scripts.python.mount_nfs
 . $HOME/tmp_results/shells/python_return_command.ps1
 
 # Configure NFS server

machineconfig/scripts/windows/{mount_ssh.ps1 → mounts/mount_ssh.ps1}

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.13 --no-dev --project $HOME/code/machineconfig python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.13 --with machineconfig python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local

machineconfig/settings/lf/linux/lfrc

@@ -14,8 +14,8 @@ set number true  # show line numbers
 
 set preview true        # preview file on the right pane
 # set previewer chafa --format sixel --work 9 --optimize 9 --stretch --zoom --size 140x80
-set previewer ~/code/machineconfig/src/machineconfig/settings/lf/linux/exe/previewer.sh
-set cleaner ~/code/machineconfig/src/machineconfig/settings/lf/linux/exe/cleaner.sh
+set previewer $HOME/.config/machineconfig/settings/lf/linux/exe/previewer.sh
+set cleaner $HOME/.config/machineconfig/settings/lf/linux/exe/cleaner.sh
 # set previewer pistol
 
 # set sixels true
@@ -48,7 +48,7 @@ set ratios '1:2:3'  # ratio of pane widths
 
 
 # test image viewer
-map Q !~/code/machineconfig/src/machineconfig/settings/lf/linux/exe/previewer.sh "$f"
+map Q !$HOME/.config/machineconfig/settings/lf/linux/exe/previewer.sh "$f"
 
 # key bindings
 map vmap v  # default is invert
@@ -70,7 +70,6 @@ map <c-u>  # half-up
 # e edit
 map e  # edit modal key.
 map eh $hx $f
-map eH !source ~/code/machineconfig/.venv/bin/activate;hx $f
 map en $nano $f
 map el $lvim $f
 map ev $nvim $f
@@ -86,7 +85,7 @@ map ww bash
 # map wp $powershell
 map wr $~/scripts/croshell
 # map wm $cmd
-map i !~/code/machineconfig/src/machineconfig/settings/lf/linux/exe/previewer.sh $f
+map i !~/.config/machineconfig/settings/lf/linux/exe/previewer.sh $f
 map I !cat $f | gum pager
 map R $~/scripts/croshell -r $f
 map O $~/scripts/croshell -rj $f
@@ -116,10 +115,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

@@ -24,8 +24,6 @@ set ifs "\n"
 # see this: https://github.com/ahrm/dotfiles/tree/main/lf-windows/lf_scripts
 # https://github.com/NikitaIvanovV/ctpv
 
-# set previewer ~/code/machineconfig/src/machineconfig/settings/lf/leftpane_previewer.ps1
-# set previewer ~\AppData\Local\Microsoft\WindowsApps\bat.exe  --color=always --theme=base16
 # also see pistol file previewer.
 # set shell pwsh  # too slow.
 # set ignorecase true
@@ -75,7 +73,7 @@ map ww $powershell
 map wp $pwsh
 map wc $~/scripts/croshell.ps1
 map wm $cmd
-map i $~/code/machineconfig/src/machineconfig/settings/lf/windows/previewer.ps1 $env:f
+map i $~/.config/machineconfig/settings/lf/windows/previewer.ps1 $env:f
 map R $powershell $env:USERPROFILE/scripts/croshell.ps1 -r $env:f
 
 # o file/folder Operations
@@ -103,31 +101,15 @@ 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 ja cd $env:LOCALAPPDATA
 map jA cd $env:APPDATA
-map jj $pwsh -File $env:USERPROFILE/.local/bin/lvim.ps1 -- $env:USERPROFILE/code/machineconfig/src/machineconfig/settings/lf/windows/lfrc
+map jj $pwsh -File $env:USERPROFILE/.local/bin/lvim.ps1 -- $HOME/.config/machineconfig/settings/lf/windows/lfrc
 
 
 
 # m make
 map m
-map md $~/code/machineconfig/src/machineconfig/settings/lf/windows/mkdir.ps1
-map mf $~/code/machineconfig/src/machineconfig/settings/lf/windows/mkfile.ps1
-
-# =================== JUNK ======================
-# Find and Jump
-#cmd fzfg $~/scripts/fzfg.ps1 $args[0]
-map J push :$~/scripts/fzfg<space>
-map F $~/code/machineconfig/src/machineconfig/settings/lf/windows/fzf_edit.ps1
-map S cd $~/code/machineconfig/src/machineconfig/settings/lf/windows/tst.ps1
-map T $~/code/machineconfig/src/machineconfig/settings/lf/windows/cd_tere.ps1
-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
+map md $~/.config/machineconfig/settings/lf/windows/mkdir.ps1
+map mf $~/.config/machineconfig/settings/lf/windows/mkfile.ps1
 

machineconfig/settings/lvim/windows/archive/config_additional.lua

@@ -31,9 +31,3 @@ require('dap').configurations.python = { {
 
 
 local dap = require('dap')
-dap.adapters.python = {
-  type = 'executable';
-  command = "C:/Users/alex/code/machineconfig/.venv/Scripts/python.exe";
-  args = {"-i" };
-}
-

machineconfig/settings/pistol/pistol.conf

@@ -5,4 +5,4 @@ inode/directory lsd -la  %pistol-filename%
 
 fpath /var/src/my-bash-project/bin/[^/]+$ bat --map-syntax :bash --paging=never --color=always %pistol-filename%
 
-image/.* /home/alex/code/machineconfig/src/machineconfig/settings/lf/linux/exe/previewer.sh %pistol-filename% %pistol-extra0% %pistol-extra1% %pistol-extra2% %pistol-extra3%
+image/.* /home/alex/.config/machineconfig/settings/lf/linux/exe/previewer.sh %pistol-filename% %pistol-extra0% %pistol-extra1% %pistol-extra2% %pistol-extra3%

machineconfig/settings/shells/bash/init.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 # 🛠️ Bash Shell Configuration and Initialization
 
-
-# export PATH="~/.local/bin:~/code/machineconfig/src/machineconfig/scripts/linux:~/dotfiles/scripts/linux:~/.nix-profile/bin:/usr/games:$PATH"
-
 add_to_path_if_not_already() {
     for dir in "$@"; do
         if [[ ! $PATH =~ (^|:)"${dir}"(:|$) ]]; then
@@ -11,12 +8,13 @@ add_to_path_if_not_already() {
         fi
     done
 }
+CONFIG_ROOT="$HOME/.config/machineconfig"
 
 # 📂 Add directories to PATH
 add_to_path_if_not_already \
     "$HOME/.local/bin" \
     "$HOME/.cargo/bin" \
-    "$HOME/code/machineconfig/src/machineconfig/scripts/linux" \
+    "$CONFIG_ROOT/scripts/linux" \
     "$HOME/dotfiles/scripts/linux" \
     "$HOME/.nix-profile/bin" \
     "/home/linuxbrew/.linuxbrew/bin" \
@@ -26,10 +24,13 @@ add_to_path_if_not_already \
 
 
 # echo "Sourcing scripts ..."
-machineconfig_path=$HOME/code/machineconfig/src/machineconfig
-. $machineconfig_path/settings/broot/br.sh
-. $machineconfig_path/settings/lf/linux/exe/lfcd.sh
-. $machineconfig_path/settings/tere/terecd.sh
+. $CONFIG_ROOT/settings/broot/br.sh
+. $CONFIG_ROOT/settings/lf/linux/exe/lfcd.sh
+. $CONFIG_ROOT/settings/tere/terecd.sh
+
+if [ -d $CONFIG_ROOT ]; then
+    source $CONFIG_ROOT/settings/shells/bash/commands.sh
+fi
 
 # set alias l to lsd -la
 alias l='lsd -la'

machineconfig/settings/shells/pwsh/init.ps1

@@ -1,5 +1,7 @@
 
 
+$MAC_ROOT = "$HOME\code\machineconfig"
+
 function Add-ToPathIfNotAlready {
     param (
         [Parameter(Mandatory=$true)]
@@ -14,7 +16,7 @@ function Add-ToPathIfNotAlready {
 }
 
 Add-ToPathIfNotAlready -Directories @(
-    "$HOME\code\machineconfig\src\machineconfig\scripts\windows",
+    "$MAC_ROOT\src\machineconfig\scripts\windows",
     "$HOME\dotfiles\scripts\windows",
     "C:\Program Files (x86)\GnuWin32\bin",
     "C:\Program Files\CodeBlocks\MinGW\bin",
@@ -27,9 +29,13 @@ Add-ToPathIfNotAlready -Directories @(
 
 
 # sources  ================================================================
-. $HOME/code/machineconfig/src/machineconfig/settings/broot/brootcd.ps1
-. $HOME/code/machineconfig/src/machineconfig/settings/lf/windows/lfcd.ps1
-. $HOME/code/machineconfig/src/machineconfig/settings/tere/terecd.ps1
+. $MAC_ROOT\src\machineconfig\settings\broot\brootcd.ps1
+. $MAC_ROOT\src\machineconfig\settings\lf\windows\lfcd.ps1
+. $MAC_ROOT\src\machineconfig\settings\tere\terecd.ps1
+
+if (Test-Path "$MAC_ROOT" -PathType Container) {
+    . "$MAC_ROOT\src\machineconfig\settings\shells\pwsh\commands.ps1"
+}
 
 function lsdla { lsd -la }
 Set-Alias -Name l -Value lsdla -Option AllScope

machineconfig/settings/svim/linux/init.toml

@@ -35,10 +35,6 @@ name = 'shell'
 default_position = 'top'
 default_height = 30
 
-[[layers]]
-  name = "lang#python"
-  python_interpreter = 'C:/Users/alex/code/machineconfig/.venv/Scripts/python.exe'
-
 [[layers]]
   name = "colorscheme"
 

machineconfig/settings/svim/windows/init.toml

@@ -35,9 +35,6 @@ name = 'shell'
 default_position = 'top'
 default_height = 30
 
-[[layers]]
-  name = "lang#python"
-  python_interpreter = '~/code/machineconfig/.venv/Scripts/python.exe'
 
 [[layers]]
   name = "colorscheme"

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -3,4 +3,26 @@
 devops() {
     "$HOME/.local/bin/uv" run --python 3.13 --with machineconfig devops "$@"
 }
+agents() {
+    "$HOME/.local/bin/uv" run --python 3.13 --with machineconfig agents "$@"
+}
+cloud() {
+    "$HOME/.local/bin/uv" run --python 3.13 --with machineconfig cloud "$@"
+}
+croshell() {
+    "$HOME/.local/bin/uv" run --python 3.13 --with machineconfig croshell "$@"
+}
+fire() {
+    "$HOME/.local/bin/uv" run --python 3.13 --with machineconfig fire "$@"
+}
+ftpx() {
+    "$HOME/.local/bin/uv" run --python 3.13 --with machineconfig ftpx "$@"
+}
+kill_process() {
+    "$HOME/.local/bin/uv" run --python 3.13 --with machineconfig kill_process "$@"
+}
+sessions() {
+    "$HOME/.local/bin/uv" run --python 3.13 --with machineconfig sessions "$@"
+}
+
 echo "devops command is now defined in this shell session."

machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -4,4 +4,37 @@ iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/s
 function devops {
     & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig devops $args
 }
-echo "devops command is now defined in this shell session."
+
+function cloud {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig cloud $args
+}
+
+function croshell {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig croshell $args
+}
+
+function agents {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig agents $args
+}
+
+function fire {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig fire $args
+}
+
+function ftpx {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig ftpx $args
+}
+
+function sessions {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig sessions $args
+}
+
+function kill_process {
+    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig kill_process $args
+}
+
+
+# DONT use this line in combination with activated virtual enviroment.
+# $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+# uv run --python 3.13 --no-dev --with machineconfig start_slidev $args
+# uv run --python 3.13 --no-dev --with machineconfig pomodoro $args

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/utils/source_of_truth.py

@@ -6,14 +6,12 @@ import machineconfig
 from pathlib import Path
 
 EXCLUDE_DIRS = [".links", ".ai", ".venv", ".git", ".idea", ".vscode", "node_modules", "__pycache__", ".mypy_cache"]
-
 LIBRARY_ROOT = Path(machineconfig.__file__).resolve().parent
-REPO_ROOT = LIBRARY_ROOT.parent.parent
 
-CONFIG_PATH = Path.home().joinpath(".config/machineconfig")
+CONFIG_ROOT = Path.home().joinpath(".config/machineconfig")
 DEFAULTS_PATH = Path.home().joinpath("dotfiles/machineconfig/defaults.ini")
 
-INSTALL_VERSION_ROOT = CONFIG_PATH.joinpath("cli_tools_installers/versions")
+INSTALL_VERSION_ROOT = CONFIG_ROOT.joinpath("cli_tools_installers/versions")
 INSTALL_TMP_DIR = Path.home().joinpath("tmp_results", "tmp_installers")
 
 # LINUX_INSTALL_PATH = '/usr/local/bin'

machineconfig/utils/ssh.py

@@ -219,7 +219,7 @@ class SSH:  # inferior alternative: https://github.com/fabric/fabric
         assert '"' not in cmd, 'Avoid using `"` in your command. I dont know how to handle this when passing is as command to python in pwsh command.'
         if not return_obj:
             return self.run(
-                cmd=f"""$HOME/.local/bin/uv run --no-dev --project $HOME/code/machineconfig python -c "{cmd}\n""" + '"',
+                cmd=f"""$HOME/.local/bin/devops self run-python -c "{cmd}\n""" + '"',
                 desc=desc or f"run_py on {self.get_remote_repr()}",
                 verbose=verbose,
                 strict_err=strict_err,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.37
+Version: 5.39
 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,9 @@ 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
+Requires-Dist: euporie>=2.8.14
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: plot
@@ -86,5 +86,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)