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

portacode/connection/handlers/proxmox_infra.py

@@ -259,21 +259,157 @@ 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 _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 _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"
+    text = str(value)
+    if ":" in text:
+        return text.split(":", 1)[0].strip() or "unknown"
+    return text.strip() or "unknown"
+
+
+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: List[str] = []
+    for prefix in ("scsi", "virtio", "sata", "ide"):
+        preferred_keys.extend(f"{prefix}{idx}" for idx in range(0, 6))
+    seen: Set[str] = 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: List[str] = []
+    for prefix in ("scsi", "virtio", "sata", "ide"):
+        preferred_keys.extend(f"{prefix}{idx}" for idx in range(0, 6))
+    seen: Set[str] = 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 _normalize_storage_name(name: Any) -> str:
-    if not name:
-        return ""
-    return str(name).strip().lower()
+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")):
+        if candidate in {None, 0}:
+            continue
+        return _normalize_bytes(candidate) / 1024**3
+    cfg_disk = cfg.get("disk")
+    if cfg_disk not in (None, 0):
+        return _normalize_bytes(cfg_disk) / 1024**3
+    return 0.0
 
 
 def _parse_bool_flag(value: Any) -> bool:
@@ -475,44 +611,16 @@ 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,
     *,
-    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_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 = int(round(_pick_disk_gib(entry_type, cfg, ct)))
     cpu_share = _to_float(
         cfg.get("cpulimit")
         or cfg.get("cpus")
@@ -521,10 +629,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 = _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)
@@ -563,33 +668,10 @@ 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
-    normalized_storage = _normalize_storage_name(_extract_storage(storage_name))
-    normalized_default = _normalize_storage_name(_extract_storage(default_storage))
-    return normalized_storage == normalized_default
+    return _normalize_storage_name(storage_name) == _normalize_storage_name(default_storage)
 
 
 def _build_managed_containers_summary(
@@ -732,15 +814,12 @@ def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
                 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",
                     )
                 )

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

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

{portacode-1.4.16.dev8.dist-info → portacode-1.4.16.dev10.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=VGaY-LcOZhWVvp6-lz1Mul_hv8BD77OfZQu3NhYJfE8,719
+portacode/_version.py,sha256=xQIvOHyr77yXKzNXQJL1rE01nrJdvUnM7LX3jaSU684,721
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
@@ -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=CDrPWs-WLVMd95AKRukeUwZkW4J0kcWh3Vb3oLNNDCU,84394
+portacode/connection/handlers/proxmox_infra.py,sha256=5XUUzr24bs-QOMpuVPq071ZDAmhadKiMs2E-wO62kMw,86709
 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.dev8.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.16.dev10.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.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,,
+portacode-1.4.16.dev10.dist-info/METADATA,sha256=CYVCSXxYLiRseul0OVvOLRWWp2-Lv1u737bm-qT1hVk,13052
+portacode-1.4.16.dev10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+portacode-1.4.16.dev10.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.16.dev10.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.16.dev10.dist-info/RECORD,,