learning-loop-node 0.18.0__py3-none-any.whl → 0.18.2__py3-none-any.whl

learning_loop_node/detector/detector_logic.py

@@ -21,6 +21,12 @@ class DetectorLogic():
         self.model_info = None
 
     def load_model_info_and_init_model(self):
+        """
+        Load model information from disk and initialize the model.
+
+        The detector node uses a lock to make sure that this is not called 
+        concurrently with evaluate() or batch_evaluate(). 
+        """
         logging.info('Loading model from %s', GLOBALS.data_folder)
         self.model_info = ModelInformation.load_from_disk(f'{GLOBALS.data_folder}/model')
         if self.model_info is None:
@@ -42,21 +48,32 @@ class DetectorLogic():
 
     @abstractmethod
     def init(self):
-        """Called when a (new) model was loaded. Initialize the model. Model information available via `self.model_info`"""
+        """
+        Initialize the model.
+
+        Called when a (new) model was loaded. 
+        Model information available via `self.model_info`
+        The detector node uses a lock to make sure that this is not called
+        concurrently with evaluate() or batch_evaluate(). 
+        """
 
     @abstractmethod
     def evaluate(self, image: np.ndarray) -> ImageMetadata:
-        """Evaluate the image and return the detections.
+        """
+        Evaluate the image and return the detections.
 
         Called by the detector node when an image should be evaluated (REST or SocketIO).
         The resulting detections should be stored in the ImageMetadata.
         Tags stored in the ImageMetadata will be uploaded to the learning loop.
-        The function should return empty metadata if the detector is not initialized."""
+        The function should return empty metadata if the detector is not initialized.
+        """
 
     @abstractmethod
     def batch_evaluate(self, images: List[np.ndarray]) -> ImagesMetadata:
-        """Evaluate a batch of images and return the detections.
+        """
+        Evaluate a batch of images and return the detections.
 
         The resulting detections per image should be stored in the ImagesMetadata.
         Tags stored in the ImagesMetadata will be uploaded to the learning loop.
-        The function should return empty metadata if the detector is not initialized."""
+        The function should return empty metadata if the detector is not initialized.
+        """

learning_loop_node/detector/detector_node.py

@@ -190,13 +190,13 @@ class DetectorNode(Node):
 
         # simulate startup
         await self.detector_logic.soft_reload()
-        self.detector_logic.load_model_info_and_init_model()
+        await self._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_info_and_init_model()
+            await self._load_model_info_and_init_model()
         except Exception:
             self.log.exception("error during 'startup'")
         self.operation_mode = OperationMode.Idle
@@ -217,7 +217,7 @@ class DetectorNode(Node):
         # Initialize the Socket.IO server with 20MB buffer size
         self.sio = socketio.AsyncServer(
             async_mode='asgi',
-            max_http_buffer_size=2e7,  # 20MB
+            max_http_buffer_size=64 * 1024 * 1024,  # 64 MiB
         )
         # Initialize and mount the ASGI app
         self.sio_app = socketio.ASGIApp(self.sio, socketio_path='/socket.io')
@@ -522,7 +522,7 @@ class DetectorNode(Node):
             self.log.info('Updated symlink for model to %s', os.readlink(model_symlink))
 
             try:
-                self.detector_logic.load_model_info_and_init_model()
+                await self._load_model_info_and_init_model()
             except NodeNeedsRestartError:
                 self.log.error('Node needs restart')
                 sys.exit(0)
@@ -535,6 +535,10 @@ class DetectorNode(Node):
             await self._sync_status_with_loop()
             # self.reload(reason='new model installed')
 
+    async def _load_model_info_and_init_model(self) -> None:
+        async with self.detection_lock:
+            self.detector_logic.load_model_info_and_init_model()
+
 # ================================== API Implementations ==================================
 
     async def set_operation_mode(self, mode: OperationMode):
@@ -570,11 +574,8 @@ class DetectorNode(Node):
         cares about uploading to the loop and returns the detections as ImageMetadata object.
         """
 
-        await self.detection_lock.acquire()
-        try:
+        async with self.detection_lock:
             metadata = await run.io_bound(self.detector_logic.evaluate, image)
-        finally:
-            self.detection_lock.release()
 
         metadata.tags.extend(tags)
         metadata.source = source
@@ -606,14 +607,12 @@ class DetectorNode(Node):
         """
         Processing function for the detector node when a a batch inference is requested via SocketIO.
 
-        This function infers the detections from all images, cares about uploading to the loop and returns the detections as a list of ImageMetadata.
+        This function infers the detections from all images, 
+        cares about uploading to the loop and returns the detections as a list of ImageMetadata.
         """
 
-        await self.detection_lock.acquire()
-        try:
+        async with self.detection_lock:
             all_detections = await run.io_bound(self.detector_logic.batch_evaluate, images)
-        finally:
-            self.detection_lock.release()
 
         for metadata in all_detections.items:
             metadata.tags.extend(tags)

{learning_loop_node-0.18.0.dist-info → learning_loop_node-0.18.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: learning-loop-node
-Version: 0.18.0
+Version: 0.18.2
 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.18.0.dist-info → learning_loop_node-0.18.2.dist-info}/RECORD

@@ -12,8 +12,8 @@ learning_loop_node/data_classes/socket_response.py,sha256=tIdt-oYf6ULoJIDYQCecNM
 learning_loop_node/data_classes/training.py,sha256=TybwcCDf_NUaDUaOj30lPm-7Z3Qk9XFRibEX5qIv96Y,5737
 learning_loop_node/data_exchanger.py,sha256=nd9JNPLn9amIeTcSIyUPpbE97ORAcb5yNphvmpgWSUQ,9095
 learning_loop_node/detector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-learning_loop_node/detector/detector_logic.py,sha256=wIOqguGedc0VUvUR812NLsG5ed5M1TLWnfQh1CIhW-g,2466
-learning_loop_node/detector/detector_node.py,sha256=8of6ku3Eu_t_yfgdFWqKDG06V14IVyvIJKca0vj5N80,31910
+learning_loop_node/detector/detector_logic.py,sha256=8J70Fulrhex9IHFBAGYLR3a0-W-zsNj4h7mYLnrmUqM,2899
+learning_loop_node/detector/detector_node.py,sha256=KtrlbB4sCwtP9cy6M-Qx0dHYKXYdt_6HagNUbVo6GG0,31925
 learning_loop_node/detector/exceptions.py,sha256=C6KbNPlSbtfgDrZx2Hbhm7Suk9jVoR3fMRCO0CkrMsQ,196
 learning_loop_node/detector/inbox_filter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 learning_loop_node/detector/inbox_filter/cam_observation_history.py,sha256=slPGm87TbBCfDUdpRTAM5yOz1An8Br5X_2HFJOGSrFg,3540
@@ -100,6 +100,6 @@ learning_loop_node/trainer/test_executor.py,sha256=6BVGDN_6f5GEMMEvDLSG1yzMybSvg
 learning_loop_node/trainer/trainer_logic.py,sha256=eK-01qZzi10UjLMCQX8vy5eW2FoghPj3rzzDC-s3Si4,8792
 learning_loop_node/trainer/trainer_logic_generic.py,sha256=KcHmXr-Hp8_Wuejzj8odY6sRPqi6aw1SEXv3YlbjM98,27057
 learning_loop_node/trainer/trainer_node.py,sha256=tsAMzJewdS7Bi_1b9FwG0d2lGlv2lY37pgOLWr0bP_I,4582
-learning_loop_node-0.18.0.dist-info/METADATA,sha256=LbLMgpf7nA5hBdsyPc-VUXvHcM-lfKPdBbQzEbuSb3U,15225
-learning_loop_node-0.18.0.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-learning_loop_node-0.18.0.dist-info/RECORD,,
+learning_loop_node-0.18.2.dist-info/METADATA,sha256=pDPv1j1iyt9KCziZNt3WHzAgqXykLeMPnO7Yb2lqf2A,15225
+learning_loop_node-0.18.2.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+learning_loop_node-0.18.2.dist-info/RECORD,,