Free Motion Capture for Everyone πβ¨
TypeScript
chk
jonmatthis69db3cd1b0b7
diff --git a/freemocap/api/http/realtime/realtime_router.py b/freemocap/api/http/realtime/realtime_router.pyindex fc6dcd4a..9e206ed7 100644--- a/freemocap/api/http/realtime/realtime_router.py+++ b/freemocap/api/http/realtime/realtime_router.py@@ -1,17 +1,13 @@import logging-from pathlib import Path-from fastapi import APIRouter, Body, HTTPException, Request+from fastapi import APIRouter, Body, HTTPExceptionfrom pydantic import BaseModel, Field-from skellycam.core.camera.config import camera_config-from skellycam.core.camera.config.camera_config import CameraConfigfrom skellycam.core.camera_group.camera_group import CameraConfigs-from skellycam.core.recorders.videos.recording_info import RecordingInfo-from skellycam.core.types.type_overloads import CameraGroupIdString, CameraIdString+from skellycam.core.types.type_overloads import CameraGroupIdStringfrom freemocap.app.freemocap_application import get_freemocap_appfrom freemocap.core.pipeline.realtime.realtime_aggregator_node import RealtimePipelineConfig-from freemocap.system.default_paths import default_recording_name, get_default_recording_folder_path+from freemocap.core.pipeline.realtime.realtime_pipeline import RealtimePipelinelogger = logging.getLogger(__name__)@@ -37,7 +33,7 @@ class RealtimePipelineCreateResponse(BaseModel):description="ID of the processing pipeline",)@classmethod- def from_pipeline(cls, pipeline: "RealtimePipeline") -> "RealtimePipelineCreateResponse":+ def from_pipeline(cls, pipeline: RealtimePipeline) -> "RealtimePipelineCreateResponse":return cls(camera_group_id=pipeline.camera_group.id,pipeline_id=pipeline.id,diff --git a/freemocap/api/websocket/websocket_server.py b/freemocap/api/websocket/websocket_server.pyindex 6d2cc140..3d06112a 100644--- a/freemocap/api/websocket/websocket_server.py+++ b/freemocap/api/websocket/websocket_server.py@@ -181,9 +181,9 @@ class WebsocketServer:if packet.frontend_payload is not None:await self._send_msgspec_json(packet.frontend_payload)- if packet.image_bytes is not None:+ if packet.images_bytearray is not None:async with self._send_lock:- await self.websocket.send_bytes(packet.image_bytes)+ await self.websocket.send_bytes(packet.images_bytearray)self.last_sent_frame_number = packet.frame_numberdiff --git a/freemocap/app/freemocap_application.py b/freemocap/app/freemocap_application.pyindex 33db6c0a..319b8488 100644--- a/freemocap/app/freemocap_application.py+++ b/freemocap/app/freemocap_application.py@@ -147,7 +147,7 @@ class FreemocapApplication:).items():frame_number, mf_timestamp, image_bytes = payload # unpack the known tuple shaperesults.append(FrontendImagePacket(- image_bytes=image_bytes,+ images_bytearray=image_bytes,multiframe_timestamp=mf_timestamp,frontend_payload=FrontendPayload(camera_group_id=cg_id,frame_number=frame_number),))diff --git a/freemocap/core/pipeline/realtime/camera_node.py b/freemocap/core/pipeline/realtime/camera_node.pyindex d1341dd9..8b726cd0 100644--- a/freemocap/core/pipeline/realtime/camera_node.py+++ b/freemocap/core/pipeline/realtime/camera_node.py@@ -32,8 +32,7 @@ from freemocap.pubsub.pubsub_topics import (CameraNodeOutputMessage,)-if TYPE_CHECKING:- import numpy as np+import numpy as nplogger = logging.getLogger(__name__)@@ -113,7 +112,7 @@ class CameraNode(SourceNode):config=config.skeleton_detector_config ,)- frame_rec_array: np.recarray | None = None+ frame_recarray: np.recarray | None = Nonetry:logger.debug(f"RealtimeCameraNode [{camera_id}] entering main loop")@@ -155,22 +154,24 @@ class CameraNode(SourceNode):continueframe_msg: ProcessFrameNumberMessage = process_frame_number_sub.get()- frame_rec_array = camera_shm.get_data_by_index(+ frame_recarray = camera_shm.get_data_by_index(index=frame_msg.frame_number,- rec_array=frame_rec_array,+ rec_array=frame_recarray,)- if frame_rec_array.frame_metadata.camera_config.rotation != -1:+ if frame_recarray.frame_metadata.camera_info.rotation != -1:image = cv2.rotate(- src=frame_rec_array.image[0],- rotateCode=frame_rec_array.frame_metadata.camera_config.rotation[0],+ src=frame_recarray.image[0],+ rotateCode=frame_recarray.frame_metadata.camera_info.rotation[0]+)else:- image = frame_rec_array.image[0]-- actual_frame_number: int = frame_rec_array.frame_metadata.frame_number[0]- actual_camera_id: CameraIdString = frame_rec_array.frame_metadata.camera_config.camera_id[0]+ image = frame_recarray.image[0]+ actual_frame_number:int = int(frame_recarray.frame_metadata.frame_number[0])+ actual_camera_id: CameraIdString = frame_recarray.frame_metadata.camera_info.camera_id[0]+ if actual_camera_id != camera_id:+ raise RuntimeError(f"RealtimeCameraNode [{camera_id}]: expected camera ID {camera_id} but got frame with camera ID {actual_camera_id}")if actual_frame_number != frame_msg.frame_number:logger.warning(f"RealtimeCameraNode [{camera_id}]: requested frame {frame_msg.frame_number} "diff --git a/freemocap/core/pipeline/realtime/realtime_pipeline.py b/freemocap/core/pipeline/realtime/realtime_pipeline.pyindex 1a3e0bf7..1bfc3de4 100644--- a/freemocap/core/pipeline/realtime/realtime_pipeline.py+++ b/freemocap/core/pipeline/realtime/realtime_pipeline.py@@ -11,7 +11,6 @@ calibration) is NOT here β it belongs in the PipelineManager or route handlersimport loggingimport uuidfrom dataclasses import dataclass-from typing import Anyfrom pydantic import BaseModel, ConfigDictfrom skellycam.core.camera.config.camera_config import CameraConfigs@@ -104,6 +103,7 @@ class RealtimePipeline:config=pipeline_config.camera_node_config,ipc=ipc,pubsub=pubsub,+)for camera_id in camera_group.configs.keys()}@@ -191,9 +191,9 @@ class RealtimePipeline:if self.camera_group.alive:result = self.camera_group.get_latest_frontend_payload(if_newer_than=if_newer_than)if result is not None:- frame_number, mf_timestamp, frames_bytes = result+ frame_number, mf_timestamp, frames_bytearray = resultreturn FrontendImagePacket(- image_bytes=frames_bytes,+ images_bytearray=frames_bytearray,multiframe_timestamp=mf_timestamp,frontend_payload=FrontendPayload(@@ -210,11 +210,11 @@ class RealtimePipeline:if aggregation_output is None:return None- frames_bytes, mf_timestamp = self.camera_group.get_frontend_payload_by_frame_number(+ frames_bytearray, mf_timestamp = self.camera_group.get_frontend_payload_by_frame_number(frame_number=aggregation_output.frame_number,)return FrontendImagePacket(- image_bytes=frames_bytes,+ images_bytearray=frames_bytearray,multiframe_timestamp=mf_timestamp,frontend_payload=FrontendPayload.from_aggregation_output(aggregation_output),)diff --git a/freemocap/core/tasks/calibration/shared/calibration_models.py b/freemocap/core/tasks/calibration/shared/calibration_models.pyindex 80848511..399e50a9 100644--- a/freemocap/core/tasks/calibration/shared/calibration_models.py+++ b/freemocap/core/tasks/calibration/shared/calibration_models.py@@ -439,7 +439,7 @@ class CalibrationResult(BaseModel, TomlMixin):path.write_text(toml.dumps(cameras_dict))@classmethod- def load_anipose_toml(cls, path: Path) -> "CalibrationResultUpdated":+ def load_anipose_toml(cls, path: Path) -> "CalibrationResult":"""Load from an anipose-compatible TOML calibration file."""path = Path(path)if not path.is_file():diff --git a/freemocap/core/viz/frontend_payload.py b/freemocap/core/viz/frontend_payload.pyindex c94b1b68..9f0fb00b 100644--- a/freemocap/core/viz/frontend_payload.py+++ b/freemocap/core/viz/frontend_payload.py@@ -53,7 +53,7 @@ class FrontendPayload(msgspec.Struct):@dataclass(slots=True, frozen=True)class FrontendImagePacket:- image_bytes: bytearray+ images_bytearray: bytearraymultiframe_timestamp: MultiframeTimestampFloatfrontend_payload: FrontendPayloaddiff --git a/freemocap/pubsub/pubsub_abcs.py b/freemocap/pubsub/pubsub_abcs.pyindex 95a00f06..411c35fd 100644--- a/freemocap/pubsub/pubsub_abcs.py+++ b/freemocap/pubsub/pubsub_abcs.py@@ -1,4 +1,5 @@import logging+import multiprocessingfrom dataclasses import dataclass, fieldfrom queue import Emptyfrom typing import TypeVar, Generic, ClassVar@@ -30,7 +31,7 @@ class PubSubTopicABC(Generic[MessageType]):topic_registry: ClassVar[set[type['PubSubTopicABC']]] = set()message_type: type[TopicMessageABC] = TopicMessageABC- publication: TopicPublicationQueue = field(default_factory=TopicPublicationQueue)+ publication: TopicPublicationQueue = field(default_factory=multiprocessing.Queue)subscriptions: list[TopicSubscriptionQueue] = field(default_factory=list)def __init_subclass__(cls, **kwargs) -> None:@@ -44,7 +45,7 @@ class PubSubTopicABC(Generic[MessageType]):def get_subscription(self) -> TopicSubscriptionQueue:"""Create and register a new subscription queue."""- sub = TopicSubscriptionQueue()+ sub = multiprocessing.Queue()self.subscriptions.append(sub)return subdiff --git a/freemocap/pubsub/pubsub_topics.py b/freemocap/pubsub/pubsub_topics.pyindex a6f18388..44567ec1 100644--- a/freemocap/pubsub/pubsub_topics.py+++ b/freemocap/pubsub/pubsub_topics.py@@ -24,7 +24,6 @@ from freemocap.pubsub.pubsub_abcs import TopicMessageABC, create_topicif TYPE_CHECKING:from skellytracker.trackers.charuco_tracker.charuco_observation import CharucoObservation- from skellytracker.trackers.mediapipe_tracker import MediapipeObservationfrom freemocap.core.viz.image_overlay.charuco_overlay_data import CharucoOverlayDatafrom freemocap.core.viz.image_overlay.mediapipe_overlay_data import MediapipeOverlayDatadiff --git a/pyproject.toml b/pyproject.tomlindex 0c119422..067a2ef9 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -21,6 +21,7 @@ dependencies = ["freemocap_blender_addon","skellycam","skellyforge",+# "skellytracker[all]","skellytracker[mediapipe]",#skelly utils"skellylogs",diff --git a/uv.lock b/uv.lockindex c0426c49..52237a20 100644--- a/uv.lock+++ b/uv.lock@@ -2227,7 +2227,7 @@ wheels = [[[package]]name = "skellycam"version = "2.0.0a1"-source = { git = "https://github.com/freemocap/skellycam?branch=development#fc52dd41f37152d8f66e3e67a27f29b78b024f6e" }+source = { git = "https://github.com/freemocap/skellycam?branch=development#f673e077a61d0f70d0915ac81e87dc28110a767e" }dependencies = [{ name = "av" },{ name = "beartype" },@@ -2283,7 +2283,7 @@ dependencies = [[[package]]name = "skellytracker"version = "2024.9.1019"-source = { git = "https://github.com/freemocap/skellytracker?branch=development#e062e7decc95b1efcc5cb9a03e6865b1cdffc4a5" }+source = { git = "https://github.com/freemocap/skellytracker?branch=development#5428f28a33df55f8c4ea8fcc035f52e7dd324755" }dependencies = [{ name = "beartype" },{ name = "numpy" },