X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=camera_utils.py;fp=camera_utils.py;h=f5d295b6ed7477815fe502eed82eaea8a2c4831c;hb=713a609bd19d491de03debf8a4a6ddf2540b13dc;hp=9e7efd6dfccbd7df2d1eb8bd13eb8075a6bfe4f1;hpb=eb1c6392095947b3205c4d52cd9b1507e6cd776b;p=python_utils.git

diff --git a/camera_utils.py b/camera_utils.py
index 9e7efd6..f5d295b 100644
--- a/camera_utils.py
+++ b/camera_utils.py
@@ -46,11 +46,7 @@ def sanity_check_image(hsv: np.ndarray) -> SanityCheckImageMetadata:
     for r in range(rows):
         for c in range(cols):
             pixel = hsv[(r, c)]
-            if (
-                is_near(pixel[0], 16)
-                and is_near(pixel[1], 117)
-                and is_near(pixel[2], 196)
-            ):
+            if is_near(pixel[0], 16) and is_near(pixel[1], 117) and is_near(pixel[2], 196):
                 weird_orange_count += 1
             elif is_near(pixel[0], 0) and is_near(pixel[1], 0):
                 hs_zero_count += 1
@@ -68,7 +64,9 @@ def fetch_camera_image_from_video_server(
     """Fetch the raw webcam image from the video server."""
     camera_name = camera_name.replace(".house", "")
     camera_name = camera_name.replace(".cabin", "")
-    url = f"http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/jpeg/GKlT2FfiSQ/{camera_name}/s.jpg"
+    url = (
+        f"http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/jpeg/GKlT2FfiSQ/{camera_name}/s.jpg"
+    )
     logger.debug(f'Fetching image from {url}')
     try:
         response = requests.get(url, stream=False, timeout=10.0)
@@ -123,9 +121,7 @@ def camera_name_to_hostname(camera_name: str) -> str:
 
 
 @decorator_utils.retry_if_none(tries=2, delay_sec=1, backoff=1.1)
-def fetch_camera_image_from_rtsp_stream(
-    camera_name: str, *, width: int = 256
-) -> Optional[bytes]:
+def fetch_camera_image_from_rtsp_stream(camera_name: str, *, width: int = 256) -> Optional[bytes]:
     """Fetch the raw webcam image straight from the webcam's RTSP stream."""
     hostname = camera_name_to_hostname(camera_name)
     stream = f"rtsp://camera:IaLaIok@{hostname}:554/live"
@@ -147,9 +143,7 @@ def fetch_camera_image_from_rtsp_stream(
             f"scale={width}:-1",
             "-",
         ]
-        with subprocess.Popen(
-            cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL
-        ) as proc:
+        with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as proc:
             out, _ = proc.communicate(timeout=10)
             return out
     except Exception as e:
@@ -161,14 +155,10 @@ def fetch_camera_image_from_rtsp_stream(
 
 
 @decorator_utils.timeout(seconds=30, use_signals=False)
-def _fetch_camera_image(
-    camera_name: str, *, width: int = 256, quality: int = 70
-) -> RawJpgHsv:
+def _fetch_camera_image(camera_name: str, *, width: int = 256, quality: int = 70) -> RawJpgHsv:
     """Fetch a webcam image given the camera name."""
     logger.debug("Trying to fetch camera image from video server")
-    raw = fetch_camera_image_from_video_server(
-        camera_name, width=width, quality=quality
-    )
+    raw = fetch_camera_image_from_video_server(camera_name, width=width, quality=quality)
     if raw is None:
         logger.debug("Reading from video server failed; trying direct RTSP stream")
         raw = fetch_camera_image_from_rtsp_stream(camera_name, width=width)
@@ -187,9 +177,7 @@ def _fetch_camera_image(
     return RawJpgHsv(None, None, None)
 
 
-def fetch_camera_image(
-    camera_name: str, *, width: int = 256, quality: int = 70
-) -> RawJpgHsv:
+def fetch_camera_image(camera_name: str, *, width: int = 256, quality: int = 70) -> RawJpgHsv:
     try:
         return _fetch_camera_image(camera_name, width=width, quality=quality)
     except exceptions.TimeoutError: