portacode 1.4.16.dev2__tar.gz → 1.4.16.dev4__tar.gz

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

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

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

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

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

@@ -1136,22 +1136,34 @@ Provides system information in response to a `system_info` action. Handled by [`
                     *   `bridge` (string): The bridge interface configured (typically `vmbr1`).
                     *   `health` (string|null): `"healthy"` when the connectivity verification succeeded.
                 *   `node_status` (object|null): Status response returned by the Proxmox API when validating the token.
-                *   `managed_containers` (object): Cached summary of the Portacode-managed containers:
-                    *   `updated_at` (string): ISO timestamp when this snapshot was last refreshed.
-                    *   `count` (integer): Number of managed containers.
-                    *   `total_ram_mib` (integer): RAM footprint summed across all containers.
-                    *   `total_disk_gib` (integer): Disk footprint summed across all containers.
-                    *   `total_cpu_share` (number): CPU shares requested across all containers.
-                    *   `containers` (array[object]): Container summaries with the following fields:
-                        *   `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_containers` (object): Cached summary of the Portacode-managed containers:
+                        *   `updated_at` (string): ISO timestamp when this snapshot was last refreshed.
+                        *   `count` (integer): Number of managed containers.
+                        *   `total_ram_mib` (integer): RAM footprint summed across all containers.
+                        *   `total_disk_gib` (integer): Disk footprint summed across all containers.
+                        *   `total_cpu_share` (number): CPU shares requested across all containers.
+                        *   `containers` (array[object]): Container summaries with the following fields:
+                            *   `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.
     *   `portacode_version` (string): Installed CLI version returned by `portacode.__version__`.
 
 ### `proxmox_infra_configured`

{portacode-1.4.16.dev2 → portacode-1.4.16.dev4}/portacode/connection/handlers/proxmox_infra.py

@@ -7,6 +7,7 @@ import json
 import logging
 import math
 import os
+import re
 import secrets
 import shlex
 import shutil
@@ -18,7 +19,7 @@ import time
 import threading
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple
+from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Set, Tuple
 
 import platformdirs
 
@@ -201,6 +202,70 @@ def _current_time_iso() -> str:
     return datetime.now(timezone.utc).isoformat()
 
 
+def _to_int(value: Any, default: int = 0) -> int:
+    try:
+        return int(value)
+    except (TypeError, ValueError):
+        return default
+
+
+def _to_float(value: Any, default: float = 0.0) -> float:
+    try:
+        return float(value)
+    except (TypeError, ValueError):
+        return default
+
+
+def _calculate_available(total: Optional[float], used: float) -> Optional[float]:
+    if total is None:
+        return None
+    delta = total - used
+    return delta if delta >= 0 else 0.0
+
+
+def _normalize_bytes(value: Any) -> float:
+    if isinstance(value, (int, float)):
+        return float(value)
+    text = str(value or "").strip()
+    if not text:
+        return 0.0
+    match = re.match(r"(?i)^\s*([0-9]*\.?[0-9]+)\s*([kmgtp]?i?b?)?\s*$", text)
+    if not match:
+        return 0.0
+    number = match.group(1)
+    unit = (match.group(2) or "").lower()
+    try:
+        value = float(number)
+    except ValueError:
+        return 0.0
+    if unit.startswith("k"):
+        return value * 1024
+    if unit.startswith("m"):
+        return value * 1024**2
+    if unit.startswith("g"):
+        return value * 1024**3
+    if unit.startswith("t"):
+        return value * 1024**4
+    if unit.startswith("p"):
+        return value * 1024**5
+    return value
+
+
+def _bytes_to_mib(value: Any) -> int:
+    return int(round(_normalize_bytes(value) / (1024**2)))
+
+
+def _bytes_to_gib(value: Any) -> int:
+    return int(round(_normalize_bytes(value) / (1024**3)))
+
+
+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
@@ -381,35 +446,68 @@ def _load_managed_container_records() -> List[Dict[str, Any]]:
     return records
 
 
-def _build_managed_containers_summary(records: List[Dict[str, Any]]) -> Dict[str, Any]:
+def _extract_host_totals(node_status: Dict[str, Any] | None) -> Tuple[Optional[int], Optional[int], Optional[int]]:
+    if not node_status:
+        return None, None, None
+    memory_total = node_status.get("memory", {}).get("total")
+    disk_total = node_status.get("disk", {}).get("total")
+    cpu_cores = node_status.get("cpuinfo", {}).get("cores")
+    host_ram = _bytes_to_mib(memory_total) if memory_total is not None else None
+    host_disk = _bytes_to_gib(disk_total) if disk_total is not None else None
+    host_cpu = _to_int(cpu_cores) if cpu_cores is not None else None
+    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]:
+    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(
+        cfg.get("cpulimit")
+        or cfg.get("cpus")
+        or cfg.get("cores")
+        or ct.get("cpus")
+        or ct.get("cpu")
+    )
+    hostname = ct.get("name") or cfg.get("hostname") or f"ct{vmid}"
+    storage = cfg.get("storage") or ct.get("storage")
+    status = (ct.get("status") or "unknown").lower()
+    reserved = _parse_bool_flag(cfg.get("onboot"))
+    return {
+        "vmid": vmid,
+        "hostname": hostname,
+        "template": cfg.get("ostemplate"),
+        "storage": storage,
+        "disk_gib": disk_gib,
+        "ram_mib": ram_mib,
+        "cpu_share": cpu_share,
+        "reserve_on_boot": reserved,
+        "status": status,
+        "managed": False,
+    }
+
+
+
+def _build_managed_containers_summary(
+    records: List[Dict[str, Any]],
+    unmanaged_records: List[Dict[str, Any]],
+    node_status: Dict[str, Any] | None,
+) -> Dict[str, Any]:
+    managed_containers: List[Dict[str, Any]] = []
     total_ram = 0
     total_disk = 0
     total_cpu_share = 0.0
