golem-vm-provider 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

{golem_vm_provider-0.1.16.dist-info → golem_vm_provider-0.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.16
+Version: 0.1.18
 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.16.dist-info → golem_vm_provider-0.1.18.dist-info}/RECORD

@@ -2,7 +2,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=P27RQvNqFWn6PacRwr1PaVz-yv5KAWsp9KeORejkXSI,6452
-provider/config.py,sha256=tF51xZqu-7x_cmHS3lQaAZorjk7DTZOZuOlU-O8Gk9k,11204
+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
@@ -13,14 +13,15 @@ provider/utils/ascii_art.py,sha256=ykBFsztk57GIiz1NJ-EII5UvN74iECqQL4h9VmiW6Z8,3
 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=lgOlpiWTtdZi6jbYceA4XERITAfJZjWi12XI3aAIIF8,3267
+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.16.dist-info/METADATA,sha256=8pEYP425VQlfm1bpPWB5RiQ-1eaftoMAvox-T7VeW_w,10594
-golem_vm_provider-0.1.16.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-golem_vm_provider-0.1.16.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
-golem_vm_provider-0.1.16.dist-info/RECORD,,
+golem_vm_provider-0.1.18.dist-info/METADATA,sha256=8YfU5Z2xOi0URBANotJQK27x2zJvUz5o2rzVl5hRHt0,10594
+golem_vm_provider-0.1.18.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+golem_vm_provider-0.1.18.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
+golem_vm_provider-0.1.18.dist-info/RECORD,,

provider/config.py

@@ -57,26 +57,90 @@ class Settings(BaseSettings):
     VM_DATA_DIR: str = ""
     SSH_KEY_DIR: str = ""
     CLOUD_INIT_DIR: str = ""
+    CLOUD_INIT_FALLBACK_DIR: str = ""  # Will be set to a temp directory if needed
 
     @validator("CLOUD_INIT_DIR", pre=True)
     def resolve_cloud_init_dir(cls, v: str) -> str:
         """Resolve and create cloud-init directory path."""
-        if not v:
-            path = Path.home() / ".golem" / "provider" / "cloud-init"
-        else:
+        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."""
+            try:
+                # Create test file
+                test_file = path / "permission_test"
+                test_file.write_text("test")
+                test_file.unlink()
+                return True
+            except Exception:
+                return False
+
+        if v:
             path = Path(v)
             if not path.is_absolute():
                 path = Path.home() / path
-        
+        else:
+            system = platform.system().lower()
+            # Try OS-specific paths first
+            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.home() / ".local" / "share" / "golem" / "provider" / "cloud-init"
+            elif system == "darwin":
+                # macOS
+                path = Path.home() / "Library" / "Application Support" / "golem" / "provider" / "cloud-init"
+            elif system == "windows":
+                # Windows
+                path = Path(os.path.expandvars("%LOCALAPPDATA%")) / "golem" / "provider" / "cloud-init"
+            else:
+                path = Path.home() / ".golem" / "provider" / "cloud-init"
+
         try:
+            # Try to create and verify the directory
             path.mkdir(parents=True, exist_ok=True)
-            path.chmod(0o755)  # Readable and executable by owner and others, writable by owner
-            logger.debug(f"Created cloud-init directory at {path}")
+            if platform.system().lower() != "windows":
+                path.chmod(0o755)  # Readable and executable by owner and others, writable by owner
+
+            if verify_dir_permissions(path):
+                logger.debug(f"Created cloud-init directory at {path}")
+                return str(path)
+            
+            # If verification fails, fall back to temp directory
+            fallback_path = Path(tempfile.gettempdir()) / "golem" / "cloud-init"
+            fallback_path.mkdir(parents=True, exist_ok=True)
+            if platform.system().lower() != "windows":
+                fallback_path.chmod(0o755)
+            
+            if verify_dir_permissions(fallback_path):
+                logger.warning(f"Using fallback cloud-init directory at {fallback_path}")
+                return str(fallback_path)
+            
+            raise ValueError("Could not create a writable cloud-init directory")
+            
         except Exception as e:
             logger.error(f"Failed to create cloud-init directory at {path}: {e}")
             raise ValueError(f"Failed to create cloud-init directory: {e}")
-            
-        return str(path)
 
     @validator("VM_DATA_DIR", pre=True)
     def resolve_vm_data_dir(cls, v: str) -> str:

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/cloud_init.py

@@ -1,5 +1,6 @@
 import yaml
 import os
+import subprocess
 from datetime import datetime
 from pathlib import Path
 from typing import Dict, Optional, Tuple
@@ -9,6 +10,29 @@ from ..utils.logging import setup_logger
 
 logger = setup_logger(__name__)
 
+def validate_cloud_init(content: str) -> bool:
+    """Validate cloud-init configuration content.
+    
+    Args:
+        content: YAML content to validate
+        
+    Returns:
+        True if valid, False otherwise
+    """
+    try:
+        # First validate YAML syntax
+        yaml.safe_load(content)
+        
+        # Check for required #cloud-config header
+        if not content.startswith("#cloud-config\n"):
+            logger.error("Cloud-init config missing #cloud-config header")
+            return False
+            
+        return True
+    except Exception as e:
+        logger.error(f"Cloud-init validation failed: {e}")
+        return False
+
 def generate_cloud_init(
     hostname: str,
     ssh_key: str,
@@ -32,10 +56,15 @@ def generate_cloud_init(
     
     logger.info(f"Generating cloud-init configuration {config_id}")
     try:
+        # Start with required #cloud-config header
+        yaml_content = "#cloud-config\n"
+        
         config = {
+            "version": 1,
             "hostname": hostname,
             "package_update": True,
             "package_upgrade": True,
+            "preserve_hostname": False,
             "ssh_authorized_keys": [ssh_key],
             "users": [{
                 "name": "root",
@@ -60,16 +89,21 @@ def generate_cloud_init(
         if runcmd:
             config["runcmd"].extend(runcmd)
 
-        # Validate YAML before writing
-        yaml_content = yaml.safe_dump(config)
-        yaml.safe_load(yaml_content)  # Validate by parsing
+        # Add config to YAML content with document markers
+        yaml_content += "---\n"
+        yaml_content += yaml.safe_dump(config, default_flow_style=False, sort_keys=False)
+
+        # Validate the configuration
+        if not validate_cloud_init(yaml_content):
+            raise Exception("Cloud-init configuration validation failed")
 
         # Write to file in our managed directory
         with open(config_path, 'w') as f:
             f.write(yaml_content)
         
         # Set proper permissions
-        config_path.chmod(0o644)  # World readable but only owner writable
+        if os.name != 'nt':  # Skip on Windows
+            config_path.chmod(0o644)  # World readable but only owner writable
         
         logger.debug(f"Cloud-init configuration written to {config_path}")
         logger.debug(f"Cloud-init configuration content:\n{yaml_content}")
@@ -82,6 +116,11 @@ def generate_cloud_init(
         # Don't cleanup on error - keep file for debugging
         if config_path.exists():
             logger.info(f"Failed config preserved at {config_path} for debugging")
+            # Log the file contents for debugging
+            try:
+                logger.debug(f"Failed config contents:\n{config_path.read_text()}")
+            except Exception as read_error:
+                logger.error(f"Could not read failed config: {read_error}")
         raise Exception(error_msg)
 
 def cleanup_cloud_init(path: str, config_id: str) -> None: