machineconfig 5.15__py3-none-any.whl → 7.66__py3-none-any.whl

machineconfig/utils/files/ouch/decompress.py

@@ -0,0 +1,45 @@
+
+
+from pathlib import Path
+from zipfile import ZipFile, BadZipFile
+from typing import Union
+
+
+def decompress_and_remove_zip(zip_path: Union[str, Path]) -> None:
+    """
+    Decompress a ZIP file and remove it after extraction.
+
+    Args:
+        zip_path (Union[str, Path]): Path to the ZIP file.
+
+    Raises:
+        FileNotFoundError: If the zip file does not exist.
+        BadZipFile: If the file is not a valid ZIP archive.
+        PermissionError: If the file cannot be deleted due to permission issues.
+        Exception: For other unexpected errors.
+    """
+    zip_path = Path(zip_path)
+
+    if not zip_path.exists():
+        raise FileNotFoundError(f"The file '{zip_path}' does not exist.")
+    
+    if not zip_path.is_file():
+        raise FileNotFoundError(f"The path '{zip_path}' is not a file.")
+
+    extract_dir = zip_path.parent
+
+    try:
+        with ZipFile(zip_path, 'r') as zip_ref:
+            zip_ref.extractall(extract_dir)
+    except BadZipFile as e:
+        raise BadZipFile(f"The file '{zip_path}' is not a valid zip archive.") from e
+    except Exception as e:
+        raise Exception(f"Failed to extract '{zip_path}': {e}") from e
+
+    try:
+        zip_path.unlink()
+    except PermissionError as e:
+        raise PermissionError(f"Permission denied when deleting '{zip_path}'.") from e
+    except Exception as e:
+        raise Exception(f"Failed to delete '{zip_path}': {e}") from e
+

machineconfig/utils/files/read.py

@@ -12,18 +12,16 @@ class Read:
         suffix = Path(path).suffix[1:]
         if suffix == "": raise ValueError(f"File type could not be inferred from suffix. Suffix is empty. Path: {path}")
         if suffix in ("sqlite", "sqlite3", "db", "duckdb"):
-            # from crocodile.database import DBMS
-            # if suffix == "duckdb": pass
-            # res = DBMS.from_local_db(path=path)
-            # print(res.describe_db())
-            # return res
-            raise NotImplementedError("Reading database files is not implemented yet. Use `crocodile.database.DBMS` to connect to the database file.")
+            from machineconfig.utils.files.dbms import DBMS
+            res = DBMS.from_local_db(path=path)
+            print(res.describe_db())
+            return res
         try: return getattr(Read, suffix)(str(path), **kwargs)
         except AttributeError as err:
             if "type object 'Read' has no attribute" not in str(err): raise AttributeError(err) from err
             if suffix in ('eps', 'jpg', 'jpeg', 'pdf', 'pgf', 'png', 'ps', 'raw', 'rgba', 'svg', 'svgz', 'tif', 'tiff'):
                 import matplotlib.pyplot as pyplot
-                return pyplot.imread(path, **kwargs)  # from: plt.gcf().canvas.get_supported_filetypes().keys():
+                return pyplot.imread(str(path), **kwargs)  # from: plt.gcf().canvas.get_supported_filetypes().keys():
             if suffix == "parquet":
                 import polars as pl
                 return pl.read_parquet(path, **kwargs)
@@ -39,17 +37,11 @@ class Read:
                 raise ImportError(err) from err2
     @staticmethod
     def json(path: 'Path', r: bool = False, **kwargs: Any) -> Any:  # return could be list or dict etc
-        import json
-        try:
-            mydict = json.loads(Path(path).read_text(encoding='utf-8'), **kwargs)
-        except Exception:
-            import pyjson5
-            mydict = pyjson5.loads(Path(path).read_text(encoding='utf-8'), **kwargs)  # file has C-style comments.
-        _ = r
-        return mydict
+        from machineconfig.utils.io import read_json
+        return read_json(path, r=r, **kwargs)
     @staticmethod
     def yaml(path: 'Path', r: bool = False) -> Any:  # return could be list or dict etc
