learning-loop-node 0.10.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

learning_loop_node/helpers/environment_reader.py

@@ -43,3 +43,7 @@ def password(default: str = '') -> str:
 
 def host(default: str = '') -> str:
     return read_from_env(['LOOP_HOST', 'HOST']) or default
+
+
+def ssl_certificate_path(default: str = '') -> str:
+    return read_from_env(['LOOP_SSL_CERT_PATH',]) or default

learning_loop_node/loop_communication.py

@@ -17,13 +17,21 @@ class LoopCommunicationException(Exception):
 class LoopCommunicator():
     def __init__(self) -> None:
         host: str = environment_reader.host(default='learning-loop.ai')
+        ssl_cert_path = environment_reader.ssl_certificate_path()
+        if ssl_cert_path:
+            logging.info('Using SSL certificate at %s', ssl_cert_path)
+        else:
+            logging.info('No SSL certificate path set')
         self.host: str = host
         self.username: str = environment_reader.username()
         self.password: str = environment_reader.password()
         self.organization: str = environment_reader.organization()  # used by mock_detector
         self.project: str = environment_reader.project()  # used by mock_detector
         self.base_url: str = f'http{"s" if "learning-loop.ai" in host else ""}://' + host
-        self.async_client: httpx.AsyncClient = httpx.AsyncClient(base_url=self.base_url, timeout=Timeout(60.0))
+        if ssl_cert_path:
+            self.async_client = httpx.AsyncClient(base_url=self.base_url, timeout=Timeout(60.0), verify=ssl_cert_path)
+        else:
+            self.async_client = httpx.AsyncClient(base_url=self.base_url, timeout=Timeout(60.0))
         self.async_client.cookies.clear()
 
         logging.info(f'Loop interface initialized with base_url: {self.base_url} / user: {self.username}')

learning_loop_node/trainer/io_helpers.py

@@ -152,21 +152,23 @@ class ActiveTrainingIO:
         current_json_file_index = self.load_detections_upload_file_index()
         for i in range(current_json_file_index, num_files):
             detections = self.load_detections(i)
-            logging.info(f'uploading detections {i}/{num_files}')
+            logging.info(f'uploading detections in file {i}/{num_files}')
             await self._upload_detections_batched(self.context, detections)
             self.save_detections_upload_file_index(i+1)
 
     async def _upload_detections_batched(self, context: Context, detections: List[Detections]):
-        batch_size = 10
+        batch_size = 100
         skip_detections = self.load_detection_upload_progress()
+        up_count = 0
         for i in range(skip_detections, len(detections), batch_size):
+            up_count += 1
             up_progress = i+batch_size
             batch_detections = detections[i:up_progress]
-            dict_detections = [jsonable_encoder(asdict(detection)) for detection in batch_detections]
-            logging.info(f'uploading detections. File size : {len(json.dumps(dict_detections))}')
             await self._upload_detections(context, batch_detections, up_progress)
             skip_detections = up_progress
 
