learning-loop-node 0.10.2__tar.gz → 0.10.4__tar.gz

{learning_loop_node-0.10.2 → learning_loop_node-0.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: learning-loop-node
-Version: 0.10.2
+Version: 0.10.4
 Summary: Python Library for Nodes which connect to the Zauberzeug Learning Loop
 Home-page: https://github.com/zauberzeug/learning_loop_node
 License: MIT
@@ -62,6 +62,7 @@ You can configure connection to our Learning Loop by specifying the following en
 | LOOP_HOST               | HOST         | Learning Loop address (e.g. learning-loop.ai)                | all                  |
 | LOOP_USERNAME           | USERNAME     | Learning Loop user name                                      | all besides Detector |
 | LOOP_PASSWORD           | PASSWORD     | Learning Loop password                                       | all besides Detector |
+| LOOP_SSL_CERT_PATH      | -            | Path to the SSL certificate                                  | all (opt.)           |
 | LOOP_ORGANIZATION       | ORGANIZATION | Organization name                                            | Detector             |
 | LOOP_PROJECT            | PROJECT      | Project name                                                 | Detector             |
 | MIN_UNCERTAIN_THRESHOLD | PROJECT      | smallest confidence (float) at which auto-upload will happen | Detector             |

{learning_loop_node-0.10.2 → learning_loop_node-0.10.4}/README.md

@@ -22,6 +22,7 @@ You can configure connection to our Learning Loop by specifying the following en
 | LOOP_HOST               | HOST         | Learning Loop address (e.g. learning-loop.ai)                | all                  |
 | LOOP_USERNAME           | USERNAME     | Learning Loop user name                                      | all besides Detector |
 | LOOP_PASSWORD           | PASSWORD     | Learning Loop password                                       | all besides Detector |
+| LOOP_SSL_CERT_PATH      | -            | Path to the SSL certificate                                  | all (opt.)           |
 | LOOP_ORGANIZATION       | ORGANIZATION | Organization name                                            | Detector             |
 | LOOP_PROJECT            | PROJECT      | Project name                                                 | Detector             |
 | MIN_UNCERTAIN_THRESHOLD | PROJECT      | smallest confidence (float) at which auto-upload will happen | Detector             |

{learning_loop_node-0.10.2 → learning_loop_node-0.10.4}/learning_loop_node/detector/detector_node.py

@@ -43,6 +43,8 @@ class DetectorNode(Node):
         self.operation_mode: OperationMode = OperationMode.Startup
         self.connected_clients: List[str] = []
 
+        self.detection_lock = asyncio.Lock()
+
         self.outbox: Outbox = Outbox()
         self.data_exchanger = DataExchanger(
             Context(organization=self.organization, project=self.project),
@@ -300,8 +302,9 @@ class DetectorNode(Node):
         """Note: raw_image is a numpy array of type uint8, but not in the correrct shape!
         It can be converted e.g. using cv2.imdecode(raw_image, cv2.IMREAD_COLOR)"""
         loop = asyncio.get_event_loop()
+        await self.detection_lock.acquire()
         detections: Detections = await loop.run_in_executor(None, self.detector_logic.evaluate, raw_image)
-
+        self.detection_lock.release()
         for seg_detection in detections.segmentation_detections:
             if isinstance(seg_detection.shape, Shape):
                 shapes = ','.join([str(value) for p in seg_detection.shape.points for _,

{learning_loop_node-0.10.2 → learning_loop_node-0.10.4}/learning_loop_node/loop_communication.py

@@ -17,9 +17,9 @@ 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)
+        self.ssl_cert_path = environment_reader.ssl_certificate_path()
+        if self.ssl_cert_path:
+            logging.info('Using SSL certificate at %s', self.ssl_cert_path)
         else:
             logging.info('No SSL certificate path set')
         self.host: str = host
@@ -28,8 +28,9 @@ class LoopCommunicator():
         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
-        if ssl_cert_path:
-            self.async_client = httpx.AsyncClient(base_url=self.base_url, timeout=Timeout(60.0), verify=ssl_cert_path)
+        if self.ssl_cert_path:
+            self.async_client = httpx.AsyncClient(
+                base_url=self.base_url, timeout=Timeout(60.0), verify=self.ssl_cert_path)
         else:
             self.async_client = httpx.AsyncClient(base_url=self.base_url, timeout=Timeout(60.0))
         self.async_client.cookies.clear()

{learning_loop_node-0.10.2 → learning_loop_node-0.10.4}/learning_loop_node/node.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import ssl
 import sys
 from abc import abstractmethod
 from contextlib import asynccontextmanager
@@ -8,6 +9,7 @@ from typing import Any, Optional
 
 import aiohttp
 import socketio
+from aiohttp import TCPConnector
 from fastapi import FastAPI
 from socketio import AsyncClient
 
@@ -122,8 +124,19 @@ class Node(FastAPI):
         """Create a socket.io client that communicates with the learning loop and register the events.
         Note: The method is called in startup and soft restart of detector, so the _sio_client should always be available."""
 
-        self._sio_client = AsyncClient(request_timeout=20,
-                                       http_session=aiohttp.ClientSession(cookies=self.loop_communicator.get_cookies()))
+        if self.loop_communicator.ssl_cert_path:
+            logging.info(f'SIO using SSL certificate path: {self.loop_communicator.ssl_cert_path}')
+            ssl_context = ssl.create_default_context(cafile=self.loop_communicator.ssl_cert_path)
+            ssl_context.check_hostname = False
+            ssl_context.verify_mode = ssl.CERT_REQUIRED
+            connector = TCPConnector(ssl=ssl_context)
+            self._sio_client = AsyncClient(request_timeout=20,
+                                           http_session=aiohttp.ClientSession(cookies=self.loop_communicator.get_cookies(),
+                                                                              connector=connector))
+
+        else:
+            self._sio_client = AsyncClient(request_timeout=20,
+                                           http_session=aiohttp.ClientSession(cookies=self.loop_communicator.get_cookies()))
 
         # pylint: disable=protected-access
         self.sio_client._trigger_event = ensure_socket_response(self.sio_client._trigger_event)

{learning_loop_node-0.10.2 → learning_loop_node-0.10.4}/pyproject.toml

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