Free Motion Capture for Everyone πβ¨
TypeScript
clean up configs a bit
jonmatthisb55c3abeaaeb
diff --git a/freemocap-ui/src/services/server/ServerContextProvider.tsx b/freemocap-ui/src/services/server/ServerContextProvider.tsxindex f1e95842..c4597b7d 100644--- a/freemocap-ui/src/services/server/ServerContextProvider.tsx+++ b/freemocap-ui/src/services/server/ServerContextProvider.tsx@@ -238,7 +238,7 @@ export const ServerContextProvider: React.FC<{ children: ReactNode }> = ({ child}};- // rAF-driven processing loop. Runs on its own macrotask boundary,+ // requestAnimationFrame(rAF)-driven processing loop. Runs on its own macrotask boundary,// so createImageBitmap promises can resolve without being starved// by the WebSocket onmessage dispatch loop.const processFrameLoop = async (): Promise<void> => {@@ -434,4 +434,4 @@ export const useServer = (): ServerContextValue => {const context = useContext(ServerContext);if (!context) throw new Error('useServer must be used within ServerContextProvider');return context;-};\ No newline at end of file+};diff --git a/freemocap/api/http/app/settings.py b/freemocap/api/http/app/settings.pyindex b640056f..cf74c824 100644--- a/freemocap/api/http/app/settings.py+++ b/freemocap/api/http/app/settings.py@@ -17,8 +17,8 @@ from skellycam.core.types.type_overloads import CameraIdStringfrom freemocap.core.pipeline.pipeline_configs import (CalibrationPipelineConfig,MocapPipelineConfig,- RealtimePipelineConfig,)+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfiglogger = logging.getLogger(__name__)@@ -271,4 +271,4 @@ class SettingsManager:moc.recording_progress = recording_progressif last_recording_path is not None:moc.last_recording_path = last_recording_path- self.notify_changed()\ No newline at end of file+ self.notify_changed()diff --git a/freemocap/api/http/calibration/calibration_router.py b/freemocap/api/http/calibration/calibration_router.pyindex c2809574..2856c1be 100644--- a/freemocap/api/http/calibration/calibration_router.py+++ b/freemocap/api/http/calibration/calibration_router.py@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field, ConfigDictfrom skellycam.core.recorders.videos.recording_info import RecordingInfofrom freemocap.app.freemocap_application import get_freemocap_app-from freemocap.core.pipeline.pipeline_configs import CalibrationPipelineConfig+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationPipelineConfigfrom freemocap.system.default_paths import FREEMOCAP_TEST_DATA_PATHlogger = logging.getLogger(__name__)diff --git a/freemocap/api/http/mocap/mocap_router.py b/freemocap/api/http/mocap/mocap_router.pyindex 9b093976..a4907d01 100644--- a/freemocap/api/http/mocap/mocap_router.py+++ b/freemocap/api/http/mocap/mocap_router.py@@ -7,7 +7,8 @@ from pydantic import BaseModel, ConfigDict, Fieldfrom skellycam.core.recorders.videos.recording_info import RecordingInfofrom freemocap.app.freemocap_application import get_freemocap_app-from freemocap.core.pipeline.pipeline_configs import CalibrationSource, MocapPipelineConfig+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationSource+from freemocap.core.pipeline.pipeline_configs.mocap_task_config import MocapPipelineConfigfrom freemocap.system.default_paths import FREEMOCAP_TEST_DATA_PATHlogger = logging.getLogger(__name__)diff --git a/freemocap/api/http/pipelines/pipeline_router.py b/freemocap/api/http/pipelines/pipeline_router.pyindex c77873eb..75dfe52a 100644--- a/freemocap/api/http/pipelines/pipeline_router.py+++ b/freemocap/api/http/pipelines/pipeline_router.py@@ -9,7 +9,7 @@ from skellycam.core.recorders.videos.recording_info import RecordingInfofrom skellycam.core.types.type_overloads import CameraGroupIdString, CameraIdStringfrom freemocap.app.freemocap_application import get_freemocap_app-from freemocap.core.pipeline.pipeline_configs import RealtimePipelineConfig+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfigfrom freemocap.system.default_paths import default_recording_name, get_default_recording_folder_pathlogger = logging.getLogger(__name__)@@ -162,4 +162,4 @@ async def stop_recording(request: Request) -> bool:return Trueexcept Exception as e:logger.error(f"Error in {request.url}: {type(e).__name__} - {e}", exc_info=True)- raise HTTPException(status_code=500, detail=str(e))\ No newline at end of file+ raise HTTPException(status_code=500, detail=str(e))diff --git a/freemocap/app/freemocap_application.py b/freemocap/app/freemocap_application.pyindex b2b5b59f..b8bc8b96 100644--- a/freemocap/app/freemocap_application.py+++ b/freemocap/app/freemocap_application.py@@ -14,17 +14,15 @@ from skellycam.core.ipc.process_management.worker_registry import WorkerRegistryfrom skellycam.core.recorders.videos.recording_info import RecordingInfofrom skellycam.core.types.type_overloads import CameraGroupIdString+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationPipelineConfig+from freemocap.core.pipeline.pipeline_configs.mocap_task_config import MocapPipelineConfigfrom freemocap.core.pipeline.posthoc.posthoc_pipeline import PosthocPipelinefrom freemocap.core.pipeline.posthoc.posthoc_pipeline_manager import PosthocPipelineManagerfrom freemocap.core.pipeline.realtime.realtime_pipeline import RealtimePipelinefrom freemocap.core.pipeline.realtime.realtime_pipeline_manager import RealtimePipelineManagerfrom freemocap.app.settings import SettingsManagerfrom freemocap.core.viz.frontend_payload import FrontendPayload-from freemocap.core.pipeline.pipeline_configs import (- CalibrationPipelineConfig,- MocapPipelineConfig,- RealtimePipelineConfig,-)+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfigfrom freemocap.core.types.type_overloads import PipelineIdString, FrameNumberIntlogger = logging.getLogger(__name__)diff --git a/freemocap/app/settings.py b/freemocap/app/settings.pyindex fb72a7ff..b11e141a 100644--- a/freemocap/app/settings.py+++ b/freemocap/app/settings.py@@ -14,11 +14,9 @@ from pydantic import BaseModel, Fieldfrom skellycam.core.camera.config.camera_config import CameraConfig, CameraConfigsfrom skellycam.core.types.type_overloads import CameraIdString-from freemocap.core.pipeline.pipeline_configs import (- CalibrationPipelineConfig,- MocapPipelineConfig,- RealtimePipelineConfig,-)+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationPipelineConfig+from freemocap.core.pipeline.pipeline_configs.mocap_task_config import MocapPipelineConfig+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfiglogger = logging.getLogger(__name__)@@ -255,4 +253,4 @@ class SettingsManager:moc.recording_progress = recording_progressif last_recording_path is not None:moc.last_recording_path = last_recording_path- self.notify_changed()\ No newline at end of file+ self.notify_changed()diff --git a/freemocap/core/calibration/anipose_calibration/run_anipose_calibration.py b/freemocap/core/calibration/anipose_calibration/run_anipose_calibration.pyindex d8e79f62..7b1e8e49 100644--- a/freemocap/core/calibration/anipose_calibration/run_anipose_calibration.py+++ b/freemocap/core/calibration/anipose_calibration/run_anipose_calibration.py@@ -21,7 +21,7 @@ from freemocap.core.calibration.anipose_calibration.helpers.freemocap_anipose imfrom freemocap.core.calibration.shared.calibration_models import CharucoBoardDefinition, CalibrationResultfrom freemocap.core.calibration.shared.groundplane_alignment import GroundPlaneResultfrom freemocap.core.calibration.shared.charuco_observation_aggregator import CharucoObservationAggregator-from freemocap.core.pipeline.pipeline_configs import CalibrationPipelineConfig+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationPipelineConfigfrom freemocap.core.pipeline.posthoc.video_group_helper import VideoMetadatafrom freemocap.core.types.type_overloads import VideoIdString@@ -32,7 +32,6 @@ def run_anipose_calibration(*,charuco_observations_by_frame: list[dict[CameraIdString, CharucoObservation]],board: CharucoBoardDefinition,- calibration_pipeline_config: CalibrationPipelineConfig,video_metadata: dict[VideoIdString, VideoMetadata],recording_info: RecordingInfo,pin_camera_0_to_origin: bool = True,diff --git a/freemocap/core/calibration/calibration_task.py b/freemocap/core/calibration/calibration_task.pyindex dd83f5dd..b7f63880 100644--- a/freemocap/core/calibration/calibration_task.py+++ b/freemocap/core/calibration/calibration_task.py@@ -28,9 +28,10 @@ from freemocap.core.calibration.shared.calibration_models import CharucoBoardDeffrom freemocap.core.calibration.shared.groundplane_alignment import GroundPlaneResult, groundplane_metadatafrom freemocap.core.calibration.shared.calibration_paths import get_last_successful_calibration_toml_pathfrom freemocap.core.calibration.shared.calibration_save import save_calibration_copies+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationPipelineConfig, \+ CalibrationSolverMethodfrom freemocap.utilities.toml_mixin import numpy_to_pythonfrom freemocap.core.mocap.mocap_helpers.charuco_model_from_observations import charuco_model_from_observations-from freemocap.core.pipeline.pipeline_configs import CalibrationPipelineConfig, CalibrationSolverMethodfrom freemocap.core.pipeline.posthoc.video_group_helper import VideoMetadatafrom freemocap.core.types.type_overloads import VideoIdStringfrom scripts.compare_calibrations import compute_calibration_health@@ -200,7 +201,6 @@ def _run_anipose_path(result, ground_plane = run_anipose_calibration(charuco_observations_by_frame=charuco_observations_by_frame,board=board,- calibration_pipeline_config=task_config,recording_info=recording_info,video_metadata=video_metadata,use_charuco_as_groundplane=task_config.use_groundplane,diff --git a/freemocap/core/mocap/posthoc_mocap_task.py b/freemocap/core/mocap/posthoc_mocap_task.pyindex 9857fcd3..55c86470 100644--- a/freemocap/core/mocap/posthoc_mocap_task.py+++ b/freemocap/core/mocap/posthoc_mocap_task.py@@ -16,6 +16,9 @@ from typing import TYPE_CHECKINGimport toml+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationSource+from freemocap.core.pipeline.pipeline_configs.mocap_task_config import MocapPipelineConfig+if TYPE_CHECKING:from skellyforge.skellymodels.managers.human import Humanfrom skellycam.core.recorders.videos.recording_info import RecordingInfo@@ -38,7 +41,6 @@ from freemocap.core.calibration.shared.groundplane_alignment import ()from freemocap.core.mocap.mocap_helpers.skeleton_from_mediapipe_observations import \skeleton_from_mediapipe_observation_recorders-from freemocap.core.pipeline.pipeline_configs import MocapPipelineConfigfrom freemocap.core.pipeline.posthoc.video_group_helper import VideoMetadatafrom freemocap.core.types.type_overloads import VideoIdStringfrom freemocap.utilities.toml_mixin import numpy_to_python@@ -86,7 +88,6 @@ def run_post_mocap_aggregation_task(observation_recorders[vid_id].add_observation(observation=obs)# ---- Get calibration path ----- from freemocap.core.pipeline.pipeline_configs import CalibrationSourceif task_config.calibration_source == CalibrationSource.SPECIFIED:if not task_config.calibration_toml_path:raise RuntimeError("calibration_source is 'specified' but calibration_toml_path is not set.")diff --git a/freemocap/core/pipeline/base_node.py b/freemocap/core/pipeline/base_node.pyindex d4734035..a8699efe 100644--- a/freemocap/core/pipeline/base_node.py+++ b/freemocap/core/pipeline/base_node.py@@ -29,6 +29,7 @@ from skellycam.core.ipc.process_management.worker_registry import WorkerRegistrylogger = logging.getLogger(__name__)+# TODO - Double check if the below is true, might be nonsense# On Windows, multiprocessing.spawn causes each child process to# re-import the full module tree. Spawning many children simultaneously# creates a file-locking race (PermissionError) because Windows holds@@ -109,4 +110,4 @@ class BaseNode:log_queue=log_queue,kwargs=kwargs,)- return shutdown_self_flag, worker\ No newline at end of file+ return shutdown_self_flag, workerdiff --git a/freemocap/core/pipeline/pipeline_configs.py b/freemocap/core/pipeline/pipeline_configs.pydeleted file mode 100644index 07f815ff..00000000--- a/freemocap/core/pipeline/pipeline_configs.py+++ /dev/null@@ -1,216 +0,0 @@-"""-Pipeline configuration types.--All detector/task configs live here.-used to tell child processes which detector to instantiate.-"""-from enum import Enum-from typing import Annotated, Any, Union--from pydantic import BaseModel, ConfigDict, Discriminator, Field, Tag-from skellycam.core.camera.config.camera_config import CameraConfigs-from skellycam.core.types.type_overloads import CameraIdString-from skellytracker.trackers.charuco_tracker.charuco_detector import CharucoDetectorConfig-from skellytracker.trackers.base_tracker.base_tracker_abcs import BaseDetectorConfig-from skellytracker.trackers.legacy_mediapipe_tracker.legacy_mediapipe_annotator import LegacyMediapipeAnnotatorConfig-from skellytracker.trackers.mediapipe_tracker import MediapipeDetectorConfig-from skellytracker.trackers.legacy_mediapipe_tracker.legacy_mediapipe_detector_config import LegacyMediapipeDetectorConfig-from skellytracker.trackers.mediapipe_tracker.body.mediapipe_pose_config import MediapipePoseConfig--from skellytracker.trackers.mediapipe_tracker.mediapipe_model_manager import MediapipePoseModelComplexity--from freemocap.core.calibration.pyceres_calibration.helpers.models import PyceresCalibrationSolverConfig-from freemocap.core.mocap.skeleton_dewiggler.realtime_skeleton_filter import RealtimeFilterConfig--# TODO - This should live in skellytracker-def create_detector_from_config(detector_config: BaseDetectorConfig):- """- Create a detector instance from a picklable config.- Called inside child processes β detector class imports are deferred- to avoid pulling in mediapipe/cv2.aruco during module import.- """-- match detector_config:- case CharucoDetectorConfig():- from skellytracker.trackers.charuco_tracker.charuco_detector import CharucoDetector- return CharucoDetector.create(config=detector_config)- case MediapipeDetectorConfig():- from skellytracker.trackers.mediapipe_tracker import MediapipeDetector- return MediapipeDetector.create(config=detector_config)- case LegacyMediapipeDetectorConfig():- from skellytracker.trackers.legacy_mediapipe_tracker.legacy_mediapipe_detector import LegacyMediapipeDetector- return LegacyMediapipeDetector.create(config=detector_config)- case _:- raise TypeError(f"Unknown detector config type: {type(detector_config).__name__}")---def create_annotator_from_config(config: BaseDetectorConfig):- """- Create an image annotator matching the given detector config.- Called inside child processes for drawing detection results onto frames.- """-- match config:- case CharucoDetectorConfig():- from skellytracker.trackers.charuco_tracker.charuco_annotator import CharucoImageAnnotator, \- CharucoAnnotatorConfig- return CharucoImageAnnotator.create(config=CharucoAnnotatorConfig())- case MediapipeDetectorConfig():- from skellytracker.trackers.mediapipe_tracker import MediapipeAnnotator, MediapipeAnnotatorConfig- return MediapipeAnnotator.create(config=MediapipeAnnotatorConfig())- case LegacyMediapipeDetectorConfig():- from skellytracker.trackers.legacy_mediapipe_tracker.legacy_mediapipe_annotator import LegacyMediapipeImageAnnotator, LegacyMediapipeAnnotatorConfig- return LegacyMediapipeImageAnnotator.create(config=LegacyMediapipeAnnotatorConfig())- case _:- raise TypeError(f"Unknown detector config type for annotator: {type(config).__name__}")---# ----------------------------------------------------------------------------# Calibration solver selection-# ------------------------------------------------------------------------------class CalibrationSolverMethod(str, Enum):- """Which calibration solver backend to use."""- ANIPOSE = "anipose"- PYCERES = "pyceres"---class CalibrationSource(str, Enum):- """How to select the calibration TOML for a mocap pipeline run."""- MOST_RECENT = "most_recent"- SPECIFIED = "specified"- # FROM_ACTIVE_RECORDING = "from_active_recording" # NotImplemented---# ----------------------------------------------------------------------------# Task configs-# ------------------------------------------------------------------------------class CalibrationPipelineConfig(BaseModel):- model_config = ConfigDict(populate_by_name=True)-- calibration_recording_folder: str | None = Field(- default=None, alias="calibrationRecordingFolder",- )- charuco_board_x_squares: int = Field(gt=0, default=5, alias="charucoBoardXSquares")- charuco_board_y_squares: int = Field(gt=0, default=3, alias="charucoBoardYSquares")- charuco_square_length: float = Field(gt=0, default=54, alias="charucoSquareLength", description="Length of one side of a black square on teh charuco board, default unit: mm")-- solver_method: CalibrationSolverMethod = Field(- default=CalibrationSolverMethod.ANIPOSE,- alias="solverMethod",- description="Which calibration solver to use: 'anipose' (legacy) or 'pyceres' (new bundle adjustment).",- )-- pyceres_solver_config: PyceresCalibrationSolverConfig = Field(- default_factory=PyceresCalibrationSolverConfig,- alias="pyceresSolverConfig",- description="Configuration for the pyceres bundle adjustment solver. Only used when solver_method='pyceres'.",- )-- use_groundplane: bool = Field(- default=False,- alias="useGroundplane",- description="Align world frame to charuco board plane after calibration.",- )-- @property- def detector_config(self) -> CharucoDetectorConfig:- return CharucoDetectorConfig(- squares_x=self.charuco_board_x_squares,- squares_y=self.charuco_board_y_squares,- # square_length=self.charuco_square_length,- )----def _detect_detector_config_type(data: Any) -> str:- """Inspect raw data to determine which detector config subclass to use."""- if isinstance(data, BaseDetectorConfig):- if isinstance(data, CharucoDetectorConfig):- return "charuco"- if isinstance(data, MediapipeDetectorConfig):- return "mediapipe"- return "legacy_mediapipe"- if isinstance(data, dict):- if "squares_x" in data or "aruco_dictionary_name" in data:- return "charuco"- if "pose_config" in data or "hand_config" in data or "face_config" in data:- return "mediapipe"- return "legacy_mediapipe"--# TODO - move this to skellytracker-DetectorConfig = Annotated[- Union[- Annotated[LegacyMediapipeDetectorConfig, Tag("legacy_mediapipe")],- Annotated[MediapipeDetectorConfig, Tag("mediapipe")],- Annotated[CharucoDetectorConfig, Tag("charuco")],- ],- Discriminator(_detect_detector_config_type),-]---class MocapPipelineConfig(BaseModel):- model_config = ConfigDict(populate_by_name=True)-- detector_config: DetectorConfig = Field(default_factory=LegacyMediapipeDetectorConfig)- realtime_filter_config: RealtimeFilterConfig = Field(default_factory=RealtimeFilterConfig)- calibration_source: CalibrationSource = Field(- default=CalibrationSource.MOST_RECENT,- alias="calibrationSource",- description="How to select the calibration: 'most_recent' uses the latest successful calibration, 'specified' uses calibration_toml_path.",- )- calibration_toml_path: str | None = Field(- default=None,- alias="calibrationTomlPath",- description="Path to calibration TOML. Only used when calibration_source is 'specified'.",- )- update_camera_positions_from_feet: bool = Field(- default=True,- alias="updateCameraPositionsFromFeet",- description="If no groundplane was applied during calibration, estimate ground plane from foot markers and update camera extrinsics in the calibration TOML.",- )- force_reestimate_groundplane: bool = Field(- default=False,- alias="forceReestimateGroundplane",- description="Re-estimate groundplane even if one was already applied during calibration.",- )-- @classmethod- def default_realtime(cls) -> "MocapPipelineConfig":- return cls(detector_config=MediapipeDetectorConfig(- pose_config=MediapipePoseConfig(model_complexity=MediapipePoseModelComplexity.LITE)- ))-- @classmethod- def default_posthoc(cls) -> "MocapPipelineConfig":- return cls(detector_config=LegacyMediapipeDetectorConfig())------# ----------------------------------------------------------------------------# Top-level realtime pipeline config-# -----------------------------------------------------------------------------class RealtimePipelineConfig(BaseModel):- camera_configs: CameraConfigs- calibration_config: CalibrationPipelineConfig = Field(- default_factory=CalibrationPipelineConfig,- )- mocap_config: MocapPipelineConfig = Field(- default_factory=MocapPipelineConfig.default_realtime,- )- calibration_detection_enabled: bool = Field(default=True)- mocap_detection_enabled: bool = Field(default=True)-- @property- def camera_ids(self) -> list[CameraIdString]:- return list(self.camera_configs.keys())-- @classmethod- def from_camera_configs(cls, *, camera_configs: CameraConfigs) -> "RealtimePipelineConfig":- return cls(camera_configs=camera_configs)diff --git a/freemocap/core/pipeline/pipeline_configs/__init__.py b/freemocap/core/pipeline/pipeline_configs/__init__.pynew file mode 100644index 00000000..e69de29bdiff --git a/freemocap/core/pipeline/pipeline_configs/calibration_task_config.py b/freemocap/core/pipeline/pipeline_configs/calibration_task_config.pynew file mode 100644index 00000000..2988cec9--- /dev/null+++ b/freemocap/core/pipeline/pipeline_configs/calibration_task_config.py@@ -0,0 +1,56 @@+from enum import Enum++from pydantic import BaseModel, ConfigDict, Field+from skellytracker.trackers.charuco_tracker.charuco_tracker_config import CharucoDetectorConfig++from freemocap.core.calibration.pyceres_calibration.helpers.models import PyceresCalibrationSolverConfig++class CalibrationSolverMethod(str, Enum):+ """Which calibration solver backend to use."""+ ANIPOSE = "anipose"+ PYCERES = "pyceres"+++class CalibrationSource(str, Enum):+ """How to select the calibration TOML for a mocap pipeline run."""+ MOST_RECENT = "most_recent"+ SPECIFIED = "specified"+ # FROM_ACTIVE_RECORDING = "from_active_recording" # NotImplemented+++class CalibrationPipelineConfig(BaseModel):+ model_config = ConfigDict(populate_by_name=True)++ calibration_recording_folder: str | None = Field(+ default=None, alias="calibrationRecordingFolder",+ )+ charuco_board_x_squares: int = Field(gt=0, default=5, alias="charucoBoardXSquares")+ charuco_board_y_squares: int = Field(gt=0, default=3, alias="charucoBoardYSquares")+ charuco_square_length: float = Field(gt=0, default=54, alias="charucoSquareLength",+ description="Length of one side of a black square on teh charuco board, default unit: mm")++ solver_method: CalibrationSolverMethod = Field(+ default=CalibrationSolverMethod.ANIPOSE,+ alias="solverMethod",+ description="Which calibration solver to use: 'anipose' (legacy) or 'pyceres' (new bundle adjustment).",+ )++ pyceres_solver_config: PyceresCalibrationSolverConfig = Field(+ default_factory=PyceresCalibrationSolverConfig,+ alias="pyceresSolverConfig",+ description="Configuration for the pyceres bundle adjustment solver. Only used when solver_method='pyceres'.",+ )++ use_groundplane: bool = Field(+ default=False,+ alias="useGroundplane",+ description="Align world frame to charuco board plane after calibration.",+ )++ @property+ def detector_config(self) -> CharucoDetectorConfig:+ return CharucoDetectorConfig(+ squares_x=self.charuco_board_x_squares,+ squares_y=self.charuco_board_y_squares,+ # square_length=self.charuco_square_length,+ )diff --git a/freemocap/core/pipeline/pipeline_configs/mocap_task_config.py b/freemocap/core/pipeline/pipeline_configs/mocap_task_config.pynew file mode 100644index 00000000..2efce7fa--- /dev/null+++ b/freemocap/core/pipeline/pipeline_configs/mocap_task_config.py@@ -0,0 +1,43 @@+from pydantic import BaseModel, ConfigDict, Field+from skellytracker.trackers.base_tracker.detector_annotation import DetectorConfig+from skellytracker.trackers.legacy_mediapipe_tracker import LegacyMediapipeDetectorConfig+from skellytracker.trackers.mediapipe_tracker import MediapipeDetectorConfig+from skellytracker.trackers.mediapipe_tracker.body.mediapipe_pose_config import MediapipePoseConfig+from skellytracker.trackers.mediapipe_tracker.mediapipe_model_manager import MediapipePoseModelComplexity++from freemocap.core.mocap.skeleton_dewiggler.realtime_skeleton_filter import RealtimeFilterConfig+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationSource+++class MocapPipelineConfig(BaseModel):+ model_config = ConfigDict(populate_by_name=True)++ detector_config: DetectorConfig = Field(default_factory=LegacyMediapipeDetectorConfig)+ realtime_filter_config: RealtimeFilterConfig = Field(default_factory=RealtimeFilterConfig)+ calibration_source: CalibrationSource = Field(+ default=CalibrationSource.MOST_RECENT,+ alias="calibrationSource",+ description="How to select the calibration: 'most_recent' uses the latest successful calibration, 'specified' uses calibration_toml_path.",+ )+ calibration_toml_path: str | None = Field(+ default=None,+ alias="calibrationTomlPath",+ description="Path to calibration TOML. Only used when calibration_source is 'specified'.",+ )++ force_reestimate_groundplane: bool = Field(+ default=False,+ alias="forceReestimateGroundplane",+ description="Re-estimate groundplane even if one was already applied during calibration.",+ )++ @classmethod+ def default_realtime(cls) -> "MocapPipelineConfig":+ # return cls(detector_config=RTMPoseDetectorConfig())+ return cls(detector_config=MediapipeDetectorConfig(+ pose_config=MediapipePoseConfig(model_complexity=MediapipePoseModelComplexity.LITE)+ ))++ @classmethod+ def default_posthoc(cls) -> "MocapPipelineConfig":+ return cls(detector_config=LegacyMediapipeDetectorConfig())diff --git a/freemocap/core/pipeline/pipeline_configs/realtime_pipeline_config.py b/freemocap/core/pipeline/pipeline_configs/realtime_pipeline_config.pynew file mode 100644index 00000000..22a3b551--- /dev/null+++ b/freemocap/core/pipeline/pipeline_configs/realtime_pipeline_config.py@@ -0,0 +1,27 @@+from pydantic import BaseModel, Field+from skellycam.core.camera.config.camera_config import CameraConfigs+from skellycam.core.types.type_overloads import CameraIdString++from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationPipelineConfig+from freemocap.core.pipeline.pipeline_configs.mocap_task_config import MocapPipelineConfig+++class RealtimePipelineConfig(BaseModel):+ camera_configs: CameraConfigs++ calibration_config: CalibrationPipelineConfig = Field(+ default_factory=CalibrationPipelineConfig,+ )+ mocap_config: MocapPipelineConfig = Field(+ default_factory=MocapPipelineConfig.default_realtime,+ )+ calibration_detection_enabled: bool = Field(default=True)+ mocap_detection_enabled: bool = Field(default=True)++ @property+ def camera_ids(self) -> list[CameraIdString]:+ return list(self.camera_configs.keys())++ @classmethod+ def from_camera_configs(cls, *, camera_configs: CameraConfigs) -> "RealtimePipelineConfig":+ return cls(camera_configs=camera_configs)diff --git a/freemocap/core/pipeline/posthoc/posthoc_pipeline_manager.py b/freemocap/core/pipeline/posthoc/posthoc_pipeline_manager.pyindex bdef190c..1eda65af 100644--- a/freemocap/core/pipeline/posthoc/posthoc_pipeline_manager.py+++ b/freemocap/core/pipeline/posthoc/posthoc_pipeline_manager.py@@ -18,7 +18,8 @@ from skellycam.core.recorders.videos.recording_info import RecordingInfofrom freemocap.core.calibration.calibration_task import run_calibration_taskfrom freemocap.core.mocap.posthoc_mocap_task import run_post_mocap_aggregation_task-from freemocap.core.pipeline.pipeline_configs import CalibrationPipelineConfig, MocapPipelineConfig+from freemocap.core.pipeline.pipeline_configs.calibration_task_config import CalibrationPipelineConfig+from freemocap.core.pipeline.pipeline_configs.mocap_task_config import MocapPipelineConfigfrom freemocap.core.pipeline.posthoc.posthoc_pipeline import PosthocPipelinefrom freemocap.core.types.type_overloads import PipelineIdStringdiff --git a/freemocap/core/pipeline/posthoc/video_node.py b/freemocap/core/pipeline/posthoc/video_node.pyindex 5ea224fc..72405bd7 100644--- a/freemocap/core/pipeline/posthoc/video_node.py+++ b/freemocap/core/pipeline/posthoc/video_node.py@@ -17,9 +17,9 @@ from pathlib import Pathimport cv2from skellycam.core.ipc.process_management.worker_registry import WorkerRegistryfrom skellytracker.trackers.base_tracker.base_tracker_abcs import BaseDetectorConfig+from skellytracker.trackers.base_tracker.helpers import create_detector_from_config, create_annotator_from_configfrom freemocap.core.pipeline.base_node import BaseNode-from freemocap.core.pipeline.pipeline_configs import create_detector_from_config, create_annotator_from_configfrom freemocap.core.pipeline.pipeline_ipc import PipelineIPCfrom freemocap.core.types.type_overloads import VideoIdString, TopicPublicationQueuefrom freemocap.pubsub.pubsub_manager import PubSubTopicManagerdiff --git a/freemocap/core/pipeline/realtime/realtime_aggregation_node.py b/freemocap/core/pipeline/realtime/realtime_aggregation_node.pyindex ed669798..b07c6643 100644--- a/freemocap/core/pipeline/realtime/realtime_aggregation_node.py+++ b/freemocap/core/pipeline/realtime/realtime_aggregation_node.py@@ -41,7 +41,7 @@ from freemocap.core.mocap.skeleton_dewiggler.realtime_skeleton_filter import ReaRealtimeSkeletonFilter, FilterResultfrom freemocap.core.pipeline.base_node import BaseNode-from freemocap.core.pipeline.pipeline_configs import RealtimePipelineConfig+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfigfrom freemocap.core.pipeline.pipeline_ipc import PipelineIPCfrom freemocap.core.types.type_overloads import TopicPublicationQueuefrom freemocap.pubsub.pubsub_manager import PubSubTopicManager@@ -237,6 +237,7 @@ class RealtimeAggregationNode(BaseNode):last_calibration_poll: float = time.monotonic()try:+ previous_tik = time.perf_counter()logger.debug(f"RealtimeAggregationNode [{camera_group_id}] entering main loop")while ipc.should_continue and not shutdown_self_flag.value:wait_1ms()@@ -305,7 +306,7 @@ class RealtimeAggregationNode(BaseNode):if isinstance(msg, CameraNodeOutputMessage)]if len(set(frame_numbers)) > 1:- raise ValueError(+ logger.warning(f"Frame number mismatch across cameras: {frame_numbers} "f"(expected {latest_requested_frame})")@@ -379,6 +380,10 @@ class RealtimeAggregationNode(BaseNode):# Convert to Point3d once at the end for the output messagetracked_points3d: dict[str, Point3d] = _arrays_to_point3d(point_arrays)+ now = time.perf_counter()+ loop_time = now - previous_tik+ previous_tik = now+ logger.trace(f"RealtimeAggregationNode [{camera_group_id}] loop time: {loop_time*1e3:.3f} ms")# ---- Publish aggregated output ----aggregation_output_pub.put(diff --git a/freemocap/core/pipeline/realtime/realtime_camera_node.py b/freemocap/core/pipeline/realtime/realtime_camera_node.pyindex a2d9a414..f3775f46 100644--- a/freemocap/core/pipeline/realtime/realtime_camera_node.py+++ b/freemocap/core/pipeline/realtime/realtime_camera_node.py@@ -16,7 +16,7 @@ from skellycam.core.types.type_overloads import CameraIdString, TopicSubscriptiofrom skellycam.utilities.wait_functions import wait_1msfrom freemocap.core.pipeline.base_node import BaseNode-from freemocap.core.pipeline.pipeline_configs import RealtimePipelineConfig+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfigfrom freemocap.core.pipeline.pipeline_ipc import PipelineIPCfrom freemocap.core.types.type_overloads import TopicPublicationQueuefrom freemocap.pubsub.pubsub_manager import PubSubTopicManagerdiff --git a/freemocap/core/pipeline/realtime/realtime_pipeline.py b/freemocap/core/pipeline/realtime/realtime_pipeline.pyindex 07bbfef6..c1981b9a 100644--- a/freemocap/core/pipeline/realtime/realtime_pipeline.py+++ b/freemocap/core/pipeline/realtime/realtime_pipeline.py@@ -18,7 +18,7 @@ from skellycam.core.camera_group.camera_group import CameraGroupfrom skellycam.core.ipc.process_management.worker_registry import WorkerRegistryfrom skellycam.core.types.type_overloads import CameraIdString, CameraGroupIdString-from freemocap.core.pipeline.pipeline_configs import RealtimePipelineConfig+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfigfrom freemocap.core.pipeline.pipeline_ipc import PipelineIPCfrom freemocap.core.pipeline.realtime.realtime_aggregation_node import RealtimeAggregationNodefrom freemocap.core.pipeline.realtime.realtime_camera_node import RealtimeCameraNode@@ -215,4 +215,4 @@ class RealtimePipeline:return (frames_bytearray,FrontendPayload.from_aggregation_output(aggregation_output=aggregation_output),- )\ No newline at end of file+ )diff --git a/freemocap/core/pipeline/realtime/realtime_pipeline_manager.py b/freemocap/core/pipeline/realtime/realtime_pipeline_manager.pyindex 1da0d3a8..23de1370 100644--- a/freemocap/core/pipeline/realtime/realtime_pipeline_manager.py+++ b/freemocap/core/pipeline/realtime/realtime_pipeline_manager.py@@ -19,7 +19,7 @@ from skellycam.core.camera_group.camera_group import CameraGroupfrom skellycam.core.ipc.process_management.worker_registry import WorkerRegistryfrom skellycam.core.types.type_overloads import CameraIdString-from freemocap.core.pipeline.pipeline_configs import RealtimePipelineConfig+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfigfrom freemocap.core.pipeline.realtime.realtime_pipeline import RealtimePipelinefrom freemocap.core.types.type_overloads import PipelineIdString, FrameNumberIntfrom freemocap.core.viz.frontend_payload import FrontendPayloaddiff --git a/freemocap/pubsub/pubsub_topics.py b/freemocap/pubsub/pubsub_topics.pyindex 10975669..b39360c1 100644--- a/freemocap/pubsub/pubsub_topics.py+++ b/freemocap/pubsub/pubsub_topics.py@@ -12,7 +12,7 @@ from skellycam.core.types.type_overloads import CameraGroupIdString, CameraIdStrfrom skellyforge.data_models.trajectory_3d import Point3dfrom skellytracker.trackers.base_tracker.base_tracker_abcs import BaseObservation-from freemocap.core.pipeline.pipeline_configs import RealtimePipelineConfig+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfigfrom freemocap.core.mocap.skeleton_dewiggler.dewiggling_methods.rigid_body_estimator import RigidBodyPosefrom freemocap.core.types.type_overloads import (FrameNumberInt,@@ -153,4 +153,4 @@ PipelineConfigUpdateTopic = create_topic(PipelineConfigUpdateMessage)CameraNodeOutputTopic = create_topic(CameraNodeOutputMessage)VideoNodeOutputTopic = create_topic(VideoNodeOutputMessage)AggregationNodeOutputTopic = create_topic(AggregationNodeOutputMessage)-PosthocProgressTopic = create_topic(PosthocProgressMessage)\ No newline at end of file+PosthocProgressTopic = create_topic(PosthocProgressMessage)diff --git a/freemocap/tests/test_schema_contract.py b/freemocap/tests/test_schema_contract.pyindex b17e29ea..74678606 100644--- a/freemocap/tests/test_schema_contract.py+++ b/freemocap/tests/test_schema_contract.py@@ -21,8 +21,8 @@ from freemocap.core.pipeline.pipeline_configs import (CalibrationPipelineConfig,CalibrationSolverMethod,MocapPipelineConfig,- RealtimePipelineConfig,)+from freemocap.core.pipeline.pipeline_configs.realtime_pipeline_config import RealtimePipelineConfigfrom freemocap.core.mocap.skeleton_dewiggler.realtime_skeleton_filter import RealtimeFilterConfigfrom freemocap.core.mocap.skeleton_dewiggler.dewiggling_methods.bone_length_estimator import EstimatorConfig@@ -440,4 +440,4 @@ class TestCalibrationSolverMethodEnum:assert CalibrationSolverMethod.PYCERES.value == "pyceres"def test_only_two_members(self) -> None:- assert len(CalibrationSolverMethod) == 2\ No newline at end of file+ assert len(CalibrationSolverMethod) == 2diff --git a/pyproject.toml b/pyproject.tomlindex 02ddd02f..e86cddf2 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -15,11 +15,16 @@ dependencies = ["scikit-learn>=1.7.2","pyceres>=2.5","tomli-w>=1.2.0",+# "rtmlib==0.0.14",+# "onnxruntime-gpu",+ #sub-skellies"freemocap_blender_addon","skellycam","skellyforge","skellytracker[mediapipe]",++ #skelly utils"skellylogs","skellypings",diff --git a/uv.lock b/uv.lockindex b3b61ad4..84928e33 100644--- a/uv.lock+++ b/uv.lock@@ -1762,7 +1762,7 @@ wheels = [[[package]]name = "pytest"-version = "9.0.2"+version = "9.0.3"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "colorama", marker = "sys_platform == 'win32'" },@@ -1771,9 +1771,9 @@ dependencies = [{ name = "pluggy" },{ name = "pygments" },]-sdist = { url = "https://files.pythonhosted.org/packages/d1/db/7ef3487e0fb0049ddb5ce41d3a49c235bf9ad299b6a25d5780a89f19230f/pytest-9.0.2.tar.gz", hash = "sha256:75186651a92bd89611d1d9fc20f0b4345fd827c41ccd5c299a868a05d70edf11", size = 1568901, upload-time = "2025-12-06T21:30:51.014Z" }+sdist = { url = "https://files.pythonhosted.org/packages/7d/0d/549bd94f1a0a402dc8cf64563a117c0f3765662e2e668477624baeec44d5/pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c", size = 1572165, upload-time = "2026-04-07T17:16:18.027Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/3b/ab/b3226f0bd7cdcf710fbede2b3548584366da3b19b5021e74f5bde2a8fa3f/pytest-9.0.2-py3-none-any.whl", hash = "sha256:711ffd45bf766d5264d487b917733b453d917afd2b0ad65223959f59089f875b", size = 374801, upload-time = "2025-12-06T21:30:49.154Z" },+ { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" },][[package]]@@ -2109,7 +2109,7 @@ wheels = [[[package]]name = "skellycam"version = "2.0.0a1"-source = { git = "https://github.com/freemocap/skellycam?branch=development#a85ec9a048ed54eeac8cd5e46ad24ccf91f5c65f" }+source = { git = "https://github.com/freemocap/skellycam?branch=development#3abd254c7045834890fb2d393eb3b62ffb822a63" }dependencies = [{ name = "av" },{ name = "cv2-enumerate-cameras" },@@ -2165,7 +2165,7 @@ dependencies = [[[package]]name = "skellytracker"version = "2024.9.1019"-source = { git = "https://github.com/freemocap/skellytracker?branch=development#e3a110b0bf48a60c262e5f246a0618c094c9973a" }+source = { git = "https://github.com/freemocap/skellytracker?branch=development#29cb9a629d467d0d6f408d9e4931b4fe0eb2da5a" }dependencies = [{ name = "numpy" },{ name = "numpydantic" },