request-vm-on-golem 0.1.54__py3-none-any.whl → 0.1.55__py3-none-any.whl

{request_vm_on_golem-0.1.54.dist-info → request_vm_on_golem-0.1.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: request-vm-on-golem
-Version: 0.1.54
+Version: 0.1.55
 Summary: VM on Golem Requestor CLI - Create and manage virtual machines on the Golem Network
 Keywords: golem,vm,cloud,decentralized,cli
 Author: Phillip Jensen

{request_vm_on_golem-0.1.54.dist-info → request_vm_on_golem-0.1.55.dist-info}/RECORD

@@ -1,7 +1,7 @@
 requestor/__init__.py,sha256=OqSUAh1uZBMx7GW0MoSMg967PVdmT8XdPJx3QYjwkak,116
 requestor/api/main.py,sha256=CTnaM7KyBtDwVlyclYbNDy-nGi5_xt9GTcGusRasDVY,2493
 requestor/cli/__init__.py,sha256=e3E4oEGxmGj-STPtFkQwg_qIWhR0JAiAQdw3G1hXciU,37
-requestor/cli/commands.py,sha256=fKZFsW4d60VYF5wxZnMxZLc0Tqod087P_NjfCQyDfRI,50998
+requestor/cli/commands.py,sha256=Obr8Z1ZX3f6WThooIInlD7HqMl_pJmOqawzazLmhke0,51253
 requestor/config.py,sha256=FMSRKdyo3nEdn62CRonnwrw4Hsy4VGcuvvfg60aORsI,12809
 requestor/data/deployments/l2.json,sha256=XTNN2C5LkBfp4YbDKdUKfWMdp1fKnfv8D3TgcwVWxtQ,249
 requestor/db/__init__.py,sha256=Gm5DfWls6uvCZZ3HGGnyRHswbUQdeA5OGN8yPwH0hc8,88
@@ -10,19 +10,19 @@ requestor/errors.py,sha256=wVpHBuYgQx5pTe_SamugfK-k768noikY1RxvPOjQGko,665
 requestor/payments/blockchain_service.py,sha256=CACvZH2ZstutX7f0L_PXl8K_V5WlIkxNYIaeJuhP5I0,7500
 requestor/payments/monitor.py,sha256=JtSnh2plFf-f8sJU-bkOpadhoK_R82_ULwkDRmBYSbc,6012
 requestor/provider/__init__.py,sha256=fmW23aYUVciF8-gmBZkG-PLhn22upmcDzdPfAOLHG6g,103
-requestor/provider/client.py,sha256=pfJymufYR13W4kfykHZSVvs6ikRUE5AdHp0W0DB17AE,4130
+requestor/provider/client.py,sha256=bWj4sNQ8w4F2sSRcMlHbWVjeBLAflDhHxy0BNMqzj8s,5021
 requestor/run.py,sha256=sR9GgylQWbYPc60wRr3rUpemlNrWqIPNFIJ8WCz6YwE,2120
 requestor/security/faucet.py,sha256=XF_13b66SKAaY0-40hNRcSgC8AZA4mD5gyXl3qaBLpQ,2320
 requestor/services/__init__.py,sha256=1qSn_6RMn0KB0A7LCnY2IW6_tC3HBQsdfkFeV-h94eM,172
 requestor/services/database_service.py,sha256=GlSrzzzd7PSYQJNup00sxkB-B2PMr1__04K8k5QSWvs,2996
-requestor/services/provider_service.py,sha256=UjCg6YOwhkclJ227gXfI5uCTinhBv6Jjfsgxq0x0ESo,15701
+requestor/services/provider_service.py,sha256=XMZtdkrpEKiGg0iFW3v_cf3zu7BZcYp1wjaphxo2SCU,16250
 requestor/services/ssh_service.py,sha256=tcOCtk2SlB9Uuv-P2ghR22e7BJ9kigQh5b4zSGdPFns,4280
-requestor/services/vm_service.py,sha256=1EUypRbCykdQTVJf4gYiNzkZNk66T3df32Vc51HkSMI,7983
+requestor/services/vm_service.py,sha256=e05OgMZwz3NcCiIwmz4EnB6joMK6S3G_RT3VajD92lw,9438
 requestor/ssh/__init__.py,sha256=hNgSqJ5s1_AwwxVRyFjUqh_LTBpI4Hmzq0F-f_wXN9g,119
 requestor/ssh/manager.py,sha256=3jQtbbK7CVC2yD1zCO88jGXh2fBcuv3CzWEqDLuaQVk,9758
 requestor/utils/logging.py,sha256=lgAswzYvO9M0EOET0cFZvuAsGI4lInh_wln_6bI-fJk,4281
 requestor/utils/spinner.py,sha256=X0jfPfs5ricglTS4_XmacrM2Z1DDHR7zGk2KqYZDpXg,2541
-request_vm_on_golem-0.1.54.dist-info/METADATA,sha256=STyVVfE84_1K_a-HlKflEM-hZHQJhYo-vQm7vcwtbRQ,15780
-request_vm_on_golem-0.1.54.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-request_vm_on_golem-0.1.54.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
-request_vm_on_golem-0.1.54.dist-info/RECORD,,
+request_vm_on_golem-0.1.55.dist-info/METADATA,sha256=wepR8dMN4ehyEx4zmQjjTl3fuXs_OdGGiBCZPn3ZZ8I,15780
+request_vm_on_golem-0.1.55.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+request_vm_on_golem-0.1.55.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
+request_vm_on_golem-0.1.55.dist-info/RECORD,,

requestor/cli/commands.py

@@ -128,6 +128,7 @@ def vm():
 @click.option('--memory', type=int, help='Minimum memory (GB) required')
 @click.option('--storage', type=int, help='Minimum disk (GB) required')
 @click.option('--country', help='Preferred provider country')
+@click.option('--platform', help='Preferred platform/arch (e.g., x86_64, arm64)')
 @click.option('--driver', type=click.Choice(['central', 'golem-base']), default=None, help='Discovery driver to use')
 @click.option('--payments-network', type=str, default=None, help='Filter by payments network profile (default: current config)')
 @click.option('--all-payments', is_flag=True, help='Do not filter by payments network (show all)')
@@ -135,7 +136,7 @@ def vm():
 @click.option('--network', type=click.Choice(['testnet', 'mainnet']), default=None,
               help='Override network filter for this command')
 @async_command
-async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Optional[int], country: Optional[str], driver: Optional[str], payments_network: Optional[str] = None, all_payments: bool = False, as_json: bool = False, network: Optional[str] = None):
+async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Optional[int], country: Optional[str], platform: Optional[str], driver: Optional[str], payments_network: Optional[str] = None, all_payments: bool = False, as_json: bool = False, network: Optional[str] = None):
     """List available providers matching requirements."""
     try:
         if as_json:
@@ -143,7 +144,7 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
         if network:
             config.network = network
         # Log search criteria if any
-        if any([cpu, memory, storage, country]):
+        if any([cpu, memory, storage, country, platform]):
             logger.command("🔍 Searching for providers with criteria:")
             if cpu:
                 logger.detail(f"CPU Cores: {cpu}+")
@@ -153,6 +154,8 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
                 logger.detail(f"Disk: {storage}GB+")
             if country:
                 logger.detail(f"Country: {country}")
+            if platform:
+                logger.detail(f"Platform: {platform}")
 
         # Determine the discovery driver being used
         discovery_driver = driver or config.discovery_driver
@@ -171,6 +174,7 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
                     memory=memory,
                     storage=storage,
                     country=country,
+                    platform=platform,
                     driver=driver,
                     payments_network=eff_pn,
                     include_all_payments=bool(all_payments),
@@ -178,7 +182,7 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
             except TypeError:
                 # Backward compatibility with older/dummy service stubs in tests
                 providers = await provider_service.find_providers(
-                    cpu=cpu, memory=memory, storage=storage, country=country, driver=driver
+                    cpu=cpu, memory=memory, storage=storage, country=country, platform=platform, driver=driver
                 )
 
         if not providers:

requestor/provider/client.py

@@ -24,7 +24,7 @@ class ProviderClient:
         ssh_key: str,
         stream_id: int | None = None,
     ) -> Dict:
