machineconfig 1.96__py3-none-any.whl → 2.0__py3-none-any.whl

machineconfig/jobs/python_windows_installers/dev/config.json

@@ -1,3 +1,3 @@
 {
-    
+
 }

machineconfig/logger.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+import logging
+import os
+import sys
+from typing import Optional
+
+
+def _configure_root_logger() -> logging.Logger:
+    """Create and configure the root logger for the machineconfig package.
+
+    The logger writes to stdout, honors MC_LOG_LEVEL env var, and avoids
+    duplicate handlers on repeated imports.
+    """
+    root = logging.getLogger("machineconfig")
+    if root.handlers:
+        return root
+
+    level_name = os.getenv("MC_LOG_LEVEL", "INFO").upper()
+    level = getattr(logging, level_name, logging.INFO)
+    root.setLevel(level)
+
+    handler = logging.StreamHandler(stream=sys.stdout)
+    fmt = "%(asctime)s | %(levelname)s | %(name)s | %(message)s"
+    datefmt = "%H:%M:%S"
+    handler.setFormatter(logging.Formatter(fmt=fmt, datefmt=datefmt))
+    root.addHandler(handler)
+    root.propagate = False
+    return root
+
+
+_ROOT_LOGGER = _configure_root_logger()
+
+
+def get_logger(name: Optional[str] = None) -> logging.Logger:
+    """Return a child logger of the package root.
+
+    Inputs:
+    - name: Optional dotted logger name; when None, returns the package root.
+
+    Returns:
+    - logging.Logger configured under the 'machineconfig' hierarchy.
+    """
+    if name is None:
+        return _ROOT_LOGGER
+    return _ROOT_LOGGER.getChild(name)
+
+
+# Convenience alias for simple imports: `from machineconfig.logger import logger`
+logger: logging.Logger = get_logger()

machineconfig/profile/create.py

@@ -5,12 +5,14 @@ This script Takes away all config files from the computer, place them in one dir
 """
 
 
-from crocodile.meta import Terminal
 from machineconfig.utils.path_reduced import P as PathExtended
 from machineconfig.utils.utils import symlink_func, symlink_copy, LIBRARY_ROOT, REPO_ROOT, display_options
+from machineconfig.utils.utils2 import read_toml
 from machineconfig.profile.shell import create_default_shell_profile
 # import os
 import platform
+import os
+import ctypes
 import subprocess
 from rich.console import Console
 from typing import Optional, Any, TypedDict
@@ -29,10 +31,7 @@ class SymlinkMapper(TypedDict):
 
 
 def main_symlinks(choice: Optional[str] = None):
-    symlink_mapper = LIBRARY_ROOT.joinpath("profile/mapper.toml").readit()
-    # symlink_mapper['wsl_windows']['home']["to_this"] = symlink_mapper['wsl_windows']['home']["to_this"].replace("username", UserName)
-    # symlink_mapper['wsl_linux']['home']["to_this"] = symlink_mapper['wsl_linux']['home']["to_this"].replace("username", UserName)
-
+    symlink_mapper: dict[str, dict[str, SymlinkMapper]] = read_toml(LIBRARY_ROOT.joinpath("profile/mapper.toml"))
     overwrite = True
     exclude: list[str] = []  # "wsl_linux", "wsl_windows"
 
@@ -55,16 +54,24 @@ def main_symlinks(choice: Optional[str] = None):
     else: choice_selected = choice
 
     if isinstance(choice_selected, str):
-        if str(choice_selected) == "all" and system == "Windows" and not Terminal.is_user_admin():
-            print(f"""
+        if str(choice_selected) == "all" and system == "Windows":
+            if os.name == 'nt':
+                try:
+                    is_admin = ctypes.windll.shell32.IsUserAnAdmin()
+                except Exception:
+                    is_admin = False
+            else:
+                is_admin = False
+            if not is_admin:
+                print(f"""
 {'*' * 80}
 ⚠️  WARNING: Administrator privileges required
 {'*' * 80}
 """)
