golem-vm-provider 0.1.17__py3-none-any.whl → 0.1.19__py3-none-any.whl

{golem_vm_provider-0.1.17.dist-info → golem_vm_provider-0.1.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.17
+Version: 0.1.19
 Summary: VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network
 Keywords: golem,vm,provider,cloud,decentralized
 Author: Phillip Jensen

{golem_vm_provider-0.1.17.dist-info → golem_vm_provider-0.1.19.dist-info}/RECORD

@@ -2,25 +2,26 @@ 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=P27RQvNqFWn6PacRwr1PaVz-yv5KAWsp9KeORejkXSI,6452
-provider/config.py,sha256=btSyU6cB6z8o9nHWpNEOBDxKqsEha1yStM-6of3Np0s,13237
+provider/config.py,sha256=-Cu05ebOjUbhnh5iv3raQ7Z79HMhZ9EcRIRrZVW3Ino,14513
 provider/discovery/__init__.py,sha256=VR3NRoQtZRH5Vs8FG7jnGLR7p7wn7XeZdLaBb3t8e1g,123
 provider/discovery/advertiser.py,sha256=yv7RbRf1K43qOLAEa2Olj9hhN8etl2qsBuoHok0xoVs,6784
 provider/discovery/resource_tracker.py,sha256=8dYhJxoe_jLRwisHoA0jr575YhUKmLIqSXfW88KshcQ,6000
-provider/main.py,sha256=nVuMxq6npioif4-bFXGjQWJCKdy6O5ZbtX3zxhCM3zI,9206
+provider/main.py,sha256=jl80WRIvsvfbHFvoPZqtIhFDUJm0andcyXqUu6Dfi2E,9389
 provider/network/port_verifier.py,sha256=AUtBGuZdfq9Jt4BRDuYesh5YEmwneEzYUgIw-uajZhA,12977
 provider/security/ethereum.py,sha256=SDRDbcjynbVy44kNnxlDcYLL0BZ3Qnc0DvmneQ-WKLE,1383
 provider/utils/ascii_art.py,sha256=ykBFsztk57GIiz1NJ-EII5UvN74iECqQL4h9VmiW6Z8,3161
 provider/utils/logging.py,sha256=C_elr0sJROHKQgErYpHJQvfujgh0k4Zf2gg8ZKfrmVk,2590
 provider/utils/port_display.py,sha256=5d_604Eo-82dqx_yV2ZScq7bKQ8IsXacc-yXC_KAz3A,11031
 provider/utils/retry.py,sha256=ekP2ucaSJNN-lBcrIvyHa4QYPKNITMl1a5V1X6BBvsw,1560
+provider/utils/setup.py,sha256=Z5dLuBQkb5vdoQsu1HJZwXmu9NWsiBYJ7Vq9-C-_tY8,2932
 provider/vm/__init__.py,sha256=JGs50tUmzOR1rQ_w4fMY_3XWylmiA1G7KKWZkVw51mY,501
 provider/vm/cloud_init.py,sha256=E5dDH7dqStRcJNDfbarBBe83-c9N63W8B5ycIrHI8eU,4627
 provider/vm/models.py,sha256=zkfvP5Z50SPDNajwZTt9NTDIMRQIsZLvSOsuirHEcJM,6256
 provider/vm/multipass.py,sha256=FOcsfcJ-NrgBg_fvq_CKOKsQ0xOmk7Z34KXi3ag_Vl8,16603
 provider/vm/name_mapper.py,sha256=MrshNeJ4Dw-WBsyiIVcn9N5xyOxaBKX4Yqhyh_m5IFg,4103
 provider/vm/port_manager.py,sha256=d03uwU76vx6LgADMN8ffBT9t400XQ3vtYlXr6cLIFN0,9831
-provider/vm/proxy_manager.py,sha256=cu0FPPbeCc3CR6NRE_CnLjiRg7xVdSFUylVUOL1g1sI,10154
-golem_vm_provider-0.1.17.dist-info/METADATA,sha256=Lu9EpHlgFmOQP56l89vLyowyM0j48TI5BTGfT_EQxtQ,10594
-golem_vm_provider-0.1.17.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-golem_vm_provider-0.1.17.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
-golem_vm_provider-0.1.17.dist-info/RECORD,,
+provider/vm/proxy_manager.py,sha256=k12bjq1WkizkpUJIyFEoHgT21vhy0l2pSggp3m-8bFc,10895
+golem_vm_provider-0.1.19.dist-info/METADATA,sha256=zt40xePOqxAmby_p-Keplksm4vnBXJ8k3H5G4H6FEqs,10594
+golem_vm_provider-0.1.19.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+golem_vm_provider-0.1.19.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
+golem_vm_provider-0.1.19.dist-info/RECORD,,

provider/config.py

@@ -64,6 +64,7 @@ class Settings(BaseSettings):
         """Resolve and create cloud-init directory path."""
         import platform
         import tempfile
+        from .utils.setup import setup_cloud_init_dir, check_setup_needed, mark_setup_complete
         
         def verify_dir_permissions(path: Path) -> bool:
             """Verify directory has correct permissions and is accessible."""
@@ -86,15 +87,32 @@ class Settings(BaseSettings):
             if system == "linux" and Path("/snap/bin/multipass").exists():
                 # Linux with snap
                 path = Path("/var/snap/multipass/common/cloud-init")
+                
+                # Check if we need to set up permissions
+                if check_setup_needed():
+                    logger.info("First run detected, setting up cloud-init directory...")
+                    success, error = setup_cloud_init_dir(path)
+                    if success:
+                        logger.info("✓ Cloud-init directory setup complete")
+                        mark_setup_complete()
+                    else:
+                        logger.error(f"Failed to set up cloud-init directory: {error}")
+                        logger.error("\nTo fix this manually, run these commands:")
+                        logger.error("  sudo mkdir -p /var/snap/multipass/common/cloud-init")
+                        logger.error("  sudo chown -R $USER:$USER /var/snap/multipass/common/cloud-init")
+                        logger.error("  sudo chmod -R 755 /var/snap/multipass/common/cloud-init\n")
+                        # Fall back to user's home directory
+                        path = Path.home() / ".local" / "share" / "golem" / "provider" / "cloud-init"
+                
             elif system == "linux":
                 # Linux without snap
-                path = Path("/var/lib/multipass/cloud-init")
+                path = Path.home() / ".local" / "share" / "golem" / "provider" / "cloud-init"
             elif system == "darwin":
                 # macOS
-                path = Path("/Library/Application Support/multipass/cloud-init")
+                path = Path.home() / "Library" / "Application Support" / "golem" / "provider" / "cloud-init"
             elif system == "windows":
                 # Windows
-                path = Path(os.path.expandvars("%ProgramData%\\Multipass\\cloud-init"))
+                path = Path(os.path.expandvars("%LOCALAPPDATA%")) / "golem" / "provider" / "cloud-init"
             else:
                 path = Path.home() / ".golem" / "provider" / "cloud-init"
 

provider/main.py

@@ -31,11 +31,15 @@ async def setup_provider() -> None:
         provider = MultipassProvider(resource_tracker, port_manager=port_manager)
         try:
             await asyncio.wait_for(provider.initialize(), timeout=30)
-            app.state.provider = provider
             
-            # Store proxy manager reference for cleanup
+            # Store provider and proxy manager references
+            app.state.provider = provider
             app.state.proxy_manager = provider.proxy_manager
             
+            # Restore proxy configurations
+            logger.process("🔄 Restoring proxy configurations...")
+            await app.state.proxy_manager._load_state()
+            
         except asyncio.TimeoutError:
             logger.error("Provider initialization timed out")
             raise

provider/utils/setup.py

@@ -0,0 +1,100 @@
+import os
+import subprocess
+import platform
+from pathlib import Path
+from typing import Tuple
+
+from .logging import setup_logger
+
+logger = setup_logger(__name__)
+
+def run_sudo_command(cmd: str) -> Tuple[bool, str]:
+    """Run a command with sudo.
+    
+    Args:
+        cmd: Command to run
+        
+    Returns:
+        Tuple of (success, error_message)
+    """
+    try:
+        # Try non-interactive sudo first
+        result = subprocess.run(
+            f"sudo -n {cmd}",
+            shell=True,
+            capture_output=True,
+            text=True
+        )
+        if result.returncode == 0:
+            return True, ""
+            
+        # If that fails, try interactive sudo
+        logger.warning("Non-interactive sudo failed, will prompt for password")
+        result = subprocess.run(
+            f"sudo {cmd}",
+            shell=True,
+            capture_output=True,
+            text=True
+        )
+        if result.returncode == 0:
+            return True, ""
+            
+        return False, result.stderr
+        
+    except Exception as e:
+        return False, str(e)
+
+def setup_cloud_init_dir(path: Path) -> Tuple[bool, str]:
+    """Set up cloud-init directory with correct permissions.
+    
+    Args:
+        path: Path to cloud-init directory
+        
+    Returns:
+        Tuple of (success, error_message)
+    """
+    if platform.system().lower() != "linux" or not Path("/snap/bin/multipass").exists():
+        # Only needed for Linux with snap
+        return True, ""
+        
+    try:
+        # Create directory
+        success, error = run_sudo_command(f"mkdir -p {path}")
+        if not success:
+            return False, f"Failed to create directory: {error}"
+            
+        # Set ownership
+        user = os.environ.get("USER", os.environ.get("USERNAME"))
+        success, error = run_sudo_command(f"chown -R {user}:{user} {path}")
+        if not success:
+            return False, f"Failed to set ownership: {error}"
+            
+        # Set permissions
+        success, error = run_sudo_command(f"chmod -R 755 {path}")
+        if not success:
+            return False, f"Failed to set permissions: {error}"
+            
+        return True, ""
+        
+    except Exception as e:
+        return False, str(e)
+
+def check_setup_needed() -> bool:
+    """Check if setup is needed.
+    
+    Returns:
+        True if setup is needed, False otherwise
+    """
+    # Only needed for Linux with snap
+    if platform.system().lower() != "linux" or not Path("/snap/bin/multipass").exists():
+        return False
+        
+    # Check if setup has already been completed
+    setup_flag = Path.home() / ".golem" / "provider" / ".setup-complete"
+    return not setup_flag.exists()
+
+def mark_setup_complete() -> None:
+    """Mark setup as complete."""
+    setup_flag = Path.home() / ".golem" / "provider" / ".setup-complete"
+    setup_flag.parent.mkdir(parents=True, exist_ok=True)
+    setup_flag.touch()

provider/vm/proxy_manager.py

@@ -158,18 +158,31 @@ class PythonProxyManager:
         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()
+        # Note: _load_state is now async and will be called explicitly during provider setup
     
-    def _load_state(self) -> None:
-        """Load proxy state from file."""
+    async def _load_state(self) -> None:
+        """Load and restore proxy state from file."""
         try:
             state_path = Path(self.state_file)
             if state_path.exists():
                 with open(state_path, 'r') as f:
                     state = json.load(f)
-                    # We only need to restore port allocations
-                    # Actual proxy servers will be recreated as needed
-                    logger.info(f"Loaded proxy state for {len(state)} VMs")
+                    # Restore proxy servers from saved state
+                    restore_tasks = []
+                    for vm_id, proxy_info in state.items():
+                        # Create task to restore proxy
+                        task = self.add_vm(
+                            vm_id=vm_id,
+                            vm_ip=proxy_info['target'],
+                            port=proxy_info['port']
+                        )
+                        restore_tasks.append(task)
+                    
+                    # Wait for all proxies to be restored
+                    if restore_tasks:
+                        results = await asyncio.gather(*restore_tasks, return_exceptions=True)
+                        successful = sum(1 for r in results if r is True)
+                        logger.info(f"Restored {successful}/{len(state)} proxy configurations")
         except Exception as e:
             logger.error(f"Failed to load proxy state: {e}")