-        import yaml  # type: ignore
+        import yaml
         with open(str(path), "r", encoding="utf-8") as file:
             mydict = yaml.load(file, Loader=yaml.FullLoader)
         _ = r
@@ -63,8 +55,8 @@ class Read:
         return res
     @staticmethod
     def toml(path: 'Path'):
-        import toml
-        return toml.loads(Path(path).read_text(encoding='utf-8'))
+        import tomllib
+        return tomllib.loads(Path(path).read_text(encoding='utf-8'))
     @staticmethod
     def npy(path: 'Path', **kwargs: Any):
         import numpy as np

machineconfig/utils/installer_utils/installer_class.py

@@ -1,18 +1,33 @@
-from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.installer_utils.installer_abc import find_move_delete_linux, find_move_delete_windows
-from machineconfig.utils.source_of_truth import INSTALL_TMP_DIR, INSTALL_VERSION_ROOT, LIBRARY_ROOT
-from machineconfig.utils.installer_utils.installer_abc import check_tool_exists
-from machineconfig.utils.io import read_json
-from machineconfig.utils.schemas.installer.installer_types import InstallerData, InstallerDataFiles, get_os_name, get_normalized_arch
+from machineconfig.utils.path_extended import PathExtended, DECOMPRESS_SUPPORTED_FORMATS
+from machineconfig.utils.source_of_truth import INSTALL_TMP_DIR, INSTALL_VERSION_ROOT
+from machineconfig.utils.installer_utils.installer_locator_utils import find_move_delete_linux, find_move_delete_windows, check_tool_exists
+from machineconfig.utils.schemas.installer.installer_types import InstallerData, get_os_name, get_normalized_arch
 
 import platform
 import subprocess
 import json
 from typing import Optional, Any
-from pathlib import Path
 from urllib.parse import urlparse
 
 
+
+def install_deb_package(downloaded: PathExtended) -> None:
+    print(f"📦 Installing .deb package: {downloaded}")
+    assert platform.system() == "Linux"
+    result = subprocess.run(f"sudo nala install -y {downloaded}", shell=True, capture_output=True, text=True)
+    success = result.returncode == 0 and result.stderr == ""
+    if not success:
+        desc = "Installing .deb"
+        print(f"❌ {desc} failed")
+        if result.stdout:
+            print(f"STDOUT: {result.stdout}")
+        if result.stderr:
+            print(f"STDERR: {result.stderr}")
+        print(f"Return code: {result.returncode}")
+    print("🗑️  Cleaning up .deb package...")
+    downloaded.delete(sure=True)
+
+
 class Installer:
     def __init__(self, installer_data: InstallerData):
         self.installer_data: InstallerData = installer_data
@@ -32,64 +47,21 @@ 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("-", "")
-
-    @staticmethod
-    def choose_app_and_install():
-        print(f"\n{'=' * 80}\n🔍 SELECT APPLICATION TO INSTALL 🔍\n{'=' * 80}")
-        from machineconfig.utils.options import choose_from_options
-
-        print("📂 Searching for configuration files...")
-        jobs_dir = Path(LIBRARY_ROOT.joinpath("jobs"))
-        config_paths = [Path(p) for p in jobs_dir.rglob("config.json")]
-        path = choose_from_options(multi=False, options=config_paths, msg="Choose one option")
-        print(f"📄 Loading configuration from: {path}")
-        config_data = read_json(path)
-        installer_data_files = InstallerDataFiles(config_data)
-
-        # Extract app names from the installers
-        app_names = [installer["appName"] for installer in installer_data_files["installers"]]
-        print("🔍 Select an application to install:")
-        app_name = choose_from_options(multi=False, options=app_names, fzf=True, msg="Choose one option")
-
-        # Find the selected installer data
-        selected_installer_data = None
-        for installer_data in installer_data_files["installers"]:
-            if installer_data["appName"] == app_name:
-                selected_installer_data = installer_data
-                break
-
-        if selected_installer_data is None:
-            raise ValueError(f"Could not find installer data for {app_name}")
-
-        installer = Installer(installer_data=selected_installer_data)
-        exe_name = installer._get_exe_name()
-        print(f"📦 Selected application: {exe_name}")
-        version = input(f"📝 Enter version to install for {exe_name} [latest]: ") or None
-        print(f"\n{'=' * 80}\n🚀 INSTALLING {exe_name.upper()} 🚀\n{'=' * 80}")
-        installer.install(version=version)
+        return self.installer_data["appName"].lower().replace(" ", "")  # .replace("-", "")
 
     def install_robust(self, version: Optional[str]) -> str:
         try:
             exe_name = self._get_exe_name()
