portacode 1.4.16.dev9__tar.gz → 1.4.16.dev10__tar.gz

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

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

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

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

@@ -259,16 +259,10 @@ 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 ""
+    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)
@@ -278,11 +272,11 @@ def _size_token_to_gib(token: str) -> float:
     unit = (match.group(2) or "").upper()
     scale = {
         "": 1,
-        "K": 1024**1,
-        "M": 1024**2,
-        "G": 1024**3,
-        "T": 1024**4,
-        "P": 1024**5,
+        "K": 1024 ** 1,
+        "M": 1024 ** 2,
+        "G": 1024 ** 3,
+        "T": 1024 ** 4,
+        "P": 1024 ** 5,
     }.get(unit, 1)
     return (number * scale) / 1024**3
 
@@ -298,6 +292,15 @@ def _extract_size_gib(value: Any) -> float:
     return _size_token_to_gib(text)
 
 
+def _extract_storage(value: Any) -> str:
+    if not value:
+        return "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)
@@ -312,10 +315,10 @@ def _storage_from_lxc(cfg: Dict[str, Any], entry: Dict[str, Any]) -> str:
 
 
 def _storage_from_qemu(cfg: Dict[str, Any]) -> str:
-    preferred_keys = []
+    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()
+    seen: Set[str] = set()
     for key in preferred_keys:
         value = cfg.get(key)
         if value is None:
@@ -353,10 +356,10 @@ def _primary_lxc_disk(cfg: Dict[str, Any], entry: Dict[str, Any]) -> str:
 
 
 def _primary_qemu_disk(cfg: Dict[str, Any]) -> str:
-    preferred_keys = []
+    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()
+    seen: Set[str] = set()
     for key in preferred_keys:
         value = cfg.get(key)
         if value is None:
@@ -399,19 +402,16 @@ def _pick_disk_gib(kind: str, cfg: Dict[str, Any], entry: Dict[str, Any]) -> flo
         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):
+    for candidate in (entry.get("maxdisk"), entry.get("disk")):
+        if candidate in {None, 0}:
             continue
-        return _bytes_to_gib(candidate)
+        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 _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
@@ -611,43 +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_gib = disk_gib_override if disk_gib_override is not None else _pick_disk_gib(entry_type, cfg, ct)
+    disk_gib = int(round(_pick_disk_gib(entry_type, cfg, ct)))
     cpu_share = _to_float(
         cfg.get("cpulimit")
         or cfg.get("cpus")
@@ -656,7 +629,7 @@ def _build_unmanaged_container_entry(
         or ct.get("cpu")
     )
     hostname = ct.get("name") or cfg.get("hostname") or f"ct{vmid}"
-    storage = storage_override or _pick_storage(entry_type, cfg, ct)
+    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)
@@ -695,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 False
-    storage = _extract_storage(storage_name)
-    default = str(default_storage).strip()
-    return storage.lower() == default.lower()
+        return True
+    return _normalize_storage_name(storage_name) == _normalize_storage_name(default_storage)
 
 
 def _build_managed_containers_summary(
@@ -864,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.dev9 → portacode-1.4.16.dev10}/portacode.egg-info/PKG-INFO

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