learning-loop-node 0.13.4__tar.gz → 0.13.5__tar.gz

{learning_loop_node-0.13.4 → learning_loop_node-0.13.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: learning-loop-node
-Version: 0.13.4
+Version: 0.13.5
 Summary: Python Library for Nodes which connect to the Zauberzeug Learning Loop
 Home-page: https://github.com/zauberzeug/learning_loop_node
 License: MIT

{learning_loop_node-0.13.4 → learning_loop_node-0.13.5}/learning_loop_node/detector/detector_logic.py

@@ -6,6 +6,7 @@ import numpy as np
 
 from ..data_classes import ImageMetadata, ModelInformation
 from ..globals import GLOBALS
+from .exceptions import NodeNeedsRestartError
 
 
 class DetectorLogic():
@@ -14,6 +15,8 @@ class DetectorLogic():
         self.model_format: str = model_format
         self._model_info: Optional[ModelInformation] = None
 
+        self._remaining_init_attempts: int = 2
+
     async def soft_reload(self):
         self._model_info = None
 
@@ -27,20 +30,22 @@ class DetectorLogic():
     def is_initialized(self) -> bool:
         return self._model_info is not None
 
-    def load_model(self):
+    def load_model_info_and_init_model(self):
         logging.info('Loading model from %s', GLOBALS.data_folder)
-        model_info = ModelInformation.load_from_disk(f'{GLOBALS.data_folder}/model')
-        if model_info is None:
+        self._model_info = ModelInformation.load_from_disk(f'{GLOBALS.data_folder}/model')
+        if self._model_info is None:
             logging.error('No model found')
             self._model_info = None
-            raise Exception('No model found')
         try:
-            self._model_info = model_info
             self.init()
             logging.info('Successfully loaded model %s', self._model_info)
+            self._remaining_init_attempts = 2
         except Exception:
+            self._remaining_init_attempts -= 1
             self._model_info = None
-            logging.error('Could not init model %s', model_info)
+            logging.error('Could not init model %s. Retries left: %s', self._model_info, self._remaining_init_attempts)
+            if self._remaining_init_attempts == 0:
+                raise NodeNeedsRestartError('Could not init model') from None
             raise
 
     @abstractmethod

{learning_loop_node-0.13.4 → learning_loop_node-0.13.5}/learning_loop_node/detector/detector_node.py

@@ -3,6 +3,7 @@ import contextlib
 import os
 import shutil
 import subprocess
+import sys
 from dataclasses import asdict
 from datetime import datetime
 from threading import Thread
@@ -23,6 +24,7 @@ from ..globals import GLOBALS
 from ..helpers import environment_reader
 from ..node import Node
 from .detector_logic import DetectorLogic
+from .exceptions import NodeNeedsRestartError
 from .inbox_filter.relevance_filter import RelevanceFilter
 from .outbox import Outbox
 from .rest import about as rest_about
@@ -170,13 +172,13 @@ class DetectorNode(Node):
 
         # simulate startup
         await self.detector_logic.soft_reload()
-        self.detector_logic.load_model()
+        self.detector_logic.load_model_info_and_init_model()
         self.operation_mode = OperationMode.Idle
 
     async def on_startup(self) -> None:
         try:
             self.outbox.ensure_continuous_upload()
-            self.detector_logic.load_model()
+            self.detector_logic.load_model_info_and_init_model()
         except Exception:
             self.log.exception("error during 'startup'")
         self.operation_mode = OperationMode.Idle
@@ -321,9 +323,12 @@ class DetectorNode(Node):
                 self.log.debug('not checking for updates; no target model selected')
                 return
 
-            current_version = self.detector_logic._model_info.version if self.detector_logic._model_info is not None else None  # pylint: disable=protected-access
+            if self.detector_logic.is_initialized:
+                current_version = self.detector_logic.model_info.version
+            else:
+                current_version = None
 
-            if not self.detector_logic.is_initialized or self.target_model.version != current_version:
+            if current_version != self.target_model.version:
                 self.log.info('Current model "%s" needs to be updated to %s',
                               current_version or "-", self.target_model.version)
 
@@ -349,7 +354,10 @@ class DetectorNode(Node):
                     self.log.info('Updated symlink for model to %s', os.readlink(model_symlink))
 
                     try:
-                        self.detector_logic.load_model()
+                        self.detector_logic.load_model_info_and_init_model()
+                    except NodeNeedsRestartError:
+                        self.log.error('Node needs restart')
+                        sys.exit(0)
                     except Exception:
                         self.log.exception('Could not load model, will retry download on next check')
                         shutil.rmtree(target_model_folder, ignore_errors=True)

learning_loop_node-0.13.5/learning_loop_node/detector/exceptions.py

@@ -0,0 +1,7 @@
+
+
+class NodeNeedsRestartError(Exception):
+    '''
+    NodeNeedsRestartError is raised when the node needs to be restarted.
+    This is e.g. the case when the GPU is not available anymore.
+    '''

{learning_loop_node-0.13.4 → learning_loop_node-0.13.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "learning_loop_node"
-version = "v0.13.4"
+version = "v0.13.5"
 description = "Python Library for Nodes which connect to the Zauberzeug Learning Loop"
 authors = ["Zauberzeug GmbH <info@zauberzeug.com>"]
 license = "MIT"