machineconfig 3.93__py3-none-any.whl → 3.95__py3-none-any.whl

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,68 +1,15 @@
 #!/bin/bash
 
-echo """#=======================================================================
+echo """
+=======================================================================
 📦 MACHINE CONFIGURATION | Interactive Installation Script
-#=======================================================================
-"""
+======================================================================="""
 
-read -p "📥 Install Apps [y]/n? " choice
+curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash
+$HOME/.local/bin/uv run --python 3.13 --with machineconfig ia
 
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    #=======================================================================
-    📦 APPLICATIONS | Installing base system applications
-    #=======================================================================
-    """
-    curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/apps.sh | bash
-else
-    echo """    ⏭️  Skipping applications installation
-    """
-fi
 
-echo """#=======================================================================
-🔄 SYSTEM UPDATE | Package management
-#=======================================================================
-"""
-read -p "🔄 Upgrade system packages [y]/n? " choice
 
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    📦 Upgrading system packages...
-    """
-    sudo nala upgrade -y
-else
-    echo """    ⏭️  Skipping system upgrade
-    """
-fi
-
-echo """#=======================================================================
-🐍 PYTHON ENVIRONMENT | Virtual environment setup
-#=======================================================================
-"""
-read -p "🐍 Install UV and repos [y]/n? " choice
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔧 Setting up Python environment...
-    """
-    curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash
-    curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/repos.sh | bash
-else
-    echo """    ⏭️  Skipping virtual environment setup
-    """
-fi
-
-
-echo """#=======================================================================
-🔒 SSH SERVER | Remote access setup
-#=======================================================================
-"""
-read -p "🔒 Install SSH Server [y]/n? " choice
-choice=${choice:-y}
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔧 Installing SSH server...
-    """
-    sudo nala install openssh-server -y
-else
-    echo """    ⏭️  Skipping SSH server installation
-    """
-fi
 
 echo """#=======================================================================
 📂 DOTFILES MIGRATION | Configuration transfer options
@@ -101,7 +48,7 @@ choice=${choice:-y}
 if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
     echo """    🔧 Creating symlinks and setting permissions...
     """
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.profile.create main --choice=all
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.profile.create main_symlinks --choice=all
     sudo chmod 600 $HOME/.ssh/*
     sudo chmod 700 $HOME/.ssh
 else
@@ -109,96 +56,3 @@ else
     """
 fi
 
-echo """#=======================================================================
-⚡ CLI APPLICATIONS | Command-line tools installation
-#=======================================================================
-"""
-read -p "⚡ Install CLI Apps [y]/n? " choice
-choice=${choice:-y}
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔧 Installing CLI applications...
-    """
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=essentials
-    . $HOME/.bashrc
-else
-    echo """    ⏭️  Skipping CLI apps installation
-    """
-fi
-
-echo """#=======================================================================
-🛠️  DEVELOPMENT TOOLS | Software development packages
-#=======================================================================
-"""
-read -p "🛠️  Install Development Tools (rust, libssql-dev, ffmpeg, wezterm, brave, code) [y]/n? " choice
-choice=${choice:-y}
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔧 Installing development tools... """
-    (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh) || true
-    sudo nala install libssl-dev -y
-    sudo nala install ffmpeg -y
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=wezterm,brave,code
-else
-    echo """    ⏭️  Skipping development tools installation
-    """
-fi
-
-echo """#=======================================================================
-📚 REPOSITORIES | Project code retrieval
-#=======================================================================
-"""
-read -p "📚 Retrieve Repositories to ~/code [y]/n? " choice
-choice=${choice:-y}
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔄 Cloning repositories...
-    """
-    repos ~/code --clone --cloud odg1
-else
-    echo """    ⏭️  Skipping repository retrieval
-    """
-fi
-
-echo """#=======================================================================
-💾 DATA RETRIEVAL | Backup restoration
-#=======================================================================
-"""
-read -p "💾 Retrieve Data [y]/n? " choice
-choice=${choice:-y}
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔄 Retrieving data...
-    """
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE
-else
-    echo """    ⏭️  Skipping data retrieval
-    """
-fi
-
-echo """#=======================================================================
-🎨 ASCII ART | Terminal visualization tools
-#=======================================================================
-"""
-read -p "🎨 Install ASCII Art Libraries [y]/n? " choice
-choice=${choice:-y}
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🎨 Installing ASCII art libraries...
-    """
-    curl bit.ly/cfgasciiartlinux -L | sudo bash
-else
-    echo """    ⏭️  Skipping ASCII art installation
-    """
-fi
-
-# echo """# 📧 Thunderbird Setup Note:
-# Run after installing Thunderbird and starting it once:
-# cd ~/AppData/Roaming/ThunderBird/Profiles
-# \$res = ls
-# \$name = \$res[0].Name
-# mv \$backup_folder \$name
-# """
-
-echo """#=======================================================================
-✨ INSTALLATION COMPLETE | System setup finished successfully
-#=======================================================================
-
-🎉 Your system has been configured successfully!
-🔄 You may need to reboot to apply all changes.
-"""

machineconfig/utils/installer.py

@@ -2,7 +2,7 @@
 
 from machineconfig.utils.installer_utils.installer_abc import LINUX_INSTALL_PATH
 from machineconfig.utils.installer_utils.installer_class import Installer
-from machineconfig.utils.schemas.installer.installer_types import APP_INSTALLER_CATEGORY, InstallerData, InstallerDataFiles
+from machineconfig.utils.schemas.installer.installer_types import APP_INSTALLER_CATEGORY, InstallerData, InstallerDataFiles, get_normalized_arch, get_os_name, OPERATING_SYSTEMS, CPU_ARCHITECTURES
 from rich.console import Console
 from rich.panel import Panel  # Added import
 
@@ -18,8 +18,7 @@ from joblib import Parallel, delayed
 def check_latest():
     console = Console()  # Added console initialization
     console.print(Panel("🔍  CHECKING FOR LATEST VERSIONS", title="Status", expand=False))  # Replaced print with Panel
-    installers = get_installers(system=platform.system(), dev=False)
-    # installers += get_installers(system=platform.system(), dev=True)
+    installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL"])
     installers_github = []
     for inst__ in installers:
         app_name = inst__.installer_data.get("appName", "unknown")
@@ -92,92 +91,30 @@ def get_installed_cli_apps():
     return apps
 
 
-def get_installers(system: str, dev: bool) -> list[Installer]:
+def get_installers(os: OPERATING_SYSTEMS, arch: CPU_ARCHITECTURES, which_cats: list[APP_INSTALLER_CATEGORY]) -> list[Installer]:
     print(f"\n{'=' * 80}\n🔍 LOADING INSTALLER CONFIGURATIONS 🔍\n{'=' * 80}")
-    res_all = get_all_installer_data_files(system=system)
-    if not dev:
-        print("ℹ️  Excluding development installers...")
-        del res_all["CUSTOM_DEV"]
-        del res_all["OS_SPECIFIC_DEV"]
-        del res_all["OS_GENERIC_DEV"]
-
-    # Flatten the installer data from all categories
+    res_all = get_all_installer_data_files(which_cats=which_cats)
     all_installers: list[InstallerData] = []
     for _category, installer_data_files in res_all.items():
-        all_installers.extend(installer_data_files["installers"])
-
+        suitable_installers = []
+        for an_installer in installer_data_files["installers"]:
+            if an_installer["fileNamePattern"][arch][os] is None:
+                continue
+            suitable_installers.append(an_installer)
+        all_installers.extend(suitable_installers)
     print(f"✅ Loaded {len(all_installers)} installer configurations\n{'=' * 80}")
     return [Installer(installer_data=installer_data) for installer_data in all_installers]
 
 
