portacode 1.4.15.dev6__tar.gz → 1.4.15.dev8__tar.gz

{portacode-1.4.15.dev6 → portacode-1.4.15.dev8}/PKG-INFO

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

{portacode-1.4.15.dev6 → portacode-1.4.15.dev8}/portacode/_version.py

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

{portacode-1.4.15.dev6 → portacode-1.4.15.dev8}/portacode/connection/handlers/proxmox_infra.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 import json
 import logging
+import math
 import os
 import secrets
 import shlex
@@ -46,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]
 
@@ -178,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:
@@ -596,7 +664,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:
@@ -1024,13 +1092,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(
@@ -1066,12 +1135,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)
@@ -1091,6 +1160,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
@@ -1121,7 +1191,7 @@ def _instantiate_container(proxmox: Any, node: str, payload: Dict[str, Any]) ->
             memory=int(payload["ram_mib"]),
             swap=int(payload.get("swap_mb", 0)),
             cores=max(int(payload.get("cores", 1)), 1),
-            cpuunits=int(payload.get("cpuunits", 256)),
+            cpulimit=float(payload.get("cpulimit", payload.get("cpus", 1))),
             net0=payload["net0"],
             unprivileged=int(payload.get("unprivileged", 1)),
             description=payload.get("description", MANAGED_MARKER),
@@ -1235,7 +1305,8 @@ class CreateProxmoxContainerHandler(SyncHandler):
             proxmox = _connect_proxmox(config)
             node = config.get("node") or DEFAULT_NODE_NAME
             payload = _build_container_payload(message, config)
-            payload["cpuunits"] = max(int(payload["cpus"] * 1024), 10)
+            payload["cpulimit"] = float(payload["cpus"])
+            payload["cores"] = int(max(math.ceil(payload["cpus"]), 1))
             payload["memory"] = int(payload["ram_mib"])
             payload["node"] = node
             logger.debug(

{portacode-1.4.15.dev6 → portacode-1.4.15.dev8}/portacode.egg-info/PKG-INFO

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