portacode 1.4.15.dev9__tar.gz → 1.4.15.dev10__tar.gz

{portacode-1.4.15.dev9 → portacode-1.4.15.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.15.dev9
+Version: 1.4.15.dev10
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.15.dev9 → portacode-1.4.15.dev10}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.15.dev9'
-__version_tuple__ = version_tuple = (1, 4, 15, 'dev9')
+__version__ = version = '1.4.15.dev10'
+__version_tuple__ = version_tuple = (1, 4, 15, 'dev10')
 
 __commit_id__ = commit_id = None

{portacode-1.4.15.dev9 → portacode-1.4.15.dev10}/portacode/connection/handlers/proxmox_infra.py

@@ -47,9 +47,7 @@ UNIT_DIR = Path("/etc/systemd/system")
 _MANAGED_CONTAINERS_CACHE_TTL_S = 30.0
 _MANAGED_CONTAINERS_CACHE: Dict[str, Any] = {"timestamp": 0.0, "summary": None}
 _MANAGED_CONTAINERS_CACHE_LOCK = threading.Lock()
-_STARTUP_TEMPLATES: List[str] | None = None
-_STARTUP_TEMPLATE_KEY: tuple[Any, ...] | None = None
-_STARTUP_TEMPLATES_LOCK = threading.Lock()
+_STARTUP_TEMPLATES_REFRESHED = False
 
 ProgressCallback = Callable[[int, int, Dict[str, Any], str, Optional[Dict[str, Any]]], None]
 
@@ -182,16 +180,6 @@ def _list_templates(client: Any, node: str, storages: Iterable[Dict[str, Any]])
     return templates
 
 
-def _template_key(config: Dict[str, Any]) -> tuple[Any, ...]:
-    return (
-        config.get("host"),
-        config.get("node"),
-        config.get("user"),
-        config.get("token_name"),
-        config.get("verify_ssl"),
-    )
-
-
 def _build_proxmox_client_from_config(config: Dict[str, Any]):
     user = config.get("user")
     token_name = config.get("token_name")
@@ -209,41 +197,22 @@ def _build_proxmox_client_from_config(config: Dict[str, Any]):
     )
 
 
-def _ensure_startup_templates(config: Dict[str, Any]) -> None:
-    global _STARTUP_TEMPLATES, _STARTUP_TEMPLATE_KEY
-    if not config:
-        with _STARTUP_TEMPLATES_LOCK:
-            _STARTUP_TEMPLATES = []
-            _STARTUP_TEMPLATE_KEY = None
+def _ensure_templates_refreshed_on_startup(config: Dict[str, Any]) -> None:
+    global _STARTUP_TEMPLATES_REFRESHED
+    if _STARTUP_TEMPLATES_REFRESHED or not config or not config.get("token_value"):
+        _STARTUP_TEMPLATES_REFRESHED = True
         return
-    with _STARTUP_TEMPLATES_LOCK:
-        if _STARTUP_TEMPLATE_KEY == _template_key(config) and _STARTUP_TEMPLATES is not None:
-            return
-    key = _template_key(config)
-    templates: List[str] = []
     try:
         client = _build_proxmox_client_from_config(config)
         node = config.get("node") or _pick_node(client)
         storages = client.nodes(node).storage.get()
         templates = _list_templates(client, node, storages)
+        if templates:
+            config["templates"] = templates
     except Exception as exc:
-        logger.warning("Unable to refresh Proxmox templates: %s", exc)
-    with _STARTUP_TEMPLATES_LOCK:
-        _STARTUP_TEMPLATES = list(templates)
-        _STARTUP_TEMPLATE_KEY = key
-
-
-def _get_startup_templates(config: Dict[str, Any]) -> List[str]:
-    _ensure_startup_templates(config)
-    with _STARTUP_TEMPLATES_LOCK:
-        return list(_STARTUP_TEMPLATES or [])
-
-
-def _clear_startup_templates() -> None:
-    global _STARTUP_TEMPLATES, _STARTUP_TEMPLATE_KEY
-    with _STARTUP_TEMPLATES_LOCK:
-        _STARTUP_TEMPLATES = None
-        _STARTUP_TEMPLATE_KEY = None
+        logger.warning("Unable to refresh Proxmox templates on startup: %s", exc)
+    finally:
+        _STARTUP_TEMPLATES_REFRESHED = True
 
 
 def _pick_storage(storages: Iterable[Dict[str, Any]]) -> str:
@@ -504,119 +473,48 @@ def _friendly_step_label(step_name: str) -> str:
     return normalized.capitalize()
 
 