-def get_all_installer_data_files(system: str) -> dict[APP_INSTALLER_CATEGORY, InstallerDataFiles]:
+def get_all_installer_data_files(which_cats: list[APP_INSTALLER_CATEGORY]) -> dict[APP_INSTALLER_CATEGORY, InstallerDataFiles]:
     print(f"\n{'=' * 80}\n📂 LOADING CONFIGURATION FILES 📂\n{'=' * 80}")
-
-    print(f"🔍 Importing OS-specific installers for {system}...")
-    if system == "Windows":
-        import machineconfig.jobs.python_windows_installers as os_specific_installer
-    else:
-        import machineconfig.jobs.python_linux_installers as os_specific_installer
-
-    print("🔍 Importing generic installers...")
-    import machineconfig.jobs.python_generic_installers as generic_installer
-
-    path_os_specific = PathExtended(os_specific_installer.__file__).parent
-    path_os_generic = PathExtended(generic_installer.__file__).parent
-
-    path_os_specific_dev = path_os_specific.joinpath("dev")
-    path_os_generic_dev = path_os_generic.joinpath("dev")
-
+    import machineconfig.jobs.installer as module
+    from pathlib import Path
     print("📂 Loading configuration files...")
-    res_final: dict[APP_INSTALLER_CATEGORY, InstallerDataFiles] = {}
-
-    print(f"""📄 Loading OS-specific config from: {path_os_specific.joinpath("config.json")}""")
-    os_specific_data = read_json(path=path_os_specific.joinpath("config.json"))
-    res_final["OS_SPECIFIC"] = InstallerDataFiles(os_specific_data)
-
-    print(f"""📄 Loading OS-generic config from: {path_os_generic.joinpath("config.json")}""")
-    os_generic_data = read_json(path=path_os_generic.joinpath("config.json"))
-    res_final["OS_GENERIC"] = InstallerDataFiles(os_generic_data)
-
-    print(f"""📄 Loading OS-specific dev config from: {path_os_specific_dev.joinpath("config.json")}""")
-    os_specific_dev_data = read_json(path=path_os_specific_dev.joinpath("config.json"))
-    res_final["OS_SPECIFIC_DEV"] = InstallerDataFiles(os_specific_dev_data)
-
-    print(f"""📄 Loading OS-generic dev config from: {path_os_generic_dev.joinpath("config.json")}""")
-    os_generic_dev_data = read_json(path=path_os_generic_dev.joinpath("config.json"))
-    res_final["OS_GENERIC_DEV"] = InstallerDataFiles(os_generic_dev_data)
-
-    path_custom_installer = path_os_generic.with_name("python_custom_installers")
-    path_custom_installer_dev = path_custom_installer.joinpath("dev")
-
-    print(f"🔍 Loading custom installers from: {path_custom_installer}")
-    import runpy
-
-    res_custom_installers: list[InstallerData] = []
-    for item in path_custom_installer.search("*.py", r=False, not_in=["__init__"]):
-        try:
-            print(f"📄 Loading custom installer: {item.name}")
-            installer_data: InstallerData = runpy.run_path(str(item), run_name=None)["config_dict"]
-            res_custom_installers.append(installer_data)
-        except Exception as ex:
-            print(f"❌ Failed to load {item}: {ex}")
-
-    print(f"🔍 Loading custom dev installers from: {path_custom_installer_dev}")
-    res_custom_dev_installers: list[InstallerData] = []
-    for item in path_custom_installer_dev.search("*.py", r=False, not_in=["__init__"]):
-        try:
-            print(f"📄 Loading custom dev installer: {item.name}")
-            installer_data: InstallerData = runpy.run_path(str(item), run_name=None)["config_dict"]
-            res_custom_dev_installers.append(installer_data)
-        except Exception as ex:
-            print(f"❌ Failed to load {item}: {ex}")
-
-    res_final["CUSTOM"] = InstallerDataFiles({"version": "1", "installers": res_custom_installers})
-    res_final["CUSTOM_DEV"] = InstallerDataFiles({"version": "1", "installers": res_custom_dev_installers})
-
-    print(
-        f"✅ Configuration loading complete:\n - OS_SPECIFIC: {len(res_final['OS_SPECIFIC']['installers'])} items\n - OS_GENERIC: {len(res_final['OS_GENERIC']['installers'])} items\n - CUSTOM: {len(res_final['CUSTOM']['installers'])} items\n{'=' * 80}"
-    )
+    res_final: dict[APP_INSTALLER_CATEGORY, InstallerDataFiles] = {key: read_json(Path(module.__file__).parent.joinpath(f"packages_{key.lower()}.json")) for key in which_cats}
+    print(f"Loaded: {len(res_final)} installer categories")
+    for k, v in res_final.items():
+        print(f" - {k}: {len(v['installers'])} items")
     return res_final
 
 

