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

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

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

@@ -17,11 +17,11 @@ 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/multipass.py,sha256=RufJbl39d_mEXruX0gX1zCmEEiQ_DytPXgW6F1qVQaM,16667
 provider/vm/name_mapper.py,sha256=MrshNeJ4Dw-WBsyiIVcn9N5xyOxaBKX4Yqhyh_m5IFg,4103
 provider/vm/port_manager.py,sha256=d03uwU76vx6LgADMN8ffBT9t400XQ3vtYlXr6cLIFN0,9831
-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/vm/proxy_manager.py,sha256=ZrLm6S6aaCvmwYmqd_9ne1_3T7M8qxoNDdAtYX8ZDRE,11704
+golem_vm_provider-0.1.20.dist-info/METADATA,sha256=jKbkVW9HxnSHl7I0qGSFqV799kPjq7LGv54HwHJBRx0,10594
+golem_vm_provider-0.1.20.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+golem_vm_provider-0.1.20.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
+golem_vm_provider-0.1.20.dist-info/RECORD,,

provider/vm/multipass.py

@@ -37,8 +37,11 @@ class MultipassProvider(VMProvider):
         self.vm_data_dir.mkdir(parents=True, exist_ok=True)
 
         # Initialize managers
-        self.proxy_manager = PythonProxyManager(port_manager=port_manager)
         self.name_mapper = VMNameMapper(self.vm_data_dir / "vm_names.json")
+        self.proxy_manager = PythonProxyManager(
+            port_manager=port_manager,
+            name_mapper=self.name_mapper
+        )
 
     def _verify_installation(self) -> None:
         """Verify multipass is installed and get version."""

provider/vm/proxy_manager.py

@@ -147,17 +147,20 @@ class PythonProxyManager:
     def __init__(
         self,
         port_manager: PortManager,
+        name_mapper: "VMNameMapper",
         state_file: Optional[str] = None
     ):
         """Initialize the proxy manager.
         
         Args:
             port_manager: Port allocation manager
+            name_mapper: VM name mapping manager
             state_file: Path to persist proxy state
         """
         self.port_manager = port_manager
+        self.name_mapper = name_mapper
         self.state_file = state_file or os.path.expanduser("~/.golem/provider/proxy_state.json")
-        self._proxies: Dict[str, ProxyServer] = {}  # vm_id -> ProxyServer
+        self._proxies: Dict[str, ProxyServer] = {}  # multipass_name -> ProxyServer
         # Note: _load_state is now async and will be called explicitly during provider setup
     
     async def _load_state(self) -> None:
@@ -169,14 +172,19 @@ class PythonProxyManager:
                     state = json.load(f)
                     # 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)
+                    for requestor_name, proxy_info in state.items():
+                        # Get current multipass name for the requestor's VM
+                        multipass_name = await self.name_mapper.get_multipass_name(requestor_name)
+                        if multipass_name:
+                            # Create task to restore proxy
+                            task = self.add_vm(
+                                vm_id=multipass_name,  # Use multipass name for internal tracking
+                                vm_ip=proxy_info['target'],
+                                port=proxy_info['port']
+                            )
+                            restore_tasks.append(task)
+                        else:
+                            logger.warning(f"No multipass name found for requestor VM {requestor_name}")
                     
                     # Wait for all proxies to be restored
                     if restore_tasks:
@@ -186,16 +194,17 @@ class PythonProxyManager:
         except Exception as e:
             logger.error(f"Failed to load proxy state: {e}")
     
-    def _save_state(self) -> None:
-        """Save current proxy state to file."""
+    async def _save_state(self) -> None:
+        """Save current proxy state to file using requestor names."""
         try:
-            state = {
-                vm_id: {
-                    'port': proxy.listen_port,
-                    'target': proxy.target_host
-                }
-                for vm_id, proxy in self._proxies.items()
-            }
+            state = {}
+            for multipass_name, proxy in self._proxies.items():
+                requestor_name = await self.name_mapper.get_requestor_name(multipass_name)
+                if requestor_name:
+                    state[requestor_name] = {
+                        'port': proxy.listen_port,
+                        'target': proxy.target_host
+                    }
             os.makedirs(os.path.dirname(self.state_file), exist_ok=True)
             with open(self.state_file, 'w') as f:
                 json.dump(state, f)
@@ -206,7 +215,7 @@ class PythonProxyManager:
         """Add proxy configuration for a new VM.
         
         Args:
-            vm_id: Unique identifier for the VM
+            vm_id: Unique identifier for the VM (multipass name)
             vm_ip: IP address of the VM
             port: Optional specific port to use, if not provided one will be allocated
             
@@ -226,7 +235,7 @@ class PythonProxyManager:
             await proxy.start()
             
             self._proxies[vm_id] = proxy
-            self._save_state()
+            await self._save_state()
             
             logger.info(f"Started proxy for VM {vm_id} on port {port}")
             return True
@@ -242,14 +251,14 @@ class PythonProxyManager:
         """Remove proxy configuration for a VM.
         
         Args:
-            vm_id: Unique identifier for the VM
+            vm_id: Unique identifier for the VM (multipass name)
         """
         try:
             if vm_id in self._proxies:
                 proxy = self._proxies.pop(vm_id)
                 await proxy.stop()
                 self.port_manager.deallocate_port(vm_id)
-                self._save_state()
+                await self._save_state()
                 logger.info(f"Removed proxy for VM {vm_id}")
         except Exception as e:
             logger.error(f"Failed to remove proxy for VM {vm_id}: {e}")
@@ -270,7 +279,7 @@ class PythonProxyManager:
                 cleanup_errors.append(f"Failed to remove proxy for VM {vm_id}: {e}")
         
         try:
-            self._save_state()
+            await self._save_state()
         except Exception as e:
             cleanup_errors.append(f"Failed to save state: {e}")