-_PACKAGE_MANAGER_PROFILES: Dict[str, Dict[str, Any]] = {
-    "apt": {
-        "update_cmd": "apt-get update -y",
-        "update_step_name": "apt_update",
-        "install_cmd": "apt-get install -y python3 python3-pip sudo --fix-missing",
-        "install_step_name": "install_deps",
-        "update_retries": 4,
-        "install_retries": 5,
-    },
-    "dnf": {
-        "update_cmd": "dnf check-update || true",
-        "update_step_name": "dnf_update",
-        "install_cmd": "dnf install -y python3 python3-pip sudo",
-        "install_step_name": "install_deps",
-        "update_retries": 3,
-        "install_retries": 5,
-    },
-    "yum": {
-        "update_cmd": "yum makecache",
-        "update_step_name": "yum_update",
-        "install_cmd": "yum install -y python3 python3-pip sudo",
-        "install_step_name": "install_deps",
-        "update_retries": 3,
-        "install_retries": 5,
-    },
-    "apk": {
-        "update_cmd": "apk update",
-        "update_step_name": "apk_update",
-        "install_cmd": "apk add --no-cache python3 py3-pip sudo",
-        "install_step_name": "install_deps",
-        "update_retries": 3,
-        "install_retries": 5,
-    },
-    "pacman": {
-        "update_cmd": "pacman -Sy --noconfirm",
-        "update_step_name": "pacman_update",
-        "install_cmd": "pacman -S --noconfirm python python-pip sudo",
-        "install_step_name": "install_deps",
-        "update_retries": 3,
-        "install_retries": 5,
-    },
-    "zypper": {
-        "update_cmd": "zypper refresh",
-        "update_step_name": "zypper_update",
-        "install_cmd": "zypper install -y python3 python3-pip sudo",
-        "install_step_name": "install_deps",
-        "update_retries": 3,
-        "install_retries": 5,
-    },
-}
-
-_UPDATE_RETRY_ON = [
-    "Temporary failure resolving",
-    "Could not resolve",
-    "Failed to fetch",
-]
-
-_INSTALL_RETRY_ON = [
-    "lock-frontend",
-    "Unable to acquire the dpkg frontend lock",
-    "Temporary failure resolving",
-    "Could not resolve",
-    "Failed to fetch",
-]
-
-
 def _build_bootstrap_steps(
     user: str,
     password: str,
     ssh_key: str,
     include_portacode_connect: bool = True,
-    package_manager: str = "apt",
 ) -> List[Dict[str, Any]]:
-    profile = _PACKAGE_MANAGER_PROFILES.get(package_manager, _PACKAGE_MANAGER_PROFILES["apt"])
-    steps: List[Dict[str, Any]] = []
-    update_cmd = profile.get("update_cmd")
-    if update_cmd:
-        steps.append(
-            {
-                "name": profile.get("update_step_name", "package_update"),
-                "cmd": update_cmd,
-                "retries": profile.get("update_retries", 3),
-                "retry_delay_s": 5,
-                "retry_on": _UPDATE_RETRY_ON,
-            }
-        )
-    install_cmd = profile.get("install_cmd")
-    if install_cmd:
-        steps.append(
-            {
-                "name": profile.get("install_step_name", "install_deps"),
-                "cmd": install_cmd,
-                "retries": profile.get("install_retries", 5),
-                "retry_delay_s": 5,
-                "retry_on": _INSTALL_RETRY_ON,
-            }
-        )
-    steps.extend(
-        [
-            {"name": "user_exists", "cmd": f"id -u {user} >/dev/null 2>&1 || adduser --disabled-password --gecos '' {user}", "retries": 0},
-            {"name": "add_sudo", "cmd": f"usermod -aG sudo {user}", "retries": 0},
-        ]
-    )
+    steps = [
+        {
+            "name": "apt_update",
+            "cmd": "apt-get update -y",
+            "retries": 4,
+            "retry_delay_s": 5,
+            "retry_on": [
+                "Temporary failure resolving",
+                "Could not resolve",
+                "Failed to fetch",
+            ],
+        },
+        {
+            "name": "install_deps",
+            "cmd": "apt-get install -y python3 python3-pip sudo --fix-missing",
+            "retries": 5,
+            "retry_delay_s": 5,
+            "retry_on": [
+                "lock-frontend",
+                "Unable to acquire the dpkg frontend lock",
+                "Temporary failure resolving",
+                "Could not resolve",
+                "Failed to fetch",
+            ],
+        },
+        {"name": "user_exists", "cmd": f"id -u {user} >/dev/null 2>&1 || adduser --disabled-password --gecos '' {user}", "retries": 0},
+        {"name": "add_sudo", "cmd": f"usermod -aG sudo {user}", "retries": 0},
+    ]
     if password:
         steps.append({"name": "set_password", "cmd": f"echo '{user}:{password}' | chpasswd", "retries": 0})
     if ssh_key:
-        steps.append(
-            {
-                "name": "add_ssh_key",
-                "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:{user} /home/{user}/.ssh",
-                "retries": 0,
-            }
-        )
+        steps.append({
+            "name": "add_ssh_key",
+            "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:{user} /home/{user}/.ssh",
+            "retries": 0,
+        })
     steps.extend(
         [
             {"name": "pip_upgrade", "cmd": "python3 -m pip install --upgrade pip", "retries": 0},
@@ -628,27 +526,6 @@ def _build_bootstrap_steps(
     return steps
 
 
-def _guess_package_manager_from_template(template: str) -> str:
-    normalized = (template or "").lower()
-    if "alpine" in normalized:
-        return "apk"
-    if "archlinux" in normalized:
-        return "pacman"
-    if "centos-7" in normalized:
-        return "yum"
-    if any(keyword in normalized for keyword in ("centos-8", "centos-9", "centos-9-stream", "centos-8-stream")):
-        return "dnf"
-    if any(keyword in normalized for keyword in ("rockylinux", "almalinux", "fedora")):
-        return "dnf"
-    if "opensuse" in normalized or "suse" in normalized:
-        return "zypper"
-    if any(keyword in normalized for keyword in ("debian", "ubuntu", "devuan", "turnkeylinux")):
-        return "apt"
-    if normalized.startswith("system/") and "linux" in normalized:
-        return "apt"
-    return "apt"
-
-
 def _get_storage_type(storages: Iterable[Dict[str, Any]], storage_name: str) -> str:
     for entry in storages:
         if entry.get("storage") == storage_name:
@@ -756,7 +633,7 @@ def _remove_container_record(vmid: int) -> None:
 
 
 def _build_container_payload(message: Dict[str, Any], config: Dict[str, Any]) -> Dict[str, Any]:
-    templates = _get_startup_templates(config)
+    templates = config.get("templates") or []
     default_template = templates[0] if templates else ""
     template = message.get("template") or default_template
     if not template:
@@ -1177,6 +1054,7 @@ def build_snapshot(config: Dict[str, Any]) -> Dict[str, Any]:
     }
     if not config:
         return {"configured": False, "network": base_network}
+    _ensure_templates_refreshed_on_startup(config)
     return {
         "configured": True,
         "host": config.get("host"),
@@ -1184,14 +1062,13 @@ def build_snapshot(config: Dict[str, Any]) -> Dict[str, Any]:
         "user": config.get("user"),
         "token_name": config.get("token_name"),
         "default_storage": config.get("default_storage"),
-        "templates": _get_startup_templates(config),
+        "templates": config.get("templates") or [],
         "last_verified": config.get("last_verified"),
         "network": base_network,
     }
 
 
 def configure_infrastructure(token_identifier: str, token_value: str, verify_ssl: bool = False) -> Dict[str, Any]:
-    _clear_startup_templates()
     ProxmoxAPI = _ensure_proxmoxer()
     user, token_name = _parse_token(token_identifier)
     client = ProxmoxAPI(
@@ -1227,12 +1104,12 @@ def configure_infrastructure(token_identifier: str, token_value: str, verify_ssl
         "token_value": token_value,
         "verify_ssl": verify_ssl,
         "default_storage": default_storage,
+        "templates": templates,
         "last_verified": datetime.utcnow().isoformat() + "Z",
         "network": network,
         "node_status": status,
     }
     _save_config(config)
-    _ensure_startup_templates(config)
     snapshot = build_snapshot(config)
     snapshot["node_status"] = status
     snapshot["managed_containers"] = _get_managed_containers_summary(force=True)
@@ -1252,7 +1129,6 @@ def revert_infrastructure() -> Dict[str, Any]:
     _revert_bridge()
     if CONFIG_PATH.exists():
         CONFIG_PATH.unlink()
-    _clear_startup_templates()
     snapshot = build_snapshot({})
     snapshot["network"] = snapshot.get("network", {})
     snapshot["network"]["applied"] = False
@@ -1313,17 +1189,12 @@ class CreateProxmoxContainerHandler(SyncHandler):
         device_public_key = (message.get("device_public_key") or "").strip()
         device_private_key = (message.get("device_private_key") or "").strip()
         has_device_keypair = bool(device_public_key and device_private_key)
-        config_guess = _load_config()
-        template_candidates = _get_startup_templates(config_guess)
-        template_hint = (message.get("template") or (template_candidates[0] if template_candidates else "")).strip()
-        package_manager = _guess_package_manager_from_template(template_hint)
         bootstrap_user, bootstrap_password, bootstrap_ssh_key = _get_provisioning_user_info(message)
         bootstrap_steps = _build_bootstrap_steps(
             bootstrap_user,
             bootstrap_password,
             bootstrap_ssh_key,
             include_portacode_connect=not has_device_keypair,
-            package_manager=package_manager,
         )
         total_steps = 3 + len(bootstrap_steps) + 2
         current_step_index = 1

{portacode-1.4.15.dev9 → portacode-1.4.15.dev10}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.15.dev9
+Version: 1.4.15.dev10
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian