Free Motion Capture for Everyone πβ¨
TypeScript
Stream Data from python to consumers through Gunicorn API
Endurance Idehen975caa0df5e8
diff --git a/bin/run_web_server.sh b/bin/run_web_server.shindex 42cad764..5039640c 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 -w 2 -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 4 -k uvicorn.workers.UvicornWorker 'src.api.app_factory:create_app()'\ No newline at end of filediff --git a/freemocap-ui/package.json b/freemocap-ui/package.jsonindex d0ac7f43..e99b375b 100644--- a/freemocap-ui/package.json+++ b/freemocap-ui/package.json@@ -23,9 +23,10 @@"react-router-dom": "^6.2.1","react-scripts": "5.0.0","react-use": "^17.3.2",+ "react-use-websocket": "^2.9.1","react-webcam": "^6.0.0","reflect-metadata": "^0.1.13",- "typescript": "4.1.5"+ "typescript": "4.5.5"},"devDependencies": {"@testing-library/jest-dom": "^5.16.1",diff --git a/freemocap-ui/src/layout/routing/router.tsx b/freemocap-ui/src/layout/routing/router.tsxindex 5f1c1786..7b59413e 100644--- a/freemocap-ui/src/layout/routing/router.tsx+++ b/freemocap-ui/src/layout/routing/router.tsx@@ -3,6 +3,8 @@ import {Route, Routes} from "react-router-dom";import {ShowCameras} from "../../views/ShowCameras";import {WebcamStreamCapture} from "../../views/Capture";import {ConfigView} from "../../views/Config";+import {WebcamJonTest} from "../../views/WebcamJonTest";+import {PythonToJsTest} from "../../views/PythonToJsTest";export const Router = () => {return (@@ -10,6 +12,8 @@ export const Router = () => {<Route path={'/'} element={<React.Fragment />} /><Route path={'/show_cameras'} element={<WebcamStreamCapture />} /><Route path={'/config'} element={<ConfigView />} />+ <Route path={'/jontestplayground'} element={<WebcamJonTest />} />+ <Route path={'/pythonToJs'} element={<PythonToJsTest />} /></Routes>)}\ No newline at end of filediff --git a/freemocap-ui/src/views/PythonToJsTest.tsx b/freemocap-ui/src/views/PythonToJsTest.tsxnew file mode 100644index 00000000..aecf0655--- /dev/null+++ b/freemocap-ui/src/views/PythonToJsTest.tsx@@ -0,0 +1,39 @@+import React from "react";+import {Box} from "@mui/material";+import {useAsync} from "react-use";+import axios from "axios";++export const PythonToJsTest = () => {+ const [data, setData] = React.useState<object>({});++ useAsync(async () => {+ const response = await axios.get('http://localhost:8080/camera/detect');+ 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) => {+ socket.onmessage = async (ev: MessageEvent<Blob>) => {+ const byteData = await ev.data.text();+ setData(prev => {+ return {+ ...prev,+ [index]: byteData+ }+ });+ }+ })+ }, []);+ if (!data) {+ return null;+ }++ const keys = Object.keys(data);+ return (+ <Box>+ {+ keys.map(k => {+ return <img src={`data:image/png;base64,${data[k]}`}/>+ })+ }+ </Box>+ )+}\ No newline at end of filediff --git a/freemocap-ui/src/views/WebcamJonTest.tsx b/freemocap-ui/src/views/WebcamJonTest.tsxnew file mode 100644index 00000000..e90acd03--- /dev/null+++ b/freemocap-ui/src/views/WebcamJonTest.tsx@@ -0,0 +1,39 @@+import Webcam from "react-webcam";+import {BrowserCam} from "../services/cam";+import {useAsync, useMount} from "react-use";+import React from "react";+import { Box } from "@mui/material";++const cams = new BrowserCam().findAllCameras();++export const WebcamJonTest = () => {+ useAsync(async () => {+ const cams = await new BrowserCam().findAllCameras();+ console.log(cams);+ }, []);+ const cst = navigator.mediaDevices.getSupportedConstraints()++ const constraints: MediaStreamConstraints = {+ video: {+ // Jon, you can change stuff here++ // You can select a specific video device by putting a device Id here.+ // Check your browser console to take a device you'd like.+ // deviceId: "",++ exposureMode: "manual",+ exposureCompensation: "-3"+ } as any+ }++++ return (+ <Box>+ <Webcam videoConstraints={constraints.video}/>+ <Box>++ </Box>+ </Box>+ )+}\ No newline at end of filediff --git a/jon_scratch/opencv_camera.py b/jon_scratch/opencv_camera.pyindex dc2c284f..8852be72 100644--- a/jon_scratch/opencv_camera.py+++ b/jon_scratch/opencv_camera.py@@ -57,7 +57,7 @@ class OpenCVCamera(TweakedModel):logger.error('Could not connect to a camera at port# {}'.format(self.port_number))return success- def get_next_frame(self)->dict:+ def get_next_frame(self):timestamp_ns_pre_grab = time.time_ns()# Why grab not read? see -> https://stackoverflow.com/questions/57716962/difference-between-video-capture-read-and-grab@@ -66,12 +66,11 @@ class OpenCVCamera(TweakedModel):timestamp_ns = (timestamp_ns_pre_grab + timestamp_ns_post_grab)/2if grab_success:- success, image = self.opencv_video_capture_object.retrieve()- logger.info('{} successfully grabbed a frame at timestamp {}'.format(self.name, timestamp_ns/1e9))- else:- # raise FailedFrameGrabException()- logger.error('{} failed to grab a frame at timestamp {}'.format(timestamp_ns/1e9))- return success, image, timestamp_ns+ success, image = self.opencv_video_capture_object.retrieve()+ # logger.info('{} successfully grabbed a frame at timestamp {}'.format(self.name, timestamp_ns/1e9))+ return success, image, timestamp_ns++ return False, None, Nonedef close(self):self.opencv_video_capture_object.release()diff --git a/requirements.txt b/requirements.txtindex e25fd8cf..863f7435 100644--- a/requirements.txt+++ b/requirements.txt@@ -18,4 +18,5 @@ fastapi==0.71.0gunicorn==20.1.0requests==2.27.1pyudev==0.22.0-python-multipart==0.0.5\ No newline at end of file+python-multipart==0.0.5+websockets==10.1\ No newline at end of filediff --git a/src/api/routes/__init__.py b/src/api/routes/__init__.pyindex 266b2cc6..f4f9d732 100644--- a/src/api/routes/__init__.py+++ b/src/api/routes/__init__.py@@ -1,8 +1,10 @@+from src.api.routes.camera.cam_data_ws import cam_ws_routerfrom src.api.routes.camera.camera_route import camera_routerfrom src.api.routes.health.health_check_route import healthcheck_router# REGISTER NEW ROUTES HEREenabled_routers = [healthcheck_router,- camera_router+ camera_router,+ cam_ws_router]diff --git a/src/api/routes/camera/cam_data_ws.py b/src/api/routes/camera/cam_data_ws.pynew file mode 100644index 00000000..3412bba0--- /dev/null+++ b/src/api/routes/camera/cam_data_ws.py@@ -0,0 +1,25 @@+import base64++import cv2+from fastapi import APIRouter, WebSocket++from jon_scratch.opencv_camera import OpenCVCamera++cam_ws_router = APIRouter()+++@cam_ws_router.websocket("/ws/{webcam_id}")+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()))diff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.pyindex b3fe04b7..3c7ef586 100644--- a/src/api/routes/camera/camera_route.py+++ b/src/api/routes/camera/camera_route.py@@ -1,28 +1,29 @@-import randomimport uuidimport numpy as npfrom fastapi import APIRouterfrom starlette.requests import Request-camera_router = APIRouter()-+from freemocap.prod.cam.cam_detection import DetectPossibleCameras-# create an endpoint-# @camera_router.post("/camera")-# def begin_detection():-# pass+camera_router = APIRouter()@camera_router.post('/camera/upload')async def stream_camera_bytes(request: Request):body = b''- # uuid_str = str(uuid.uuid4())- with open(f"{random.randint(0,10000)}.webm", "wb") as fd:+ with open(f"{uuid.uuid4().hex}.webm", "wb") as fd:async for chunk in request.stream():body += chunkfd.write(chunk)# convert into numpy arraycamera_data = np.frombuffer(body, dtype=np.uint8)- print(camera_data)+ return camera_data+++@camera_router.get("/camera/detect")+async def get_cameras():+ d = DetectPossibleCameras()+ cams = d.find_available_cameras()+ return cams