portacode 1.4.16.dev3__py3-none-any.whl → 1.4.16.dev8__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.16.dev3'
-__version_tuple__ = version_tuple = (1, 4, 16, 'dev3')
+__version__ = version = '1.4.16.dev8'
+__version_tuple__ = version_tuple = (1, 4, 16, 'dev8')
 
 __commit_id__ = commit_id = None

portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -1153,17 +1153,26 @@ Provides system information in response to a `system_info` action. Handled by [`
                             *   `status` (string): Lowercase lifecycle status (e.g., `running`, `stopped`, `deleted`).
                             *   `created_at` (string|null): ISO timestamp recorded when the CT was provisioned.
                             *   `managed` (boolean): `true` for Portacode-managed entries.
+                            *   `matches_default_storage` (boolean): `true` when this container is backed by the default storage pool used for new Portacode containers.
+                            *   `type` (string): Either `lxc` or `qemu`, indicating whether we enumerated the container from the LXC or QEMU APIs.
                         *   `unmanaged_containers` (array[object]): Facts about containers Portacode did not provision; fields mirror the managed list but are marked `managed=false`.
-                        *   `unmanaged_count` (integer): Number of unmanaged containers detected on the node.
-                        *   `allocated_ram_mib` (integer): Total RAM reserved by both managed and unmanaged containers.
-                        *   `allocated_disk_gib` (integer): Total disk reserved by both managed and unmanaged containers.
-                        *   `allocated_cpu_share` (number): Total CPU shares requested by both managed and unmanaged containers.
-                        *   `available_ram_mib` (integer|null): Remaining RAM after subtracting all reservations from the host total (null when unavailable).
-                        *   `available_disk_gib` (integer|null): Remaining disk GB after subtracting allocations from the host total.
-                        *   `available_cpu_share` (number|null): Remaining CPU shares after allocations.
-                        *   `host_total_ram_mib` (integer|null): Host memory capacity observed via Proxmox.
-                        *   `host_total_disk_gib` (integer|null): Host disk capacity observed via Proxmox.
-                        *   `host_total_cpu_cores` (integer|null): Number of CPU cores reported by Proxmox.
+                            *   `reserve_on_boot` (boolean): `true` when the CT is configured to start at boot; this flag is used to decide if its RAM and CPU allocations count toward the available totals.
+                    *   `unmanaged_count` (integer): Number of unmanaged containers detected on the node.
+                    *   `allocated_ram_mib` (integer): Total RAM reserved by both managed and unmanaged containers.
+                    *   `allocated_disk_gib` (integer): Total disk reserved by both managed and unmanaged containers.
+                    *   `allocated_cpu_share` (number): Total CPU shares requested by both managed and unmanaged containers.
+                    *   `available_ram_mib` (integer|null): Remaining RAM after subtracting all reservations from the host total (null when unavailable).
+                    *   `available_disk_gib` (integer|null): Remaining disk GB after subtracting allocations from the host total.
+                    *   `available_cpu_share` (number|null): Remaining CPU shares after allocations.
+                    *   `host_total_ram_mib` (integer|null): Host memory capacity observed via Proxmox.
+                    *   `host_total_disk_gib` (integer|null): Host disk capacity observed via Proxmox.
+                    *   `host_total_cpu_cores` (integer|null): Number of CPU cores reported by Proxmox.
+                    *   `default_storage` (string|null): Storage pool name selected during infrastructure configuration.
+                    *   `default_storage_snapshot` (object|null): Fresh stats for the default storage pool:
+                        *   `storage` (string): Storage pool identifier.
+                        *   `total_gib` (integer|null): Capacity of the storage pool.
+                        *   `avail_gib` (integer|null): Available space remaining.
+                        *   `used_gib` (integer|null): Space already consumed.
     *   `portacode_version` (string): Installed CLI version returned by `portacode.__version__`.
 
 ### `proxmox_infra_configured`

portacode/connection/handlers/proxmox_infra.py

@@ -259,6 +259,30 @@ def _bytes_to_gib(value: Any) -> int:
     return int(round(_normalize_bytes(value) / (1024**3)))
 
 
+def _extract_storage(value: Any) -> str:
+    if not value:
+        return "unknown"
+    text = str(value).strip()
+    if not text:
+        return "unknown"
+    primary = text.split(",", 1)[0]
+    storage = primary.split(":", 1)[0].strip()
+    return storage or "unknown"
+
+
+def _normalize_storage_name(name: Any) -> str:
+    if not name:
+        return ""
+    return str(name).strip().lower()
+
+
+def _parse_bool_flag(value: Any) -> bool:
+    if isinstance(value, bool):
+        return value
+    text = str(value or "").strip().lower()
+    return text in {"1", "true", "yes", "on"}
+
+
 def _parse_iso_timestamp(value: str) -> Optional[datetime]:
     if not value:
         return None
@@ -451,9 +475,44 @@ def _extract_host_totals(node_status: Dict[str, Any] | None) -> Tuple[Optional[i
     return host_ram, host_disk, host_cpu
 
 
-def _build_unmanaged_container_entry(ct: Dict[str, Any], cfg: Dict[str, Any], vmid: str) -> Dict[str, Any]:
+def _parse_disk_reference(value: Any) -> Tuple[str | None, int]:
+    if not value:
+        return None, 0
+    text = str(value)
+    primary = text.split(",", 1)[0]
+    if ":" not in primary:
+        return primary.strip() or None, 0
+    storage_name, size_part = primary.split(":", 1)
+    storage_name = storage_name.strip() or None
+    size_text = size_part.strip()
+    if not size_text:
+        return storage_name, 0
+    unit = size_text[-1].upper()
+    number = size_text[:-1] if unit in {"G", "M"} else size_text
+    try:
+        value_num = float(number)
+    except ValueError:
+        return storage_name, 0
+    if unit == "M":
+        gib = value_num / 1024.0
+    else:
+        gib = value_num
+    return storage_name, int(round(gib))
+
+
+def _build_unmanaged_container_entry(
+    ct: Dict[str, Any],
+    cfg: Dict[str, Any],
+    vmid: str,
+    default_storage: str | None,
+    *,
+    disk_gib_override: int | None = None,
+    storage_override: str | None = None,
+    entry_type: str = "lxc",
+) -> Dict[str, Any]:
     ram_mib = _to_int(cfg.get("memory")) or _bytes_to_mib(ct.get("maxmem"))
-    disk_gib = _bytes_to_gib(ct.get("maxdisk"))
+    disk_source = cfg.get("disk") or ct.get("disk") or ct.get("maxdisk")
+    disk_gib = disk_gib_override if disk_gib_override is not None else _bytes_to_gib(disk_source)
     cpu_share = _to_float(
         cfg.get("cpulimit")
         or cfg.get("cpus")
@@ -462,8 +521,13 @@ def _build_unmanaged_container_entry(ct: Dict[str, Any], cfg: Dict[str, Any], vm
         or ct.get("cpu")
     )
     hostname = ct.get("name") or cfg.get("hostname") or f"ct{vmid}"
-    storage = cfg.get("storage") or ct.get("storage")
+    storage_source = (
+        storage_override or cfg.get("storage") or ct.get("storage") or ct.get("rootfs")
+    )
+    storage = _extract_storage(storage_source)
     status = (ct.get("status") or "unknown").lower()
+    reserved = _parse_bool_flag(cfg.get("onboot"))
+    storage_matches_default = _storage_matches_default(storage, default_storage)
     return {
         "vmid": vmid,
         "hostname": hostname,
@@ -472,16 +536,68 @@ def _build_unmanaged_container_entry(ct: Dict[str, Any], cfg: Dict[str, Any], vm
         "disk_gib": disk_gib,
         "ram_mib": ram_mib,
         "cpu_share": cpu_share,
+        "reserve_on_boot": reserved,
+        "matches_default_storage": storage_matches_default,
+        "type": entry_type,
         "status": status,
         "managed": False,
     }
 
 
+def _get_storage_snapshot(proxmox: Any, node: str, storage_name: str | None) -> Dict[str, Any] | None:
+    if not storage_name:
+        return None
+    try:
+        storage = proxmox.nodes(node).storage(storage_name).status.get()
+    except Exception as exc:
+        logger.debug("Unable to read storage status %s:%s: %s", node, storage_name, exc)
+        return None
+    total_bytes = storage.get("total")
+    avail_bytes = storage.get("avail")
+    used_bytes = storage.get("used")
+    return {
+        "storage": storage_name,
+        "total_gib": _bytes_to_gib(total_bytes) if total_bytes is not None else None,
+        "avail_gib": _bytes_to_gib(avail_bytes) if avail_bytes is not None else None,
+        "used_gib": _bytes_to_gib(used_bytes) if used_bytes is not None else None,
+    }
+
+
+def _extract_qemu_disk_info(cfg: Dict[str, Any]) -> Tuple[str | None, int]:
+    disk_keys = sorted(
+        key
+        for key in cfg.keys()
+        if (
+            key.startswith("ide")
+            or key.startswith("sata")
+            or key.startswith("scsi")
+            or key.startswith("virtio")
+            or key.startswith("efidisk")
+            or key.startswith("raid")
+        )
+        and cfg.get(key)
+    )
+    for key in disk_keys:
+        storage_name, size_gib = _parse_disk_reference(cfg.get(key))
+        if storage_name or size_gib:
+            return storage_name, size_gib
+    return None, 0
+
+
+def _storage_matches_default(storage_name: Any, default_storage: str | None) -> bool:
+    if not default_storage:
+        return True
+    normalized_storage = _normalize_storage_name(_extract_storage(storage_name))
+    normalized_default = _normalize_storage_name(_extract_storage(default_storage))
+    return normalized_storage == normalized_default
+
 
 def _build_managed_containers_summary(
     records: List[Dict[str, Any]],
     unmanaged_records: List[Dict[str, Any]],
     node_status: Dict[str, Any] | None,
+    storage_snapshot: Dict[str, Any] | None,
+    default_storage: str | None,
 ) -> Dict[str, Any]:
     managed_containers: List[Dict[str, Any]] = []
     total_ram = 0
@@ -509,18 +625,36 @@ def _build_managed_containers_summary(
                 "created_at": record.get("created_at"),
                 "status": status,
                 "managed": True,
+                "matches_default_storage": _storage_matches_default(record.get("storage"), default_storage),
             }
         )
 
-    unmanaged_total_ram = sum(_to_int(entry.get("ram_mib")) for entry in unmanaged_records)
-    unmanaged_total_disk = sum(_to_int(entry.get("disk_gib")) for entry in unmanaged_records)
-    unmanaged_total_cpu = sum(_to_float(entry.get("cpu_share")) for entry in unmanaged_records)
+    unmanaged_total_ram = sum(
+        _to_int(entry.get("ram_mib"))
+        for entry in unmanaged_records
+        if entry.get("reserve_on_boot")
+    )
+    unmanaged_total_disk = sum(
+        _to_int(entry.get("disk_gib"))
+        for entry in unmanaged_records
+        if entry.get("matches_default_storage")
+    )
+    unmanaged_total_cpu = sum(
+        _to_float(entry.get("cpu_share"))
+        for entry in unmanaged_records
+        if entry.get("reserve_on_boot")
+    )
 
     allocated_ram = total_ram + unmanaged_total_ram
     allocated_disk = total_disk + unmanaged_total_disk
     allocated_cpu = total_cpu_share + unmanaged_total_cpu
 
-    host_ram, host_disk, host_cpu = _extract_host_totals(node_status)
+    host_ram_node, host_disk_node, host_cpu_node = _extract_host_totals(node_status)
+    storage_host_disk = storage_snapshot.get("total_gib") if storage_snapshot else None
+    host_ram = host_ram_node
+    host_disk = storage_host_disk if storage_host_disk is not None else host_disk_node
+    host_cpu = host_cpu_node
+
 
     return {
         "updated_at": datetime.utcnow().isoformat() + "Z",
@@ -540,6 +674,8 @@ def _build_managed_containers_summary(
         "host_total_ram_mib": host_ram,
         "host_total_disk_gib": host_disk,
         "host_total_cpu_cores": host_cpu,
+        "default_storage": default_storage,
+        "default_storage_snapshot": storage_snapshot,
     }
 
 
@@ -548,12 +684,15 @@ def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
         records: List[Dict[str, Any]],
         config: Dict[str, Any] | None,
         managed_vmids: Set[str],
-    ) -> Tuple[Dict[str, str], List[Dict[str, Any]], Dict[str, Any] | None]:
+        default_storage: str | None,
+    ) -> Tuple[Dict[str, str], List[Dict[str, Any]], Dict[str, Any] | None, Dict[str, Any] | None]:
         statuses: Dict[str, str] = {}
         unmanaged: List[Dict[str, Any]] = []
         node_status: Dict[str, Any] | None = None
         if not config:
-            return statuses, unmanaged, node_status
+            return statuses, unmanaged, node_status, None
+        proxmox = None
+        node = None
         try:
             proxmox = _connect_proxmox(config)
             node = _get_node_from_config(config)
@@ -574,10 +713,45 @@ def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
                 description = (cfg.get("description") or "")
                 if MANAGED_MARKER in description:
                     continue
-                unmanaged.append(_build_unmanaged_container_entry(ct, cfg, vmid_key))
+                unmanaged.append(
+                    _build_unmanaged_container_entry(ct, cfg, vmid_key, default_storage, entry_type="lxc")
+                )
+            for vm in proxmox.nodes(node).qemu.get():
+                vmid_val = vm.get("vmid")
+                if vmid_val is None:
+                    continue
+                vmid_key = str(_to_int(vmid_val))
+                statuses[vmid_key] = (vm.get("status") or "unknown").lower()
+                if vmid_key in managed_vmids:
+                    continue
+                cfg: Dict[str, Any] = {}
+                try:
+                    cfg = proxmox.nodes(node).qemu(vmid_key).config.get() or {}
+                except Exception as exc:
+                    logger.debug("Failed to read config for VM %s: %s", vmid_key, exc)
+                description = (cfg.get("description") or "")
+                if MANAGED_MARKER in description:
+                    continue
+                storage_name, disk_gib_override = _extract_qemu_disk_info(cfg)
+                unmanaged.append(
+                    _build_unmanaged_container_entry(
+                        vm,
+                        cfg,
+                        vmid_key,
+                        default_storage,
+                        disk_gib_override=disk_gib_override,
+                        storage_override=storage_name,
+                        entry_type="qemu",
+                    )
+                )
         except Exception as exc:  # pragma: no cover - best effort
             logger.debug("Failed to refresh container statuses: %s", exc)
-        return statuses, unmanaged, node_status
+        storage_snapshot = (
+            _get_storage_snapshot(proxmox, node, default_storage)
+            if proxmox and node
+            else None
+        )
+        return statuses, unmanaged, node_status, storage_snapshot
 
     now = time.monotonic()
     with _MANAGED_CONTAINERS_CACHE_LOCK:
@@ -590,7 +764,10 @@ def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
     managed_vmids: Set[str] = {
         str(_to_int(record.get("vmid"))) for record in records if record.get("vmid") is not None
     }
-    statuses, unmanaged, node_status = _refresh_container_statuses(records, config, managed_vmids)
+    default_storage = config.get("default_storage") if config else None
+    statuses, unmanaged, node_status, storage_snapshot = _refresh_container_statuses(
+        records, config, managed_vmids, default_storage
+    )
     for record in records:
         vmid = record.get("vmid")
         if vmid is None:
@@ -599,7 +776,7 @@ def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
         status = statuses.get(vmid_key)
         if status:
             record["status"] = status
-    summary = _build_managed_containers_summary(records, unmanaged, node_status)
+    summary = _build_managed_containers_summary(records, unmanaged, node_status, storage_snapshot, default_storage)
     with _MANAGED_CONTAINERS_CACHE_LOCK:
         _MANAGED_CONTAINERS_CACHE["timestamp"] = now
         _MANAGED_CONTAINERS_CACHE["summary"] = summary

{portacode-1.4.16.dev3.dist-info → portacode-1.4.16.dev8.dist-info}/METADATA

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

{portacode-1.4.16.dev3.dist-info → portacode-1.4.16.dev8.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=HLH9O1BtoKVO_ZLCnGRXJ_xMQe43OyaD07QzQgNnelQ,719
+portacode/_version.py,sha256=VGaY-LcOZhWVvp6-lz1Mul_hv8BD77OfZQu3NhYJfE8,719
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
@@ -14,7 +14,7 @@ portacode/connection/client.py,sha256=jtLb9_YufqPkzi9t8VQH3iz_JEMisbtY6a8L9U5wei
 portacode/connection/multiplex.py,sha256=L-TxqJ_ZEbfNEfu1cwxgJ5vUdyRzZjsMy2Kx1diiZys,5237
 portacode/connection/terminal.py,sha256=n1Uu92JacV5K6d1Qwx94Tw9OB2Tpke5HqsW2NDn76Ls,49032
 portacode/connection/handlers/README.md,sha256=HsLZG1QK1JNm67HsgL6WoDg9nxzKXxwkc5fJPFJdX5g,12169
-portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=U7zkUpwscWf5aqimNIP3uYXvg-t9S0MhyaZ3ygF-ADk,102593
+portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=R9trHDWDuADIY2Xs2LrpIw1himtxE-NDb_6CzNVNVcM,103625
 portacode/connection/handlers/__init__.py,sha256=WSeBmi65GWFQPYt9M3E10rn0uZ_EPCJzNJOzSf2HZyw,2921
 portacode/connection/handlers/base.py,sha256=oENFb-Fcfzwk99Qx8gJQriEMiwSxwygwjOiuCH36hM4,10231
 portacode/connection/handlers/chunked_content.py,sha256=h6hXRmxSeOgnIxoU8CkmvEf2Odv-ajPrpHIe_W3GKcA,9251
@@ -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=IG8qp607grx4v9jSWL5TawUrIN0VElIR2swjA_rpn9U,78132
+portacode/connection/handlers/proxmox_infra.py,sha256=CDrPWs-WLVMd95AKRukeUwZkW4J0kcWh3Vb3oLNNDCU,84394
 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.16.dev3.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.16.dev8.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.16.dev3.dist-info/METADATA,sha256=ulkuZ2NkbFWXncNI8ZPHvWD2ThvRJ3-rFMYBNuFHpG8,13051
-portacode-1.4.16.dev3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-portacode-1.4.16.dev3.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.16.dev3.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.16.dev3.dist-info/RECORD,,
+portacode-1.4.16.dev8.dist-info/METADATA,sha256=oXg32kxrBFgBp8Che47OV2D20d5zz0Vdyc517TAdzCU,13051
+portacode-1.4.16.dev8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+portacode-1.4.16.dev8.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.16.dev8.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.16.dev8.dist-info/RECORD,,