request-vm-on-golem 0.1.35__tar.gz → 0.1.37__tar.gz

{request_vm_on_golem-0.1.35 → request_vm_on_golem-0.1.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: request-vm-on-golem
-Version: 0.1.35
+Version: 0.1.37
 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.35 → request_vm_on_golem-0.1.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "request-vm-on-golem"
-version = "0.1.35"
+version = "0.1.37"
 description = "VM on Golem Requestor CLI - Create and manage virtual machines on the Golem Network"
 authors = ["Phillip Jensen <phillip+vm-on-golem@golemgrid.com>"]
 readme = "README.md"

{request_vm_on_golem-0.1.35 → request_vm_on_golem-0.1.37}/requestor/cli/commands.py

@@ -1,6 +1,7 @@
 """CLI interface for VM on Golem."""
 import click
 import asyncio
+import json
 from typing import Optional
 from pathlib import Path
 import subprocess
@@ -13,7 +14,7 @@ except ImportError:
     # Python < 3.8
     import importlib_metadata as metadata
 
-from ..config import config
+from ..config import config, ensure_config
 from ..provider.client import ProviderClient
 from ..errors import RequestorError
 from ..utils.logging import setup_logger
@@ -55,6 +56,7 @@ def print_version(ctx, param, value):
               expose_value=False, is_eager=True, help="Show the version and exit.")
 def cli():
     """VM on Golem management CLI"""
+    ensure_config()
     pass
 
 
@@ -70,8 +72,9 @@ def vm():
 @click.option('--storage', type=int, help='Minimum storage (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')
 @async_command
-async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Optional[int], country: Optional[str], driver: Optional[str]):
+async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Optional[int], country: Optional[str], driver: Optional[str], as_json: bool):
     """List available providers matching requirements."""
     try:
         # Log search criteria if any
@@ -85,11 +88,11 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
                 logger.detail(f"Storage: {storage}GB+")
             if country:
                 logger.detail(f"Country: {country}")
-        
+
         # Determine the discovery driver being used
         discovery_driver = driver or config.discovery_driver
         logger.process(f"Querying discovery service via {discovery_driver}")
-        
+
         # Initialize provider service
         provider_service = ProviderService()
         async with provider_service:
@@ -103,24 +106,31 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
 
         if not providers:
             logger.warning("No providers found matching criteria")
-            return
+            return {"providers": []}
 
-        # Format provider information using service with colors
-        headers = provider_service.provider_headers
-        rows = await asyncio.gather(*(provider_service.format_provider_row(p, colorize=True) for p in providers))
+        result = {"providers": providers}
 
-        # Show fancy header
-        click.echo("\n" + "─" * 80)
-        click.echo(click.style(f"  🌍 Available Providers ({len(providers)} total)", fg="blue", bold=True))
-        click.echo("─" * 80)
+        if as_json:
+            click.echo(json.dumps(result, indent=2))
+        else:
+            # Format provider information using service with colors
+            headers = provider_service.provider_headers
+            rows = await asyncio.gather(*(provider_service.format_provider_row(p, colorize=True) for p in providers))
 
-        # Show table with colored headers
-        click.echo("\n" + tabulate(
-            rows,
-            headers=[click.style(h, bold=True) for h in headers],
-            tablefmt="grid"
-        ))
-        click.echo("\n" + "─" * 80)
+            # Show fancy header
+            click.echo("\n" + "─" * 80)
+            click.echo(click.style(f"  🌍 Available Providers ({len(providers)} total)", fg="blue", bold=True))
+            click.echo("─" * 80)
+
+            # Show table with colored headers
+            click.echo("\n" + tabulate(
+                rows,
+                headers=[click.style(h, bold=True) for h in headers],
+                tablefmt="grid"
+            ))
+            click.echo("\n" + "─" * 80)
+
+        return result
 
     except Exception as e:
         logger.error(f"Failed to list providers: {str(e)}")
@@ -274,6 +284,56 @@ async def ssh_vm(name: str):
         raise click.Abort()
 
 
