portacode 1.4.17.dev1__tar.gz → 1.4.17.dev3__tar.gz

{portacode-1.4.17.dev1 → portacode-1.4.17.dev3}/PKG-INFO

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

{portacode-1.4.17.dev1 → portacode-1.4.17.dev3}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.17.dev1'
-__version_tuple__ = version_tuple = (1, 4, 17, 'dev1')
+__version__ = version = '1.4.17.dev3'
+__version_tuple__ = version_tuple = (1, 4, 17, 'dev3')
 
 __commit_id__ = commit_id = None

{portacode-1.4.17.dev1 → portacode-1.4.17.dev3}/portacode/connection/handlers/proxmox_infra.py

@@ -49,6 +49,7 @@ _MANAGED_CONTAINERS_CACHE_TTL_S = 30.0
 _MANAGED_CONTAINERS_CACHE: Dict[str, Any] = {"timestamp": 0.0, "summary": None}
 _MANAGED_CONTAINERS_CACHE_LOCK = threading.Lock()
 _CAPACITY_LOCK = threading.Lock()
+_PENDING_ALLOCATIONS = {"ram_mib": 0.0, "disk_gib": 0.0, "cpu_share": 0.0}
 TEMPLATES_REFRESH_INTERVAL_S = 300
 
 ProgressCallback = Callable[[int, int, Dict[str, Any], str, Optional[Dict[str, Any]]], None]
@@ -421,7 +422,14 @@ def _to_mib(value: Any) -> float:
 
 
 def _pick_container_ram_mib(kind: str, cfg: Dict[str, Any], entry: Dict[str, Any]) -> float:
-    for candidate in (cfg.get("memory"), entry.get("maxmem"), entry.get("mem")):
+    """
+    Proxmox config `memory` is already MiB for both LXC and QEMU.
+    Fall back to list fields (bytes) only when it is absent/zero.
+    """
+    mem_cfg = _safe_float(cfg.get("memory"))
+    if mem_cfg:
+        return mem_cfg
+    for candidate in (entry.get("maxmem"), entry.get("mem")):
         ram = _to_mib(candidate)
         if ram:
             return ram
@@ -721,6 +729,13 @@ def _build_full_container_summary(records: List[Dict[str, Any]], config: Dict[st
                     "template": record.get("template") if record else None,
                     "created_at": record.get("created_at") if record else None,
                 }
+                # Fallback to recorded specs if live probing returned zeros (e.g., just-created CT).
+                if not merged["ram_mib"] and record:
+                    merged["ram_mib"] = record.get("ram_mib") or merged["ram_mib"]
+                if not merged["disk_gib"] and record:
+                    merged["disk_gib"] = record.get("disk_gib") or merged["disk_gib"]
+                if not merged["cpu_share"] and record:
+                    merged["cpu_share"] = record.get("cpus") or merged["cpu_share"]
                 managed_entries.append(merged)
             else:
                 unmanaged_entries.append(base_entry)
@@ -783,20 +798,24 @@ def _compute_free_resources(summary: Dict[str, Any]) -> Dict[str, float]:
     free_ram = None
     free_disk = None
     free_cpu = None
+    with _CAPACITY_LOCK:
+        pending_ram = float(_PENDING_ALLOCATIONS["ram_mib"])
+        pending_disk = float(_PENDING_ALLOCATIONS["disk_gib"])
+        pending_cpu = float(_PENDING_ALLOCATIONS["cpu_share"])
     host_ram = summary.get("host_total_ram_mib")
     alloc_ram = summary.get("allocated_ram_mib")
     if host_ram is not None and alloc_ram is not None:
-        free_ram = max(float(host_ram) - float(alloc_ram), 0.0)
+        free_ram = max(float(host_ram) - float(alloc_ram) - pending_ram, 0.0)
 
     host_disk = summary.get("host_total_disk_gib")
     alloc_disk = summary.get("allocated_disk_gib")
     if host_disk is not None and alloc_disk is not None:
-        free_disk = max(float(host_disk) - float(alloc_disk), 0.0)
+        free_disk = max(float(host_disk) - float(alloc_disk) - pending_disk, 0.0)
 
     host_cpu = summary.get("host_total_cpu_cores")
     alloc_cpu = summary.get("allocated_cpu_share")
     if host_cpu is not None and alloc_cpu is not None:
-        free_cpu = max(float(host_cpu) - float(alloc_cpu), 0.0)
+        free_cpu = max(float(host_cpu) - float(alloc_cpu) - pending_cpu, 0.0)
 
     return {
         "ram_mib": free_ram,
@@ -1155,21 +1174,30 @@ def _start_container(proxmox: Any, node: str, vmid: int) -> Tuple[Dict[str, Any]
         return status, 0.0
 
     # Validate capacity using the same math as the dashboard and serialize allocation.
+    summary = _get_managed_containers_summary(force=True)
+    cfg = proxmox.nodes(node).lxc(vmid).config.get()
+    payload = {
+        "ram_mib": _to_mib(cfg.get("memory")),
+        "disk_gib": _pick_container_disk_gib("lxc", cfg, {"rootfs": cfg.get("rootfs")}),
+        "cpus": _pick_container_cpu_share("lxc", cfg, {}),
+    }
     with _CAPACITY_LOCK:
-        summary = _get_managed_containers_summary(force=True)
-        cfg = proxmox.nodes(node).lxc(vmid).config.get()
-        payload = {
-            "ram_mib": _to_mib(cfg.get("memory")),
-            "disk_gib": _pick_container_disk_gib("lxc", cfg, {"rootfs": cfg.get("rootfs")}),
-            "cpus": _pick_container_cpu_share("lxc", cfg, {}),
-        }
         try:
             _assert_capacity_for_payload(payload, summary)
         except RuntimeError as exc:
             raise RuntimeError(f"Not enough resources to start container {vmid}: {exc}") from exc
+        _PENDING_ALLOCATIONS["ram_mib"] += float(payload["ram_mib"] or 0)
+        _PENDING_ALLOCATIONS["disk_gib"] += float(payload["disk_gib"] or 0)
+        _PENDING_ALLOCATIONS["cpu_share"] += float(payload["cpus"] or 0)
 
-    upid = proxmox.nodes(node).lxc(vmid).status.start.post()
-    return _wait_for_task(proxmox, node, upid)
+    try:
+        upid = proxmox.nodes(node).lxc(vmid).status.start.post()
+        return _wait_for_task(proxmox, node, upid)
+    finally:
+        with _CAPACITY_LOCK:
+            _PENDING_ALLOCATIONS["ram_mib"] -= float(payload["ram_mib"] or 0)
+            _PENDING_ALLOCATIONS["disk_gib"] -= float(payload["disk_gib"] or 0)
+            _PENDING_ALLOCATIONS["cpu_share"] -= float(payload["cpus"] or 0)
 
 
 def _stop_container(proxmox: Any, node: str, vmid: int) -> Tuple[Dict[str, Any], float]:
@@ -1896,22 +1924,31 @@ class CreateProxmoxContainerHandler(SyncHandler):
             _validate_environment,
         )
 
-        def _create_container():
-            proxmox = _connect_proxmox(config)
-            node = config.get("node") or DEFAULT_NODE_NAME
-            payload = _build_container_payload(message, config)
-            payload["cpulimit"] = float(payload["cpus"])
-            payload["cores"] = int(max(math.ceil(payload["cpus"]), 1))
-            payload["memory"] = int(payload["ram_mib"])
-            payload["node"] = node
-            # Validate against current free resources (same math as dashboard charts) with serialization.
-            with _CAPACITY_LOCK:
-                summary = _get_managed_containers_summary(force=True)
-                try:
-                    _assert_capacity_for_payload(payload, summary)
-                except RuntimeError as exc:
-                    raise RuntimeError(f"Not enough resources to create the container safely: {exc}") from exc
-                vmid, _ = _instantiate_container(proxmox, node, payload)
+def _create_container():
+    proxmox = _connect_proxmox(config)
+    node = config.get("node") or DEFAULT_NODE_NAME
+    payload = _build_container_payload(message, config)
+    payload["cpulimit"] = float(payload["cpus"])
+    payload["cores"] = int(max(math.ceil(payload["cpus"]), 1))
+    payload["memory"] = int(payload["ram_mib"])
+    payload["node"] = node
+    # Validate against current free resources (same math as dashboard charts) and place a short-lived reservation.
+    summary = _get_managed_containers_summary(force=True)
+    with _CAPACITY_LOCK:
+        try:
+            _assert_capacity_for_payload(payload, summary)
+        except RuntimeError as exc:
+            raise RuntimeError(f"Not enough resources to create the container safely: {exc}") from exc
+        _PENDING_ALLOCATIONS["ram_mib"] += float(payload["ram_mib"] or 0)
+        _PENDING_ALLOCATIONS["disk_gib"] += float(payload["disk_gib"] or 0)
+        _PENDING_ALLOCATIONS["cpu_share"] += float(payload["cpus"] or 0)
+    try:
+        vmid, _ = _instantiate_container(proxmox, node, payload)
+    finally:
+        with _CAPACITY_LOCK:
+            _PENDING_ALLOCATIONS["ram_mib"] -= float(payload["ram_mib"] or 0)
+            _PENDING_ALLOCATIONS["disk_gib"] -= float(payload["disk_gib"] or 0)
+            _PENDING_ALLOCATIONS["cpu_share"] -= float(payload["cpus"] or 0)
             logger.debug(
                 "Provisioning container node=%s template=%s ram=%s cpu=%s storage=%s",
                 node,

{portacode-1.4.17.dev1 → portacode-1.4.17.dev3}/portacode.egg-info/PKG-INFO

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