-            print(f"\n{'=' * 80}\n🚀 INSTALLING {exe_name.upper()} 🚀\n{'=' * 80}")
             result_old = subprocess.run(f"{exe_name} --version", shell=True, capture_output=True, text=True)
             old_version_cli = result_old.stdout.strip()
-            print(f"📊 Current version: {old_version_cli or 'Not installed'}")
-
+            print(f"🚀 INSTALLING {exe_name.upper()} 🚀. 📊 Current version: {old_version_cli or 'Not installed'}")
             self.install(version=version)
-
             result_new = subprocess.run(f"{exe_name} --version", shell=True, capture_output=True, text=True)
             new_version_cli = result_new.stdout.strip()
-            print(f"📊 New version: {new_version_cli}")
-
             if old_version_cli == new_version_cli:
-                print(f"ℹ️  Same version detected: {old_version_cli}")
                 return f"""📦️ 😑 {exe_name}, same version: {old_version_cli}"""
             else:
-                print(f"🚀 Update successful: {old_version_cli} ➡️ {new_version_cli}")
                 return f"""📦️ 🤩 {exe_name} updated from {old_version_cli} ➡️ TO ➡️  {new_version_cli}"""
-
         except Exception as ex:
             exe_name = self._get_exe_name()
             app_name = self.installer_data["appName"]
@@ -104,18 +76,15 @@ class Installer:
         installer_arch_os = self.installer_data["fileNamePattern"][arch][os_name]
         if installer_arch_os is None:
             raise ValueError(f"No installation pattern for {exe_name} on {os_name} {arch}")
-
-        print(f"\n{'=' * 80}\n🔧 INSTALLATION PROCESS: {exe_name} 🔧\n{'=' * 80}")
         version_to_be_installed: str = "unknown"  # Initialize to ensure it's always bound
         if repo_url == "CMD":
-            if "npm " in installer_arch_os or "pip " in installer_arch_os or "winget " in installer_arch_os:
+            if any(pm in installer_arch_os for pm in ["npm ", "pip ", "winget ", "brew ", "curl "]):
                 package_manager = installer_arch_os.split(" ", maxsplit=1)[0]
-                print(f"📦 Using package manager: {package_manager}")
+                print(f"📦 Using package manager: {installer_arch_os}")
                 desc = package_manager + " installation"
                 version_to_be_installed = package_manager + "Latest"
-                print(f"🚀 Running: {installer_arch_os}")
-                result = subprocess.run(installer_arch_os, shell=True, capture_output=True, text=True)
-                success = result.returncode == 0 and result.stderr == ""
+                result = subprocess.run(installer_arch_os, shell=True, capture_output=True, text=False)
+                success = result.returncode == 0 and result.stderr == "".encode()
                 if not success:
                     print(f"❌ {desc} failed")
                     if result.stdout:
@@ -123,9 +92,7 @@ class Installer:
                     if result.stderr:
                         print(f"STDERR: {result.stderr}")
                     print(f"Return code: {result.returncode}")
