portacode 1.4.17.dev1__py3-none-any.whl → 1.4.17.dev3__py3-none-any.whl

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/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.dist-info → portacode-1.4.17.dev3.dist-info}/METADATA

@@ -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.dist-info → portacode-1.4.17.dev3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 portacode/README.md,sha256=4dKtpvR8LNgZPVz37GmkQCMWIr_u25Ao63iW56s7Ke4,775
 portacode/__init__.py,sha256=oB3sV1wXr-um-RXio73UG8E5Xx6cF2ZVJveqjNmC-vQ,1086
 portacode/__main__.py,sha256=jmHTGC1hzmo9iKJLv-SSYe9BSIbPPZ2IOpecI03PlTs,296
-portacode/_version.py,sha256=30JbXF45c9c1UEsvLScl1Hcz0g1qPk9RGMCBErXUK0c,719
+portacode/_version.py,sha256=16HDRPCTtR6orWusoLn2afHMuqIOPfcRoxTVdLzEYl0,719
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
@@ -22,7 +22,7 @@ portacode/connection/handlers/diff_handlers.py,sha256=iYTIRCcpEQ03vIPKZCsMTE5aZb
 portacode/connection/handlers/file_handlers.py,sha256=nAJH8nXnX07xxD28ngLpgIUzcTuRwZBNpEGEKdRqohw,39507
 portacode/connection/handlers/project_aware_file_handlers.py,sha256=AqgMnDqX2893T2NsrvUSCwjN5VKj4Pb2TN0S_SuboOE,9803
 portacode/connection/handlers/project_state_handlers.py,sha256=v6ZefGW9i7n1aZLq2jOGumJIjYb6aHlPI4m1jkYewm8,1686
-portacode/connection/handlers/proxmox_infra.py,sha256=afndfVsjcHWHsa8F2PkRnHmc67c39k5VMmJeUoSSnok,87601
+portacode/connection/handlers/proxmox_infra.py,sha256=Tuugl7DRJ_oejKQO96A722N4Jt5S-RBkz73LIWDeKEc,89543
 portacode/connection/handlers/registry.py,sha256=qXGE60sYEWg6ZtVQzFcZ5YI2XWR6lMgw4hAL9x5qR1I,6181
 portacode/connection/handlers/session.py,sha256=uNGfiO_1B9-_yjJKkpvmbiJhIl6b-UXlT86UTfd6WYE,42219
 portacode/connection/handlers/system_handlers.py,sha256=fr12QpOr_Z8KYGUU-AYrTQwRPAcrLK85hvj3SEq1Kw8,14757
@@ -65,7 +65,7 @@ portacode/utils/__init__.py,sha256=NgBlWTuNJESfIYJzP_3adI1yJQJR0XJLRpSdVNaBAN0,3
 portacode/utils/diff_apply.py,sha256=4Oi7ft3VUCKmiUE4VM-OeqO7Gk6H7PF3WnN4WHXtjxI,15157
 portacode/utils/diff_renderer.py,sha256=S76StnQ2DLfsz4Gg0m07UwPfRp8270PuzbNaQq-rmYk,13850
 portacode/utils/ntp_clock.py,sha256=VqCnWCTehCufE43W23oB-WUdAZGeCcLxkmIOPwInYHc,2499
-portacode-1.4.17.dev1.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.17.dev3.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
 test_modules/README.md,sha256=Do_agkm9WhSzueXjRAkV_xEj6Emy5zB3N3VKY5Roce8,9274
 test_modules/__init__.py,sha256=1LcbHodIHsB0g-g4NGjSn6AMuCoGbymvXPYLOb6Z7F0,53
 test_modules/test_device_online.py,sha256=QtYq0Dq9vME8Gp2O4fGSheqVf8LUtpsSKosXXk56gGM,1654
@@ -91,8 +91,8 @@ testing_framework/core/playwright_manager.py,sha256=Tw46qwxIhOFkS48C2IWIQHHNpEe-
 testing_framework/core/runner.py,sha256=j2QwNJmAxVBmJvcbVS7DgPJUKPNzqfLmt_4NNdaKmZU,19297
 testing_framework/core/shared_cli_manager.py,sha256=BESSNtyQb7BOlaOvZmm04T8Uezjms4KCBs2MzTxvzYQ,8790
 testing_framework/core/test_discovery.py,sha256=2FZ9fJ8Dp5dloA-fkgXoJ_gCMC_nYPBnA3Hs2xlagzM,4928
-portacode-1.4.17.dev1.dist-info/METADATA,sha256=fiXLmOIToLe48UzncEAQCZnpib1ITZpl0gS06M5fmFA,13051
-portacode-1.4.17.dev1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-portacode-1.4.17.dev1.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.17.dev1.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.17.dev1.dist-info/RECORD,,
+portacode-1.4.17.dev3.dist-info/METADATA,sha256=2SfZxixbECm7f6jilfpD9-8Oal2HIpqK0T07xnxEVa4,13051
+portacode-1.4.17.dev3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+portacode-1.4.17.dev3.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.17.dev3.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.17.dev3.dist-info/RECORD,,