learning-loop-node 0.13.0__py3-none-any.whl → 0.13.3__py3-none-any.whl

learning_loop_node/detector/detector_logic.py

@@ -31,14 +31,15 @@ class DetectorLogic():
         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:
-            logging.warning('No model found')
+            logging.error('No model found')
             self._model_info = None
-            return
+            raise Exception('No model found')
         try:
             self._model_info = model_info
             self.init()
             logging.info('Successfully loaded model %s', self._model_info)
         except Exception:
+            self._model_info = None
             logging.error('Could not init model %s', model_info)
             raise
 

learning_loop_node/detector/detector_node.py

@@ -107,6 +107,8 @@ class DetectorNode(Node):
 
     async def set_model_version_mode(self, version_control_mode: str) -> None:
 
+        self.log.info('Setting model version mode to %s', version_control_mode)
+
         if version_control_mode == 'follow_loop':
             self.version_control = VersionMode.FollowLoop
         elif version_control_mode == 'pause':
@@ -215,7 +217,8 @@ class DetectorNode(Node):
                     camera_id=data.get('camera-id', None) or data.get('mac', None),
                     tags=data.get('tags', []),
                     source=data.get('source', None),
-                    autoupload=data.get('autoupload', None)
+                    autoupload=data.get('autoupload', None),
+                    creation_date=data.get('creation_date', None)
                 )
                 if det is None:
                     return {'error': 'no model loaded'}
@@ -324,13 +327,16 @@ class DetectorNode(Node):
                 with step_into(GLOBALS.data_folder):
                     model_symlink = 'model'
                     target_model_folder = f'models/{self.target_model.version}'
-                    shutil.rmtree(target_model_folder, ignore_errors=True)
-                    os.makedirs(target_model_folder)
-
-                    await self.data_exchanger.download_model(target_model_folder,
-                                                             Context(organization=self.organization,
-                                                                     project=self.project),
-                                                             self.target_model.id, self.detector_logic.model_format)
+                    if not os.path.exists(target_model_folder):
+                        os.makedirs(target_model_folder)
+                        await self.data_exchanger.download_model(target_model_folder,
+                                                                 Context(organization=self.organization,
+                                                                         project=self.project),
+                                                                 self.target_model.id,
+                                                                 self.detector_logic.model_format)
+                        self.log.info('Downloaded model %s', self.target_model.version)
+                    else:
+                        self.log.info('No need to download model %s (already exists)', self.target_model.version)
                     try:
                         os.unlink(model_symlink)
                         os.remove(model_symlink)
@@ -339,7 +345,12 @@ class DetectorNode(Node):
                     os.symlink(target_model_folder, model_symlink)
                     self.log.info('Updated symlink for model to %s', os.readlink(model_symlink))
 
-                    self.detector_logic.load_model()
+                    try:
+                        self.detector_logic.load_model()
+                    except Exception:
+                        self.log.exception('Could not load model, will retry download on next check')
+                        shutil.rmtree(target_model_folder, ignore_errors=True)
+                        return
                     try:
                         await self.sync_status_with_learning_loop()
                     except Exception:
@@ -390,6 +401,7 @@ class DetectorNode(Node):
 
         self.log_status_on_change(status.state or 'None', status)
 
+        # NOTE: sending organization and project is no longer required!
         response = await self.sio_client.call('update_detector', (self.organization, self.project, jsonable_encoder(asdict(status))))
         if not response:
             self.socket_connection_broken = True

learning_loop_node/detector/inbox_filter/cam_observation_history.py

@@ -1,8 +1,8 @@
 import os
 from typing import List, Union
 
-from learning_loop_node.data_classes import (BoxDetection, ClassificationDetection, ImageMetadata, Observation,
-                                             PointDetection, SegmentationDetection)
+from ...data_classes import (BoxDetection, ClassificationDetection, ImageMetadata, Observation, PointDetection,
+                             SegmentationDetection)
 
 
 class CamObservationHistory:

learning_loop_node/detector/outbox.py

@@ -79,10 +79,10 @@ class Outbox():
         image_metadata.source = source or 'unknown'
         os.makedirs(tmp, exist_ok=True)
 
-        with open(tmp + '/image.json', 'w') as f:
+        with open(tmp + f'/image_{identifier}.json', 'w') as f:
             json.dump(jsonable_encoder(asdict(image_metadata)), f)
 
-        with open(tmp + '/image.jpg', 'wb') as f:
+        with open(tmp + f'/image_{identifier}.jpg', 'wb') as f:
             f.write(image)
 
         if os.path.exists(tmp):
@@ -141,8 +141,10 @@ class Outbox():
         # results in a post failure on the first run of the test in a docker environment (WTF)
 
         data: List[Tuple[str, Union[TextIOWrapper, BufferedReader]]] = []
-        data = [('files', open(f'{item}/image.json', 'r')) for item in items]
-        data += [('files', open(f'{item}/image.jpg', 'rb')) for item in items]
+        for item in items:
+            identifier = os.path.basename(item)
+            data.append(('files', open(f'{item}/image_{identifier}.json', 'r')))
+            data.append(('files', open(f'{item}/image_{identifier}.jpg', 'rb')))
 
         try:
             async with aiohttp.ClientSession() as session:
@@ -158,7 +160,11 @@ class Outbox():
         if response.status == 200:
             self.upload_counter += len(items)
             for item in items:
-                shutil.rmtree(item, ignore_errors=True)
+                try:
+                    shutil.rmtree(item)
+                    self.log.debug('Deleted %s', item)
+                except Exception:
+                    self.log.exception('Failed to delete %s', item)
             self.log.info('Uploaded %s images successfully', len(items))
 
         elif response.status == 422:

learning_loop_node/tests/trainer/conftest.py

@@ -36,8 +36,8 @@ async def test_initialized_trainer_node():
                                                 'model_variant': '',
                                                 'hyperparameters': {
                                    'resolution': 800,
-                                   'flip_rl': False,
-                                   'flip_ud': False}
+                                   'fliplr': 0.5,
+                                   'flipud': 0.5}
     })
     await node._on_startup()
     yield node
@@ -59,8 +59,8 @@ async def test_initialized_trainer():
                                                 'model_variant': '',
                                                 'hyperparameters': {
                                    'resolution': 800,
-                                   'flip_rl': False,
-                                   'flip_ud': False}
+                                   'fliplr': 0.5,
+                                   'flipud': 0.5}
     })
     yield trainer
     try:

learning_loop_node/trainer/trainer_logic_generic.py

@@ -402,7 +402,7 @@ class TrainerLogicGeneric(ABC):
         """
 
         files = await self._get_latest_model_files()
-        if files is None:
+        if files is None or len(files) == 0:
             raise CriticalError('Could not get latest model files. Training might have failed.')
 
         if isinstance(files, List):

{learning_loop_node-0.13.0.dist-info → learning_loop_node-0.13.3.dist-info}/METADATA

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

@@ -11,12 +11,12 @@ learning_loop_node/data_classes/socket_response.py,sha256=tIdt-oYf6ULoJIDYQCecNM
 learning_loop_node/data_classes/training.py,sha256=FFPsr2AA7ynYz39MLZaFJ0sF_9Axll5HHbAA8nnirp0,5726
 learning_loop_node/data_exchanger.py,sha256=IG5ki3f3IsVuXbyw6q_gUIakgv-GMT6e9nhOhzjKgW4,9055
 learning_loop_node/detector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-learning_loop_node/detector/detector_logic.py,sha256=fAaeLykvkuOeaQx-scuN1pkydK8cPdmNT75P8xqImY0,2130
-learning_loop_node/detector/detector_node.py,sha256=ltx2AMdCvq5J-nXl4h6RXxO_bcMfdKCtUR12A--e-zw,24260
+learning_loop_node/detector/detector_logic.py,sha256=FhGbu0mdF0tW0Gg8cr8xM6ZmZzEigGf0IcAWBjoxFrs,2191
+learning_loop_node/detector/detector_node.py,sha256=TMypE1Z0KnuPcJ9wLiflhdvd9oe0t86gAQyK7UvuDpA,25060
 learning_loop_node/detector/inbox_filter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-learning_loop_node/detector/inbox_filter/cam_observation_history.py,sha256=8gzxYPD3t1OS9wBHXfIvNV2xTTMo0B70O1b50iaH2D8,3344
+learning_loop_node/detector/inbox_filter/cam_observation_history.py,sha256=1PHgXRrhSQ34HSFw7mdX8ndRxHf_i1aP5nXXnrZxhAY,3312
 learning_loop_node/detector/inbox_filter/relevance_filter.py,sha256=NPEmrAtuGjIWCtHS0B3zDmnYWkhVFCLbd_7RUp08_AM,1372
-learning_loop_node/detector/outbox.py,sha256=CYuXI6uXQ_mrVPZ0qvNgdSZH1nLarcs7Fj_7Mb3k7MA,8558
+learning_loop_node/detector/outbox.py,sha256=i12X28FJka8HMm4iqE7SCODT1uCEtM53tIBul3uxKFw,8828
 learning_loop_node/detector/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 learning_loop_node/detector/rest/about.py,sha256=evHJ2svUZY_DFz0FSef5u9c5KW4Uc3GL7EbPinG9-dg,583
 learning_loop_node/detector/rest/backdoor_controls.py,sha256=ZNaFOvC0OLWNtcLiG-NIqS_y1kkLP4csgk3CHhp8Gis,885
@@ -70,7 +70,7 @@ learning_loop_node/tests/general/test_downloader.py,sha256=y4GcUyR0OAfrwltd6eyQg
 learning_loop_node/tests/general/test_learning_loop_node.py,sha256=SZd-VChpWnnsPN46pr4E_LL3ZevYx6psU-AWdVeOFpQ,770
 learning_loop_node/tests/test_helper.py,sha256=Xajn6BWJqeD36YAETwdcJd6awY2NPmaOis3gWgFc97k,2909
 learning_loop_node/tests/trainer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-learning_loop_node/tests/trainer/conftest.py,sha256=X-Ib-ju-emKomgaPjddwAgMp0zt2Slu59Y3cPfmTipI,3672
+learning_loop_node/tests/trainer/conftest.py,sha256=F8b8cVJeDRG08OufAE4TuG4Dm-ViSyK_PzM2DrHUzJQ,3660
 learning_loop_node/tests/trainer/pytest.ini,sha256=8QdjmawLy1zAzXrJ88or1kpFDhJw0W5UOnDfGGs_igU,262
 learning_loop_node/tests/trainer/state_helper.py,sha256=MDe9opeKruip74FoRFff8MSWGiQNFqDpPtIEIbgPnFc,919
 learning_loop_node/tests/trainer/states/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -94,8 +94,8 @@ learning_loop_node/trainer/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 learning_loop_node/trainer/rest/backdoor_controls.py,sha256=ZnK8ypY5r_q0-YZbtaOxhQThzuZvMsQHM5gJGESd_dE,5131
 learning_loop_node/trainer/test_executor.py,sha256=6BVGDN_6f5GEMMEvDLSG1yzMybSvgXaP5uYpSfsVPP0,2224
 learning_loop_node/trainer/trainer_logic.py,sha256=eK-01qZzi10UjLMCQX8vy5eW2FoghPj3rzzDC-s3Si4,8792
-learning_loop_node/trainer/trainer_logic_generic.py,sha256=JGH2IClpte8WqO_Pmh7Epa-328Pyl5RYYZlWgOdygvs,26827
+learning_loop_node/trainer/trainer_logic_generic.py,sha256=RQqon8JIVzxaNh0KdEe6tMxebsY0DgZllEohHR-AgqU,26846
 learning_loop_node/trainer/trainer_node.py,sha256=Dl4ZQAjjXQggibeBjvhXAoFClw1ZX2Kkt3v_fjrJnCI,4508
-learning_loop_node-0.13.0.dist-info/METADATA,sha256=sNXOfB7X3QtZ4BW090qPWMtfvwloBhtfdkr3RharFeg,12761
-learning_loop_node-0.13.0.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-learning_loop_node-0.13.0.dist-info/RECORD,,
+learning_loop_node-0.13.3.dist-info/METADATA,sha256=zB6JXpeyUlyfBVDgEV8kABmdQ2QgqjaCn2U8wib5288,12761
+learning_loop_node-0.13.3.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+learning_loop_node-0.13.3.dist-info/RECORD,,