portacode 1.4.15.dev7__tar.gz → 1.4.15.dev9__tar.gz

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

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

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

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

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

@@ -47,6 +47,9 @@ 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()
 
 ProgressCallback = Callable[[int, int, Dict[str, Any], str, Optional[Dict[str, Any]]], None]
 
@@ -179,6 +182,70 @@ 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")
+    token_value = config.get("token_value")
+    if not user or not token_name or not token_value:
+        raise RuntimeError("Proxmox API credentials are missing")
+    ProxmoxAPI = _ensure_proxmoxer()
+    return ProxmoxAPI(
+        config.get("host", DEFAULT_HOST),
+        user=user,
+        token_name=token_name,
+        token_value=token_value,
+        verify_ssl=config.get("verify_ssl", False),
+        timeout=30,
+    )
+
+
+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
+        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)
+    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
+
+
 def _pick_storage(storages: Iterable[Dict[str, Any]]) -> str:
     candidates = [s for s in storages if "rootdir" in s.get("content", "") and s.get("avail", 0) > 0]
     if not candidates:
@@ -561,21 +628,24 @@ def _build_bootstrap_steps(
     return steps
 
 
-def _detect_package_manager(vmid: int) -> str:
-    candidates = [
-        ("apt", "apt-get"),
-        ("dnf", "dnf"),
-        ("yum", "yum"),
-        ("apk", "apk"),
-        ("pacman", "pacman"),
-        ("zypper", "zypper"),
-    ]
-    for name, binary in candidates:
-        res = _run_pct(vmid, f"command -v {binary} >/dev/null 2>&1")
-        if res.get("returncode") == 0:
-            logger.debug("Detected package manager %s inside container %s", name, vmid)
-            return name
-    logger.warning("Unable to detect package manager inside container %s; defaulting to apt", vmid)
+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"
 
 
@@ -686,7 +756,7 @@ def _remove_container_record(vmid: int) -> None:
 
 
 def _build_container_payload(message: Dict[str, Any], config: Dict[str, Any]) -> Dict[str, Any]:
-    templates = config.get("templates") or []
+    templates = _get_startup_templates(config)
     default_template = templates[0] if templates else ""
     template = message.get("template") or default_template
     if not template:
@@ -1056,16 +1126,7 @@ def _bootstrap_portacode(
     total_steps: Optional[int] = None,
     default_public_key: Optional[str] = None,
 ) -> Tuple[str, List[Dict[str, Any]]]:
-    if steps is not None:
-        actual_steps = steps
-    else:
-        package_manager = _detect_package_manager(vmid)
-        actual_steps = _build_bootstrap_steps(
-            user,
-            password,
-            ssh_key,
-            package_manager=package_manager,
-        )
+    actual_steps = steps if steps is not None else _build_bootstrap_steps(user, password, ssh_key)
     results, ok = _run_setup_steps(
         vmid,
         actual_steps,
@@ -1123,13 +1184,14 @@ 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": config.get("templates") or [],
+        "templates": _get_startup_templates(config),
         "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(
@@ -1165,12 +1227,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)
@@ -1190,6 +1252,7 @@ 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
@@ -1250,12 +1313,17 @@ 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.dev7 → portacode-1.4.15.dev9}/portacode.egg-info/PKG-INFO

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