+@vm.command(name='info')
+@click.argument('name')
+@click.option('--json', 'as_json', is_flag=True, help='Output in JSON format')
+@async_command
+async def info_vm(name: str, as_json: bool):
+    """Show information about a VM."""
+    try:
+        logger.command(f"ℹ️  Getting info for VM '{name}'")
+
+        # Initialize VM service
+        ssh_service = SSHService(config.ssh_key_dir)
+        vm_service = VMService(db_service, ssh_service)
+
+        # Retrieve VM details
+        vm = await vm_service.get_vm(name)
+        if not vm:
+            raise click.BadParameter(f"VM '{name}' not found")
+
+        result = vm
+
+        if as_json:
+            click.echo(json.dumps(result, indent=2))
+        else:
+            headers = [
+                "Status",
+                "IP Address",
+                "SSH Port",
+                "CPU",
+                "Memory (GB)",
+                "Storage (GB)",
+            ]
+
+            row = [
+                vm.get("status", "unknown"),
+                vm["provider_ip"],
+                vm["config"].get("ssh_port", "N/A"),
+                vm["config"]["cpu"],
+                vm["config"]["memory"],
+                vm["config"]["storage"],
+            ]
+
+            click.echo("\n" + tabulate([row], headers=headers, tablefmt="grid"))
+
+        return result
+
+    except Exception as e:
+        logger.error(f"Failed to get VM info: {str(e)}")
+        raise click.Abort()
+
+
 @vm.command(name='destroy')
 @click.argument('name')
 @async_command
@@ -520,37 +580,45 @@ def run_api_server(host: str, port: int, reload: bool):
 
 
 @vm.command(name='list')
+@click.option('--json', 'as_json', is_flag=True, help='Output in JSON format')
 @async_command
-async def list_vms():
+async def list_vms(as_json: bool):
     """List all VMs."""
     try:
         logger.command("📋 Listing your VMs")
         logger.process("Fetching VM details")
-        
+
         # Initialize VM service with temporary client (not needed for listing)
         ssh_service = SSHService(config.ssh_key_dir)
         vm_service = VMService(db_service, ssh_service, None)
         vms = await vm_service.list_vms()
         if not vms:
             logger.warning("No VMs found")
-            return
+            return {"vms": []}
 
-        # Format VM information using service
-        headers = vm_service.vm_headers
-        rows = [vm_service.format_vm_row(vm, colorize=True) for vm in vms]
+        result = {"vms": vms}
 
-        # Show fancy header
-        click.echo("\n" + "─" * 60)
-        click.echo(click.style(f"  📋 Your VMs ({len(vms)} total)", fg="blue", bold=True))
-        click.echo("─" * 60)
-        
-        # Show table with colored status
-        click.echo("\n" + tabulate(
-            rows,
-            headers=[click.style(h, bold=True) for h in headers],
-            tablefmt="grid"
-        ))
-        click.echo("\n" + "─" * 60)
+        if as_json:
+            click.echo(json.dumps(result, indent=2))
+        else:
+            # Format VM information using service
+            headers = vm_service.vm_headers
+            rows = [vm_service.format_vm_row(vm, colorize=True) for vm in vms]
+
+            # Show fancy header
+            click.echo("\n" + "─" * 60)
+            click.echo(click.style(f"  📋 Your VMs ({len(vms)} total)", fg="blue", bold=True))
+            click.echo("─" * 60)
+
+            # Show table with colored status
+            click.echo("\n" + tabulate(
+                rows,
+                headers=[click.style(h, bold=True) for h in headers],
+                tablefmt="grid"
+            ))
+            click.echo("\n" + "─" * 60)
+
+        return result
 
     except Exception as e:
         error_msg = str(e)

{request_vm_on_golem-0.1.35 → request_vm_on_golem-0.1.37}/requestor/config.py

@@ -1,14 +1,46 @@
 from pathlib import Path
 from typing import Optional, Dict
 import os
-from pydantic_settings import BaseSettings
-from pydantic import Field, validator
+from pydantic_settings import BaseSettings, SettingsConfigDict
+from pydantic import Field, field_validator, ValidationInfo
+
+
+def ensure_config() -> None:
+    """Ensure the requestor configuration directory and defaults exist."""
+    base_dir = Path.home() / ".golem" / "requestor"
+    ssh_dir = base_dir / "ssh"
+    env_file = base_dir / ".env"
+    created = False
+
+    if not base_dir.exists():
+        base_dir.mkdir(parents=True, exist_ok=True)
+        created = True
+    if not ssh_dir.exists():
+        ssh_dir.mkdir(parents=True, exist_ok=True)
+        created = True
+
+    if not env_file.exists():
+        env_file.write_text("GOLEM_REQUESTOR_ENVIRONMENT=production\n")
+        created = True
+
+    private_key = ssh_dir / "id_rsa"
+    public_key = ssh_dir / "id_rsa.pub"
+    if not private_key.exists():
+        private_key.write_text("placeholder-private-key")
+        private_key.chmod(0o600)
+        public_key.write_text("placeholder-public-key")
+        created = True
+
+    if created:
+        print("Using default settings – run with --help to customize")
+
+
+ensure_config()
 
 class RequestorConfig(BaseSettings):
     """Configuration settings for the requestor node."""