-    containers: List[Dict[str, Any]] = []
-
-    def _as_int(value: Any) -> int:
-        try:
-            return int(value)
-        except (TypeError, ValueError):
-            return 0
 
-    def _as_float(value: Any) -> float:
-        try:
-            return float(value)
-        except (TypeError, ValueError):
-            return 0.0
-
-    for record in sorted(records, key=lambda entry: _as_int(entry.get("vmid"))):
-        ram_mib = _as_int(record.get("ram_mib"))
-        disk_gib = _as_int(record.get("disk_gib"))
-        cpu_share = _as_float(record.get("cpus"))
+    for record in sorted(records, key=lambda entry: _to_int(entry.get("vmid"))):
+        ram_mib = _to_int(record.get("ram_mib"))
+        disk_gib = _to_int(record.get("disk_gib"))
+        cpu_share = _to_float(record.get("cpus"))
         total_ram += ram_mib
         total_disk += disk_gib
         total_cpu_share += cpu_share
         status = (record.get("status") or "unknown").lower()
-        containers.append(
+        managed_containers.append(
             {
-                "vmid": str(_as_int(record.get("vmid"))) if record.get("vmid") is not None else None,
+                "vmid": str(_to_int(record.get("vmid"))) if record.get("vmid") is not None else None,
                 "device_id": record.get("device_id"),
                 "hostname": record.get("hostname"),
                 "template": record.get("template"),
@@ -419,44 +517,84 @@ def _build_managed_containers_summary(records: List[Dict[str, Any]]) -> Dict[str
                 "cpu_share": cpu_share,
                 "created_at": record.get("created_at"),
                 "status": status,
+                "managed": True,
             }
         )
 
+    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)
+    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)
+
     return {
         "updated_at": datetime.utcnow().isoformat() + "Z",
-        "count": len(containers),
+        "count": len(managed_containers),
         "total_ram_mib": total_ram,
         "total_disk_gib": total_disk,
         "total_cpu_share": round(total_cpu_share, 2),
-        "containers": containers,
+        "containers": managed_containers,
+        "unmanaged_containers": unmanaged_records,
+        "unmanaged_count": len(unmanaged_records),
+        "allocated_ram_mib": allocated_ram,
+        "allocated_disk_gib": allocated_disk,
+        "allocated_cpu_share": round(allocated_cpu, 2),
+        "available_ram_mib": _calculate_available(host_ram, allocated_ram) if host_ram is not None else None,
+        "available_disk_gib": _calculate_available(host_disk, allocated_disk) if host_disk is not None else None,
+        "available_cpu_share": _calculate_available(host_cpu, allocated_cpu) if host_cpu is not None else None,
+        "host_total_ram_mib": host_ram,
+        "host_total_disk_gib": host_disk,
+        "host_total_cpu_cores": host_cpu,
     }
 
 
 def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
