request-vm-on-golem 0.1.26__tar.gz → 0.1.27__tar.gz

{request_vm_on_golem-0.1.26 → request_vm_on_golem-0.1.27}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "request-vm-on-golem"
-version = "0.1.26"
+version = "0.1.27"
 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.26 → request_vm_on_golem-0.1.27}/requestor/cli/commands.py

@@ -298,7 +298,7 @@ async def destroy_vm(name: str):
 
 
 @vm.command(name='purge')
-@click.option('--force', is_flag=True, help='Force purge even if errors occur')
+@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?')
 @async_command
 async def purge_vms(force: bool):
@@ -306,53 +306,48 @@ async def purge_vms(force: bool):
     try:
         logger.command("🌪️  Purging all VMs")
         
-        # Get all VMs using database service
-        logger.process("Retrieving all VM details")
         vms = await db_service.list_vms()
         if not vms:
             logger.warning("No VMs found to purge")
             return
 
-        # Track results
-        results = {
-            'success': [],
-            'failed': []
-        }
+        results = {'success': [], 'failed': []}
 
-        # Process each VM
         for vm in vms:
             try:
                 logger.process(f"Purging VM '{vm['name']}'")
-                
-                # Initialize VM service
                 provider_url = config.get_provider_url(vm['provider_ip'])
+                
                 async with ProviderClient(provider_url) as client:
                     vm_service = VMService(db_service, SSHService(config.ssh_key_dir), client)
-                    try:
-                        await vm_service.destroy_vm(vm['name'])
-                        results['success'].append((vm['name'], 'Destroyed successfully'))
-                    except Exception as e:
-                        error_msg = str(e)
-                        if "Not Found" in error_msg:
-                            results['success'].append((vm['name'], 'Already removed from provider'))
-                            # Still need to clean up database
-                            await db_service.delete_vm(vm['name'])
-                        else:
-                            if not force:
-                                raise
-                            results['failed'].append((vm['name'], f"Provider error: {error_msg}"))
-                
+                    await vm_service.destroy_vm(vm['name'])
+                    results['success'].append((vm['name'], 'Destroyed successfully'))
+
+            except (aiohttp.ClientError, asyncio.TimeoutError) as e:
+                await db_service.delete_vm(vm['name'])
+                msg = f"Could not connect to provider ({e}). Removed from local DB. Please destroy manually."
+                results['failed'].append((vm['name'], msg))
+            
             except Exception as e:
-                if not force:
+                if "Cannot connect to host" in str(e):
+                    await db_service.delete_vm(vm['name'])
+                    msg = f"Could not connect to provider ({e}). Removed from local DB. Please destroy manually."
+                    results['failed'].append((vm['name'], msg))
+                elif "not found in multipass" in str(e).lower():
+                    await db_service.delete_vm(vm['name'])
+                    msg = "VM not found on provider. Removed from local DB."
+                    results['success'].append((vm['name'], msg))
+                elif not force:
+                    logger.error(f"Failed to purge VM '{vm['name']}'. Use --force to ignore errors and continue.")
                     raise
-                results['failed'].append((vm['name'], str(e)))
+                else:
+                    results['failed'].append((vm['name'], str(e)))
 
         # Show results
         click.echo("\n" + "─" * 60)
         click.echo(click.style("  🌪️  VM Purge Complete", fg="blue", bold=True))
         click.echo("─" * 60 + "\n")
 
-        # Success section
         if results['success']:
             click.echo(click.style("  ✅ Successfully Purged", fg="green", bold=True))
             click.echo("  " + "┈" * 25)
@@ -360,7 +355,6 @@ async def purge_vms(force: bool):
                 click.echo(f"  • {click.style(name, fg='cyan')}: {click.style(msg, fg='green')}")
             click.echo()
 
-        # Failures section
         if results['failed']:
             click.echo(click.style("  ❌ Failed to Purge", fg="red", bold=True))
             click.echo("  " + "┈" * 25)
@@ -368,7 +362,6 @@ async def purge_vms(force: bool):
                 click.echo(f"  • {click.style(name, fg='cyan')}: {click.style(error, fg='red')}")
             click.echo()
 
-        # Summary
         total = len(results['success']) + len(results['failed'])
         success_rate = (len(results['success']) / total) * 100 if total > 0 else 0
         
@@ -382,10 +375,7 @@ async def purge_vms(force: bool):
         click.echo("\n" + "─" * 60)
 
     except Exception as e:
-        error_msg = str(e)
-        if "database" in error_msg.lower():
-            error_msg = "Failed to access local database"
-        logger.error(f"Purge operation failed: {error_msg}")
+        logger.error(f"Purge operation failed: {str(e)}")
         raise click.Abort()
 
 

{request_vm_on_golem-0.1.26 → request_vm_on_golem-0.1.27}/requestor/services/provider_service.py

