golem-vm-provider 0.1.59__tar.gz → 0.1.60__tar.gz

{golem_vm_provider-0.1.59 → golem_vm_provider-0.1.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.59
+Version: 0.1.60
 Summary: VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network
 Keywords: golem,vm,provider,cloud,decentralized
 Author: Phillip Jensen

{golem_vm_provider-0.1.59 → golem_vm_provider-0.1.60}/provider/api/routes.py

@@ -31,6 +31,12 @@ from ..vm.multipass_adapter import MultipassError
 logger = setup_logger(__name__)
 router = APIRouter()
 
+# Expose Settings class at module scope for tests to monkeypatch default deployment lookup
+try:
+    from ..config import Settings as _Cfg  # type: ignore
+except Exception:  # noqa: BLE001
+    _Cfg = None  # type: ignore
+
 # Job status persisted in SQLite via JobStore (see Container.job_store)
 
 
@@ -56,8 +62,10 @@ async def create_vm(
         if spa and spa != "0x0000000000000000000000000000000000000000":
             if os.environ.get("PYTEST_CURRENT_TEST"):
                 try:
-                    from ..config import Settings as _Cfg  # type: ignore
-                    default_spa, _ = _Cfg._load_l2_deployment()  # type: ignore[attr-defined]
+                    if _Cfg is not None:
+                        default_spa, _ = _Cfg._load_l2_deployment()  # type: ignore[attr-defined]
+                    else:
+                        default_spa = None
                 except Exception:
                     default_spa = None
                 if not default_spa or spa.lower() != default_spa.lower():
@@ -302,6 +310,8 @@ async def provider_info(settings: Any = Depends(Provide[Container.config])) -> P
         provider_id=settings["PROVIDER_ID"],
         stream_payment_address=settings["STREAM_PAYMENT_ADDRESS"],
         glm_token_address=settings["GLM_TOKEN_ADDRESS"],
+        # Provide ETH-focused alias for clients; keep legacy field too
+        eth_token_address=settings["GLM_TOKEN_ADDRESS"],
         ip_address=ip_addr,
         country=(settings.get("PROVIDER_COUNTRY") if isinstance(settings, dict) else getattr(settings, "PROVIDER_COUNTRY", None)),
         platform=platform_str,

{golem_vm_provider-0.1.59 → golem_vm_provider-0.1.60}/provider/main.py

@@ -15,6 +15,7 @@ if "--json" in _sys.argv:
 
 # Defer heavy local imports (may import config) until after we decide on silence
 from .container import Container
+from .config import settings  # used by pricing CLI and server commands
 from .service import ProviderService
 
 logger = setup_logger(__name__)

{golem_vm_provider-0.1.59 → golem_vm_provider-0.1.60}/provider/vm/multipass_adapter.py

@@ -32,6 +32,26 @@ class MultipassAdapter(VMProvider):
         self.proxy_manager = proxy_manager
         self.name_mapper = name_mapper
 
+    @staticmethod
+    def _safe_int(value, default: int = 0) -> int:
+        """Best-effort int conversion that treats missing/blank values as default.
+
+        Multipass may return empty strings for numeric fields (e.g., when a VM is
+        stopped). This helper prevents ValueError by mapping '', None, or
+        unparsable values to a sensible default.
+        """
+        try:
+            if value is None:
+                return default
+            if isinstance(value, str):
+                v = value.strip()
+                if v == "":
+                    return default
+                return int(v)
+            return int(value)
+        except (ValueError, TypeError):
+            return default
+
     async def _run_multipass(self, args: List[str], check: bool = True) -> subprocess.CompletedProcess:
         """Run a multipass command."""
         # Commands that produce JSON or version info that we need to parse.
@@ -160,8 +180,8 @@ class MultipassAdapter(VMProvider):
         vms: List[VMInfo] = []
         for requestor_name, multipass_name in list(all_mappings.items()):
             try:
-                # get_vm_status expects multipass_name
-                vm_info = await self.get_vm_status(multipass_name)
+                # Pass requestor id; get_vm_status accepts either id
+                vm_info = await self.get_vm_status(requestor_name)
                 vms.append(vm_info)
             except VMNotFoundError:
                 logger.warning(
@@ -188,30 +208,40 @@ class MultipassAdapter(VMProvider):
         await self._run_multipass(["stop", multipass_name])
         return await self.get_vm_status(multipass_name)
 
-    async def get_vm_status(self, multipass_name: str) -> VMInfo:
-        """Get the status of a VM."""
+    async def get_vm_status(self, name_or_id: str) -> VMInfo:
+        """Get VM status by multipass name or requestor id."""
+        # Resolve identifiers flexibly
+        requestor_name = await self.name_mapper.get_requestor_name(name_or_id)
+        if requestor_name:
+            multipass_name = name_or_id
+        else:
+            multipass_name = await self.name_mapper.get_multipass_name(name_or_id)
+            if not multipass_name:
+                raise VMNotFoundError(f"VM {name_or_id} mapping not found")
+            requestor_name = name_or_id
         try:
             info = await self._get_vm_info(multipass_name)
         except MultipassError:
             raise VMNotFoundError(f"VM {multipass_name} not found in multipass")
 
-        requestor_name = await self.name_mapper.get_requestor_name(multipass_name)
-        if not requestor_name:
-            raise VMNotFoundError(f"Mapping for VM {multipass_name} not found")
-
         ipv4 = info.get("ipv4")
         ip_address = ipv4[0] if ipv4 else None
         logger.debug(f"Parsed VM info for {requestor_name}: {info}")
         
         disks_info = info.get("disks", {})
-        total_storage = sum(int(disk.get("total", 0)) for disk in disks_info.values())
+        total_storage = 0
+        for disk in disks_info.values():
+            total_storage += self._safe_int(disk.get("total"), 0)
+
+        # Memory reported by multipass is in bytes; default to 1 GiB if missing/blank
+        mem_total_bytes = self._safe_int(info.get("memory", {}).get("total"), 1024**3)
         vm_info_obj = VMInfo(
             id=requestor_name,
             name=requestor_name,
             status=VMStatus(info["state"].lower()),
             resources=VMResources(
-                cpu=int(info.get("cpu_count", "1")),
-                memory=round(info.get("memory", {}).get("total", 1024**3) / (1024**3)),
+                cpu=self._safe_int(info.get("cpu_count"), 1),
+                memory=round(mem_total_bytes / (1024**3)),
                 storage=round(total_storage / (1024**3)) if total_storage > 0 else 10
             ),
             ip_address=ip_address,
@@ -228,10 +258,13 @@ class MultipassAdapter(VMProvider):
             try:
                 info = await self._get_vm_info(multipass_name)
                 disks_info = info.get("disks", {})
-                total_storage = sum(int(disk.get("total", 0)) for disk in disks_info.values())
+                total_storage = 0
+                for disk in disks_info.values():
+                    total_storage += self._safe_int(disk.get("total"), 0)
+                mem_total_bytes = self._safe_int(info.get("memory", {}).get("total"), 1024**3)
                 vm_resources[requestor_name] = VMResources(
-                    cpu=int(info.get("cpu_count", "1")),
-                    memory=round(info.get("memory", {}).get("total", 1024**3) / (1024**3)),
+                    cpu=self._safe_int(info.get("cpu_count"), 1),
+                    memory=round(mem_total_bytes / (1024**3)),
                     storage=round(total_storage / (1024**3)) if total_storage > 0 else 10
                 )
             except (MultipassError, VMNotFoundError):

{golem_vm_provider-0.1.59 → golem_vm_provider-0.1.60}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "golem-vm-provider"
-version = "0.1.59"
+version = "0.1.60"
 description = "VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network"
 authors = ["Phillip Jensen <phillip+vm-on-golem@golemgrid.com>"]
 readme = "README.md"