Free Motion Capture for Everyone πβ¨
TypeScript
single gunicorn process for handling api requests
Endurance Idehend58e8915374c
diff --git a/bin/run_web_server.sh b/bin/run_web_server.shindex 5039640c..6601863b 100755--- a/bin/run_web_server.sh+++ b/bin/run_web_server.sh@@ -3,4 +3,4 @@# Start the webserver# shellcheck disable=SC2086-gunicorn -b 0.0.0.0:8080 --timeout 0 -w 4 -k uvicorn.workers.UvicornWorker 'src.api.app_factory:create_app()'\ No newline at end of file+gunicorn -b 0.0.0.0:8080 --timeout 0 -w 1 -k uvicorn.workers.UvicornWorker 'src.api.app_factory:create_app()'\ No newline at end of filediff --git a/freemocap-ui/src/App.tsx b/freemocap-ui/src/App.tsxindex 238c7a01..ca294b90 100644--- a/freemocap-ui/src/App.tsx+++ b/freemocap-ui/src/App.tsx@@ -1,11 +1,9 @@import React from 'react';-import {CssBaseline} from "@mui/material";import {Paperbase} from "./layout/Paperbase";function App() {return (<React.Fragment>- <CssBaseline /><Paperbase /></React.Fragment>);diff --git a/freemocap-ui/src/layout/Paperbase.tsx b/freemocap-ui/src/layout/Paperbase.tsxindex 2e8fd6a9..e044ee73 100644--- a/freemocap-ui/src/layout/Paperbase.tsx+++ b/freemocap-ui/src/layout/Paperbase.tsx@@ -6,6 +6,7 @@ import {Navigator} from './Navigator';import {Copyright} from "./Copyright";import {BaseContent} from "./content/BaseContent";import {BrowserRouter} from 'react-router-dom';+import {CssBaseline} from "@mui/material";let theme = createTheme({palette: {@@ -162,6 +163,7 @@ export const Paperbase = function () {return (<ThemeProvider theme={theme}>+ <CssBaseline /><BrowserRouter><Box sx={{display: 'flex', minHeight: '100vh'}}><Boxdiff --git a/freemocap-ui/src/views/PythonToJsTest.tsx b/freemocap-ui/src/views/PythonToJsTest.tsxindex aecf0655..41ed1da3 100644--- a/freemocap-ui/src/views/PythonToJsTest.tsx+++ b/freemocap-ui/src/views/PythonToJsTest.tsx@@ -11,6 +11,10 @@ export const PythonToJsTest = () => {const port_numbers = response.data.cams_to_use.map(x => x.port_number);const sockets: WebSocket[] = port_numbers.map(port => new WebSocket(`ws://localhost:8080/ws/${port}`));sockets.forEach((socket, index) => {+ window.onbeforeunload = function() {+ socket.onclose = function () {}; // disable onclose handler first+ socket.close();+ };socket.onmessage = async (ev: MessageEvent<Blob>) => {const byteData = await ev.data.text();setData(prev => {@@ -22,6 +26,7 @@ export const PythonToJsTest = () => {}})}, []);+if (!data) {return null;}diff --git a/freemocap/__init__.py b/freemocap/__init__.pyindex 87a847ed..eb932f3e 100644--- a/freemocap/__init__.py+++ b/freemocap/__init__.py@@ -3,8 +3,8 @@ from ._version import get_versions__version__ = get_versions()["version"]del get_versions-from freemocap.fmc_runme import RunMe-from freemocap import fmc_demo, fmc_runme+# from freemocap.fmc_runme import RunMe+# from freemocap import fmc_demo, fmc_runme# from freemocap import fmc_runme, fmc_demo #JSM NOTE - there's gotta be a better way to do this loldiff --git a/freemocap/prod/cam/cam_detection.py b/freemocap/prod/cam/cam_detection.pyindex 1deacc8e..34908cea 100644--- a/freemocap/prod/cam/cam_detection.py+++ b/freemocap/prod/cam/cam_detection.py@@ -50,3 +50,15 @@ class DetectPossibleCameras:return cv2.CAP_DSHOWelse:return cv2.CAP_ANY+++_available_cameras = None+++def get_or_create_cams():+ global _available_cameras+ if _available_cameras is None:+ d = DetectPossibleCameras()+ _available_cameras = d.find_available_cameras()++ return _available_camerasdiff --git a/jon_scratch/opencv_camera.py b/jon_scratch/opencv_camera.pyindex 8852be72..62b8407a 100644--- a/jon_scratch/opencv_camera.py+++ b/jon_scratch/opencv_camera.py@@ -1,5 +1,4 @@import logging-from typing import List, Optional, Dictimport platformimport time@@ -25,17 +24,20 @@ class TweakedModel(BaseModel):# OpenCV Implementation of interacting with a cameraclass OpenCVCamera(TweakedModel):port_number: int=0- name: str = 'Camera0' # `camera{}`.format(port_number)+ name: str = f'Camera{port_number}' # `camera{}`.format(port_number)+ # exposure: int = 0exposure: int = -6- resolution_width: int = 1280- resolution_height: int = 720+ resolution_width: int = 800+ resolution_height: int = 600+ # resolution_width: int = 1280+ # resolution_height: int = 720opencv_video_capture_object: cv2.VideoCapture = None- def connect(self)->bool:+ def connect(self):if platform.system() == 'Windows':- cap_backend = cv2.CAP_DSHOW+ cap_backend = cv2.CAP_DSHOWelse:- cap_backend = cv2.CAP_ANY+ cap_backend = cv2.CAP_ANYself.opencv_video_capture_object = cv2.VideoCapture(self.port_number, cap_backend)diff --git a/src/api/routes/__init__.py b/src/api/routes/__init__.pyindex f4f9d732..6e9cfeab 100644--- a/src/api/routes/__init__.py+++ b/src/api/routes/__init__.py@@ -3,8 +3,11 @@ from src.api.routes.camera.camera_route import camera_routerfrom src.api.routes.health.health_check_route import healthcheck_router# REGISTER NEW ROUTES HERE+from src.api.routes.startup.startup import startup_router+enabled_routers = [healthcheck_router,camera_router,- cam_ws_router+ cam_ws_router,+ startup_router]diff --git a/src/api/routes/camera/cam_data_ws.py b/src/api/routes/camera/cam_data_ws.pyindex 3412bba0..14861438 100644--- a/src/api/routes/camera/cam_data_ws.py+++ b/src/api/routes/camera/cam_data_ws.py@@ -1,10 +1,12 @@import base64+import loggingimport cv2from fastapi import APIRouter, WebSocketfrom jon_scratch.opencv_camera import OpenCVCamera+logger = logging.getLogger(__name__)cam_ws_router = APIRouter()@@ -13,13 +15,17 @@ async def websocket_endpoint(websocket: WebSocket, webcam_id: str):await websocket.accept()cam = OpenCVCamera(port_number=webcam_id)cam.connect()- while True:- success, image, timestamp = cam.get_next_frame()- if not success:- continue- if image is None:- continue- success, frame = cv2.imencode('.png', image)- if not success:- continue- await websocket.send_bytes(base64.b64encode(frame.tobytes()))+ try:+ while True:+ success, image, timestamp = cam.get_next_frame()+ if not success:+ continue+ if image is None:+ continue+ success, frame = cv2.imencode('.png', image)+ if not success:+ continue+ await websocket.send_bytes(base64.b64encode(frame.tobytes()))+ except:+ logger.info("Close the camera being used")+ cam.close()diff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.pyindex 3c7ef586..565bbc15 100644--- a/src/api/routes/camera/camera_route.py+++ b/src/api/routes/camera/camera_route.py@@ -4,7 +4,7 @@ import numpy as npfrom fastapi import APIRouterfrom starlette.requests import Request-from freemocap.prod.cam.cam_detection import DetectPossibleCameras+from freemocap.prod.cam.cam_detection import get_or_create_camscamera_router = APIRouter()@@ -24,6 +24,4 @@ async def stream_camera_bytes(request: Request):@camera_router.get("/camera/detect")async def get_cameras():- d = DetectPossibleCameras()- cams = d.find_available_cameras()- return cams+ return get_or_create_cams()diff --git a/src/api/routes/startup/startup.py b/src/api/routes/startup/startup.pynew file mode 100644index 00000000..de7bd56a--- /dev/null+++ b/src/api/routes/startup/startup.py@@ -0,0 +1,10 @@+from fastapi import APIRouter++from freemocap.prod.cam.cam_detection import get_or_create_cams++startup_router = APIRouter()+++@startup_router.on_event('startup')+async def handle_startup():+ get_or_create_cams()