-                print(f"✅ Package manager installation completed\n{'=' * 80}")
             elif installer_arch_os.endswith((".sh", ".py", ".ps1")):
-                # search for the script, see which path ends with the script name
                 import machineconfig.jobs.installer as module
                 from pathlib import Path
                 search_root = Path(module.__file__).parent
@@ -139,33 +106,29 @@ class Installer:
                 if installer_arch_os.endswith(".sh"):
                     if platform.system() not in ["Linux", "Darwin"]:
                         raise NotImplementedError(f"Shell script installation not supported on {platform.system()}")
-                    print(f"🚀 Running shell script: {installer_path}")
                     subprocess.run(f"bash {installer_path}", shell=True, check=True)
                     version_to_be_installed = "scripted_installation"
-                    print(f"✅ Shell script installation completed\n{'=' * 80}")
                 elif installer_arch_os.endswith(".ps1"):
                     if platform.system() != "Windows":
                         raise NotImplementedError(f"PowerShell script installation not supported on {platform.system()}")
-                    print(f"🚀 Running PowerShell script: {installer_path}")
                     subprocess.run(f"powershell -ExecutionPolicy Bypass -File {installer_path}", shell=True, check=True)
                     version_to_be_installed = "scripted_installation"
-                    print(f"✅ PowerShell script installation completed\n{'=' * 80}")
                 elif installer_arch_os.endswith(".py"):
                     import runpy
                     runpy.run_path(str(installer_path), run_name=None)["main"](self.installer_data, version=version)
                     version_to_be_installed = str(version)
-                    print(f"✅ Custom installation completed\n{'=' * 80}")
             elif installer_arch_os.startswith("https://"):  # its a url to be downloaded
-                print(f"📥 Downloading object from URL: {installer_arch_os}")
-                downloaded_object = PathExtended(installer_arch_os).download(folder=INSTALL_TMP_DIR)
+                # downloaded_object = PathExtended(installer_arch_os).download(folder=INSTALL_TMP_DIR)
+                from machineconfig.scripts.python.helpers_utils.download import download
+                downloaded_object = download(installer_arch_os, output_dir=str(INSTALL_TMP_DIR))
+                if downloaded_object is None:
+                    raise ValueError(f"Failed to download from URL: {installer_arch_os}")
                 # object is either a zip containing a binary or a straight out binary.
-                if downloaded_object.suffix in [".zip", ".tar.gz"]:
-                    print(f"📦 Decompressing downloaded archive: {downloaded_object}")
+                downloaded_object = PathExtended(downloaded_object)
+                if downloaded_object.suffix in DECOMPRESS_SUPPORTED_FORMATS:
                     downloaded_object = downloaded_object.decompress()
-                    print(f"✅ Decompression completed to: {downloaded_object}")
                 if downloaded_object.suffix in [".exe", ""]:  # likely an executable
                     if platform.system() == "Windows":
-                        print("🪟 Installing on Windows...")
                         exe = find_move_delete_windows(downloaded_file_path=downloaded_object, exe_name=exe_name, delete=True, rename_to=exe_name.replace(".exe", "") + ".exe")
                     elif platform.system() in ["Linux", "Darwin"]:
                         system_name = "Linux" if platform.system() == "Linux" else "macOS"
@@ -175,7 +138,6 @@ class Installer:
                         error_msg = f"❌ ERROR: System {platform.system()} not supported"
                         print(error_msg)
                         raise NotImplementedError(error_msg)
-
                     _ = exe
                     if exe.name.replace(".exe", "") != exe_name.replace(".exe", ""):
                         from rich import print as pprint
@@ -186,32 +148,19 @@ class Installer:
                         print(f"🔄 Renaming to correct name: {new_exe_name}")
                         exe.with_name(name=new_exe_name, inplace=True, overwrite=True)
                     version_to_be_installed = "downloaded_binary"
