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

machineconfig/setup_windows/wt_and_pwsh/set_pwsh_theme.py

@@ -4,11 +4,11 @@ https://glitchbone.github.io/vscode-base16-term/#/3024
 
 """
 
-
-from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.utils import LIBRARY_ROOT
 from machineconfig.utils.installer_utils.installer_class import Installer
 import subprocess
+from typing import Iterable
 
 
 nerd_fonts = {
@@ -17,13 +17,61 @@ nerd_fonts = {
     "filename_template_windows_amd_64": "CascadiaCode.zip",
     "filename_template_linux_amd_64": "CascadiaCode.zip",
     "strip_v": False,
-    "exe_name": "nerd_fonts"
+    "exe_name": "nerd_fonts",
 }
 
 
-def install_nerd_fonts():
-    print(f"\n{'='*80}\n📦 INSTALLING NERD FONTS 📦\n{'='*80}")
-    # Step 1: download the required fonts that has all the glyphs and install them.
+# Patterns to match any installed variant (NF, Nerd Font, Mono, Propo, style weights) of Cascadia/Caskaydia
+# We'll compile them at runtime for flexibility. Keep them simple to avoid false positives.
+REQUIRED_FONT_PATTERNS: tuple[str, ...] = (
+    r"caskaydiacove.*(nf|nerd ?font)",
+    r"cascadiacode.*(nf|nerd ?font)",
+)
+
+
+def _list_installed_fonts() -> list[str]:
+    """Return list of installed font file base names (without extension) on Windows.
+
+    Uses PowerShell to enumerate c:\\windows\\fonts because Python on *nix host can't rely on that path.
+    If PowerShell call fails (e.g. running on non-Windows), returns empty list so install proceeds.
+    """
+    try:
+        # Query only base names to make substring matching simpler; remove underscores like the PS script does.
+        cmd = [
+            "powershell.exe",
+            "-NoLogo",
+            "-NonInteractive",
+            "-Command",
+            "Get-ChildItem -Path C:/Windows/Fonts -File | Select-Object -ExpandProperty BaseName"
+        ]
+        res = subprocess.run(cmd, capture_output=True, text=True, check=True)  # noqa: S603 S607 (trusted command)
+        fonts = [x.strip().replace("_", "") for x in res.stdout.splitlines() if x.strip() != ""]
+        return fonts
+    except Exception as exc:  # noqa: BLE001
+        print(f"⚠️ Could not enumerate installed fonts (continuing with install). Reason: {exc}")
+        return []
+
+
+def _missing_required_fonts(installed_fonts: Iterable[str]) -> list[str]:
+    import re
+
+    installed_norm = [f.lower().replace(" ", "") for f in installed_fonts]
+    missing: list[str] = []
+    for pattern in REQUIRED_FONT_PATTERNS:
+        regex = re.compile(pattern)
+        if not any(regex.search(f) for f in installed_norm):
+            missing.append(pattern)
+    return missing
+
+
+def install_nerd_fonts() -> None:
+    print(f"\n{'=' * 80}\n📦 INSTALLING NERD FONTS 📦\n{'=' * 80}")
+    installed = _list_installed_fonts()
+    missing = _missing_required_fonts(installed)
+    if len(missing) == 0:
+        print("✅ Required Nerd Fonts already installed. Skipping download & install.")
+        return
+    print(f"🔍 Missing fonts detected: {', '.join(missing)}. Proceeding with installation...")
     print("🔍 Downloading Nerd Fonts package...")
     folder, _version_to_be_installed = Installer.from_dict(d=nerd_fonts, name="nerd_fonts").download(version=None)
 
@@ -35,20 +83,26 @@ def install_nerd_fonts():
     print("⚙️  Installing fonts via PowerShell...")
     file = PathExtended.tmpfile(suffix=".ps1")
     file.parent.mkdir(parents=True, exist_ok=True)
-    content = LIBRARY_ROOT.joinpath("setup_windows/wt_and_pwsh/install_fonts.ps1").read_text(encoding="utf-8").replace(r".\fonts-to-be-installed", str(folder))
+    raw_content = LIBRARY_ROOT.joinpath("setup_windows/wt_and_pwsh/install_fonts.ps1").read_text(encoding="utf-8").replace(r".\fonts-to-be-installed", str(folder))
+    # PowerShell 5.1 can choke on certain unicode chars in some locales; keep ASCII only.
+    content = "".join(ch for ch in raw_content if ord(ch) < 128)
     file.write_text(content, encoding="utf-8")
-    subprocess.run(rf"powershell.exe -executionpolicy Bypass -nologo -noninteractive -File {str(file)}", check=True)
+    try:
+        subprocess.run(rf"powershell.exe -executionpolicy Bypass -nologo -noninteractive -File {str(file)}", check=True)
+    except subprocess.CalledProcessError as cpe:
+        print(f"💥 Font installation script failed (continuing without abort): {cpe}")
+        return
 
     print("🗑️  Cleaning up temporary files...")
     folder.delete(sure=True)
-    print(f"\n✅ Nerd Fonts installation complete! ✅\n{'='*80}")
+    print(f"\n✅ Nerd Fonts installation complete! ✅\n{'=' * 80}")
 
 
 def main():
-    print(f"\n{'='*80}\n🎨 POWERSHELL THEME SETUP 🎨\n{'='*80}")
+    print(f"\n{'=' * 80}\n🎨 POWERSHELL THEME SETUP 🎨\n{'=' * 80}")
     install_nerd_fonts()
-    print(f"\n✅ All PowerShell theme components installed successfully! ✅\n{'='*80}")
+    print(f"\n✅ All PowerShell theme components installed successfully! ✅\n{'=' * 80}")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass

machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py

@@ -1,8 +1,7 @@
-"""Set Windows Terminal Settings
-"""
+"""Set Windows Terminal Settings"""
 
 from machineconfig.utils.utils2 import randstr, read_json
-from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.io_save import save_json
 import platform
 from machineconfig.utils.utils import LIBRARY_ROOT
@@ -26,13 +25,13 @@ All settings are available on GitHub: https://aka.ms/terminal-profiles-schema
 console = Console()
 system = platform.system()  # Linux or Windows
 
-assert system == 'Windows', 'This script is only for Windows.'
+assert system == "Windows", "This script is only for Windows."
 
 
 class TerminalSettings(object):
     def __init__(self):
         # Grabbing Terminal Settings file:
-        print(f"\n{'='*80}\n🔍 INITIALIZING TERMINAL SETTINGS 🔍\n{'='*80}")
+        print(f"\n{'=' * 80}\n🔍 INITIALIZING TERMINAL SETTINGS 🔍\n{'=' * 80}")
         tmp = os.getenv("LOCALAPPDATA")
         if not isinstance(tmp, str):
             print("❌ ERROR: Could not find LOCALAPPDATA environment variable!")
@@ -69,15 +68,16 @@ class TerminalSettings(object):
 
     # 1- Customizing Powershell========================================================
     # as opposed to Windows Powershell
-    def customize_powershell(self, nerd_font: bool=True):
+    def customize_powershell(self, nerd_font: bool = True):
         print("\n🛠️  Customizing PowerShell profile...")
-        pwsh: dict[str, Any] = dict(name="PowerShell",
-                                    commandline="pwsh",
-                                    hidden=False,
-                                    opacity=87,
-                                    # guid="{" + str(uuid4()) + "}",  # WT doesn't accept any GUID to identify pwsh
-                                    startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
-                                    )
+        pwsh: dict[str, Any] = dict(
+            name="PowerShell",
+            commandline="pwsh",
+            hidden=False,
+            opacity=87,
+            # guid="{" + str(uuid4()) + "}",  # WT doesn't accept any GUID to identify pwsh
+            startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
+        )
         if nerd_font:
             print("🔤 Setting PowerShell font to CaskaydiaCove Nerd Font...")
             pwsh["font"] = dict(face="CaskaydiaCove Nerd Font")  # because oh-my-posh uses glyphs from this font.
@@ -102,12 +102,12 @@ class TerminalSettings(object):
 
     def add_croshell(self):
         print("\n🐊 Adding croshell profile...")
-        croshell = dict(name="croshell",
-                        guid="{" + str(uuid4()) + "}",
-                        # commandline=f"powershell.exe -Command \"{activate} ipython -i -c 'from crocodile.toolbox import *'\"",
-                        commandline=f'powershell.exe -Command "{LIBRARY_ROOT.as_posix()}/scripts/windows/croshell.ps1"',
-                        startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
-                        )
+        croshell = dict(
+            name="croshell",
+            guid="{" + str(uuid4()) + "}",
+            commandline=f'powershell.exe -Command "{LIBRARY_ROOT.as_posix()}/scripts/windows/croshell.ps1"',
+            startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
+        )
         # startingDirectory = None means: inheret from parent process, which will is the default, which point to /System32
         # Launching a new profile with ctr+shift+2 is equivalent to: wt --profile croshell -d . --new-tab
         for profile in self.profs:
@@ -122,12 +122,13 @@ class TerminalSettings(object):
     def add_ubuntu(self):
         print("\n🐧 Adding Ubuntu WSL profile...")
         # Add Ubunto if it is not there.
-        ubuntu = dict(name="Ubuntu",
-                      commandline="wsl -d Ubuntu -- cd ~",
-                      hidden=False,
-                      guid="{" + str(uuid4()) + "}",
-                      startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
-                      )
+        ubuntu = dict(
+            name="Ubuntu",
+            commandline="wsl -d Ubuntu -- cd ~",
+            hidden=False,
+            guid="{" + str(uuid4()) + "}",
+            startingDirectory="%USERPROFILE%",  # "%USERPROFILE%",   # None: inherent from parent process.
+        )
         if not any(x.get("name") == "Ubuntu" for x in self.profs):
             self.profs.append(ubuntu)
             console.print(Panel("✅ Added Ubuntu WSL profile", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
@@ -141,19 +142,26 @@ class TerminalSettings(object):
         pwsh = croshell = ubuntu = wpwsh = cmd = azure = None
         for profile in self.profs:
             name = profile["name"]
-            if name == "PowerShell": pwsh = profile
-            elif name == "croshell": croshell = profile
-            elif name == "Ubuntu": ubuntu = profile
-            elif name == "Windows PowerShell": wpwsh = profile
-            elif name == "Command Prompt": cmd = profile
-            elif name == "Azure Cloud Shell": azure = profile
-            else: others.append(profile)
+            if name == "PowerShell":
+                pwsh = profile
+            elif name == "croshell":
+                croshell = profile
+            elif name == "Ubuntu":
+                ubuntu = profile
+            elif name == "Windows PowerShell":
+                wpwsh = profile
+            elif name == "Command Prompt":
+                cmd = profile
+            elif name == "Azure Cloud Shell":
+                azure = profile
+            else:
+                others.append(profile)
         self.profs = [item for item in [pwsh, croshell, ubuntu, wpwsh, cmd, azure] + others if item is not None]
         console.print(Panel("✅ Profile order standardized", title="[bold blue]Terminal Settings[/bold blue]", border_style="blue"))
 
 
 def main():
-    print(f"\n{'='*80}\n🖥️  WINDOWS TERMINAL SETUP 🖥️\n{'='*80}")
+    print(f"\n{'=' * 80}\n🖥️  WINDOWS TERMINAL SETUP 🖥️\n{'=' * 80}")
     shell = {"powershell": "pwsh.exe", "Windows Powershell": "powershell.exe"}["powershell"].split(".exe", maxsplit=1)[0]
     if shell == "pwsh":
         print("🚀 Starting Windows Terminal configuration with PowerShell...")
@@ -167,15 +175,15 @@ def main():
         ts.standardize_profiles_order()
 
         print("⌨️  Adding keyboard shortcut for pane zoom (ctrl+shift+z)...")
-        ts.dat['actions'].append({'command': 'togglePaneZoom', 'keys': 'ctrl+shift+z'})
+        ts.dat["actions"].append({"command": "togglePaneZoom", "keys": "ctrl+shift+z"})
 
         ts.save_terminal_settings()
-        print(f"\n{'='*80}\n✨ WINDOWS TERMINAL SETUP COMPLETE ✨\n{'='*80}")
+        print(f"\n{'=' * 80}\n✨ WINDOWS TERMINAL SETUP COMPLETE ✨\n{'=' * 80}")
     else:
         error_msg = "❌ ERROR: Only PowerShell is supported, not Windows PowerShell!"
         print(error_msg)
         raise NotImplementedError(error_msg)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass

machineconfig/utils/ai/generate_file_checklist.py

@@ -7,20 +7,19 @@ from rich.panel import Panel
 
 
 def generate_file_checklist(repo_root: Union[str, Path], exclude_dirs: Optional[List[str]] = None) -> Path:
-
-    actual_exclude_dirs: List[str] = ['.venv', '.git', '__pycache__', 'build', 'dist', '*.egg-info']
+    actual_exclude_dirs: List[str] = [".venv", ".git", "__pycache__", "build", "dist", "*.egg-info"]
     if exclude_dirs is not None:
         actual_exclude_dirs = exclude_dirs
     repo_root = Path(repo_root).expanduser().absolute()
     output_path: Path = repo_root / ".ai" / "repo_task" / "file_checklist.md"
     py_files: List[Path] = []
-    for filepath in repo_root.glob('**/*.py'):
+    for filepath in repo_root.glob("**/*.py"):
         if any(excl in filepath.parts for excl in actual_exclude_dirs) or any(filepath.match(f"**/{excl}/**") for excl in actual_exclude_dirs) or filepath.name == "__init__.py":
             continue
         py_files.append(filepath.relative_to(repo_root))
 
     sh_files: List[Path] = []
-    for filepath in repo_root.glob('**/*.sh'):
+    for filepath in repo_root.glob("**/*.sh"):
         if any(excl in filepath.parts for excl in actual_exclude_dirs) or any(filepath.match(f"**/{excl}/**") for excl in actual_exclude_dirs):
             continue
         sh_files.append(filepath.relative_to(repo_root))
@@ -47,17 +46,16 @@ def generate_file_checklist(repo_root: Union[str, Path], exclude_dirs: Optional[
 def main() -> None:
     import argparse
 
-    parser = argparse.ArgumentParser(description='Generate a markdown file with checkboxes for all .py and .sh files.')
-    parser.add_argument('--repo', '-r', type=str, default=str(Path.cwd()), help='Repository root path. Defaults to current working directory.')
-    parser.add_argument('--exclude', '-e', nargs='+', type=str,
-                        help='Additional directories to exclude (by default excludes .venv, .git, __pycache__, build, dist, *.egg-info)')
+    parser = argparse.ArgumentParser(description="Generate a markdown file with checkboxes for all .py and .sh files.")
+    parser.add_argument("--repo", "-r", type=str, default=str(Path.cwd()), help="Repository root path. Defaults to current working directory.")
+    parser.add_argument("--exclude", "-e", nargs="+", type=str, help="Additional directories to exclude (by default excludes .venv, .git, __pycache__, build, dist, *.egg-info)")
 
     args = parser.parse_args()
 
-    exclude_dirs: List[str] = ['.venv', '.git', '__pycache__', 'build', 'dist', '*.egg-info']
+    exclude_dirs: List[str] = [".venv", ".git", "__pycache__", "build", "dist", "*.egg-info"]
     if args.exclude:
         exclude_dirs.extend(args.exclude)
-    if args.repo == '':
+    if args.repo == "":
         print("Error: Repository path cannot be empty.")
         return
 

machineconfig/utils/ai/url2md.py

@@ -46,7 +46,8 @@ print(f"✅ Found {len(relevant_urls)} relevant URLs. Preparing to convert to Ma
 
 commands: list[str] = []
 for a_url in relevant_urls:
-    commands.append(f"""curl {a_url} | html2markdown --output {op_dir.joinpath(a_url.split('/')[-1] + "_" + randstr(5) + ".md")} """)
+    commands.append(f"""curl {a_url} | html2markdown --output {op_dir.joinpath(a_url.split("/")[-1] + "_" + randstr(5) + ".md")} """)
+
 
 def run_command(cmd: str) -> bool:
     try:
@@ -57,6 +58,7 @@ def run_command(cmd: str) -> bool:
         print(f"❌ Error with command: {cmd[:60]}...\n{str(e)}")
         return False
 
+
 def main():
     cpu_count = multiprocessing.cpu_count()
     max_processes = min(20, cpu_count)
@@ -78,6 +80,6 @@ def main():
 
     print(f"📂 Output saved to: {op_dir}\n")
 
+
 if __name__ == "__main__":
     main()
-

machineconfig/utils/cloud/onedrive/setup_oauth.py

@@ -15,6 +15,7 @@ sys.path.insert(0, str(Path(__file__).parent))
 # from transaction import setup_oauth_authentication, CLIENT_ID, CLIENT_SECRET, REDIRECT_URI
 from machineconfig.utils.cloud.onedrive.transaction import CLIENT_ID, CLIENT_SECRET, REDIRECT_URI, setup_oauth_authentication
 
+
 def main():
     """Main setup function."""
     print("🔧 OneDrive OAuth Setup")