golem-vm-provider 0.1.49__py3-none-any.whl → 0.1.50__py3-none-any.whl

{golem_vm_provider-0.1.49.dist-info → golem_vm_provider-0.1.50.dist-info}/METADATA

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

@@ -16,7 +16,7 @@ provider/discovery/service.py,sha256=vX_mVSxvn3arnb2cKDM_SeJp1ZgPdImP2aUubeXgdRg
 provider/main.py,sha256=RSq2_dbBjQYkNwohxuwgzKbnzcqzEgJH1wcPMMf00t0,18925
 provider/network/port_verifier.py,sha256=3l6WNwBHydggJRFYkAsuBp1eCxaU619kjWuM-zSVj2o,13267
 provider/payments/blockchain_service.py,sha256=4GrzDKwCSUVoENqjD4RLyJ0qwBOJKMyVk5Li-XNsyTc,3567
-provider/payments/monitor.py,sha256=76ab-86UzFzWOkf9UtKE4B3Rz9-LRVjRrUJOHEKnwFA,4055
+provider/payments/monitor.py,sha256=Rw17zYsxZre0zU6R0oeRNvVIzMdXLsgoUvSPHpJy6I0,4488
 provider/payments/stream_map.py,sha256=qk6Y8hS72DplAifZ0ZMWPHBAyc_3IWIQyWUBuCU3_To,1191
 provider/security/ethereum.py,sha256=EwPZj4JR8OEpto6LhKjuuT3Z9pBX6P7-UQaqJtqFkYQ,1242
 provider/security/faucet.py,sha256=8T4lW1fVQgUk8EQILgbrr9UUosw9e7eA40tlZ2_KCPQ,4368
@@ -38,7 +38,7 @@ provider/vm/port_manager.py,sha256=iYSwjTjD_ziOhG8aI7juKHw1OwwRUTJQyQoRUNQvz9w,1
 provider/vm/provider.py,sha256=A7QN89EJjcSS40_SmKeinG1Jp_NGffJaLse-XdKciAs,1164
 provider/vm/proxy_manager.py,sha256=n4NTsyz2rtrvjtf_ceKBk-g2q_mzqPwruB1q7UlQVBc,14928
 provider/vm/service.py,sha256=Ki4SGNIZUq3XmaPMwAOoNzdZzKQsmFXid374wgjFPes,4636
-golem_vm_provider-0.1.49.dist-info/METADATA,sha256=4-pM4zumZUj7ZfXOiWO2s-lC4BsquHGFdETQfFkyPTQ,16585
-golem_vm_provider-0.1.49.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-golem_vm_provider-0.1.49.dist-info/entry_points.txt,sha256=5Jiie1dIXygmxmDW66bKKxQpmBLJ7leSKRrb8bkQALw,52
-golem_vm_provider-0.1.49.dist-info/RECORD,,
+golem_vm_provider-0.1.50.dist-info/METADATA,sha256=h4dTmyA9UOyvi8R3pp13bW34sxr8W8JSoYzALN8gRmA,16585
+golem_vm_provider-0.1.50.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+golem_vm_provider-0.1.50.dist-info/entry_points.txt,sha256=5Jiie1dIXygmxmDW66bKKxQpmBLJ7leSKRrb8bkQALw,52
+golem_vm_provider-0.1.50.dist-info/RECORD,,

provider/payments/monitor.py

@@ -15,11 +15,21 @@ class StreamMonitor:
         self.settings = settings
         self._task: Optional[asyncio.Task] = None
 
+    def _get(self, key: str, default=None):
+        """Safely read setting from either an object with attributes or a dict-like mapping."""
+        try:
+            return getattr(self.settings, key)
+        except Exception:
+            try:
+                return self.settings.get(key, default)
+            except Exception:
+                return default
+
     def start(self):
-        if self.settings.STREAM_MONITOR_ENABLED or self.settings.STREAM_WITHDRAW_ENABLED:
+        if self._get("STREAM_MONITOR_ENABLED", False) or self._get("STREAM_WITHDRAW_ENABLED", False):
             logger.info(
-                f"⏱️ Stream monitor enabled (check={self.settings.STREAM_MONITOR_ENABLED}, withdraw={self.settings.STREAM_WITHDRAW_ENABLED}) "
-                f"interval={self.settings.STREAM_MONITOR_INTERVAL_SECONDS}s"
+                f"⏱️ Stream monitor enabled (check={self._get('STREAM_MONITOR_ENABLED', False)}, "
+                f"withdraw={self._get('STREAM_WITHDRAW_ENABLED', False)}) interval={self._get('STREAM_MONITOR_INTERVAL_SECONDS', 60)}s"
             )
             self._task = asyncio.create_task(self._run(), name="stream-monitor")
 
@@ -35,7 +45,7 @@ class StreamMonitor:
         last_withdraw = 0
         while True:
             try:
-                await asyncio.sleep(self.settings.STREAM_MONITOR_INTERVAL_SECONDS)
+                await asyncio.sleep(int(self._get("STREAM_MONITOR_INTERVAL_SECONDS", 60)))
                 items = await self.stream_map.all_items()
                 now = int(self.reader.web3.eth.get_block("latest")["timestamp"]) if items else 0
                 logger.debug(f"stream monitor tick: {len(items)} streams, now={now}")
@@ -51,7 +61,7 @@ class StreamMonitor:
                         f"stream {stream_id} for VM {vm_id}: start={s['startTime']} stop={s['stopTime']} "
                         f"rate={s['ratePerSecond']} withdrawn={s['withdrawn']} halted={s['halted']} remaining={remaining}s"
                     )
-                    if self.settings.STREAM_MONITOR_ENABLED and remaining < self.settings.STREAM_MIN_REMAINING_SECONDS:
+                    if self._get("STREAM_MONITOR_ENABLED", False) and remaining < int(self._get("STREAM_MIN_REMAINING_SECONDS", 0)):
                         logger.info(f"Stopping VM {vm_id} due to low stream runway ({remaining}s)")
                         try:
                             await self.vm_service.stop_vm(vm_id)
@@ -59,16 +69,16 @@ class StreamMonitor:
                             logger.warning(f"stop_vm failed for {vm_id}: {e}")
                     else:
                         logger.debug(
-                            f"VM {vm_id} stream {stream_id} healthy (remaining={remaining}s, threshold={self.settings.STREAM_MIN_REMAINING_SECONDS}s)"
+                            f"VM {vm_id} stream {stream_id} healthy (remaining={remaining}s, threshold={self._get('STREAM_MIN_REMAINING_SECONDS', 0)}s)"
                         )
                     # Withdraw if enough vested and configured
-                    if self.settings.STREAM_WITHDRAW_ENABLED and self.client:
+                    if self._get("STREAM_WITHDRAW_ENABLED", False) and self.client:
                         vested = max(min(now, s["stopTime"]) - s["startTime"], 0) * s["ratePerSecond"]
                         withdrawable = max(vested - s["withdrawn"], 0)
                         logger.debug(f"withdraw check stream {stream_id}: vested={vested} withdrawable={withdrawable}")
                         # Enforce a minimum interval between withdrawals
-                        if withdrawable >= self.settings.STREAM_MIN_WITHDRAW_WEI and (
-                            now - last_withdraw >= self.settings.STREAM_WITHDRAW_INTERVAL_SECONDS
+                        if withdrawable >= int(self._get("STREAM_MIN_WITHDRAW_WEI", 0)) and (
+                            now - last_withdraw >= int(self._get("STREAM_WITHDRAW_INTERVAL_SECONDS", 1800))
                         ):
                             try:
                                 self.client.withdraw(stream_id)