+        logging.info('uploaded %d detections', len(detections))
+
     async def _upload_detections(self, context: Context, batch_detections: List[Detections], up_progress: int):
         detections_json = [jsonable_encoder(asdict(detections)) for detections in batch_detections]
         response = await self.loop_communicator.post(
@@ -177,7 +179,7 @@ class ActiveTrainingIO:
             raise Exception(msg)
 
         logging.info('successfully uploaded detections')
-        if up_progress > len(batch_detections):
+        if up_progress >= len(batch_detections):
             self.save_detection_upload_progress(0)
         else:
             self.save_detection_upload_progress(up_progress)

{learning_loop_node-0.10.0.dist-info → learning_loop_node-0.10.2.dist-info}/METADATA

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

@@ -37,11 +37,11 @@ learning_loop_node/detector/tests/testing_detector.py,sha256=2DSwIYJDOG4ixOGU8Ox
 learning_loop_node/examples/novelty_score_updater.py,sha256=1DRgM9lxjFV-q2JvGDDsNLz_ic_rhEZ9wc6ZdjcxwPE,2038
 learning_loop_node/globals.py,sha256=tgw_8RYOipPV9aYlyUhYtXfUxvJKRvfUk6u-qVAtZmY,174
 learning_loop_node/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-learning_loop_node/helpers/environment_reader.py,sha256=1GNTXRBcv6QKolbJ50TpsbWoVyw1oO0kvKrt9yjJ0nA,1543
+learning_loop_node/helpers/environment_reader.py,sha256=OtCTDc0KT9r-SMygkZB_Mw-ZIJPfUZVyUzHJoDCgJP8,1658
 learning_loop_node/helpers/gdrive_downloader.py,sha256=zeYJciTAJVRpu_eFjwgYLCpIa6hU1d71anqEBb564Rk,1145
 learning_loop_node/helpers/log_conf.py,sha256=3yd-jaMOeD5cRIgA5w_BH2L5odf8c4-ZjD89Bdqwe44,824
 learning_loop_node/helpers/misc.py,sha256=j4is8Rv0ttnCqF-R-wP3xwEi67OI6IBJav5Woo5lyDk,7701
-learning_loop_node/loop_communication.py,sha256=w_CF1Ynl6GdpL1cdZ6wbb-X0-5gmGlPLjSfDQDRpwLE,6157
+learning_loop_node/loop_communication.py,sha256=t3G6wvdRCjXxUFT2QpLdRHrSEcI7N272gAvFTVyNSuU,6534
 learning_loop_node/node.py,sha256=jpTP3gnGxFDF7tq9H7MVfVIIHm8e7bYA5euttHNJAEg,7252
 learning_loop_node/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 learning_loop_node/pytest.ini,sha256=8QdjmawLy1zAzXrJ88or1kpFDhJw0W5UOnDfGGs_igU,262
@@ -58,7 +58,7 @@ learning_loop_node/tests/test_learning_loop_node.py,sha256=4qWi1ovBzebUAbvw8ecSa
 learning_loop_node/trainer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 learning_loop_node/trainer/downloader.py,sha256=qzx7zzObcFEvRVQFe8gi8KJNIapASi1_XssbspXD1Rw,1469
 learning_loop_node/trainer/executor.py,sha256=j-1pkc_5b1Y0Bh8KiQthAK7SoOfJelr5Qi7L0p1sTxE,3933
-learning_loop_node/trainer/io_helpers.py,sha256=MKyGjqK_Ch7EwyU-Iy01NdkufzdJaj2l2UdBa71Ug8Y,7230
+learning_loop_node/trainer/io_helpers.py,sha256=fyjImT1NY10gLV0KM4Ns7sRrtKFswVJU_pV9-c3IVEY,7152
 learning_loop_node/trainer/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 learning_loop_node/trainer/rest/backdoor_controls.py,sha256=YQcG0KwxzKDNYeMtHrSwr26q__N7ty0o6Kar6CLWAd0,5869
 learning_loop_node/trainer/rest/controls.py,sha256=XF37i2edeMHKdSXyJc4ZqaTZ38u6d3u3Sb3C-Mwyfko,934
@@ -80,6 +80,6 @@ learning_loop_node/trainer/tests/testing_trainer_logic.py,sha256=7sQ6okiOhM4IhvR
 learning_loop_node/trainer/trainer_logic.py,sha256=PJxiO1chPdvpq8UTtzv_nVam9CouCswX9b1FnRwT2Tw,8411
 learning_loop_node/trainer/trainer_logic_generic.py,sha256=KFDuxgzrGITHQaJoGvhjHxWzhbb4Q7HBxSpks4CeGBg,24801
 learning_loop_node/trainer/trainer_node.py,sha256=bcyOMeLXrLuLgsPqS8lwEOSZ6vCjGLgT0pLXgaylI1Q,4155
-learning_loop_node-0.10.0.dist-info/METADATA,sha256=HnnnPdOewwDQeM9Ha-8Q3NWMKCToQVhfIs6Mp65JtPA,9158
-learning_loop_node-0.10.0.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-learning_loop_node-0.10.0.dist-info/RECORD,,
+learning_loop_node-0.10.2.dist-info/METADATA,sha256=CHv6dBGvmdhieoPsmN_PrzqQNi26OoVJoRW29thMGNc,9158
+learning_loop_node-0.10.2.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+learning_loop_node-0.10.2.dist-info/RECORD,,