portacode 1.4.16.dev4__tar.gz → 1.4.16.dev6__tar.gz

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

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

{portacode-1.4.16.dev4 → portacode-1.4.16.dev6}/portacode/_version.py

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

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

@@ -1146,24 +1146,32 @@ 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.
-                        *   `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.
+                        *   `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.
+                    *   `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-1.4.16.dev4 → portacode-1.4.16.dev6}/portacode/connection/handlers/proxmox_infra.py

@@ -259,6 +259,12 @@ def _bytes_to_gib(value: Any) -> int:
     return int(round(_normalize_bytes(value) / (1024**3)))
 
 
+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
@@ -458,7 +464,9 @@ 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 _build_unmanaged_container_entry(
+    ct: Dict[str, Any], cfg: Dict[str, Any], vmid: str, default_storage: str | None
+) -> 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"))
     cpu_share = _to_float(
@@ -472,6 +480,7 @@ def _build_unmanaged_container_entry(ct: Dict[str, Any], cfg: Dict[str, Any], vm
     storage = cfg.get("storage") or ct.get("storage")
     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,
@@ -481,16 +490,44 @@ def _build_unmanaged_container_entry(ct: Dict[str, Any], cfg: Dict[str, Any], vm
         "ram_mib": ram_mib,
         "cpu_share": cpu_share,
         "reserve_on_boot": reserved,
+        "matches_default_storage": storage_matches_default,
         "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 _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)
+
 
 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
@@ -518,6 +555,7 @@ 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),
             }
         )
 
@@ -526,7 +564,12 @@ def _build_managed_containers_summary(
         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)
+    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)
+    )
     unmanaged_total_cpu = sum(
         _to_float(entry.get("cpu_share"))
         for entry in unmanaged_records
@@ -537,7 +580,12 @@ def _build_managed_containers_summary(
     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",
@@ -557,6 +605,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,
     }
 
 
@@ -565,12 +615,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)
@@ -591,10 +644,15 @@ 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))
         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:
@@ -607,7 +665,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:
@@ -616,7 +677,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.dev4 → portacode-1.4.16.dev6}/portacode.egg-info/PKG-INFO

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