@@ -84,7 +84,7 @@ class ProviderService:
                 provider = {
                     'provider_id': annotations.get('golem_provider_id'),
                     'provider_name': annotations.get('golem_provider_name'),
-                    'ip_address': '127.0.0.1' if 'DEVMODE' in annotations.get('golem_provider_name', '') else annotations.get('golem_ip_address'),
+                    'ip_address': annotations.get('golem_ip_address'),
                     'country': annotations.get('golem_country'),
                     'resources': {
                         'cpu': int(annotations.get('golem_cpu', 0)),

{request_vm_on_golem-0.1.26 → request_vm_on_golem-0.1.27}/requestor/services/ssh_service.py

@@ -19,6 +19,13 @@ class SSHService:
         except Exception as e:
             raise SSHError(f"Failed to get SSH key pair: {str(e)}")
 
+    def get_key_pair_sync(self):
+        """Get or create SSH key pair synchronously."""
+        try:
+            return self.ssh_manager.get_key_pair_sync()
+        except Exception as e:
+            raise SSHError(f"Failed to get SSH key pair: {str(e)}")
+
     def connect_to_vm(
         self,
         host: str,
@@ -36,7 +43,7 @@ class SSHService:
                 "-o", "UserKnownHostsFile=/dev/null",
                 f"{username}@{host}"
             ]
-            subprocess.run(cmd)
+            subprocess.run(cmd, check=True)
         except Exception as e:
             raise SSHError(f"Failed to establish SSH connection: {str(e)}")
 

{request_vm_on_golem-0.1.26 → request_vm_on_golem-0.1.27}/requestor/services/vm_service.py

@@ -149,6 +149,13 @@ class VMService:
         """Format VM information for display."""
         from click import style
 
+        key_pair = self.ssh_service.get_key_pair_sync()
+        connect_command = self.ssh_service.format_ssh_command(
+            host=vm['provider_ip'],
+            port=vm['config'].get('ssh_port', 'N/A'),
+            private_key_path=key_pair.private_key.absolute()
+        )
+
         row = [
             vm['name'],
             vm['status'],
@@ -157,6 +164,7 @@ class VMService:
             vm['config']['cpu'],
             vm['config']['memory'],
             vm['config']['storage'],
+            connect_command,
             vm['created_at']
         ]
 
@@ -188,6 +196,7 @@ class VMService:
             "CPU",
             "Memory (GB)",
             "Storage (GB)",
+            "Connect Command",
             "Created"
         ]
 

{request_vm_on_golem-0.1.26 → request_vm_on_golem-0.1.27}/requestor/ssh/manager.py

@@ -93,6 +93,36 @@ class SSHKeyManager:
             public_key_content=golem_pub_key.read_text().strip()
         )
 
+    def get_key_pair_sync(self) -> KeyPair:
+        """Get the SSH key pair to use (synchronous version)."""
+        logger.debug("Checking for system SSH key at %s", self.system_key_path)
+        system_pub_key = self.system_key_path.parent / 'id_rsa.pub'
+        
+        if self.system_key_path.exists() and system_pub_key.exists():
+            logger.info("Using existing system SSH key")
+            try:
+                return KeyPair(
+                    private_key=self.system_key_path,
+                    public_key=system_pub_key,
+                    private_key_content=self.system_key_path.read_text().strip(),
+                    public_key_content=system_pub_key.read_text().strip()
+                )
+            except (PermissionError, OSError) as e:
+                logger.warning("Could not read system SSH key: %s", e)
+        
+        logger.debug("Using Golem SSH key at %s", self.golem_key_path)
+        if not self.golem_key_path.exists():
+            logger.info("No existing Golem SSH key found, generating new key pair")
+            self._generate_key_pair_sync()
+        
+        golem_pub_key = Path(str(self.golem_key_path) + '.pub')
+        return KeyPair(
+            private_key=self.golem_key_path,
+            public_key=golem_pub_key,
+            private_key_content=self.golem_key_path.read_text().strip(),
+            public_key_content=golem_pub_key.read_text().strip()
+        )
+
     async def get_public_key_content(self) -> str:
         """Get the content of the public key file."""
         key_pair = await self.get_key_pair()
@@ -155,6 +185,38 @@ class SSHKeyManager:
             logger.error("Failed to generate key pair: %s", str(e))
             raise
 
+    def _generate_key_pair_sync(self):
+        """Generate a new RSA key pair for Golem VMs (synchronous version)."""
+        logger.debug("Generating new RSA key pair")
+        try:
+            private_key = rsa.generate_private_key(
+                public_exponent=65537,
+                key_size=2048,
+                backend=default_backend()
+            )
+            private_pem = private_key.private_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PrivateFormat.PKCS8,
+                encryption_algorithm=serialization.NoEncryption()
+            )
+            self.golem_key_path.write_bytes(private_pem)
+            if os.name == 'posix':
+                os.chmod(self.golem_key_path, 0o600)
+
+            public_key = private_key.public_key()
+            public_pem = public_key.public_bytes(
+                encoding=serialization.Encoding.OpenSSH,
+                format=serialization.PublicFormat.OpenSSH
+            )
+            pub_key_path = Path(str(self.golem_key_path) + '.pub')
+            pub_key_path.write_bytes(public_pem)
+            if os.name == 'posix':
+                os.chmod(pub_key_path, 0o644)
+            logger.info("Successfully generated and saved SSH key pair")
+        except Exception as e:
+            logger.error("Failed to generate key pair: %s", str(e))
+            raise
+
     async def get_private_key_content(self, force_golem_key: bool = False) -> Optional[str]:
         """Get the content of the private key file."""
         key_pair = await self.get_key_pair(force_golem_key)