-            raise RuntimeError("Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
+                raise RuntimeError("Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
         elif choice_selected == "all":
             print(f"""
-🔍 Processing all program keys: 
+🔍 Processing all program keys:
 {program_keys}
 """)
             pass  # i.e. program_keys = program_keys
@@ -80,17 +87,17 @@ def main_symlinks(choice: Optional[str] = None):
                 try:
                     for a_target in to_this.expanduser().search("*"):
                         symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=overwrite)
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
             if "copy" in file_map:
                 try:
                     symlink_copy(this=this, to_this=to_this, prioritize_to_this=overwrite)
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | {ex}")
             else:
-                try: 
+                try:
                     symlink_func(this=this, to_this=to_this, prioritize_to_this=overwrite)
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
 
             if program_key == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
@@ -106,9 +113,9 @@ def main_symlinks(choice: Optional[str] = None):
 
     if system == "Linux":
         print("\n📜 Setting executable permissions for scripts...")
-        Terminal().run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R')
+        subprocess.run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R', shell=True, capture_output=True, text=True)
         print("✅ Script permissions updated")
-        
+
     if len(ERROR_LIST) > 0:
         print(f"""
 {'*' * 80}
@@ -134,7 +141,7 @@ def main(choice: Optional[str] = None):
     print("\n")
     console.rule("[bold green]🐚 CREATING SHELL PROFILE 🐚")
     create_default_shell_profile()
-    
+
     print(f"""
 {'=' * 80}
 ✨ Configuration setup complete! ✨

machineconfig/profile/create_hardlinks.py

@@ -6,9 +6,9 @@ This script Takes away all config files from the computer, place them in one dir
 
 
 import platform
-from crocodile.meta import Terminal
 from machineconfig.utils.path_reduced import P as PathExtended
 from machineconfig.utils.utils import symlink_copy as symlink_func, LIBRARY_ROOT, REPO_ROOT, display_options
+from machineconfig.utils.utils2 import read_toml
 from machineconfig.profile.shell import create_default_shell_profile
 # import os
 import subprocess
@@ -23,7 +23,7 @@ SYSTEM = system.lower()
 
 
 def main_symlinks(choice: Optional[str] = None):
-    symlink_mapper = LIBRARY_ROOT.joinpath("profile/mapper.toml").readit()
+    symlink_mapper = read_toml(LIBRARY_ROOT.joinpath("profile/mapper.toml"))
     # symlink_mapper['wsl_windows']['home']["to_this"] = symlink_mapper['wsl_windows']['home']["to_this"].replace("username", UserName)
     # symlink_mapper['wsl_linux']['home']["to_this"] = symlink_mapper['wsl_linux']['home']["to_this"].replace("username", UserName)
 
@@ -53,7 +53,7 @@ def main_symlinks(choice: Optional[str] = None):
     if isinstance(choice_selected, str):
         if choice_selected == "all":
             print(f"""
-🔍 Processing all program keys: 
+🔍 Processing all program keys:
 {program_keys}
 """)
             pass  # i.e. program_keys = program_keys
@@ -69,13 +69,13 @@ def main_symlinks(choice: Optional[str] = None):
                 try:
                     for a_target in to_this.expanduser().search("*"):
                         symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=overwrite)
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
             else:
-                try: 
+                try:
                     symlink_func(this=this, to_this=to_this, prioritize_to_this=overwrite)
                     print(f"  ✅ Created hardlink from {this} to {to_this}")
-                except Exception as ex: 
+                except Exception as ex:
                     print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
 
             if program_key == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
@@ -91,7 +91,7 @@ def main_symlinks(choice: Optional[str] = None):
 
     if system == "Linux":
         print("\n📜 Setting executable permissions for scripts...")
-        Terminal().run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R')
+        subprocess.run(f'chmod +x {LIBRARY_ROOT.joinpath(f"scripts/{system.lower()}")} -R', shell=True, capture_output=True, text=True)
         print("✅ Script permissions updated")
 
     if len(ERROR_LIST) > 0:
@@ -119,7 +119,7 @@ def main(choice: Optional[str] = None):
     print("\n")
     console.rule("[bold green]🐚 CREATING SHELL PROFILE 🐚")
     create_default_shell_profile()
-    
+
     print(f"""
 {'=' * 80}
 ✨ Configuration setup complete! ✨

machineconfig/profile/shell.py

@@ -3,7 +3,7 @@
 
 from machineconfig.utils.utils2 import randstr
 from machineconfig.utils.path_reduced import P as PathExtended, modify_text
-from crocodile.meta import Terminal
+from machineconfig.utils.terminal import Terminal
 from machineconfig.utils.utils import LIBRARY_ROOT, REPO_ROOT, display_options
 import platform
 import os
@@ -24,13 +24,13 @@ BOX_WIDTH = 100  # Define BOX_WIDTH or get it from a config
 # for windows it won't change the profile, if the profile was modified already e.g. due to syncing
 
 
-def create_default_shell_profile():
+def create_default_shell_profile() -> None:
     profile_path = get_shell_profile_path()
-    profile = profile_path.read_text()
-    if system == "Windows": source = f". {str(LIBRARY_ROOT.joinpath('settings/shells/pwsh/init.ps1').collapseuser()).replace('~', '$HOME')}"
-    else: source = f"source {str(LIBRARY_ROOT.joinpath('settings/shells/bash/init.sh').collapseuser()).replace('~', '$HOME')}"
+    profile = profile_path.read_text(encoding="utf-8")
+    if system == "Windows": source = f""". {str(LIBRARY_ROOT.joinpath('settings/shells/pwsh/init.ps1').collapseuser()).replace('~', '$HOME')}"""
+    else: source = f"""source {str(LIBRARY_ROOT.joinpath('settings/shells/bash/init.sh').collapseuser()).replace('~', '$HOME')}"""
 
-    if source in profile: 
+    if source in profile:
         console.print(Panel("🔄 PROFILE | Skipping init script sourcing - already present in profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
     else:
         console.print(Panel("📝 PROFILE | Adding init script sourcing to profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
@@ -38,28 +38,28 @@ def create_default_shell_profile():
         if system == "Linux":
             res = Terminal().run("cat /proc/version").op
             if "microsoft" in res.lower() or "wsl" in res.lower():
-                profile += "\ncd ~"  # this is to make sure that the current dir is not in the windows file system, which is terribly slow and its a bad idea to be there anyway.
+                profile += "\ncd ~"
                 console.print("📌 WSL detected - adding 'cd ~' to profile to avoid Windows filesystem")
         profile_path.parent.mkdir(parents=True, exist_ok=True)
-        profile_path.write_text(profile)
+        profile_path.write_text(profile, encoding="utf-8")
         console.print(Panel("✅ Profile updated successfully", title="[bold blue]Profile[/bold blue]", border_style="blue"))
 
 
-def get_shell_profile_path():
+def get_shell_profile_path() -> PathExtended:
     if system == "Windows":
         obj = Terminal().run("$PROFILE", shell="pwsh")
         res = obj.op2path()
         if isinstance(res, PathExtended): profile_path = res
         else:
             obj.print(capture=False)
-            raise ValueError(f"Could not get profile path for Windows. Got {res}")
+            raise ValueError(f"""Could not get profile path for Windows. Got {res}""")
     elif system == "Linux": profile_path = PathExtended("~/.bashrc").expanduser()
-    else: raise ValueError(f"Not implemented for this system {system}")
-    console.print(Panel(f"🐚 SHELL PROFILE | Working with path: `{profile_path}`", title="[bold blue]Shell Profile[/bold blue]", border_style="blue"))
+    else: raise ValueError(f"""Not implemented for this system {system}""")
+    console.print(Panel(f"""🐚 SHELL PROFILE | Working with path: `{profile_path}`""", title="[bold blue]Shell Profile[/bold blue]", border_style="blue"))
     return profile_path
 
 
-def append_temporarily(dirs: list[str], kind: Literal['append', 'prefix', 'replace'] = "append"):
+def append_temporarily(dirs: list[str], kind: Literal['append', 'prefix', 'replace']) -> str:
     dirs_ = []
     for path in dirs:
         path_rel = PathExtended(path).collapseuser(strict=False)
@@ -81,8 +81,10 @@ def append_temporarily(dirs: list[str], kind: Literal['append', 'prefix', 'repla
     else: raise ValueError
     return result
 
-def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = None):
-    env_path = LIBRARY_ROOT.joinpath("profile/env_path.toml").readit()
+def main_env_path(choice: Optional[str], profile_path: Optional[str]) -> None:
+    from machineconfig.utils.utils2 import read_toml
+    env_path = read_toml(LIBRARY_ROOT.joinpath("profile/env_path.toml"))
+    # env_path = LIBRARY_ROOT.joinpath("profile/env_path.toml").readit()
     dirs = env_path[f'path_{system.lower()}']['extension']
 
     console.print(Panel("🔍 ENVIRONMENT | Current PATH variables:", title="[bold blue]Environment[/bold blue]", border_style="blue"))
@@ -95,19 +97,21 @@ def main_env_path(choice: Optional[str] = None, profile_path: Optional[str] = No
     if choice == "none(EXIT)": return
 
     console.print(f"\n📌 Adding directories to PATH: {dirs}")
-    addition = append_temporarily(dirs=dirs)
+    addition = append_temporarily(dirs=dirs, kind="append")
     profile_path_obj = PathExtended(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
     profile_path_obj.copy(name=profile_path_obj.name + ".orig_" + randstr())
     console.print(f"💾 Created backup of profile: {profile_path_obj.name}.orig_*")
     # Inline deprecated P.modify_text: if file missing, seed with search text before modification
-    current = profile_path_obj.read_text() if profile_path_obj.exists() else addition
+    current = profile_path_obj.read_text(encoding="utf-8") if profile_path_obj.exists() else addition
     updated = modify_text(current, addition, addition, replace_line=False, notfound_append=True)
-    profile_path_obj.write_text(updated)
+    profile_path_obj.write_text(updated, encoding="utf-8")
     console.print(Panel("✅ PATH variables added to profile successfully", title="[bold blue]Environment[/bold blue]", border_style="blue"))
 
 
-def main_add_sources_to_shell_profile(profile_path: Optional[str] = None, choice: Optional[str] = None):
-    sources: list[str] = LIBRARY_ROOT.joinpath("profile/sources.toml").readit()[system.lower()]['files']
+def main_add_sources_to_shell_profile(profile_path: Optional[str], choice: Optional[str]) -> None:
+    # sources: list[str] = LIBRARY_ROOT.joinpath("profile/sources.toml").readit()[system.lower()]['files']
+    from machineconfig.utils.utils2 import read_toml
+    sources: list[str] = read_toml(LIBRARY_ROOT.joinpath("profile/sources.toml"))[system.lower()]['files']
 
     console.print(Panel("🔄 Adding sources to shell profile", title="[bold blue]Sources[/bold blue]", border_style="blue"))
 
@@ -124,52 +128,52 @@ def main_add_sources_to_shell_profile(profile_path: Optional[str] = None, choice
     if isinstance(profile_path, str):
         profile_path_obj = PathExtended(profile_path)
     else: profile_path_obj = get_shell_profile_path()
-    profile = profile_path_obj.read_text()
+    profile = profile_path_obj.read_text(encoding="utf-8")
 
     for a_file in sources:
         tmp = a_file.replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix())
         file = PathExtended(tmp).collapseuser()  # this makes the shell profile interuseable across machines.
         file = file.as_posix() if system == "Linux" else str(file)
         if file not in profile:
-            if system == "Windows": 
+            if system == "Windows":
                 profile += f"\n. {file}"
                 console.print(f"➕ Added PowerShell source: {file}")
-            elif system == "Linux": 
+            elif system == "Linux":
                 profile += f"\nsource {file}"
                 console.print(f"➕ Added Bash source: {file}")
             else: raise ValueError(f"Not implemented for this system {system}")
-        else: 
+        else:
             console.print(f"⏭️  Source already present: {file}")
-    
-    profile_path_obj.write_text(profile)
+
+    profile_path_obj.write_text(profile, encoding="utf-8")
     console.print(Panel("✅ Shell profile updated with sources", title="[bold blue]Sources[/bold blue]", border_style="blue"))
 
 
-def main_add_patches_to_shell_profile(profile_path: Optional[str] = None, choice: Optional[str] = None):
-    patches: list[str] = list(LIBRARY_ROOT.joinpath(f"profile/patches/{system.lower()}").search().apply(lambda x: x.as_posix()))
-    
+def main_add_patches_to_shell_profile(profile_path: Optional[str], choice: Optional[str]) -> None:
+    patches: list[str] = [item.as_posix() for item in LIBRARY_ROOT.joinpath(f"profile/patches/{system.lower()}").search()]
+
     console.print(Panel("🩹 Adding patches to shell profile", title="[bold blue]Patches[/bold blue]", border_style="blue"))
-    
+
     if choice is None:
         choice_chosen = display_options(msg="Which patch to add?", options=list(patches) + ["all", "none(EXIT)"], default="none(EXIT)", multi=False)
         assert isinstance(choice_chosen, str), f"Choice must be a string or a list of strings, not {type(choice)}"
         choice = choice_chosen
     if choice == "none(EXIT)": return None
-    elif str(choice) == "all": 
+    elif str(choice) == "all":
         console.print("📌 Adding all patches to profile")
-    else: 
+    else:
         patches = [choice]
         console.print(f"📌 Adding selected patch: {choice}")
 
     profile_path_obj = PathExtended(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
-    profile = profile_path_obj.read_text()
+    profile = profile_path_obj.read_text(encoding="utf-8")
 
     for patch_path in patches:
         patch_path_obj = PathExtended(patch_path)
-        patch = patch_path_obj.read_text()
-        if patch in profile: 
+        patch = patch_path_obj.read_text(encoding="utf-8")
+        if patch in profile:
             console.print(f"⏭️  Patch already present: {patch_path_obj.name}")
-        else: 
+        else:
             profile += "\n" + patch
             console.print(f"➕ Added patch: {patch_path_obj.name}")
 
@@ -179,7 +183,7 @@ def main_add_patches_to_shell_profile(profile_path: Optional[str] = None, choice
             profile += "\ncd ~"  # this is to make sure that the current dir is not in the windows file system, which is terribly slow and its a bad idea to be there anyway.
             console.print("📌 WSL detected - adding 'cd ~' to profile to avoid Windows filesystem")
 
-    profile_path_obj.write_text(profile)
+    profile_path_obj.write_text(profile, encoding="utf-8")
     console.print(Panel("✅ Shell profile updated with patches", title="[bold blue]Patches[/bold blue]", border_style="blue"))
 
 

machineconfig/scripts/linux/devops

@@ -4,14 +4,14 @@
 # if [ -z "$VIRTUAL_ENV" ]; then
 #   source ~/scripts/activate_ve ''
 # fi
-source ~/scripts/activate_ve ve  # this script only works under ve default ve.
+# source ~/scripts/activate_ve ve  # this script only works under ve default ve.
 
 op_script=$HOME/tmp_results/shells/python_return_command.sh
 if [ -f "$op_script" ]; then
   rm $op_script
 fi
 
-python -m machineconfig.scripts.python.devops "$@"
+uv run --no-dev --project ~/code/machineconfig python -m machineconfig.scripts.python.devops "$@"
 if [ -f "$op_script" ]; then
   chmod +x $op_script
   source $op_script

machineconfig/scripts/linux/fire

@@ -14,6 +14,7 @@ fi
 
 python -m machineconfig.scripts.python.fire_jobs "$@"
 
+
 if [ -f "$op_script" ]; then
   echo "Running $op_script"
   chmod +x $op_script

machineconfig/scripts/linux/fire_agents

@@ -11,7 +11,6 @@ if [ -f "$op_script" ]; then
   rm $op_script
 fi
 
-
 python -m machineconfig.scripts.python.fire_agents "$@"
 
 if [ -f "$op_script" ]; then

machineconfig/scripts/linux/mcinit

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+. $HOME/scripts/activate_ve 've'
+
+# Generate random string of length 5
+random_str=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 10 | head -n 1)
+export op_script=$HOME/tmp_results/shells/$random_str/python_return_command.sh
+# op_script=$HOME/tmp_results/shells/$random_str/python_return_command.sh
+
+if [ -f "$op_script" ]; then
+  rm $op_script
+fi
+
+
+python -m machineconfig.scripts.python.ai.mcinit "$@"
+
+if [ -f "$op_script" ]; then
+  echo "Running $op_script"
+  chmod +x $op_script
+  set --  # clear all positional parameters
+  source $op_script  # sourcing the script means the args passed to the this script are passed to the sourced script which cofuses the sources script as it contains activate_ve and it doesn't understand first.sh arguments.
+fi
+
+
+if [ -n "$VIRTUAL_ENV" ]; then
+  deactivate || true
+fi