-    
-    class Config:
-        env_prefix = "GOLEM_REQUESTOR_"
+
+    model_config = SettingsConfigDict(env_prefix="GOLEM_REQUESTOR_")
     
     # Environment
     environment: str = Field(
@@ -36,10 +68,11 @@ class RequestorConfig(BaseSettings):
         description="URL of the discovery service (for 'central' driver)"
     )
 
-    @validator("discovery_url", always=True)
-    def set_discovery_url(cls, v: str, values: dict) -> str:
+    @field_validator("discovery_url")
+    @classmethod
+    def set_discovery_url(cls, v: str, info: ValidationInfo) -> str:
         """Prefix discovery URL with DEVMODE if in development."""
-        if values.get("environment") == "development":
+        if info.data.get("environment") == "development":
             return f"DEVMODE-{v}"
         return v
 
@@ -63,7 +96,7 @@ class RequestorConfig(BaseSettings):
     
     # Base Directory
     base_dir: Path = Field(
-        default_factory=lambda: Path.home() / ".golem",
+        default_factory=lambda: Path.home() / ".golem" / "requestor",
         description="Base directory for all Golem requestor files"
     )
     
@@ -86,10 +119,10 @@ class RequestorConfig(BaseSettings):
 
         # Set dependent paths before validation
         if 'ssh_key_dir' not in kwargs:
-            base_dir = kwargs.get('base_dir', Path.home() / ".golem")
+            base_dir = kwargs.get('base_dir', Path.home() / ".golem" / "requestor")
             kwargs['ssh_key_dir'] = base_dir / "ssh"
         if 'db_path' not in kwargs:
-            base_dir = kwargs.get('base_dir', Path.home() / ".golem")
+            base_dir = kwargs.get('base_dir', Path.home() / ".golem" / "requestor")
             kwargs['db_path'] = base_dir / "vms.db"
         super().__init__(**kwargs)
 

{request_vm_on_golem-0.1.35 → request_vm_on_golem-0.1.37}/requestor/run.py

@@ -5,30 +5,36 @@ from pathlib import Path
 from dotenv import load_dotenv
 
 from requestor.utils.logging import setup_logger
-from requestor.cli.commands import cli
 
 # Configure logging with debug mode from environment variable
 logger = setup_logger(__name__)
 
-def check_requirements():
-    """Check if all requirements are met."""
-    # Check required directories
-    ssh_key_dir = os.environ.get(
-        'GOLEM_REQUESTOR_SSH_KEY_DIR',
-        str(Path.home() / '.golem' / 'requestor' / 'ssh')
+
+def get_ssh_key_dir() -> Path:
+    """Return the path to the SSH key directory."""
+    return Path(
+        os.environ.get(
+            "GOLEM_REQUESTOR_SSH_KEY_DIR",
+            str(Path.home() / ".golem" / "requestor" / "ssh"),
+        )
     )
-    
+
+
+def secure_directory(path: Path) -> bool:
+    """Create the directory if needed and set strict permissions."""
     try:
-        # Create and secure directories
-        path = Path(ssh_key_dir)
         path.mkdir(parents=True, exist_ok=True)
-        path.chmod(0o700)  # Secure permissions for SSH keys
-    except Exception as e:
+        path.chmod(0o700)
+    except Exception as e:  # pragma: no cover - OS-related failures
         logger.error(f"Failed to create required directories: {e}")
         return False
-        
     return True
 
+
+def check_requirements() -> bool:
+    """Check if all requirements are met."""
+    return secure_directory(get_ssh_key_dir())
+
 def main():
     """Run the requestor CLI."""
     try:
@@ -44,6 +50,8 @@ def main():
             sys.exit(1)
 
         # Run CLI
+        from requestor.cli.commands import cli
+
         cli()
     except Exception as e:
         logger.error(f"Failed to start requestor CLI: {e}")