-                    print(f"✅ Downloaded binary installation completed\n{'=' * 80}")
+                elif downloaded_object.suffix in [".deb"]:
+                    install_deb_package(downloaded_object)
+                    version_to_be_installed = "downloaded_deb"
+                else:
+                    raise ValueError(f"Downloaded file is not an executable: {downloaded_object}")
             else:
                 raise NotImplementedError(f"CMD installation method not implemented for: {installer_arch_os}")
         else:
             assert repo_url.startswith("https://github.com/"), f"repoURL must be a GitHub URL, got {repo_url}"
-            print("📥 Downloading from repository...")
-            downloaded, version_to_be_installed = self.download(version=version)
-            if str(downloaded).endswith(".deb"):
-                print(f"📦 Installing .deb package: {downloaded}")
-                assert platform.system() == "Linux"
-                result = subprocess.run(f"sudo nala install -y {downloaded}", shell=True, capture_output=True, text=True)
-                success = result.returncode == 0 and result.stderr == ""
-                if not success:
-                    desc = "Installing .deb"
-                    print(f"❌ {desc} failed")
-                    if result.stdout:
-                        print(f"STDOUT: {result.stdout}")
-                    if result.stderr:
-                        print(f"STDERR: {result.stderr}")
-                    print(f"Return code: {result.returncode}")
-                print("🗑️  Cleaning up .deb package...")
-                downloaded.delete(sure=True)
-                print(f"✅ DEB package installation completed\n{'=' * 80}")
+            downloaded, version_to_be_installed = self.binary_download(version=version)
+            if str(downloaded).endswith(".deb"): install_deb_package(downloaded)
             else:
                 if platform.system() == "Windows":
-                    print("🪟 Installing on Windows...")
                     exe = find_move_delete_windows(downloaded_file_path=downloaded, exe_name=exe_name, delete=True, rename_to=exe_name.replace(".exe", "") + ".exe")
                 elif platform.system() in ["Linux", "Darwin"]:
                     system_name = "Linux" if platform.system() == "Linux" else "macOS"
@@ -221,33 +170,24 @@ class Installer:
                     error_msg = f"❌ ERROR: System {platform.system()} not supported"
                     print(error_msg)
                     raise NotImplementedError(error_msg)
-
                 _ = exe
                 if exe.name.replace(".exe", "") != exe_name.replace(".exe", ""):
                     from rich import print as pprint
                     from rich.panel import Panel
-
                     print("⚠️  Warning: Executable name mismatch")
                     pprint(Panel(f"Expected exe name: [red]{exe_name}[/red] \nAttained name: [red]{exe.name.replace('.exe', '')}[/red]", title="exe name mismatch", subtitle=repo_url))
                     new_exe_name = exe_name + ".exe" if platform.system() == "Windows" else exe_name
                     print(f"🔄 Renaming to correct name: {new_exe_name}")
                     exe.with_name(name=new_exe_name, inplace=True, overwrite=True)
-
-        print(f"💾 Saving version information to: {INSTALL_VERSION_ROOT.joinpath(exe_name)}")
         INSTALL_VERSION_ROOT.joinpath(exe_name).parent.mkdir(parents=True, exist_ok=True)
         INSTALL_VERSION_ROOT.joinpath(exe_name).write_text(version_to_be_installed or "unknown", encoding="utf-8")
-        print(f"✅ Installation completed successfully!\n{'=' * 80}")
-
-    def download(self, version: Optional[str]) -> tuple[PathExtended, str]:
+    def binary_download(self, version: Optional[str]) -> tuple[PathExtended, str]:
         exe_name = self._get_exe_name()
         repo_url = self.installer_data["repoURL"]
-        app_name = self.installer_data["appName"]
-        print(f"\n{'=' * 80}\n📥 DOWNLOADING: {exe_name} 📥\n{'=' * 80}")
-        
+        # app_name = self.installer_data["appName"]
         download_link: Optional[str] = None
         version_to_be_installed: Optional[str] = None
