portacode 1.4.16.dev6__tar.gz → 1.4.16.dev8__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.16.dev6
+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.dev6 → portacode-1.4.16.dev8}/portacode/_version.py

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

{portacode-1.4.16.dev6 → portacode-1.4.16.dev8}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -1146,16 +1146,17 @@ Provides system information in response to a `system_info` action. Handled by [`
                             *   `vmid` (string|null): Numeric CT ID.
                             *   `hostname` (string|null): Hostname configured in the CT.
                             *   `template` (string|null): Template identifier used.
-                        *   `storage` (string|null): Storage pool backing the rootfs.
-                        *   `disk_gib` (integer): Rootfs size in GiB.
-                        *   `ram_mib` (integer): Memory size in MiB.
-                        *   `cpu_share` (number): vCPU-equivalent share requested at creation.
-                        *   `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.
-                    *   `unmanaged_containers` (array[object]): Facts about containers Portacode did not provision; fields mirror the managed list but are marked `managed=false`.
-                        *   `reserve_on_boot` (boolean): `true` when the CT is configured to start at boot; used to determine whether its RAM/CPU allocations count toward the available totals.
+                            *   `storage` (string|null): Storage pool backing the rootfs.
+                            *   `disk_gib` (integer): Rootfs size in GiB.
+                            *   `ram_mib` (integer): Memory size in MiB.
+                            *   `cpu_share` (number): vCPU-equivalent share requested at creation.
+                            *   `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`.
+                            *   `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.

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

@@ -259,6 +259,17 @@ 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 ""
@@ -464,11 +475,44 @@ def _extract_host_totals(node_status: Dict[str, Any] | None) -> Tuple[Optional[i
     return host_ram, host_disk, host_cpu
 
 
+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
+    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")
@@ -477,7 +521,10 @@ def _build_unmanaged_container_entry(
         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)
@@ -491,6 +538,7 @@ def _build_unmanaged_container_entry(
         "cpu_share": cpu_share,
         "reserve_on_boot": reserved,
         "matches_default_storage": storage_matches_default,
+        "type": entry_type,
         "status": status,
         "managed": False,
     }
@@ -515,11 +563,33 @@ def _get_storage_snapshot(proxmox: Any, node: str, storage_name: str | 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
-    return _normalize_storage_name(storage_name) == _normalize_storage_name(default_storage)
+    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(
@@ -567,8 +637,7 @@ def _build_managed_containers_summary(
     unmanaged_total_disk = sum(
         _to_int(entry.get("disk_gib"))
         for entry in unmanaged_records
-        if entry.get("reserve_on_boot")
-        and _storage_matches_default(entry.get("storage"), default_storage)
+        if entry.get("matches_default_storage")
     )
     unmanaged_total_cpu = sum(
         _to_float(entry.get("cpu_share"))
@@ -644,7 +713,37 @@ 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, default_storage))
+                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)
         storage_snapshot = (

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

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