Free Motion Capture for Everyone πβ¨
TypeScript
wtf is happening with git rn?
jonmatthis3a2a14874b37
diff --git a/freemocap/freemocap_app/freemocap_app_state.py b/freemocap/freemocap_app/freemocap_app_state.pyindex d429aa19..aa68fb3f 100644--- a/freemocap/freemocap_app/freemocap_app_state.py+++ b/freemocap/freemocap_app/freemocap_app_state.py@@ -43,7 +43,7 @@ class FreemocapAppState:if not self.frame_escape_shm:raise ValueError("Cannot create image processing server without frame escape shared memory!")self.pipeline_shutdown_event.clear()- return DummyProcessingServer.create(camera_shm_dtos=self.skellycam_app_state.camera_group.camera_configs,+ return DummyProcessingServer.create(camera_shm_dtos=self.skellycam_app_state.camera_ring_buffer_shms,pipeline_config=DummyPipelineConfig.create(camera_ids=self.skellycam_app_state.camera_group.camera_ids),shutdown_event=self.pipeline_shutdown_event,diff --git a/freemocap/pipelines/dummy_pipeline.py b/freemocap/pipelines/dummy_pipeline.pyindex d74ae34b..a2a96bc6 100644--- a/freemocap/pipelines/dummy_pipeline.py+++ b/freemocap/pipelines/dummy_pipeline.py@@ -8,28 +8,26 @@ from skellycam.core.camera_group.shmorchestrator.shared_memory.ring_buffer_camerRingBufferCameraSharedMemoryfrom freemocap.pipelines.pipeline_abcs import CameraProcessingNode, PipelineStageConfig, logger, PipelineData, \- AggregationProcessNode, PipelineConfig, CameraGroupProcessingPipeline, CameraGroupProcessingServer, StageConfigKeys+ AggregationProcessNode, PipelineConfig, CameraGroupProcessingPipeline, CameraGroupProcessingServerclass DummyCameraPipelineConfig(PipelineStageConfig):- pass+ param1: int = 1class DummyAggregationProcessConfig(PipelineStageConfig):- pass+ param2: int = 2class DummyPipelineConfig(PipelineConfig):- stage_configs: Dict[CameraId, PipelineStageConfig] = {- StageConfigKeys.CAMERA_PROCESSES: Dict[CameraId, DummyCameraPipelineConfig],- StageConfigKeys.AGGREGATION_PROCESS: DummyAggregationProcessConfig}+ camera_node_configs: dict[CameraId, DummyCameraPipelineConfig]+ aggregation_node_config: DummyAggregationProcessConfig+@classmethoddef create(cls, camera_ids: list[CameraId]):- camera_processes = {camera_id: DummyCameraPipelineConfig() for camera_id in camera_ids}- return cls(stage_configs={StageConfigKeys.CAMERA_PROCESSES: camera_processes,- StageConfigKeys.AGGREGATION_PROCESS: DummyAggregationProcessConfig()})-+ return cls(camera_node_configs={camera_id: DummyCameraPipelineConfig() for camera_id in camera_ids},+ aggregation_node_config=DummyAggregationProcessConfig())class DummyCameraProcessingNode(CameraProcessingNode):@@ -48,7 +46,6 @@ class DummyCameraProcessingNode(CameraProcessingNode):# TODO - process imageoutput_queue.put(PipelineData(data=image))-class DummyAggregationProcessNode(AggregationProcessNode):@staticmethod@@ -67,13 +64,11 @@ class DummyAggregationProcessNode(AggregationProcessNode):# TODO - process aggregated dataoutput_queue.put(PipelineData(data=data_by_camera_id))-class DummyProcessingPipeline(CameraGroupProcessingPipeline):config: DummyPipelineConfigcamera_processes: Dict[CameraId, DummyCameraProcessingNode]aggregation_process: DummyAggregationProcessNode-class DummyProcessingServer(CameraGroupProcessingServer):processing_pipeline: DummyProcessingPipelinepipeline_config: DummyPipelineConfigdiff --git a/freemocap/pipelines/pipeline_abcs.py b/freemocap/pipelines/pipeline_abcs.pyindex 24a2f0ec..7179f35e 100644--- a/freemocap/pipelines/pipeline_abcs.py+++ b/freemocap/pipelines/pipeline_abcs.py@@ -1,11 +1,11 @@import loggingimport multiprocessing-from abc import ABC, abstractmethod+from abc import ABC+from dataclasses import dataclassfrom enum import Enumfrom multiprocessing import Process, Queue-from typing import Dict-from pydantic import BaseModel, Field, ConfigDict+from pydantic import BaseModel, Field, ConfigDict, PrivateAttrfrom skellycam.core import CameraIdfrom skellycam.core.camera_group.shmorchestrator.shared_memory.ring_buffer_camera_shared_memory import \RingBufferCameraSharedMemory, RingBufferCameraSharedMemoryDTO@@ -26,27 +26,32 @@ class PipelineStageConfig(BaseModel, ABC):class PipelineConfig(BaseModel, ABC):- stage_configs: Dict[str, PipelineStageConfig] = Field(default_factory=dict)+ camera_node_configs: dict[CameraId, PipelineStageConfig] = Field(default_factory=dict)+ aggregation_node_config: PipelineStageConfig = Field(default_factory=PipelineStageConfig)++ @classmethod+ def create(cls, camera_ids: list[CameraId]):+ return cls(camera_node_configs={camera_id: PipelineStageConfig() for camera_id in camera_ids},+ aggregation_node_config=PipelineStageConfig())class CameraGroupPipelineConfig(PipelineConfig):- stage_configs: Dict[str, PipelineStageConfig] = {- StageConfigKeys.CAMERA_PROCESSES: Dict[CameraId, PipelineStageConfig],- StageConfigKeys.AGGREGATION_PROCESS: PipelineStageConfig}+ stage_configs: dict[str, PipelineStageConfig] = {+ StageConfigKeys.CAMERA_PROCESSES.value: dict[CameraId, PipelineStageConfig],+ StageConfigKeys.AGGREGATION_PROCESS.value: PipelineStageConfig}class PipelineData(BaseModel, ABC):data: objectmetadata: dict[object, object] = Field(default_factory=dict)--class CameraProcessingNode(BaseModel, ABC):- model_config = ConfigDict(arbitrary_types_allowed=True)+@dataclass+class CameraProcessingNode(ABC):config: PipelineStageConfigcamera_id: CameraId- process: Process- output_queue: Queuecamera_ring_shm: RingBufferCameraSharedMemory++ process: Processshutdown_event: multiprocessing.Event@classmethod@@ -56,12 +61,15 @@ class CameraProcessingNode(BaseModel, ABC):camera_ring_shm_dto: RingBufferCameraSharedMemoryDTO,output_queue: Queue,shutdown_event: multiprocessing.Event):- return cls(camera_id=camera_id,+ return cls(config=config,+ camera_id=camera_id,camera_ring_shm=RingBufferCameraSharedMemory.recreate(dto=camera_ring_shm_dto,read_only=False),+ process=Process(target=cls._run, args=(config,+ camera_ring_shm_dto,+ output_queue)),shutdown_event=shutdown_event,- process=Process(target=cls._run, args=(config, camera_ring_shm_dto, output_queue)),- config=config)+ )def intake_data(self, frame_payload: FramePayload):self.camera_ring_shm.put_frame(frame_payload.image, frame_payload.metadata)@@ -85,19 +93,18 @@ class CameraProcessingNode(BaseModel, ABC):def join(self):self.process.join()--class AggregationProcessNode(BaseModel, ABC):- model_config = ConfigDict(arbitrary_types_allowed=True)+@dataclass+class AggregationProcessNode(ABC):config: PipelineStageConfigprocess: Process- input_queues: Dict[CameraId, Queue]+ input_queues: dict[CameraId, Queue]output_queue: Queueshutdown_event: multiprocessing.Event@classmethoddef create(cls,config: PipelineConfig,- input_queues: Dict[CameraId, Queue],+ input_queues: dict[CameraId, Queue],output_queue: Queue,shutdown_event: multiprocessing.Event):return cls(config=config,@@ -108,11 +115,13 @@ class AggregationProcessNode(BaseModel, ABC):@staticmethoddef _run(config: PipelineConfig,- input_queues: Dict[CameraId, Queue],+ input_queues: dict[CameraId, Queue],output_queue: Queue,shutdown_event: multiprocessing.Event):pass++def start(self):logger.debug(f"Starting {self.__class__.__name__}")self.process.start()@@ -126,30 +135,31 @@ class AggregationProcessNode(BaseModel, ABC):self.process.join()-class CameraGroupProcessingPipeline(BaseModel, ABC):+@dataclass+class CameraGroupProcessingPipeline(ABC):model_config = ConfigDict(arbitrary_types_allowed=True)config: PipelineConfig- camera_processes: Dict[CameraId, CameraProcessingNode]+ camera_processes: dict[CameraId, CameraProcessingNode]aggregation_process: AggregationProcessNode- output_queue: Queueshutdown_event: multiprocessing.Event+@classmethoddef create(cls,config: PipelineConfig,- camera_shm_dtos: Dict[CameraId, RingBufferCameraSharedMemoryDTO],+ camera_shm_dtos: dict[CameraId, RingBufferCameraSharedMemoryDTO],shutdown_event: multiprocessing.Event):- camera_process_configs = config.stage_configs.get("camera_processes", {})- aggregation_process_config = config.stage_configs.get("aggregation_process", {})+ if not all(camera_id in camera_shm_dtos.keys() for camera_id in config.camera_node_configs.keys()):+ raise ValueError("Camera IDs provided in config not in camera shared memory DTOS!")camera_output_queues = {camera_id: Queue() for camera_id in camera_shm_dtos.keys()}aggregation_output_queue = Queue()- camera_processes = {camera_id: CameraProcessingNode.create(config=camera_process_configs.get(camera_id, {}),- camera_id=camera_id,+ camera_processes = {camera_id: CameraProcessingNode.create(config=config,+ camera_id=CameraId(camera_id),camera_ring_shm_dto=camera_shm_dtos[camera_id],output_queue=camera_output_queues[camera_id],shutdown_event=shutdown_event)- for camera_id in camera_process_configs.keys()}- aggregation_process = AggregationProcessNode.create(config=aggregation_process_config,+ for camera_id, config in config.camera_node_configs.items()}+ aggregation_process = AggregationProcessNode.create(config=config.aggregation_node_config,input_queues=camera_output_queues,output_queue=aggregation_output_queue,shutdown_event=shutdown_event)@@ -157,7 +167,6 @@ class CameraGroupProcessingPipeline(BaseModel, ABC):return cls(config=config,camera_processes=camera_processes,aggregation_process=aggregation_process,- output_queue=aggregation_process.output_queue,shutdown_event=shutdown_event,)@@ -180,17 +189,20 @@ class CameraGroupProcessingPipeline(BaseModel, ABC):for camera_id, camera_process in self.camera_processes.items():camera_process.join()--class CameraGroupProcessingServer(BaseModel, ABC):+@dataclass+class CameraGroupProcessingServer(ABC):model_config = ConfigDict(arbitrary_types_allowed=True)- processing_pipeline: CameraGroupProcessingPipelinepipeline_config: PipelineConfig+ processing_pipeline: CameraGroupProcessingPipelineshutdown_event: multiprocessing.Event+ def intake_data(self, multiframe_payload: MultiFramePayload):+ self.processing_pipeline.intake_data(multiframe_payload)+@classmethoddef create(cls,pipeline_config: PipelineConfig,- camera_shm_dtos: Dict[CameraId, RingBufferCameraSharedMemoryDTO],+ camera_shm_dtos: dict[CameraId, RingBufferCameraSharedMemoryDTO],shutdown_event: multiprocessing.Event):return cls(processing_pipeline=CameraGroupProcessingPipeline.create(config=pipeline_config,camera_shm_dtos=camera_shm_dtos,@@ -198,9 +210,6 @@ class CameraGroupProcessingServer(BaseModel, ABC):pipeline_config=pipeline_config,shutdown_event=shutdown_event)- def intake_data(self, multiframe_payload: MultiFramePayload):- self.processing_pipeline.intake_data(multiframe_payload)-def start(self):logger.debug(f"Starting {self.__class__.__name__}...")self.processing_pipeline.start()diff --git a/uv.lock b/uv.lockindex 997d1812..647ee525 100644--- a/uv.lock+++ b/uv.lock@@ -207,14 +207,14 @@ wheels = [[[package]]name = "click"-version = "8.1.7"+version = "8.1.8"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "colorama", marker = "platform_system == 'Windows'" },]-sdist = { url = "https://files.pythonhosted.org/packages/96/d3/f04c7bfcf5c1862a2a5b845c6b2b360488cf47af55dfa79c98f6a6bf98b5/click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de", size = 336121 }+sdist = { url = "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a", size = 226593 }wheels = [- { url = "https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", size = 97941 },+ { url = "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2", size = 98188 },][[package]]