-        
-        if "github" not in repo_url or ".zip" in repo_url or ".tar.gz" in repo_url:
+        if "github" not in repo_url or (any(ext in repo_url for ext in DECOMPRESS_SUPPORTED_FORMATS)):
             # Direct download URL
             download_link = repo_url
             version_to_be_installed = "predefined_url"
@@ -259,25 +199,20 @@ class Installer:
             arch = get_normalized_arch()
             os_name = get_os_name()
             print(f"🧭 Detected system={os_name} arch={arch}")
-            
             # Use existing get_github_release method to get download link and version
             download_link, version_to_be_installed = self.get_github_release(repo_url, version)
-            
             if download_link is None:
                 raise ValueError(f"Could not retrieve download link for {exe_name} version {version or 'latest'}")
-            
             print(f"📦 Version to be installed: {version_to_be_installed}")
             print(f"🔗 Download URL: {download_link}")
-
         assert download_link is not None, "download_link must be set"
         assert version_to_be_installed is not None, "version_to_be_installed must be set"
-        print(f"📥 Downloading {app_name} from: {download_link}")
         downloaded = PathExtended(download_link).download(folder=INSTALL_TMP_DIR).decompress()
-        print(f"✅ Download and extraction completed to: {downloaded}\n{'=' * 80}")
+        if downloaded.is_dir() and len(downloaded.search("*", r=True)) == 1:
+            only_file_in = next(downloaded.glob("*"))
+            if only_file_in.is_file() and only_file_in.suffix in DECOMPRESS_SUPPORTED_FORMATS:  # further decompress
+                downloaded = only_file_in.decompress()
         return downloaded, version_to_be_installed
-
-    # --------------------------- Arch / template helpers ---------------------------
-
     @staticmethod
     def _get_repo_name_from_url(repo_url: str) -> str:
         """Extract owner/repo from GitHub URL."""
@@ -292,23 +227,16 @@ class Installer:
     def _fetch_github_release_data(repo_name: str, version: Optional[str] = None) -> Optional[dict[str, Any]]:
         """Fetch release data from GitHub API using requests."""
         import requests
-        
         try:
-            if version and version.lower() != "latest":
-                # Fetch specific version
+            if version and version.lower() != "latest":  # Fetch specific version
                 url = f"https://api.github.com/repos/{repo_name}/releases/tags/{version}"
-            else:
-                # Fetch latest release
+            else:   # Fetch latest release
                 url = f"https://api.github.com/repos/{repo_name}/releases/latest"
-            
             response = requests.get(url, timeout=30)
-            
             if response.status_code != 200:
                 print(f"❌ Failed to fetch data for {repo_name}: HTTP {response.status_code}")
                 return None
-                
             response_data = response.json()
-            
             # Check if API returned an error
             if "message" in response_data:
                 if "API rate limit exceeded" in response_data.get("message", ""):
@@ -350,9 +278,23 @@ class Installer:
             an_dl = asset.get("browser_download_url", "NA")
             available_filenames.append(an_dl.split("/")[-1])
         if filename not in available_filenames:
-            filename = filename_pattern.format(version=actual_version.replace("v", ""))
-            if filename not in available_filenames:
-                print(f"❌ Filename {filename} not found in assets: {available_filenames}")
+            candidates = [
+                filename,
+                filename_pattern.format(version=actual_version),
+                filename_pattern.format(version=actual_version.replace("v", "")),
+            ]
+
+            # Include hyphen/underscore variants
+            variants = []
+            for f in candidates:
+                variants += [f, f.replace("-", "_"), f.replace("_", "-")]
+
+            for f in variants:
+                if f in available_filenames:
+                    filename = f
+                    break
+            else:
+                print(f"❌ Filename not found in assets. Tried: {variants}\nAvailable: {available_filenames}")
                 return None, None
         browser_download_url = f"{repo_url}/releases/download/{actual_version}/{filename}"
         return browser_download_url, actual_version