machineconfig/utils/installer_utils/github_release_bulk.py

@@ -0,0 +1,198 @@
+#!/usr/bin/env python3
+"""
+Script to fetch GitHub release information from installer JSON files.
+Extracts GitHub repository URLs and fetches latest release data with rate limiting.
+"""
+
+import json
+import time
+import subprocess
+from pathlib import Path
+from typing import Any, Dict, Optional, Set
+from urllib.parse import urlparse
+
+
+def is_github_repo(url: str) -> bool:
+    """Check if URL is a GitHub repository URL."""
+    try:
+        parsed = urlparse(url)
+        return parsed.netloc == "github.com" and len(parsed.path.split("/")) >= 3
+    except Exception:
+        return False
+
+
+def extract_github_repos_from_json(json_file_path: Path) -> Set[str]:
+    """Extract GitHub repository URLs from installer JSON file."""
+    github_repos: Set[str] = set()
+    
+    try:
+        with open(json_file_path, 'r', encoding='utf-8') as file:
+            data = json.load(file)
+            
+        for installer in data.get("installers", []):
+            repo_url = installer.get("repoURL", "")
+            if is_github_repo(repo_url):
+                github_repos.add(repo_url)
+                
+    except (json.JSONDecodeError, FileNotFoundError) as e:
+        print(f"Error reading {json_file_path}: {e}")
+        
+    return github_repos
+
+
+def get_repo_name_from_url(repo_url: str) -> str:
+    """Extract owner/repo from GitHub URL."""
+    try:
+        parsed = urlparse(repo_url)
+        path_parts = parsed.path.strip("/").split("/")
+        return f"{path_parts[0]}/{path_parts[1]}"
+    except (IndexError, AttributeError):
+        return ""
+
+
+def fetch_github_release_data(repo_name: str) -> Optional[Dict[str, Any]]:
+    """Fetch latest release data from GitHub API using curl."""
+    try:
+        cmd = [
+            "curl", "-s",
+            f"https://api.github.com/repos/{repo_name}/releases/latest"
+        ]
+        
+        result = subprocess.run(
+            cmd,
+            capture_output=True,
+            text=True,
+            timeout=30
+        )
+        
+        if result.returncode != 0:
+            print(f"❌ Failed to fetch data for {repo_name}: {result.stderr}")
+            return None
+            
+        response_data = json.loads(result.stdout)
+        
+        # Check if API returned an error
+        if "message" in response_data:
+            if "API rate limit exceeded" in response_data.get("message", ""):
+                print(f"🚫 Rate limit exceeded for {repo_name}")
+                return None
+            elif "Not Found" in response_data.get("message", ""):
+                print(f"🔍 No releases found for {repo_name}")
+                return None
+                
+        return response_data
+        
+    except (subprocess.TimeoutExpired, json.JSONDecodeError, subprocess.SubprocessError) as e:
+        print(f"❌ Error fetching {repo_name}: {e}")
+        return None
+
+
+def extract_release_info(release_data: Dict[str, Any]) -> Dict[str, Any]:
+    """Extract relevant information from GitHub release data."""
+    if not release_data:
+        return {}
+        
+    asset_names = [asset["name"] for asset in release_data.get("assets", [])]
+    
+    return {
+        "tag_name": release_data.get("tag_name", ""),
+        "name": release_data.get("name", ""),
+        "published_at": release_data.get("published_at", ""),
+        "assets": asset_names,
+        "assets_count": len(asset_names)
+    }
+
+
+def main() -> None:
+    """Main function to process installer JSON files and fetch GitHub release data."""
+    # Define paths
+    current_dir = Path(__file__).parent
+    installer_dir = current_dir.parent.parent / "jobs" / "installer"
+    
+    standard_json = installer_dir / "packages_standard.json"
+    dev_json = installer_dir / "packages_dev.json"
+    output_json = current_dir / "github_releases.json"
+    
+    print("🔍 Starting GitHub release data extraction...")
+    print(f"📁 Processing files from: {installer_dir}")
+    
+    # Extract GitHub repositories from both files
+    all_github_repos: Set[str] = set()
+    
+    if standard_json.exists():
+        print(f"📄 Reading {standard_json.name}...")
+        repos = extract_github_repos_from_json(standard_json)
+        all_github_repos.update(repos)
+        print(f"   Found {len(repos)} GitHub repos")
+    else:
+        print(f"⚠️  File not found: {standard_json}")
+        
+    if dev_json.exists():
+        print(f"📄 Reading {dev_json.name}...")
+        repos = extract_github_repos_from_json(dev_json)
+        all_github_repos.update(repos)
+        print(f"   Found {len(repos)} GitHub repos")
+    else:
+        print(f"⚠️  File not found: {dev_json}")
+    
+    print(f"🎯 Total unique GitHub repositories found: {len(all_github_repos)}")
+    
+    if not all_github_repos:
+        print("❌ No GitHub repositories found. Exiting.")
+        return
+    
+    # Fetch release data with rate limiting
+    release_mapping: Dict[str, Any] = {}
+    total_repos = len(all_github_repos)
+    
+    print(f"\n🚀 Fetching release data for {total_repos} repositories...")
+    print("⏰ Rate limiting: 5 seconds between requests")
+    print("-" * 60)
+    
+    for i, repo_url in enumerate(sorted(all_github_repos), 1):
+        repo_name = get_repo_name_from_url(repo_url)
+        
+        if not repo_name:
+            print(f"⚠️  [{i:3d}/{total_repos}] Invalid repo URL: {repo_url}")
+            continue
+            
+        print(f"📡 [{i:3d}/{total_repos}] Fetching: {repo_name}", end=" ... ")
+        
+        release_data = fetch_github_release_data(repo_name)
+        
+        if release_data:
+            release_info = extract_release_info(release_data)
+            release_mapping[repo_url] = release_info
+            assets_count = release_info.get("assets_count", 0)
+            tag = release_info.get("tag_name", "unknown")
+            print(f"✅ {tag} ({assets_count} assets)")
+        else:
+            release_mapping[repo_url] = {}
+            print("❌ No data")
+        
+        # Rate limiting - wait 5 seconds between requests (except for the last one)
+        if i < total_repos:
+            time.sleep(5)
+    
+    # Save results
+    output_data = {
+        "generated_at": time.strftime("%Y-%m-%d %H:%M:%S UTC", time.gmtime()),
+        "total_repositories": len(all_github_repos),
+        "successful_fetches": len([v for v in release_mapping.values() if v]),
+        "releases": release_mapping
+    }
+    
+    with open(output_json, 'w', encoding='utf-8') as f:
+        json.dump(output_data, f, indent=2, ensure_ascii=False)
+    
+    successful = len([v for v in release_mapping.values() if v])
+    print("\n📊 Summary:")
+    print(f"   Total repositories processed: {len(all_github_repos)}")
+    print(f"   Successful fetches: {successful}")
+    print(f"   Failed fetches: {len(all_github_repos) - successful}")
+    print(f"   Output saved to: {output_json}")
+    print("✅ Done!")
+
+
+if __name__ == "__main__":
+    main()