golem-vm-provider 0.1.2__py3-none-any.whl → 0.1.7__py3-none-any.whl

{golem_vm_provider-0.1.2.dist-info → golem_vm_provider-0.1.7.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.2
+Version: 0.1.7
 Summary: VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network
-Home-page: https://github.com/cryptobench/vm-on-golem
 Keywords: golem,vm,provider,cloud,decentralized
 Author: Phillip Jensen
 Author-email: phillip+vm-on-golem@golemgrid.com
@@ -33,6 +32,7 @@ Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: rich (>=13.7.0,<14.0.0)
 Requires-Dist: setuptools (>=69.0.3,<70.0.0)
 Requires-Dist: uvicorn (>=0.15.0,<0.16.0)
+Project-URL: Homepage, https://github.com/cryptobench/vm-on-golem
 Project-URL: Repository, https://github.com/cryptobench/vm-on-golem
 Description-Content-Type: text/markdown
 

{golem_vm_provider-0.1.2.dist-info → golem_vm_provider-0.1.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 provider/__init__.py,sha256=HO1fkPpZqPO3z8O8-eVIyx8xXSMIVuTR_b1YF0RtXOg,45
 provider/api/__init__.py,sha256=ssX1ugDqEPt8Fn04IymgmG-Ev8PiXLsCSaiZVvHQnec,344
 provider/api/models.py,sha256=JOzoNf1oE5N97UqTN5xuIrTkqn2tCHqPDaIzGA3jUyo,3513
-provider/api/routes.py,sha256=KvTbFk61Vo1_4PeLzV0ohMXyuRidt1SJRLmpwvufJtQ,6486
+provider/api/routes.py,sha256=P27RQvNqFWn6PacRwr1PaVz-yv5KAWsp9KeORejkXSI,6452
 provider/config.py,sha256=Q6xmU6cPRBUYkVusv-Fc1U4ekr4OYLXfOfEtaWL9miM,5000
 provider/discovery/__init__.py,sha256=VR3NRoQtZRH5Vs8FG7jnGLR7p7wn7XeZdLaBb3t8e1g,123
 provider/discovery/advertiser.py,sha256=yv7RbRf1K43qOLAEa2Olj9hhN8etl2qsBuoHok0xoVs,6784
@@ -16,11 +16,11 @@ provider/utils/retry.py,sha256=ekP2ucaSJNN-lBcrIvyHa4QYPKNITMl1a5V1X6BBvsw,1560
 provider/vm/__init__.py,sha256=JGs50tUmzOR1rQ_w4fMY_3XWylmiA1G7KKWZkVw51mY,501
 provider/vm/cloud_init.py,sha256=o2CWLjl1ZN9fSEFHAWO-glh7BW-DxAMSe0MbqhzKNTg,1709
 provider/vm/models.py,sha256=zkfvP5Z50SPDNajwZTt9NTDIMRQIsZLvSOsuirHEcJM,6256
-provider/vm/multipass.py,sha256=kS0HkKZT6--YEjxxdr4Ot0oF24T128hLrq-STKsuCK4,16406
+provider/vm/multipass.py,sha256=RLUqCeoYz4PG8RL7dBu_TzjNEAmgIz9NonBtSuYc4kw,16431
 provider/vm/name_mapper.py,sha256=MrshNeJ4Dw-WBsyiIVcn9N5xyOxaBKX4Yqhyh_m5IFg,4103
-provider/vm/port_manager.py,sha256=e9qQCNSQX5KcY4zxnkCRBRvzXq4hjcY4nuQJ8yygsag,8423
-provider/vm/proxy_manager.py,sha256=nLcs9Nane3ANvfgvHL4ZPytTuHCqG1ArQ-_ZSyMaDyQ,10188
-golem_vm_provider-0.1.2.dist-info/METADATA,sha256=Gw7qPoo4J1aV2EhdhSG-GkmlkJdhwancofLL7ubF9yA,10449
-golem_vm_provider-0.1.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-golem_vm_provider-0.1.2.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
-golem_vm_provider-0.1.2.dist-info/RECORD,,
+provider/vm/port_manager.py,sha256=147phrKFXiv1jpJfqpwHsuHqYTj4t2kP3_UV0lV8Lr0,10063
+provider/vm/proxy_manager.py,sha256=cu0FPPbeCc3CR6NRE_CnLjiRg7xVdSFUylVUOL1g1sI,10154
+golem_vm_provider-0.1.7.dist-info/METADATA,sha256=LsfKA092K5_R6bZA25J5E3S3JLzEK-WTY2IJSBv7k4I,10461
+golem_vm_provider-0.1.7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+golem_vm_provider-0.1.7.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
+golem_vm_provider-0.1.7.dist-info/RECORD,,

{golem_vm_provider-0.1.2.dist-info → golem_vm_provider-0.1.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any

provider/api/routes.py

@@ -1,7 +1,7 @@
 import json
 from typing import List
 from pathlib import Path
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter, HTTPException, Request
 
 from ..config import settings
 from ..utils.logging import setup_logger, PROCESS, SUCCESS
@@ -9,19 +9,12 @@ from ..utils.ascii_art import vm_creation_animation, vm_status_change
 from ..vm.models import VMInfo, VMStatus, VMAccessInfo, VMConfig, VMResources
 from .models import CreateVMRequest
 from ..vm.multipass import MultipassProvider, MultipassError
-from ..discovery.resource_tracker import ResourceTracker
-from ..vm.port_manager import PortManager
 
 logger = setup_logger(__name__)
 router = APIRouter()
 
-# Initialize components
-resource_tracker = ResourceTracker()
-port_manager = PortManager()
-provider = MultipassProvider(resource_tracker, port_manager)
-
 @router.post("/vms", response_model=VMInfo)
-async def create_vm(request: CreateVMRequest) -> VMInfo:
+async def create_vm(request: CreateVMRequest, req: Request) -> VMInfo:
     """Create a new VM."""
     try:
         logger.info(f"📥 Received VM creation request for '{request.name}'")
@@ -47,7 +40,7 @@ async def create_vm(request: CreateVMRequest) -> VMInfo:
 
         # Check and allocate resources
         logger.process("🔄 Allocating resources")
-        if not await resource_tracker.allocate(resources):
+        if not await req.app.state.resource_tracker.allocate(resources):
             logger.error("❌ Insufficient resources available")
             raise HTTPException(400, "Insufficient resources available on provider")
         
@@ -62,7 +55,7 @@ async def create_vm(request: CreateVMRequest) -> VMInfo:
             
             # Create VM
             logger.process(f"🔄 Creating VM with config: {config}")
-            vm_info = await provider.create_vm(config)
+            vm_info = await req.app.state.provider.create_vm(config)
 
             # Show success message
             await vm_creation_animation(request.name)
@@ -70,7 +63,7 @@ async def create_vm(request: CreateVMRequest) -> VMInfo:
         except Exception as e:
             # If VM creation fails, deallocate resources
             logger.warning("⚠️ VM creation failed, deallocating resources")
-            await resource_tracker.deallocate(resources)
+            await req.app.state.resource_tracker.deallocate(resources)
             raise
         
     except MultipassError as e:
@@ -78,13 +71,13 @@ async def create_vm(request: CreateVMRequest) -> VMInfo:
         raise HTTPException(500, str(e))
 
 @router.get("/vms", response_model=List[VMInfo])
-async def list_vms() -> List[VMInfo]:
+async def list_vms(req: Request) -> List[VMInfo]:
     """List all VMs."""
     try:
         logger.info("📋 Listing all VMs")
         vms = []
-        for vm_id in resource_tracker.get_allocated_vms():
-            vm_info = await provider.get_vm_status(vm_id)
+        for vm_id in req.app.state.resource_tracker.get_allocated_vms():
+            vm_info = await req.app.state.provider.get_vm_status(vm_id)
             vms.append(vm_info)
         return vms
     except MultipassError as e:
@@ -92,11 +85,11 @@ async def list_vms() -> List[VMInfo]:
         raise HTTPException(500, str(e))
 
 @router.get("/vms/{requestor_name}", response_model=VMInfo)
-async def get_vm_status(requestor_name: str) -> VMInfo:
+async def get_vm_status(requestor_name: str, req: Request) -> VMInfo:
     """Get VM status."""
     try:
         logger.info(f"🔍 Getting status for VM '{requestor_name}'")
-        status = await provider.get_vm_status(requestor_name)
+        status = await req.app.state.provider.get_vm_status(requestor_name)
         vm_status_change(requestor_name, status.status.value)
         return status
     except MultipassError as e:
@@ -104,16 +97,16 @@ async def get_vm_status(requestor_name: str) -> VMInfo:
         raise HTTPException(500, str(e))
 
 @router.get("/vms/{requestor_name}/access", response_model=VMAccessInfo)
-async def get_vm_access(requestor_name: str) -> VMAccessInfo:
+async def get_vm_access(requestor_name: str, req: Request) -> VMAccessInfo:
     """Get VM access information."""
     try:
         # Get VM info
-        vm = await provider.get_vm_status(requestor_name)
+        vm = await req.app.state.provider.get_vm_status(requestor_name)
         if not vm:
             raise HTTPException(404, "VM not found")
         
         # Get multipass name from mapper
-        multipass_name = await provider.name_mapper.get_multipass_name(requestor_name)
+        multipass_name = await req.app.state.provider.name_mapper.get_multipass_name(requestor_name)
         if not multipass_name:
             raise HTTPException(404, "VM mapping not found")
         
@@ -130,7 +123,7 @@ async def get_vm_access(requestor_name: str) -> VMAccessInfo:
         raise HTTPException(500, str(e))
 
 @router.delete("/vms/{requestor_name}")
-async def delete_vm(requestor_name: str) -> None:
+async def delete_vm(requestor_name: str, req: Request) -> None:
     """Delete a VM.
     
     Args:
@@ -140,14 +133,14 @@ async def delete_vm(requestor_name: str) -> None:
         logger.process(f"🗑️  Deleting VM '{requestor_name}'")
         
         # Get multipass name from mapper
-        multipass_name = await provider.name_mapper.get_multipass_name(requestor_name)
+        multipass_name = await req.app.state.provider.name_mapper.get_multipass_name(requestor_name)
         if not multipass_name:
             logger.warning(f"No multipass name found for VM '{requestor_name}' (may have been already deleted)")
             return
             
         try:
             vm_status_change(requestor_name, "STOPPING", "Cleanup in progress")
-            await provider.delete_vm(requestor_name)
+            await req.app.state.provider.delete_vm(requestor_name)
             vm_status_change(requestor_name, "TERMINATED", "Cleanup complete")
             logger.success(f"✨ Successfully deleted VM '{requestor_name}'")
         except MultipassError as e:

provider/vm/multipass.py

@@ -37,7 +37,7 @@ class MultipassProvider(VMProvider):
         self.vm_data_dir.mkdir(parents=True, exist_ok=True)
 
         # Initialize managers
-        self.proxy_manager = PythonProxyManager()
+        self.proxy_manager = PythonProxyManager(port_manager=port_manager)
         self.name_mapper = VMNameMapper(self.vm_data_dir / "vm_names.json")
 
     def _verify_installation(self) -> None:

provider/vm/port_manager.py

@@ -1,5 +1,6 @@
 import os
 import json
+import socket
 import logging
 import asyncio
 from pathlib import Path
@@ -172,7 +173,23 @@ class PortManager:
             if vm_id in self._used_ports:
                 port = self._used_ports[vm_id]
                 if port in self.verified_ports:
-                    return port
+                    # Quick check if port is still available
+                    try:
+                        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                        sock.settimeout(1)
+                        result = sock.connect_ex(('127.0.0.1', port))
+                        sock.close()
+                        
+                        if result != 0:  # Port is available
+                            return port
+                        else:
+                            # Port is in use, remove from verified ports
+                            self.verified_ports.remove(port)
+                            self._used_ports.pop(vm_id)
+                    except Exception as e:
+                        logger.debug(f"Failed to check port {port}: {e}")
+                        # Keep the port if check fails, let proxy setup handle any issues
+                        return port
                 else:
                     # Previously allocated port is no longer verified
                     self._used_ports.pop(vm_id)
@@ -182,10 +199,24 @@ class PortManager:
             # Find first available verified port
             for port in sorted(self.verified_ports):
                 if port not in used_ports:
-                    self._used_ports[vm_id] = port
-                    self._save_state()
-                    logger.info(f"Allocated verified port {port} for VM {vm_id}")
-                    return port
+                    # Quick check if port is actually available
+                    try:
+                        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                        sock.settimeout(1)
+                        result = sock.connect_ex(('127.0.0.1', port))
+                        sock.close()
+                        
+                        if result != 0:  # Port is available
+                            self._used_ports[vm_id] = port
+                            self._save_state()
+                            logger.info(f"Allocated verified port {port} for VM {vm_id}")
+                            return port
+                        else:
+                            # Port is in use, remove from verified ports
+                            self.verified_ports.remove(port)
+                    except Exception as e:
+                        logger.debug(f"Failed to check port {port}: {e}")
+                        continue
             
             logger.error("No verified ports available for allocation")
             return None

provider/vm/proxy_manager.py

@@ -146,7 +146,7 @@ class PythonProxyManager:
     
     def __init__(
         self,
-        port_manager: Optional[PortManager] = None,
+        port_manager: PortManager,
         state_file: Optional[str] = None
     ):
         """Initialize the proxy manager.
@@ -155,7 +155,7 @@ class PythonProxyManager:
             port_manager: Port allocation manager
             state_file: Path to persist proxy state
         """
-        self.port_manager = port_manager or PortManager()
+        self.port_manager = port_manager
         self.state_file = state_file or os.path.expanduser("~/.golem/provider/proxy_state.json")
         self._proxies: Dict[str, ProxyServer] = {}  # vm_id -> ProxyServer
         self._load_state()