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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: request-vm-on-golem
-Version: 0.1.36
+Version: 0.1.38
 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.36.dist-info → request_vm_on_golem-0.1.38.dist-info}/RECORD

@@ -1,8 +1,8 @@
 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=4CcKLqLEVFjVCurJ1KCIPuYnLro0Ga2kYr16i5LFiy8,26094
-requestor/config.py,sha256=6s95PFAu5aSk3JunWoPfYszFaZAgbYZtmXSKyqgOU2k,3590
+requestor/cli/commands.py,sha256=1ETYhZJWOjzZXtHx4CAMvURX_icO5u-MCZ4e7iMkJag,26484
+requestor/config.py,sha256=O39E-Wa-ewqdC9XP5nvj3zkOs52mevvFMyQGtHaqANk,4668
 requestor/db/__init__.py,sha256=Gm5DfWls6uvCZZ3HGGnyRHswbUQdeA5OGN8yPwH0hc8,88
 requestor/db/sqlite.py,sha256=l5pWbx2qlHuar1N_a0B9tVnmumLJY1w5rp3yZ7jmsC0,4146
 requestor/errors.py,sha256=wVpHBuYgQx5pTe_SamugfK-k768noikY1RxvPOjQGko,665
@@ -18,7 +18,7 @@ requestor/ssh/__init__.py,sha256=hNgSqJ5s1_AwwxVRyFjUqh_LTBpI4Hmzq0F-f_wXN9g,119
 requestor/ssh/manager.py,sha256=XhZjz7_BRPnmpu-zxqnGHLCq0b2JZ8Xr8zc1OlMNDkc,9355
 requestor/utils/logging.py,sha256=oFNpO8pJboYM8Wp7g3HOU4HFyBTKypVdY15lUiz1a4I,3721
 requestor/utils/spinner.py,sha256=PUHJdTD9jpUHur__01_qxXy87WFfNmjQbD_sLG-KlGo,2459
-request_vm_on_golem-0.1.36.dist-info/METADATA,sha256=j7kR3rVAkGfGWkG-pX9s28kMlXTWTNOO-nlyT3dK5Uo,9950
-request_vm_on_golem-0.1.36.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-request_vm_on_golem-0.1.36.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
-request_vm_on_golem-0.1.36.dist-info/RECORD,,
+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,,

requestor/cli/commands.py

@@ -14,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
@@ -56,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
 
 
@@ -238,7 +239,7 @@ async def create_vm(name: str, provider_id: str, cpu: int, memory: int, storage:
 @click.argument('name')
 @async_command
 async def ssh_vm(name: str):
-    """SSH into a VM."""
+    """SSH into a VM (alias: connect)."""
     try:
         logger.command(f"🔌 Connecting to VM '{name}'")
         
@@ -283,6 +284,13 @@ async def ssh_vm(name: str):
         raise click.Abort()
 
 
+@vm.command(name="connect")
+@click.argument("name")
+def connect_vm(name: str):
+    """Connect to a VM via SSH (alias of ssh)."""
+    return ssh_vm.callback(name)
+
+
 @vm.command(name='info')
 @click.argument('name')
 @click.option('--json', 'as_json', is_flag=True, help='Output in JSON format')
@@ -337,7 +345,7 @@ async def info_vm(name: str, as_json: bool):
 @click.argument('name')
 @async_command
 async def destroy_vm(name: str):
-    """Destroy a VM."""
+    """Destroy a VM (alias: delete)."""
     try:
         logger.command(f"💥 Destroying VM '{name}'")
 
@@ -376,6 +384,13 @@ async def destroy_vm(name: str):
         raise click.Abort()
 
 
+@vm.command(name="delete")
+@click.argument("name")
+def delete_vm(name: str):
+    """Delete a VM (alias of destroy)."""
+    return destroy_vm.callback(name)
+
+
 @vm.command(name='purge')
 @click.option('--force', is_flag=True, help='Force purge even if other errors occur')
 @click.confirmation_option(prompt='Are you sure you want to purge all VMs?')

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)