learning-loop-node 0.17.0__py3-none-any.whl → 0.17.2__py3-none-any.whl

learning_loop_node/detector/detector_node.py

@@ -522,11 +522,14 @@ class DetectorNode(Node):
         It can be converted e.g. using cv2.imdecode(np.frombuffer(image, np.uint8), cv2.IMREAD_COLOR)"""
 
         await self.detection_lock.acquire()
-        metadata = await run.io_bound(self.detector_logic.evaluate, raw_image)
+        try:
+            metadata = await run.io_bound(self.detector_logic.evaluate, raw_image)
+        finally:
+            self.detection_lock.release()
+
         metadata.tags.extend(tags)
         metadata.source = source
         metadata.created = creation_date
-        self.detection_lock.release()
 
         fix_shape_detections(metadata)
         n_bo, n_cl = len(metadata.box_detections), len(metadata.classification_detections)
@@ -555,8 +558,15 @@ class DetectorNode(Node):
         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()
-        all_detections = await run.io_bound(self.detector_logic.batch_evaluate, raw_images)
-        self.detection_lock.release()
+        try:
+            all_detections = await run.io_bound(self.detector_logic.batch_evaluate, raw_images)
+        finally:
+            self.detection_lock.release()
+
+        for metadata in all_detections.items:
+            metadata.tags.extend(tags)
+            metadata.source = source
+            metadata.created = creation_date
 
         for detections, raw_image in zip(all_detections.items, raw_images):
             fix_shape_detections(detections)

learning_loop_node/detector/inbox_filter/cam_observation_history.py

@@ -1,8 +1,14 @@
 import os
 from typing import List, Union
 
-from ...data_classes import (BoxDetection, ClassificationDetection, ImageMetadata, Observation, PointDetection,
-                             SegmentationDetection)
+from ...data_classes import (
+    BoxDetection,
+    ClassificationDetection,
+    ImageMetadata,
+    Observation,
+    PointDetection,
+    SegmentationDetection,
+)
 
 
 class CamObservationHistory:
@@ -10,6 +16,8 @@ class CamObservationHistory:
         self.reset_time = 3600
         self.recent_observations: List[Observation] = []
         self.iou_threshold = 0.5
+        self.min_uncertain_threshold = float(os.environ.get('MIN_UNCERTAIN_THRESHOLD', '0.3'))
+        self.max_uncertain_threshold = float(os.environ.get('MAX_UNCERTAIN_THRESHOLD', '0.6'))
 
     def forget_old_detections(self) -> None:
         self.recent_observations = [detection
@@ -25,7 +33,8 @@ class CamObservationHistory:
                 continue
             if isinstance(detection, ClassificationDetection):
                 # self.recent_observations.append(Observation(detection))
-                causes.add('classification_detection')
+                if self.min_uncertain_threshold <= detection.confidence <= self.max_uncertain_threshold:
+                    causes.add('uncertain')
                 continue
 
             assert isinstance(detection, (BoxDetection, PointDetection)), f"Unknown detection type: {type(detection)}"
@@ -37,7 +46,7 @@ class CamObservationHistory:
                 continue
 
             self.recent_observations.append(Observation(detection))
-            if float(os.environ.get('MIN_UNCERTAIN_THRESHOLD', '0.3')) <= detection.confidence <= float(os.environ.get('MAX_UNCERTAIN_THRESHOLD', '0.6')):
+            if self.min_uncertain_threshold <= detection.confidence <= self.max_uncertain_threshold:
                 causes.add('uncertain')
 
         return list(causes)

{learning_loop_node-0.17.0.dist-info → learning_loop_node-0.17.2.dist-info}/METADATA

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

@@ -13,10 +13,10 @@ learning_loop_node/data_classes/training.py,sha256=TybwcCDf_NUaDUaOj30lPm-7Z3Qk9
 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=0RilHkb_IYFk-BXso1QJ8in01WodbN7XeAXsKzptovY,2470
-learning_loop_node/detector/detector_node.py,sha256=GosNSGsa0wA172xiYk94RT8mMicDI75J8xsZuidYNWg,29716
+learning_loop_node/detector/detector_node.py,sha256=3xWI6kauXJx4WAe6iaRsdBxk-c0zAKEMusxTKQqOCyY,29961
 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=1PHgXRrhSQ34HSFw7mdX8ndRxHf_i1aP5nXXnrZxhAY,3312
+learning_loop_node/detector/inbox_filter/cam_observation_history.py,sha256=slPGm87TbBCfDUdpRTAM5yOz1An8Br5X_2HFJOGSrFg,3540
 learning_loop_node/detector/inbox_filter/relevance_filter.py,sha256=IpoJMBPAO5GSr2uGINNu5uFar_jxWQWbH0Lz6FQ3n1M,1501
 learning_loop_node/detector/outbox.py,sha256=HaNps_XEbvOZ-jlpZTCsk4Dbk5zq-vNYdKMBu001ckU,12132
 learning_loop_node/detector/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.17.0.dist-info/METADATA,sha256=7obfPe_Nc6q2j40ns2teaGxoA1tpnmPFFd6XAIoeuvw,13979
-learning_loop_node-0.17.0.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-learning_loop_node-0.17.0.dist-info/RECORD,,
+learning_loop_node-0.17.2.dist-info/METADATA,sha256=iw2TwzqWwCht4SD4u9Z_Vqnt0n13ejGIlbti8-fMrKY,13979
+learning_loop_node-0.17.2.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+learning_loop_node-0.17.2.dist-info/RECORD,,