-    def _refresh_container_statuses(records: List[Dict[str, Any]], config: Dict[str, Any] | None) -> None:
-        if not records or not config:
-            return
+    def _refresh_container_statuses(
+        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]:
+        statuses: Dict[str, str] = {}
+        unmanaged: List[Dict[str, Any]] = []
+        node_status: Dict[str, Any] | None = None
+        if not config:
+            return statuses, unmanaged, node_status
         try:
             proxmox = _connect_proxmox(config)
             node = _get_node_from_config(config)
-            statuses = {
-                str(ct.get("vmid")): (ct.get("status") or "unknown").lower()
-                for ct in proxmox.nodes(node).lxc.get()
-            }
+            node_status = proxmox.nodes(node).status.get()
+            for ct in proxmox.nodes(node).lxc.get():
+                vmid_val = ct.get("vmid")
+                if vmid_val is None:
+                    continue
+                vmid_key = str(_to_int(vmid_val))
+                statuses[vmid_key] = (ct.get("status") or "unknown").lower()
+                if vmid_key in managed_vmids:
+                    continue
+                cfg: Dict[str, Any] = {}
+                try:
+                    cfg = proxmox.nodes(node).lxc(vmid_key).config.get() or {}
+                except Exception as exc:  # pragma: no cover - best effort
+                    logger.debug("Failed to read config for container %s: %s", vmid_key, exc)
+                description = (cfg.get("description") or "")
+                if MANAGED_MARKER in description:
+                    continue
+                unmanaged.append(_build_unmanaged_container_entry(ct, cfg, vmid_key))
         except Exception as exc:  # pragma: no cover - best effort
             logger.debug("Failed to refresh container statuses: %s", exc)
-            return
-        for record in records:
-            vmid = record.get("vmid")
-            if vmid is None:
-                continue
-            try:
-                vmid_key = str(int(vmid))
-            except (ValueError, TypeError):
-                continue
-            status = statuses.get(vmid_key)
-            if status:
-                record["status"] = status
+        return statuses, unmanaged, node_status
 
     now = time.monotonic()
     with _MANAGED_CONTAINERS_CACHE_LOCK:
@@ -466,8 +604,19 @@ def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
         return cached
     config = _load_config()
     records = _load_managed_container_records()
-    _refresh_container_statuses(records, config)
-    summary = _build_managed_containers_summary(records)
+    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)
+    for record in records:
+        vmid = record.get("vmid")
+        if vmid is None:
+            continue
+        vmid_key = str(_to_int(vmid))
+        status = statuses.get(vmid_key)
+        if status:
+            record["status"] = status
+    summary = _build_managed_containers_summary(records, unmanaged, node_status)
     with _MANAGED_CONTAINERS_CACHE_LOCK:
         _MANAGED_CONTAINERS_CACHE["timestamp"] = now
         _MANAGED_CONTAINERS_CACHE["summary"] = summary

{portacode-1.4.16.dev2 → portacode-1.4.16.dev4}/portacode.egg-info/PKG-INFO

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