portacode 1.4.16.dev8__tar.gz → 1.4.16.dev9__tar.gz

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

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

{portacode-1.4.16.dev8 → portacode-1.4.16.dev9}/portacode/_version.py

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

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

@@ -270,6 +270,142 @@ def _extract_storage(value: Any) -> str:
     return storage or "unknown"
 
 
+def _size_token_to_gib(token: str) -> float:
+    match = re.match(r"^\s*([0-9]+(?:\.[0-9]+)?)\s*([KMGTP])?([iI]?[bB])?\s*$", token)
+    if not match:
+        return 0.0
+    number = float(match.group(1))
+    unit = (match.group(2) or "").upper()
+    scale = {
+        "": 1,
+        "K": 1024**1,
+        "M": 1024**2,
+        "G": 1024**3,
+        "T": 1024**4,
+        "P": 1024**5,
+    }.get(unit, 1)
+    return (number * scale) / 1024**3
+
+
+def _extract_size_gib(value: Any) -> float:
+    if not value:
+        return 0.0
+    text = str(value)
+    for part in text.split(","):
+        if "size=" in part:
+            token = part.split("=", 1)[1]
+            return _size_token_to_gib(token)
+    return _size_token_to_gib(text)
+
+
+def _storage_from_lxc(cfg: Dict[str, Any], entry: Dict[str, Any]) -> str:
+    rootfs = cfg.get("rootfs") or entry.get("rootfs")
+    storage = _extract_storage(rootfs)
+    if storage != "unknown":
+        return storage
+    for idx in range(0, 10):
+        mp_value = cfg.get(f"mp{idx}")
+        storage = _extract_storage(mp_value)
+        if storage != "unknown":
+            return storage
+    return "unknown"
+
+
+def _storage_from_qemu(cfg: Dict[str, Any]) -> str:
+    preferred_keys = []
+    for prefix in ("scsi", "virtio", "sata", "ide"):
+        preferred_keys.extend(f"{prefix}{idx}" for idx in range(0, 6))
+    seen = set()
+    for key in preferred_keys:
+        value = cfg.get(key)
+        if value is None:
+            continue
+        seen.add(key)
+        text = str(value)
+        if "media=cdrom" in text or "cloudinit" in text:
+            continue
+        storage = _extract_storage(text)
+        if storage != "unknown":
+            return storage
+    for key in sorted(cfg.keys()):
+        if key in seen:
+            continue
+        if not any(key.startswith(prefix) for prefix in ("scsi", "virtio", "sata", "ide")):
+            continue
+        value = cfg.get(key)
+        if value is None:
+            continue
+        text = str(value)
+        if "media=cdrom" in text or "cloudinit" in text:
+            continue
+        storage = _extract_storage(text)
+        if storage != "unknown":
+            return storage
+    for key in ("efidisk0", "tpmstate0"):
+        storage = _extract_storage(cfg.get(key))
+        if storage != "unknown":
+            return storage
+    return "unknown"
+
+
+def _primary_lxc_disk(cfg: Dict[str, Any], entry: Dict[str, Any]) -> str:
+    return str(cfg.get("rootfs") or entry.get("rootfs") or "")
+
+
+def _primary_qemu_disk(cfg: Dict[str, Any]) -> str:
+    preferred_keys = []
+    for prefix in ("scsi", "virtio", "sata", "ide"):
+        preferred_keys.extend(f"{prefix}{idx}" for idx in range(0, 6))
+    seen = set()
+    for key in preferred_keys:
+        value = cfg.get(key)
+        if value is None:
+            continue
+        seen.add(key)
+        text = str(value)
+        if "media=cdrom" in text or "cloudinit" in text:
+            continue
+        return text
+    for key in sorted(cfg.keys()):
+        if key in seen:
+            continue
+        if not any(key.startswith(prefix) for prefix in ("scsi", "virtio", "sata", "ide")):
+            continue
+        value = cfg.get(key)
+        if value is None:
+            continue
+        text = str(value)
+        if "media=cdrom" in text or "cloudinit" in text:
+            continue
+        return text
+    return ""
+
+
+def _pick_storage(kind: str, cfg: Dict[str, Any], entry: Dict[str, Any]) -> str:
+    storage = _extract_storage(cfg.get("storage") or entry.get("storage"))
+    if storage != "unknown":
+        return storage
+    if kind == "lxc":
+        return _storage_from_lxc(cfg, entry)
+    return _storage_from_qemu(cfg)
+
+
+def _pick_disk_gib(kind: str, cfg: Dict[str, Any], entry: Dict[str, Any]) -> float:
+    if kind == "lxc":
+        size = _extract_size_gib(_primary_lxc_disk(cfg, entry))
+        if size:
+            return size
+    else:
+        size = _extract_size_gib(_primary_qemu_disk(cfg))
+        if size:
+            return size
+    for candidate in (entry.get("maxdisk"), entry.get("disk"), cfg.get("disk")):
+        if candidate in (None, 0):
+            continue
+        return _bytes_to_gib(candidate)
+    return 0.0
+
+
 def _normalize_storage_name(name: Any) -> str:
     if not name:
         return ""
@@ -511,8 +647,7 @@ def _build_unmanaged_container_entry(
     entry_type: str = "lxc",
 ) -> Dict[str, Any]:
     ram_mib = _to_int(cfg.get("memory")) or _bytes_to_mib(ct.get("maxmem"))
-    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)
+    disk_gib = disk_gib_override if disk_gib_override is not None else _pick_disk_gib(entry_type, cfg, ct)
     cpu_share = _to_float(
         cfg.get("cpulimit")
         or cfg.get("cpus")
@@ -521,10 +656,7 @@ def _build_unmanaged_container_entry(
         or ct.get("cpu")
     )
     hostname = ct.get("name") or cfg.get("hostname") or f"ct{vmid}"
-    storage_source = (
-        storage_override or cfg.get("storage") or ct.get("storage") or ct.get("rootfs")
-    )
-    storage = _extract_storage(storage_source)
+    storage = storage_override or _pick_storage(entry_type, cfg, ct)
     status = (ct.get("status") or "unknown").lower()
     reserved = _parse_bool_flag(cfg.get("onboot"))
     storage_matches_default = _storage_matches_default(storage, default_storage)
@@ -586,10 +718,10 @@ def _extract_qemu_disk_info(cfg: Dict[str, Any]) -> Tuple[str | None, int]:
 
 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
+        return False
+    storage = _extract_storage(storage_name)
+    default = str(default_storage).strip()
+    return storage.lower() == default.lower()
 
 
 def _build_managed_containers_summary(

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

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