golem-vm-provider 0.1.12__py3-none-any.whl → 0.1.13__py3-none-any.whl

{golem_vm_provider-0.1.12.dist-info → golem_vm_provider-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.12
+Version: 0.1.13
 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.12.dist-info → golem_vm_provider-0.1.13.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=6eixu6AgKKerZJVIRs24Pdno7S7rP1qyeKWlMPXYqY8,7547
+provider/config.py,sha256=41FhWAzPJrbyu1VJC4YOMLl79RzYmzFpOjEuS2MZSm4,9128
 provider/discovery/__init__.py,sha256=VR3NRoQtZRH5Vs8FG7jnGLR7p7wn7XeZdLaBb3t8e1g,123
 provider/discovery/advertiser.py,sha256=yv7RbRf1K43qOLAEa2Olj9hhN8etl2qsBuoHok0xoVs,6784
 provider/discovery/resource_tracker.py,sha256=8dYhJxoe_jLRwisHoA0jr575YhUKmLIqSXfW88KshcQ,6000
@@ -20,7 +20,7 @@ provider/vm/multipass.py,sha256=RLUqCeoYz4PG8RL7dBu_TzjNEAmgIz9NonBtSuYc4kw,1643
 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.12.dist-info/METADATA,sha256=HN8xlU_GQXT8uhZlH0EaCM68gm3IB3xHngUCSL9FJAo,10594
-golem_vm_provider-0.1.12.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-golem_vm_provider-0.1.12.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
-golem_vm_provider-0.1.12.dist-info/RECORD,,
+golem_vm_provider-0.1.13.dist-info/METADATA,sha256=zaGnsTHOW6OEZAOOpl-a3gchR9ESFbDNNfOR35JJUSQ,10594
+golem_vm_provider-0.1.13.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+golem_vm_provider-0.1.13.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
+golem_vm_provider-0.1.13.dist-info/RECORD,,

provider/config.py

@@ -3,7 +3,10 @@ from pathlib import Path
 from typing import Optional
 import uuid
 
-from pydantic import BaseSettings, validator
+from pydantic import BaseSettings, validator, Field
+from .utils.logging import setup_logger
+
+logger = setup_logger(__name__)
 
 
 class Settings(BaseSettings):
@@ -88,98 +91,130 @@ class Settings(BaseSettings):
     RATE_LIMIT_PER_MINUTE: int = 100
 
     # Multipass Settings
-    MULTIPASS_BINARY_PATH: str = ""
+    MULTIPASS_BINARY_PATH: str = Field(
+        default="",
+        description="Path to multipass binary"
+    )
 
-    @validator("MULTIPASS_BINARY_PATH", pre=True)
+    @validator("MULTIPASS_BINARY_PATH")
     def detect_multipass_path(cls, v: str) -> str:
         """Detect and validate Multipass binary path."""
+        import platform
+        import subprocess
+        
+        def validate_path(path: str) -> bool:
+            """Validate that a path exists and is executable."""
+            return os.path.isfile(path) and os.access(path, os.X_OK)
+
+        # If path provided via environment variable, ONLY validate that path
         if v:
-            path = v
-        else:
-            import platform
-            import subprocess
-            
-            system = platform.system().lower()
-            binary_name = "multipass.exe" if system == "windows" else "multipass"
-            
-            # Try to find multipass based on OS
-            if system == "linux":
-                # First try to find snap
-                try:
-                    snap_result = subprocess.run(
-                        ["which", "snap"],
-                        capture_output=True,
-                        text=True
-                    )
-                    if snap_result.returncode == 0:
-                        # If snap exists, check if multipass is installed
-                        snap_path = "/snap/bin/multipass"
-                        if os.path.isfile(snap_path) and os.access(snap_path, os.X_OK):
-                            return snap_path
-                except subprocess.SubprocessError:
-                    pass
+            logger.debug(f"Using provided multipass path: {v}")
+            if not validate_path(v):
+                logger.error(f"Provided path {v} is invalid or not executable")
+                raise ValueError(f"Invalid multipass binary path: {v}")
+            return v
+
+        logger.debug("No multipass path provided, attempting auto-detection")
+        system = platform.system().lower()
+        logger.debug(f"Detected OS: {system}")
+        binary_name = "multipass.exe" if system == "windows" else "multipass"
+        
+        # Try to find multipass based on OS
+        if system == "linux":
+            logger.debug("Checking for snap installation on Linux")
+            # First try to find snap and check if multipass is installed
+            try:
+                # Check if snap exists
+                snap_result = subprocess.run(
+                    ["which", "snap"],
+                    capture_output=True,
+                    text=True,
+                    check=True
+                )
+                if snap_result.returncode == 0:
+                    logger.debug("Found snap, checking for multipass installation")
+                    # Check if multipass is installed via snap
+                    try:
+                        snap_list = subprocess.run(
+                            ["snap", "list", "multipass"],
+                            capture_output=True,
+                            text=True,
+                            check=True
+                        )
+                        if snap_list.returncode == 0:
+                            snap_path = "/snap/bin/multipass"
+                            if validate_path(snap_path):
+                                logger.debug(f"Found multipass via snap at {snap_path}")
+                                return snap_path
+                    except subprocess.CalledProcessError:
+                        logger.debug("Multipass not installed via snap")
+                        pass
+            except subprocess.CalledProcessError:
+                logger.debug("Snap not found")
+                pass
                 
-                # Common Linux paths
-                search_paths = [
-                    "/usr/local/bin",
-                    "/usr/bin",
-                    "/snap/bin"
-                ]
+            # Common Linux paths if snap installation not found
+            search_paths = [
+                "/usr/local/bin",
+                "/usr/bin",
+                "/snap/bin"
+            ]
+            logger.debug(f"Checking common Linux paths: {search_paths}")
                 
-            elif system == "darwin":  # macOS
-                search_paths = [
-                    "/opt/homebrew/bin",    # M1 Mac
-                    "/usr/local/bin",       # Intel Mac
-                    "/opt/local/bin"        # MacPorts
-                ]
+        elif system == "darwin":  # macOS
+            search_paths = [
+                "/opt/homebrew/bin",    # M1 Mac
+                "/usr/local/bin",       # Intel Mac
+                "/opt/local/bin"        # MacPorts
+            ]
+            logger.debug(f"Checking macOS paths: {search_paths}")
                 
-            elif system == "windows":
-                search_paths = [
-                    os.path.expandvars(r"%ProgramFiles%\Multipass"),
-                    os.path.expandvars(r"%ProgramFiles(x86)%\Multipass"),
-                    os.path.expandvars(r"%LocalAppData%\Multipass")
-                ]
+        elif system == "windows":
+            search_paths = [
+                os.path.expandvars(r"%ProgramFiles%\Multipass"),
+                os.path.expandvars(r"%ProgramFiles(x86)%\Multipass"),
+                os.path.expandvars(r"%LocalAppData%\Multipass")
+            ]
+            logger.debug(f"Checking Windows paths: {search_paths}")
                 
+        else:
+            search_paths = ["/usr/local/bin", "/usr/bin"]
+            logger.debug(f"Checking default paths: {search_paths}")
+
+        # Search for multipass binary in OS-specific paths
+        for directory in search_paths:
+            path = os.path.join(directory, binary_name)
+            logger.debug(f"Checking path: {path}")
+            if validate_path(path):
+                logger.debug(f"Found valid multipass binary at: {path}")
+                return path
             else:
-                search_paths = ["/usr/local/bin", "/usr/bin"]
-
-            # Search for multipass binary in OS-specific paths
-            for directory in search_paths:
-                path = os.path.join(directory, binary_name)
-                if os.path.isfile(path) and os.access(path, os.X_OK):
-                    return path
-
-            # OS-specific installation instructions
-            if system == "linux":
-                raise ValueError(
-                    "Multipass binary not found. Please install using:\n"
-                    "sudo snap install multipass\n"
-                    "Or set GOLEM_PROVIDER_MULTIPASS_BINARY_PATH to your Multipass binary path."
-                )
-            elif system == "darwin":
-                raise ValueError(
-                    "Multipass binary not found. Please install using:\n"
-                    "brew install multipass\n"
-                    "Or set GOLEM_PROVIDER_MULTIPASS_BINARY_PATH to your Multipass binary path."
-                )
-            elif system == "windows":
-                raise ValueError(
-                    "Multipass binary not found. Please install from:\n"
-                    "Microsoft Store or https://multipass.run/download/windows\n"
-                    "Or set GOLEM_PROVIDER_MULTIPASS_BINARY_PATH to your Multipass binary path."
-                )
-            else:
-                raise ValueError(
-                    "Multipass binary not found. Please install Multipass or set "
-                    "GOLEM_PROVIDER_MULTIPASS_BINARY_PATH to your Multipass binary path."
-                )
-
-        # Validate the path
-        if not os.path.isfile(path):
-            raise ValueError(f"Multipass binary not found at: {path}")
-        if not os.access(path, os.X_OK):
-            raise ValueError(f"Multipass binary at {path} is not executable")
-        return path
+                logger.debug(f"No valid multipass binary at: {path}")
+
+        # OS-specific installation instructions
+        if system == "linux":
+            raise ValueError(
+                "Multipass binary not found. Please install using:\n"
+                "sudo snap install multipass\n"
+                "Or set GOLEM_PROVIDER_MULTIPASS_BINARY_PATH to your Multipass binary path."
+            )
+        elif system == "darwin":
+            raise ValueError(
+                "Multipass binary not found. Please install using:\n"
+                "brew install multipass\n"
+                "Or set GOLEM_PROVIDER_MULTIPASS_BINARY_PATH to your Multipass binary path."
+            )
+        elif system == "windows":
+            raise ValueError(
+                "Multipass binary not found. Please install from:\n"
+                "Microsoft Store or https://multipass.run/download/windows\n"
+                "Or set GOLEM_PROVIDER_MULTIPASS_BINARY_PATH to your Multipass binary path."
+            )
+        else:
+            raise ValueError(
+                "Multipass binary not found. Please install Multipass or set "
+                "GOLEM_PROVIDER_MULTIPASS_BINARY_PATH to your Multipass binary path."
+            )
 
     # Proxy Settings
     PORT_RANGE_START: int = 50800