-        """Create a VM on the provider."""
+        """Create a VM on the provider (async job semantics)."""
         payload = {
             "name": name,
             "resources": {
@@ -37,12 +37,29 @@ class ProviderClient:
         if stream_id is not None:
             payload["stream_id"] = int(stream_id)
         async with self.session.post(
-            f"{self.provider_url}/api/v1/vms",
+            f"{self.provider_url}/api/v1/vms?async=true",
             json=payload
         ) as response:
             if not response.ok:
                 error_text = await response.text()
                 raise Exception(f"Failed to create VM: {error_text}")
+            data = await response.json()
+            # Normalize: support both old (VMInfo) and new (job) responses
+            # New shape: { job_id, vm_id, status }
+            # Old shape: { id, ... }
+            if isinstance(data, dict) and "job_id" in data:
+                return data
+            # Fallback: synthesize a job-like envelope from immediate VM info
+            vm_id = data.get("id") or data.get("name") or name
+            return {"job_id": "", "vm_id": vm_id, "status": data.get("status", "ready"), "_vm": data}
+
+    async def get_vm_info(self, vm_id: str) -> Dict:
+        async with self.session.get(
+            f"{self.provider_url}/api/v1/vms/{vm_id}"
+        ) as response:
+            if not response.ok:
+                error_text = await response.text()
+                raise Exception(f"Failed to get VM info: {error_text}")
             return await response.json()
 
     async def get_provider_info(self) -> Dict:

requestor/services/provider_service.py

@@ -66,6 +66,7 @@ class ProviderService:
         memory: Optional[int] = None,
         storage: Optional[int] = None,
         country: Optional[str] = None,
+        platform: Optional[str] = None,
         driver: Optional[str] = None,
         payments_network: Optional[str] = None,
         include_all_payments: bool = False,
@@ -82,12 +83,12 @@ class ProviderService:
                     private_key=private_key_bytes,
                 )
             return await self._find_providers_golem_base(
-                cpu, memory, storage, country,
+                cpu, memory, storage, country, platform,
                 payments_network=payments_network,
                 include_all_payments=include_all_payments,
             )
         else:
-            return await self._find_providers_central(cpu, memory, storage, country)
+            return await self._find_providers_central(cpu, memory, storage, country, platform)
 
     async def _find_providers_golem_base(
         self,
@@ -95,6 +96,7 @@ class ProviderService:
         memory: Optional[int] = None,
         storage: Optional[int] = None,
         country: Optional[str] = None,
+        platform: Optional[str] = None,
         payments_network: Optional[str] = None,
         include_all_payments: bool = False,
     ) -> List[Dict]:
@@ -124,6 +126,8 @@ class ProviderService:
                 query += f' && golem_storage>={storage}'
             if country:
                 query += f' && golem_country="{country}"'
+            if platform:
+                query += f' && golem_platform="{platform}"'
 
             results = await self.golem_base_client.query_entities(query)
 
@@ -142,6 +146,7 @@ class ProviderService:
                     'provider_name': annotations.get('golem_provider_name'),
                     'ip_address': annotations.get('golem_ip_address'),
                     'country': annotations.get('golem_country'),
+                    'platform': annotations.get('golem_platform') or None,
                     'payments_network': annotations.get('golem_payments_network'),
                     'resources': {
                         'cpu': int(annotations.get('golem_cpu', 0)),
@@ -171,7 +176,8 @@ class ProviderService:
         cpu: Optional[int] = None,
         memory: Optional[int] = None,
         storage: Optional[int] = None,
-        country: Optional[str] = None
+        country: Optional[str] = None,
+        platform: Optional[str] = None
     ) -> List[Dict]:
         """Find providers using the central discovery service."""
         try:
@@ -181,7 +187,8 @@ class ProviderService:
                     'cpu': cpu,
                     'memory': memory,
                     'storage': storage,
-                    'country': country
+                    'country': country,
+                    'platform': platform,
                 }.items() if v is not None
             }
 
@@ -328,6 +335,7 @@ class ProviderService:
             usd_storage if usd_storage is not None else '—',
             est_usd,
             est_glm,
+            (provider.get('platform') or '—'),
             updated_at_str
         ]
 
@@ -358,6 +366,10 @@ class ProviderService:
             # Format location info
             row[3] = style(f"🌍 {row[3]}", fg="green", bold=True)
 
+            # Platform column: dim label
+            if row[12] != '—':
+                row[12] = style(f"{row[12]}", fg="white")
+
         return row
 
     @property
@@ -376,5 +388,6 @@ class ProviderService:
             "USD/GB Disk/mo",
             "Est. $/mo",
             "Est. GLM/mo",
+            "Platform",
             "Updated"
         ]

requestor/services/vm_service.py

@@ -39,8 +39,8 @@ class VMService:
             if existing_vm:
                 raise VMError(f"VM with name '{name}' already exists")
 
-            # Create VM on provider
-            vm = await self.provider_client.create_vm(
+            # Create VM on provider (returns job envelope)
+            job = await self.provider_client.create_vm(
                 name=name,
                 cpu=cpu,
                 memory=memory,
@@ -49,8 +49,41 @@ class VMService:
                 stream_id=stream_id
             )
 
-            # Get VM access info
-            access_info = await self.provider_client.get_vm_access(vm['id'])
+            vm_id = job.get('vm_id') or name
+
+            # Save initial record with 'creating' status (no port yet)
+            await self.db.save_vm(
+                name=name,
+                provider_ip=provider_ip,
+                vm_id=vm_id,
+                config={
+                    'cpu': cpu,
+                    'memory': memory,
+                    'storage': storage,
+                    **({"stream_id": stream_id} if stream_id is not None else {}),
+                },
+                status='creating'
+            )
+
+            # Poll provider until VM is ready, then fetch access info
+            import asyncio as _asyncio
+            deadline = _asyncio.get_event_loop().time() + 600.0  # 10 minutes max
+            last_status = 'creating'
+            while _asyncio.get_event_loop().time() < deadline:
+                try:
+                    info = await self.provider_client.get_vm_info(vm_id)
+                    last_status = (info.get('status') or '').lower() or last_status
+                    if last_status == 'running':
+                        break
+                except Exception:
+                    # Best-effort: ignore transient errors during startup
+                    pass
+                await _asyncio.sleep(2.0)
+            if last_status != 'running':
+                raise VMError(f"VM did not become ready in time (status={last_status})")
+
+            # Get VM access info (ssh port)
+            access_info = await self.provider_client.get_vm_access(vm_id)
 
             # Preserve any provided stream_id; do not auto-create streams here
             # Stream creation should be explicit via CLI `vm stream open` command.
@@ -67,7 +100,8 @@ class VMService:
                 name=name,
                 provider_ip=provider_ip,
                 vm_id=access_info['vm_id'],
-                config=config
+                config=config,
+                status='running'
             )
 
             return {