Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

still making camera preview routes

Jond95e4ef88ed6
diff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.py
index 3d9f8da9..7a3a29ba 100644
--- a/src/api/routes/camera/camera_route.py
+++ b/src/api/routes/camera/camera_route.py
@@ -6,7 +6,6 @@ from fastapi import APIRouter
from pydantic import BaseModel
from src.api.services.user_config import UserConfigService, WebcamConfigModel
-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera
from src.cameras.detection.cam_singleton import get_or_create_cams
from src.cameras.multicam_manager.cv_camera_manager import OpenCVCameraManager
@@ -18,8 +17,8 @@ logger = logging.getLogger(__name__)
class CameraPreviewModel(BaseModel):
session_id: str
-@camera_router.post("/camera/config")
-async def config_cam(webcam_config_model: WebcamConfigModel):
+@camera_router.post("/camera/config/{session_id}")
+async def config_cam(webcam_config_model: WebcamConfigModel, session_id):
s = UserConfigService()
return s.save_webcam_config_to_disk(webcam_config_model, session_id)
diff --git a/src/api/services/user_config.py b/src/api/services/user_config.py
index 7325c59a..4d0f12a5 100644
--- a/src/api/services/user_config.py
+++ b/src/api/services/user_config.py
@@ -20,19 +20,24 @@ def get_camera_name(camera_id: str):
class UserConfigService:
"""take things like WebcamConfigModel and save it to a text file or whatever"""
- def save_webcam_config_to_disk(self, webcam_config_model: WebcamConfigModel, session_id:str):
- webcam_config_json = webcam_config_model.dict()
+ def save_webcam_config_to_disk(self, webcam_config_model: WebcamConfigModel, session_id: str):
+ webcam_config_json = webcam_config_model.json()
camera_name = get_camera_name(webcam_config_model.webcam_id)
json_file_name = camera_name + '_config.json'
- webcam_config_json_path = Path(webcam_config_model.session_path) / json_file_name
+ session_path = get_session_path(session_id)
+ webcam_config_json_path = Path(session_path) / json_file_name
with open(webcam_config_json_path, 'w') as outfile:
outfile.write(str(webcam_config_json))
return webcam_config_json
- def webcam_config_by_id(self, webcam_id: str, session_id: str)->WebcamConfigModel:
+ def webcam_config_by_id(self, webcam_id: str, session_id: str) -> WebcamConfigModel:
+ print(f"webcam id: {webcam_id}")
session_path = get_session_path(session_id)
camera_name = get_camera_name(webcam_id)
+ print(f"webcam id (again): {webcam_id}")
+ print(f"camera name: {camera_name}")
json_file_name = camera_name + '_config.json'
webcam_config_json_path = Path(session_path) / json_file_name
+ print(f'webcam_config_path: {webcam_config_json_path}')
webcam_config_model = WebcamConfigModel.parse_file(webcam_config_json_path)
return webcam_config_model
diff --git a/src/cameras/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.py
index 08abe678..acbec4fd 100644
--- a/src/cameras/multicam_manager/cv_camera_manager.py
+++ b/src/cameras/multicam_manager/cv_camera_manager.py
@@ -30,17 +30,7 @@ class OpenCVCameraManager:
self._session_id = session_id
self._config_service = UserConfigService()
self._detected_cams_data = get_or_create_cams()
- global _open_cv_cameras
- if _open_cv_cameras is None:
- logger.info("Creating cams.")
- # we create the _cv_cams /once/, and reuse it for the lifetime of the session
- _open_cv_cameras = self._create_opencv_cameras()
- self._open_cv_camera_objects = _open_cv_cameras
- # self._timestamp_logger = TimestampLogger(self.available_webcam_ids, self.camera0_id)
- self._number_of_cameras = len(self._open_cv_camera_objects)
- else:
- logger.info("Reusing already created resources cam resources.")
- self._open_cv_camera_objects = _open_cv_cameras
+
@property
def number_of_cameras(self):
@@ -118,9 +108,12 @@ class OpenCVCameraManager:
self,
) -> ContextManager[Dict[str, OpenCVCamera]]:
+ open_cv_camera_objects = self._create_opencv_cameras()
+ number_of_cameras = len(open_cv_camera_objects)
+
try:
connected_cameras_dict = {}
- for cv_cam in self._open_cv_camera_objects:
+ for cv_cam in open_cv_camera_objects:
connected_cameras_dict[cv_cam.webcam_id_as_str] = cv_cam
cv_cam.connect()
cv_cam.start_frame_capture_thread()