request-vm-on-golem 0.1.38__py3-none-any.whl → 0.1.40__py3-none-any.whl

{request_vm_on_golem-0.1.38.dist-info → request_vm_on_golem-0.1.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: request-vm-on-golem
-Version: 0.1.38
+Version: 0.1.40
 Summary: VM on Golem Requestor CLI - Create and manage virtual machines on the Golem Network
 Keywords: golem,vm,cloud,decentralized,cli
 Author: Phillip Jensen
@@ -175,7 +175,7 @@ Example output:
 ────────────────────────────────────────────────
   🌍 Available Providers (3 total)
 ────────────────────────────────────────────────
-Provider ID     Country   CPU    Memory    Storage
+Provider ID     Country   CPU    Memory    Disk
 provider-1      🌍 SE     💻 4    🧠 8GB    💾 40GB
 provider-2      🌍 US     💻 8    🧠 16GB   💾 80GB
 provider-3      🌍 DE     💻 2    🧠 4GB    💾 20GB
@@ -206,7 +206,7 @@ Example output:
   VM Details
   ┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈
   🏷️  Name      : my-webserver
-  💻 Resources  : 2 CPU, 4GB RAM, 20GB Storage
+  💻 Resources  : 2 CPU, 4GB RAM, 20GB Disk
   🟢 Status     : running
 
   Connection Details

{request_vm_on_golem-0.1.38.dist-info → request_vm_on_golem-0.1.40.dist-info}/RECORD

@@ -1,7 +1,7 @@
 requestor/__init__.py,sha256=OqSUAh1uZBMx7GW0MoSMg967PVdmT8XdPJx3QYjwkak,116
 requestor/api/main.py,sha256=7utCzFNbh5Ol-vsBWeSwT4lXeHD7zdA-GFZuS3rHMWc,2180
 requestor/cli/__init__.py,sha256=e3E4oEGxmGj-STPtFkQwg_qIWhR0JAiAQdw3G1hXciU,37
-requestor/cli/commands.py,sha256=1ETYhZJWOjzZXtHx4CAMvURX_icO5u-MCZ4e7iMkJag,26484
+requestor/cli/commands.py,sha256=sCodN_skF24IkWo6x73H3SeahdE1uFlzjJ2BpMfiLrs,28991
 requestor/config.py,sha256=O39E-Wa-ewqdC9XP5nvj3zkOs52mevvFMyQGtHaqANk,4668
 requestor/db/__init__.py,sha256=Gm5DfWls6uvCZZ3HGGnyRHswbUQdeA5OGN8yPwH0hc8,88
 requestor/db/sqlite.py,sha256=l5pWbx2qlHuar1N_a0B9tVnmumLJY1w5rp3yZ7jmsC0,4146
@@ -11,14 +11,14 @@ requestor/provider/client.py,sha256=OUP7CoOCCtKD6DB9eqFkOXK6A2BLFdM4DWSkoulJQxg,
 requestor/run.py,sha256=GqOG6n34szt8Sp3SEqjRV6huWm737yCN6YnBqoiwI-U,1785
 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=iejw8Q-ziK3Ny0cEAD1EHejUsAqf9BwJTa7jFmei0_8,9773
+requestor/services/provider_service.py,sha256=auUc5XSHWbtOzyLHFqJ4RF337rCNYThzb7TjvUaK_uo,14542
 requestor/services/ssh_service.py,sha256=tcOCtk2SlB9Uuv-P2ghR22e7BJ9kigQh5b4zSGdPFns,4280
-requestor/services/vm_service.py,sha256=yHvGtfzoWw_wAC7MwgZEudbK8ElxB_2fCuG5Xa-F1KE,6820
+requestor/services/vm_service.py,sha256=LhNBf9V5-m0ssPGikEM8R2K0vwwFDPQ8KIgCM6vX0XI,6817
 requestor/ssh/__init__.py,sha256=hNgSqJ5s1_AwwxVRyFjUqh_LTBpI4Hmzq0F-f_wXN9g,119
-requestor/ssh/manager.py,sha256=XhZjz7_BRPnmpu-zxqnGHLCq0b2JZ8Xr8zc1OlMNDkc,9355
+requestor/ssh/manager.py,sha256=3jQtbbK7CVC2yD1zCO88jGXh2fBcuv3CzWEqDLuaQVk,9758
 requestor/utils/logging.py,sha256=oFNpO8pJboYM8Wp7g3HOU4HFyBTKypVdY15lUiz1a4I,3721
 requestor/utils/spinner.py,sha256=PUHJdTD9jpUHur__01_qxXy87WFfNmjQbD_sLG-KlGo,2459
-request_vm_on_golem-0.1.38.dist-info/METADATA,sha256=atnrLF9Phe9qcOvZ0S8MJyLAdULykpPKgK_KUls-gew,9950
-request_vm_on_golem-0.1.38.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-request_vm_on_golem-0.1.38.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
-request_vm_on_golem-0.1.38.dist-info/RECORD,,
+request_vm_on_golem-0.1.40.dist-info/METADATA,sha256=eyg8EzOeDCRq_wZKZw1KgGN89HvxMhHYCfWr49SxyHc,9944
+request_vm_on_golem-0.1.40.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+request_vm_on_golem-0.1.40.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
+request_vm_on_golem-0.1.40.dist-info/RECORD,,

requestor/cli/commands.py

@@ -14,7 +14,28 @@ except ImportError:
     # Python < 3.8
     import importlib_metadata as metadata
 
-from ..config import config, ensure_config
+from ..config import config
+
+# `ensure_config` is responsible for creating default configuration
+# files and directories on first run.  Some unit tests replace the
+# entire `requestor.config` module with a lightweight stub that only
+# provides a `config` object.  Importing `ensure_config` in such
+# scenarios would raise an ``ImportError`` which prevents the CLI
+# module from being imported at all.  To make the CLI resilient during
+# tests we try to import ``ensure_config`` but fall back to a no-op
+# when it isn't available.
+try:
+    from ..config import ensure_config  # type: ignore
+except Exception:  # pragma: no cover - used only when tests stub the module
+    def ensure_config() -> None:
+        """Fallback ``ensure_config`` used in tests.
+
+        When the real configuration module is replaced with a stub the
+        CLI should still be importable.  The stub simply does nothing
+        which is sufficient for the unit tests exercising the CLI
+        command mappings.
+        """
+        pass
 from ..provider.client import ProviderClient
 from ..errors import RequestorError
 from ..utils.logging import setup_logger
@@ -69,7 +90,7 @@ def vm():
 @vm.command(name='providers')
 @click.option('--cpu', type=int, help='Minimum CPU cores required')
 @click.option('--memory', type=int, help='Minimum memory (GB) required')
-@click.option('--storage', type=int, help='Minimum storage (GB) required')
+@click.option('--storage', type=int, help='Minimum disk (GB) required')
 @click.option('--country', help='Preferred provider country')
 @click.option('--driver', type=click.Choice(['central', 'golem-base']), default=None, help='Discovery driver to use')
 @click.option('--json', 'as_json', is_flag=True, help='Output in JSON format')
@@ -85,7 +106,7 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
             if memory:
                 logger.detail(f"Memory: {memory}GB+")
             if storage:
-                logger.detail(f"Storage: {storage}GB+")
+                logger.detail(f"Disk: {storage}GB+")
             if country:
                 logger.detail(f"Country: {country}")
 
@@ -96,6 +117,9 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
         # Initialize provider service
         provider_service = ProviderService()
         async with provider_service:
+            # If a full spec is provided, enable per-provider estimate display
+            if cpu and memory and storage:
+                provider_service.estimate_spec = (cpu, memory, storage)
             providers = await provider_service.find_providers(
                 cpu=cpu,
                 memory=memory,
@@ -108,6 +132,12 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
             logger.warning("No providers found matching criteria")
             return {"providers": []}
 
+        # If JSON requested and full spec provided, include estimates per provider
+        if as_json and cpu and memory and storage:
+            for p in providers:
+                est = provider_service.compute_estimate(p, (cpu, memory, storage))
+                if est is not None:
+                    p['estimate'] = est
         result = {"providers": providers}
 
         if as_json:
@@ -142,9 +172,10 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
 @click.option('--provider-id', required=True, help='Provider ID to use')
 @click.option('--cpu', type=int, required=True, help='Number of CPU cores')
 @click.option('--memory', type=int, required=True, help='Memory in GB')
-@click.option('--storage', type=int, required=True, help='Storage in GB')
+@click.option('--storage', type=int, required=True, help='Disk in GB')
+@click.option('--yes', is_flag=True, help='Do not prompt for confirmation')
 @async_command
-async def create_vm(name: str, provider_id: str, cpu: int, memory: int, storage: int):
+async def create_vm(name: str, provider_id: str, cpu: int, memory: int, storage: int, yes: bool):
     """Create a new VM on a specific provider."""
     try:
         # Show configuration details
@@ -152,7 +183,7 @@ async def create_vm(name: str, provider_id: str, cpu: int, memory: int, storage:
         click.echo(click.style("  VM Configuration", fg="blue", bold=True))
         click.echo("─" * 60)
         click.echo(f"  Provider   : {click.style(provider_id, fg='cyan')}")
-        click.echo(f"  Resources  : {click.style(f'{cpu} CPU, {memory}GB RAM, {storage}GB Storage', fg='cyan')}")
+        click.echo(f"  Resources  : {click.style(f'{cpu} CPU, {memory}GB RAM, {storage}GB Disk', fg='cyan')}")
         click.echo("─" * 60 + "\n")
 
         # Now start the deployment with spinner
@@ -170,6 +201,21 @@ async def create_vm(name: str, provider_id: str, cpu: int, memory: int, storage:
                 if not provider_ip and config.environment == "production":
                     raise RequestorError("Provider IP address not found in advertisement")
 
+                # Before proceeding, show estimated monthly price and confirm
+                provider_service.estimate_spec = (cpu, memory, storage)
+                est_row = await provider_service.format_provider_row(provider, colorize=False)
+                # Columns: ... [7]=USD/core/mo, [8]=USD/GB RAM/mo, [9]=USD/GB Disk/mo, [10]=Est. $/mo, [11]=Est. GLM/mo
+                est_usd = est_row[10]
+                est_glm = est_row[11]
+                price_str = f"~${est_usd}/mo" if est_usd != '—' else "(no USD pricing)"
+                if est_glm != '—':
+                    price_str += f" (~{est_glm} GLM/mo)"
+                click.echo(click.style(f"  💵 Estimated Monthly Cost: {price_str}", fg='yellow', bold=True))
+                if not yes:
+                    if not click.confirm("Proceed with VM creation?", default=True):
+                        logger.warning("Creation cancelled by user")
+                        return
+
                 # Setup SSH
                 ssh_service = SSHService(config.ssh_key_dir)
                 key_pair = await ssh_service.get_key_pair()
@@ -201,7 +247,7 @@ async def create_vm(name: str, provider_id: str, cpu: int, memory: int, storage:
         click.echo(click.style("  VM Details", fg="blue", bold=True))
         click.echo("  " + "┈" * 25)
         click.echo(f"  🏷️  Name      : {click.style(name, fg='cyan')}")
-        click.echo(f"  💻 Resources  : {click.style(f'{cpu} CPU, {memory}GB RAM, {storage}GB Storage', fg='cyan')}")
+        click.echo(f"  💻 Resources  : {click.style(f'{cpu} CPU, {memory}GB RAM, {storage}GB Disk', fg='cyan')}")
         click.echo(f"  🟢 Status     : {click.style('running', fg='green')}")
         
         # Connection Details Section
@@ -320,7 +366,7 @@ async def info_vm(name: str, as_json: bool):
                 "SSH Port",
                 "CPU",
                 "Memory (GB)",
-                "Storage (GB)",
+                "Disk (GB)",
             ]
 
             row = [

requestor/services/provider_service.py

@@ -15,6 +15,39 @@ class ProviderService:
     def __init__(self):
         self.session = None
         self.golem_base_client = None
+        # Optional spec (cpu, memory, storage) to compute estimates for display
+        self.estimate_spec: Optional[tuple[int, int, int]] = None
+
+    def compute_estimate(self, provider: Dict, spec: tuple[int, int, int]) -> Optional[Dict]:
+        """Compute estimated pricing for a given spec, if provider has pricing.
+
+        Returns dict with usd_per_month, glm_per_month (if GLM per-unit available),
+        and usd_per_hour, or None if insufficient pricing data.
+        """
+        pricing = provider.get('pricing') or {}
+        usd_core = pricing.get('usd_per_core_month')
+        usd_ram = pricing.get('usd_per_gb_ram_month')
+        usd_storage = pricing.get('usd_per_gb_storage_month')
+        if usd_core is None or usd_ram is None or usd_storage is None:
+            return None
+        cpu, mem, sto = spec
+        try:
+            usd_per_month = float(usd_core) * cpu + float(usd_ram) * mem + float(usd_storage) * sto
+            glm_core = pricing.get('glm_per_core_month')
+            glm_ram = pricing.get('glm_per_gb_ram_month')
+            glm_storage = pricing.get('glm_per_gb_storage_month')
+            glm_per_month = None
+            if glm_core is not None and glm_ram is not None and glm_storage is not None:
+                glm_per_month = float(glm_core) * cpu + float(glm_ram) * mem + float(glm_storage) * sto
+            usd_per_hour = usd_per_month / 730.0
+            # Round for display consistency
+            return {
+                'usd_per_month': round(usd_per_month, 4),
+                'usd_per_hour': round(usd_per_hour, 6),
+                'glm_per_month': round(glm_per_month, 8) if glm_per_month is not None else None,
+            }
+        except Exception:
+            return None
 
     async def __aenter__(self):
         self.session = aiohttp.ClientSession()
@@ -91,6 +124,14 @@ class ProviderService:
                         'memory': int(annotations.get('golem_memory', 0)),
                         'storage': int(annotations.get('golem_storage', 0)),
                     },
+                    'pricing': {
+                        'usd_per_core_month': annotations.get('golem_price_usd_core_month'),
+                        'usd_per_gb_ram_month': annotations.get('golem_price_usd_ram_gb_month'),
+                        'usd_per_gb_storage_month': annotations.get('golem_price_usd_storage_gb_month'),
+                        'glm_per_core_month': annotations.get('golem_price_glm_core_month'),
+                        'glm_per_gb_ram_month': annotations.get('golem_price_glm_ram_gb_month'),
+                        'glm_per_gb_storage_month': annotations.get('golem_price_glm_storage_gb_month'),
+                    },
                     'created_at_block': metadata.expires_at_block - (config.advertisement_interval * 2)
                 }
                 if provider['provider_id']:
@@ -225,6 +266,31 @@ class ProviderService:
 
         updated_at_str = await self._format_block_timestamp(provider.get('created_at_block', 0))
 
+        pricing = provider.get('pricing') or {}
+        usd_core = pricing.get('usd_per_core_month')
+        usd_ram = pricing.get('usd_per_gb_ram_month')
+        usd_storage = pricing.get('usd_per_gb_storage_month')
+
+        # Precompute estimates if a spec is set and pricing available
+        est_usd = '—'
+        est_glm = '—'
+        est_hr_usd = '—'
+        if self.estimate_spec and all(p is not None for p in (usd_core, usd_ram, usd_storage)):
+            spec_cpu, spec_mem, spec_sto = self.estimate_spec
+            try:
+                est_usd_val = (float(usd_core) * spec_cpu) + (float(usd_ram) * spec_mem) + (float(usd_storage) * spec_sto)
+                est_usd = round(est_usd_val, 4)
+                est_hr_usd = round(est_usd_val / 730.0, 6)
+                # If GLM per-unit is present, compute GLM estimate as well
+                glm_core = pricing.get('glm_per_core_month')
+                glm_ram = pricing.get('glm_per_gb_ram_month')
+                glm_storage = pricing.get('glm_per_gb_storage_month')
+                if all(x is not None for x in (glm_core, glm_ram, glm_storage)):
+                    est_glm_val = (float(glm_core) * spec_cpu) + (float(glm_ram) * spec_mem) + (float(glm_storage) * spec_sto)
+                    est_glm = round(est_glm_val, 8)
+            except Exception:
+                pass
+
         row = [
             provider['provider_id'],
             provider['provider_name'],
@@ -233,18 +299,38 @@ class ProviderService:
             provider['resources']['cpu'],
             provider['resources']['memory'],
             provider['resources']['storage'],
+            usd_core if usd_core is not None else '—',
+            usd_ram if usd_ram is not None else '—',
+            usd_storage if usd_storage is not None else '—',
+            est_usd,
+            est_glm,
             updated_at_str
         ]
 
         if colorize:
             # Format Provider ID
-            row[0] = style(row[0], fg="yellow")
+            id_txt = style(row[0], fg="yellow")
+            if est_hr_usd != '—':
+                id_txt += style(f"  (~${est_hr_usd}/hr)", fg="yellow")
+            row[0] = id_txt
 
             # Format resources with icons and colors
             row[4] = style(f"💻 {row[4]}", fg="cyan", bold=True)
             row[5] = style(f"🧠 {row[5]}", fg="cyan", bold=True)
             row[6] = style(f"💾 {row[6]}", fg="cyan", bold=True)
 
+            # Format pricing with currency markers
+            if usd_core != '—':
+                row[7] = style(f"${row[7]}/mo", fg="magenta")
+            if usd_ram != '—':
+                row[8] = style(f"${row[8]}/GB/mo", fg="magenta")
+            if usd_storage != '—':
+                row[9] = style(f"${row[9]}/GB/mo", fg="magenta")
+            if est_usd != '—':
+                row[10] = style(f"~${row[10]}/mo", fg="yellow", bold=True)
+            if est_glm != '—':
+                row[11] = style(f"~{row[11]} GLM/mo", fg="yellow")
+
             # Format location info
             row[3] = style(f"🌍 {row[3]}", fg="green", bold=True)
 
@@ -260,6 +346,11 @@ class ProviderService:
             "Country",
             "CPU",
             "Memory (GB)",
-            "Storage (GB)",
+            "Disk (GB)",
+            "USD/core/mo",
+            "USD/GB RAM/mo",
+            "USD/GB Disk/mo",
+            "Est. $/mo",
+            "Est. GLM/mo",
             "Updated"
         ]

requestor/services/vm_service.py

@@ -195,7 +195,7 @@ class VMService:
             "SSH Port",
             "CPU",
             "Memory (GB)",
-            "Storage (GB)",
+            "Disk (GB)",
             "Connect Command",
             "Created"
         ]

requestor/ssh/manager.py

@@ -53,9 +53,17 @@ class SSHKeyManager:
         
         # Create Golem directory if needed
         self.golem_dir.mkdir(parents=True, exist_ok=True)
-        # Secure directory permissions (on Unix-like systems)
+        # Secure directory permissions (on Unix-like systems). If the directory
+        # is a system path (e.g., "/tmp") or not owned/permission-changeable
+        # by the current user, ignore the error to avoid test and runtime failures.
         if os.name == 'posix':
-            os.chmod(self.golem_dir, 0o700)
+            try:
+                os.chmod(self.golem_dir, 0o700)
+            except PermissionError:
+                logger.warning(
+                    "Could not set permissions on %s; continuing without chmod",
+                    self.golem_dir,
+                )
 
     async def get_key_pair(self) -> KeyPair:
         """Get the SSH key pair to use.