Merge branch 'main' into faster-rtsp-stream-processing

rosys/vision/camera_provider.py

@@ -1,4 +1,5 @@
 import abc
+import warnings
 from typing import Generic, TypeVar
 
 from .. import persistence, rosys
@@ -57,7 +58,7 @@ def add_camera(self, camera: T) -> None:
         self.request_backup()
 
     def remove_camera(self, camera_id: str) -> None:
-        del self.cameras[camera_id]
+        del self._cameras[camera_id]
         self.CAMERA_REMOVED.emit(camera_id)
         self.request_backup()
 
@@ -66,6 +67,8 @@ def remove_all_cameras(self) -> None:
             self.remove_camera(camera_id)
 
     def prune_images(self, max_age_seconds: float | None = None):
+        warnings.warn('Pruning images is not required anymore because images is now a deque',
+                      DeprecationWarning, stacklevel=2)
         for camera in self.cameras.values():
             if max_age_seconds is None:
                 camera.images.clear()

rosys/vision/multi_camera_provider.py

@@ -33,3 +33,11 @@ def request_backup(self) -> None:
     @property
     def cameras(self) -> dict[str, Camera]:
         return {id: camera for provider in self.providers for id, camera in provider.cameras.items()}
+
+    def remove_camera(self, camera_id: str) -> None:
+        for provider in self.providers:
+            if camera_id in provider.cameras:
+                provider.remove_camera(camera_id)
+
+    def add_camera(self, camera) -> None:
+        raise NotImplementedError('Adding cameras to a MultiCameraProvider is not supported')