learning-loop-node 0.10.5__tar.gz → 0.10.6__tar.gz

{learning_loop_node-0.10.5 → learning_loop_node-0.10.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: learning-loop-node
-Version: 0.10.5
+Version: 0.10.6
 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.10.5 → learning_loop_node-0.10.6}/learning_loop_node/annotation/tests/test_annotator_node.py

@@ -1,3 +1,4 @@
+import asyncio
 import os
 from dataclasses import asdict
 from typing import Dict
@@ -7,10 +8,8 @@ from fastapi.encoders import jsonable_encoder
 
 from learning_loop_node.annotation.annotator_logic import AnnotatorLogic
 from learning_loop_node.annotation.annotator_node import AnnotatorNode
-from learning_loop_node.data_classes import (AnnotationData,
-                                             AnnotationEventType, Category,
-                                             CategoryType, Context, Point,
-                                             ToolOutput, UserInput)
+from learning_loop_node.data_classes import (AnnotationData, AnnotationEventType, Category, CategoryType, Context,
+                                             Point, ToolOutput, UserInput)
 
 
 class MockedAnnotatatorLogic(AnnotatorLogic):
@@ -29,7 +28,7 @@ def default_user_input() -> UserInput:
         coordinate=Point(x=0, y=0),
         event_type=AnnotationEventType.LeftMouseDown,
         context=Context(organization='zauberzeug', project='pytest_p'),
-        image_uuid='501205a9-9b64-3df0-3785-507a677b7f05',
+        image_uuid='f786350c-89ca-9424-9b00-720a9a85fe09',
         category=Category(id='some_id', name='category_1', description='',
                           hotkey='', color='', type=CategoryType.Segmentation)
     )
@@ -40,7 +39,8 @@ def default_user_input() -> UserInput:
 
 @pytest.mark.asyncio
 async def test_image_download(setup_test_project):  # pylint: disable=unused-argument
-    image_path = '/tmp/learning_loop_lib_data/zauberzeug/pytest_p/images/501205a9-9b64-3df0-3785-507a677b7f05.jpg'
+    # TODO: This test depends on a pseudo-random uuid..
+    image_path = '/tmp/learning_loop_lib_data/zauberzeug/pytest_p/images/f786350c-89ca-9424-9b00-720a9a85fe09.jpg'
 
     assert os.path.exists(image_path) is False
 

{learning_loop_node-0.10.5 → learning_loop_node-0.10.6}/learning_loop_node/detector/detector_node.py

@@ -156,9 +156,6 @@ class DetectorNode(Node):
 
             tags = data.get('tags', [])
             tags.append('picked_by_system')
-            camera_id = data.get('camera-id', None) or data.get('mac', None)
-            if camera_id is not None:
-                tags.append(camera_id)
 
             loop = asyncio.get_event_loop()
             try:
@@ -315,8 +312,6 @@ class DetectorNode(Node):
         n_po, n_se = len(detections.point_detections), len(detections.segmentation_detections)
         self.log.info(f'detected:{n_bo} boxes, {n_po} points, {n_se} segs, {n_cl} classes')
 
-        if camera_id is not None:
-            tags.append(camera_id)
         if autoupload is None or autoupload == 'filtered':  # NOTE default is filtered
             Thread(target=self.relevance_filter.may_upload_detections,
                    args=(detections, camera_id, raw_image, tags)).start()

{learning_loop_node-0.10.5 → learning_loop_node-0.10.6}/learning_loop_node/tests/test_executor.py

@@ -44,6 +44,7 @@ async def test_executor_lifecycle():
 
     assert not executor.is_running()
     sleep(1)
+    # NOTE: It happend that this process became a zombie process which leads to repeated test failures -> restart machine required
     assert_process_is_running('some_executable.sh', False)
 
 

{learning_loop_node-0.10.5 → learning_loop_node-0.10.6}/learning_loop_node/trainer/executor.py

@@ -3,7 +3,7 @@ import logging
 import os
 import shlex
 from io import BufferedWriter
-from typing import List, Optional
+from typing import List, Optional, Dict
 
 
 class Executor:
@@ -16,7 +16,7 @@ class Executor:
 
         self.path = base_path
         self.log_file_path = f'{self.path}/{log_name}'
-        self.log_file: None | BufferedWriter = None
+        self.log_file: Optional[BufferedWriter] = None
         self._process: Optional[asyncio.subprocess.Process] = None  # pylint: disable=no-member
         os.makedirs(self.path, exist_ok=True)
 
@@ -26,7 +26,7 @@ class Executor:
             return self._process
         return None
 
-    async def start(self, cmd: str, env: Optional[dict[str, str]] = None) -> None:
+    async def start(self, cmd: str, env: Optional[Dict[str, str]] = None) -> None:
         """Start the process with the given command and environment variables."""
 
         full_env = os.environ.copy()

{learning_loop_node-0.10.5 → learning_loop_node-0.10.6}/learning_loop_node/trainer/tests/conftest.py

@@ -29,7 +29,7 @@ async def test_initialized_trainer_node():
     trainer._node = node
     trainer._init_new_training(context=Context(organization='zauberzeug', project='demo'),
                                details={'categories': [],
-                                        'id': '917d5c7f-403d-7e92-f95f-577f79c2273a',  # version 1.2 of demo project
+                                        'id': '00000000-0000-0000-0000-000000000012',  # version 1.2 of demo project
                                         'training_number': 0,
                                         'resolution': 800,
                                         'flip_rl': False,
@@ -49,7 +49,7 @@ async def test_initialized_trainer():
     trainer._node = node
     trainer._init_new_training(context=Context(organization='zauberzeug', project='demo'),
                                details={'categories': [],
-                                        'id': '917d5c7f-403d-7e92-f95f-577f79c2273a',  # version 1.2 of demo project
+                                        'id': '00000000-0000-0000-0000-000000000012',  # version 1.2 of demo project
                                         'training_number': 0,
                                         'resolution': 800,
                                         'flip_rl': False,

{learning_loop_node-0.10.5 → learning_loop_node-0.10.6}/learning_loop_node/trainer/tests/states/test_state_detecting.py

@@ -14,11 +14,11 @@ def trainer_has_error(trainer: TrainerLogic):
     return trainer.errors.has_error_for(error_key)
 
 
-async def test_successful_detecting(test_initialized_trainer: TestingTrainerLogic):  # NOTE was a flaky test
+async def test_successful_detecting(test_initialized_trainer: TestingTrainerLogic):
     trainer = test_initialized_trainer
     create_active_training_file(trainer, training_state='train_model_uploaded',
-                                model_uuid_for_detecting='917d5c7f-403d-7e92-f95f-577f79c2273a')
-    # trainer.load_active_training()
+                                model_uuid_for_detecting='00000000-0000-0000-0000-000000000011')  # NOTE: this is the hard coded model uuid for zauberzeug/demo (model version 1.1)
+
     _ = asyncio.get_running_loop().create_task(
         trainer._perform_state('do_detections', TrainerState.Detecting, TrainerState.Detected, trainer._do_detections))
 

{learning_loop_node-0.10.5 → learning_loop_node-0.10.6}/pyproject.toml

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