Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

seems to run :)

jonmatthisb7718495d029
diff --git a/freemocap/api/websocket/websocket_server.py b/freemocap/api/websocket/websocket_server.py
index 697144dc..7f11ee1a 100644
--- a/freemocap/api/websocket/websocket_server.py
+++ b/freemocap/api/websocket/websocket_server.py
@@ -112,7 +112,7 @@ class FreemocapWebsocketServer:
latest_mf_number = -1
camera_group_uuid = self._freemocap_app_state.skellycam_app_state.camera_group.uuid
if processing_server:
- processing_server.shutdown()
+ processing_server.shutdown_pipeline()
processing_server = self._freemocap_app_state.create_processing_server()
processing_server.start()
@@ -127,7 +127,7 @@ class FreemocapWebsocketServer:
if processing_server:
- mf_payload = processing_server.intake_data(mf_payload, annotate_images=True)
+ processing_server.intake_data(mf_payload)
await self._send_frontend_payload(mf_payload)
diff --git a/freemocap/freemocap_app/freemocap_app_state.py b/freemocap/freemocap_app/freemocap_app_state.py
index d34ea60a..518a4b8f 100644
--- a/freemocap/freemocap_app/freemocap_app_state.py
+++ b/freemocap/freemocap_app/freemocap_app_state.py
@@ -10,7 +10,9 @@ from skellycam.core.camera_group.shmorchestrator.shared_memory.single_slot_camer
from skellycam.skellycam_app.skellycam_app_controller.skellycam_app_controller import create_skellycam_app_controller
from skellycam.skellycam_app.skellycam_app_state import SkellycamAppState, get_skellycam_app_state
-from freemocap.pipelines.dummy_pipeline import DummyProcessingServer, DummyPipelineConfig
+from freemocap.pipelines.calibration_pipeline.calibration_pipeline_main import CalibrationPipelineConfig, \
+ CalibrationProcessingServer
+from freemocap.pipelines.pipeline_abcs import BaseProcessingServer
logger = logging.getLogger(__name__)
@@ -57,14 +59,21 @@ class FreemocapAppState:
self.camera_group_shm = SingleSlotCameraGroupSharedMemory.create(camera_configs=self.camera_configs,
read_only=True)
- def create_processing_server(self) -> DummyProcessingServer:
+ def create_processing_server(self) -> BaseProcessingServer:
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(
- pipeline_config=DummyPipelineConfig.create(camera_configs=self.camera_configs),
+ # if processing_server_type == ProcessingServerTypes.DUMMY:
+ # return processing_server_type.value.create(
+ # pipeline_config=DummyPipelineConfig.create(camera_configs=self.camera_configs),
+ # camera_shm_dtos=self.get_camera_shm_dtos(),
+ # shutdown_event=self.pipeline_shutdown_event,
+ # )
+
+ return CalibrationProcessingServer.create(
+ pipeline_config=CalibrationPipelineConfig.create(camera_configs=self.camera_configs),
camera_shm_dtos=self.get_camera_shm_dtos(),
shutdown_event=self.pipeline_shutdown_event,
)
@@ -77,7 +86,7 @@ class FreemocapAppState:
self.camera_group_shm.close_and_unlink()
-FREEMOCAP_APP_STATE: Optional[FreemocapAppState] = None
+FREEMOCAP_APP_STATE: FreemocapAppState|None = None
def create_freemocap_app_state(global_kill_flag: multiprocessing.Value) -> FreemocapAppState:
diff --git a/freemocap/pipelines/calibration_pipeline/calibration_camera_node.py b/freemocap/pipelines/calibration_pipeline/calibration_camera_node.py
index 9243937b..553377e2 100644
--- a/freemocap/pipelines/calibration_pipeline/calibration_camera_node.py
+++ b/freemocap/pipelines/calibration_pipeline/calibration_camera_node.py
@@ -10,32 +10,32 @@ from skellycam.core.camera_group.shmorchestrator.shared_memory.single_slot_camer
from skellycam.core.frames.payloads.metadata.frame_metadata_enum import FRAME_METADATA_MODEL
from skellytracker import SkellyTrackerTypes
-from freemocap.pipelines.pipeline_abcs import CameraProcessingNode, PipelineStageConfig, PipelineData
+from freemocap.pipelines.pipeline_abcs import BaseCameraNode, BasePipelineStageConfig, BasePipelineData
logger = logging.getLogger(__name__)
-class CalibrationPipelineAggregationLayerOutputData(PipelineData):
+class CalibrationPipelineAggregationLayerOutputData(BasePipelineData):
pass
-class CalibrationPipelineAggregationNodeConfig(PipelineStageConfig):
+class CalibrationPipelineAggregationNodeConfig(BasePipelineStageConfig):
param2: int = 2
-class CalibrationPipelineCameraNodeConfig(PipelineStageConfig):
+class CalibrationPipelineCameraNodeConfig(BasePipelineStageConfig):
camera_config: CameraConfig
param1: int = 1
-class CalibrationCameraNodeOutputData(PipelineData):
+class CalibrationCameraNodeOutputData(BasePipelineData):
data: object
-class CalibrationCameraProcessingNode(CameraProcessingNode):
+class CalibrationCameraNode(BaseCameraNode):
@classmethod
def create(cls,
camera_id: CameraId,
diff --git a/freemocap/pipelines/calibration_pipeline/calibration_pipeline_main.py b/freemocap/pipelines/calibration_pipeline/calibration_pipeline_main.py
index babd3cb7..a637979c 100644
--- a/freemocap/pipelines/calibration_pipeline/calibration_pipeline_main.py
+++ b/freemocap/pipelines/calibration_pipeline/calibration_pipeline_main.py
@@ -13,36 +13,36 @@ from skellytracker import SkellyTrackerTypes
from skellytracker.trackers.charuco_tracker.charuco_annotator import CharucoImageAnnotator
from freemocap.pipelines.calibration_pipeline.calibration_camera_node import CalibrationPipelineCameraNodeConfig, \
- CalibrationCameraNodeOutputData, CalibrationCameraProcessingNode
-from freemocap.pipelines.pipeline_abcs import PipelineStageConfig, PipelineData, \
- AggregationProcessNode, PipelineConfig, CameraGroupProcessingPipeline, CameraGroupProcessingServer
+ CalibrationCameraNodeOutputData, CalibrationCameraNode
+from freemocap.pipelines.pipeline_abcs import BasePipelineStageConfig, BasePipelineData, \
+ BaseAggregationNode, BasePipelineConfig, BaseProcessingPipeline, BaseProcessingServer
logger = logging.getLogger(__name__)
-class CalibrationPipelineAggregationLayerOutputData(PipelineData):
+class CalibrationPipelineOutputData(BasePipelineData):
pass
-class CalibrationPipelineAggregationNodeConfig(PipelineStageConfig):
+class CalibrationAggregationNodeConfig(BasePipelineStageConfig):
param2: int = 2
-class CalibrationPipelineConfig(PipelineConfig):
+class CalibrationPipelineConfig(BasePipelineConfig):
camera_node_configs: dict[CameraId, CalibrationPipelineCameraNodeConfig]
- aggregation_node_config: CalibrationPipelineAggregationNodeConfig
+ aggregation_node_config: CalibrationAggregationNodeConfig
@classmethod
def create(cls, camera_configs: CameraConfigs):
return cls(camera_node_configs={camera_id: CalibrationPipelineCameraNodeConfig(camera_config=camera_config) for
camera_id, camera_config in camera_configs.items()},
- aggregation_node_config=CalibrationPipelineAggregationNodeConfig())
+ aggregation_node_config=CalibrationAggregationNodeConfig())
-class CalibrationAggregationProcessNode(AggregationProcessNode):
+class CalibrationAggregationProcessNode(BaseAggregationNode):
@classmethod
def create(cls,
- config: PipelineConfig,
+ config: CalibrationAggregationNodeConfig,
input_queues: dict[CameraId, Queue],
output_queue: Queue,
shutdown_event: multiprocessing.Event):
@@ -58,13 +58,15 @@ class CalibrationAggregationProcessNode(AggregationProcessNode):
shutdown_event=shutdown_event)
@staticmethod
- def _run(config: PipelineConfig, input_queues: Dict[CameraId, Queue], output_queue: Queue,
+ def _run(config: CalibrationAggregationNodeConfig,
+ input_queues: Dict[CameraId, Queue],
+ output_queue: Queue,
shutdown_event: multiprocessing.Event):
try:
while not shutdown_event.is_set():
- data_by_camera_id: dict[CameraId, CalibrationCameraProcessingNode | None] = {camera_id: None for
- camera_id in
- input_queues.keys()}
+ data_by_camera_id: dict[CameraId, CalibrationCameraNode | None] = {camera_id: None for
+ camera_id in
+ input_queues.keys()}
while any([input_queues[camera_id] is None for camera_id in input_queues.keys()]):
time.sleep(0.001)
for camera_id in input_queues.keys():
@@ -79,11 +81,9 @@ class CalibrationAggregationProcessNode(AggregationProcessNode):
f"Unexpected camera ID received from camera {camera_id}: {camera_node_output.camera_id}")
data_by_camera_id[camera_id] = camera_node_output
- print(
- f"Aggregation layer received from cameras: {data_by_camera_id.keys()} with data: {data_by_camera_id.values()}")
if len(data_by_camera_id) == len(input_queues):
# TODO - process aggregated data
- output_queue.put(CalibrationPipelineAggregationLayerOutputData(data=data_by_camera_id))
+ output_queue.put(CalibrationPipelineOutputData(data=data_by_camera_id))
else:
raise ValueError("Not all camera data received!")
except Exception as e:
@@ -93,16 +93,17 @@ class CalibrationAggregationProcessNode(AggregationProcessNode):
logger.trace(f"Shutting down aggregation processing node")
shutdown_event.set()
+
@dataclass
-class CalibrationPipeline(CameraGroupProcessingPipeline):
+class CalibrationPipeline(BaseProcessingPipeline):
config: CalibrationPipelineConfig
- camera_nodes: Dict[CameraId, CalibrationCameraProcessingNode]
+ camera_nodes: Dict[CameraId, CalibrationCameraNode]
aggregation_node: CalibrationAggregationProcessNode
annotator: CharucoImageAnnotator
@classmethod
def create(cls,
- config: PipelineConfig,
+ config: CalibrationPipelineConfig,
camera_shm_dtos: CameraSharedMemoryDTOs,
shutdown_event: multiprocessing.Event):
if not all(camera_id in camera_shm_dtos.keys() for camera_id in config.camera_node_configs.keys()):
@@ -110,26 +111,26 @@ class CalibrationPipeline(CameraGroupProcessingPipeline):
camera_output_queues = {camera_id: Queue() for camera_id in camera_shm_dtos.keys()}
aggregation_output_queue = Queue()
- camera_nodes = {camera_id: CalibrationCameraProcessingNode.create(config=config,
- camera_id=CameraId(camera_id),
- camera_shm_dto=camera_shm_dtos[camera_id],
- output_queue=camera_output_queues[camera_id],
- shutdown_event=shutdown_event)
- for camera_id, config in config.camera_node_configs.items()}
- aggregation_process = CalibrationAggregationProcessNode.create(config=config.aggregation_node_config,
- input_queues=camera_output_queues,
- output_queue=aggregation_output_queue,
- shutdown_event=shutdown_event)
- annotator = SkellyTrackerTypes.CHARUCO.value.create().annotator, # NOTE - not the same annotator as the one that will be created in the tracker, but will be able to process its outputs
return cls(config=config,
- camera_nodes=camera_nodes,
- aggregation_node=aggregation_process,
- annotator=annotator,
+ camera_nodes={camera_id: CalibrationCameraNode.create(config=config,
+ camera_id=CameraId(camera_id),
+ camera_shm_dto=camera_shm_dtos[
+ camera_id],
+ output_queue=camera_output_queues[
+ camera_id],
+ shutdown_event=shutdown_event)
+ for camera_id, config in config.camera_node_configs.items()},
+ aggregation_node=CalibrationAggregationProcessNode.create(config=config.aggregation_node_config,
+ input_queues=camera_output_queues,
+ output_queue=aggregation_output_queue,
+ shutdown_event=shutdown_event),
+ # NOTE - this `annotator` is not the same annotator as the one that will be created in the tracker, but will be able to process its outputs
+ annotator=SkellyTrackerTypes.CHARUCO.value.create().annotator,
shutdown_event=shutdown_event,
)
-class CalibrationProcessingServer(CameraGroupProcessingServer):
+class CalibrationProcessingServer(BaseProcessingServer):
processing_pipeline: CalibrationPipeline
pipeline_config: CalibrationPipelineConfig
diff --git a/freemocap/pipelines/dummy_pipeline.py b/freemocap/pipelines/dummy_pipeline.py
index 30204aa2..cf3f82fe 100644
--- a/freemocap/pipelines/dummy_pipeline.py
+++ b/freemocap/pipelines/dummy_pipeline.py
@@ -12,29 +12,29 @@ from skellycam.core.camera_group.shmorchestrator.shared_memory.single_slot_camer
CameraSharedMemoryDTO, SingleSlotCameraSharedMemory
from skellycam.core.frames.payloads.metadata.frame_metadata_enum import FRAME_METADATA_MODEL
-from freemocap.pipelines.pipeline_abcs import CameraProcessingNode, PipelineStageConfig, PipelineData, \
- AggregationProcessNode, PipelineConfig, CameraGroupProcessingPipeline, CameraGroupProcessingServer
+from freemocap.pipelines.pipeline_abcs import BaseCameraNode, BasePipelineStageConfig, BasePipelineData, \
+ BaseAggregationNode, BasePipelineConfig, BaseProcessingPipeline, BaseProcessingServer
logger = logging.getLogger(__name__)
-class DummyPipelineCameraLayerOutputData(PipelineData):
+class DummyPipelineCameraLayerOutputData(BasePipelineData):
data: object
-class DummyPipelineAggregationLayerOutputData(PipelineData):
+class DummyPipelineAggregationLayerOutputData(BasePipelineData):
pass
-class DummyPipelineCameraNodeConfig(PipelineStageConfig):
+class DummyPipelineCameraNodeConfig(BasePipelineStageConfig):
camera_config: CameraConfig
param1: int = 1
-class DummyPipelineAggregationNodeConfig(PipelineStageConfig):
+class DummyPipelineAggregationNodeConfig(BasePipelineStageConfig):
param2: int = 2
-class DummyPipelineConfig(PipelineConfig):
+class DummyPipelineConfig(BasePipelineConfig):
camera_node_configs: dict[CameraId, DummyPipelineCameraNodeConfig]
aggregation_node_config: DummyPipelineAggregationNodeConfig
@@ -44,7 +44,7 @@ class DummyPipelineConfig(PipelineConfig):
aggregation_node_config=DummyPipelineAggregationNodeConfig())
-class DummyCameraProcessingNode(CameraProcessingNode):
+class DummyCameraProcessingNode(BaseCameraNode):
@classmethod
def create(cls,
camera_id: CameraId,
@@ -98,10 +98,10 @@ class DummyCameraProcessingNode(CameraProcessingNode):
camera_ring_shm.close()
-class DummyAggregationProcessNode(AggregationProcessNode):
+class DummyAggregationProcessNode(BaseAggregationNode):
@classmethod
def create(cls,
- config: PipelineConfig,
+ config: DummyPipelineAggregationNodeConfig,
input_queues: dict[CameraId, Queue],
output_queue: Queue,
shutdown_event: multiprocessing.Event):
@@ -117,7 +117,7 @@ class DummyAggregationProcessNode(AggregationProcessNode):
shutdown_event=shutdown_event)
@staticmethod
- def _run(config: PipelineConfig, input_queues: Dict[CameraId, Queue], output_queue: Queue,
+ def _run(config: DummyPipelineAggregationNodeConfig, input_queues: Dict[CameraId, Queue], output_queue: Queue,
shutdown_event: multiprocessing.Event):
try:
while not shutdown_event.is_set():
@@ -134,8 +134,6 @@ class DummyAggregationProcessNode(AggregationProcessNode):
raise ValueError(f"Unexpected camera ID received from camera {camera_id}: {camera_node_output.camera_id}")
data_by_camera_id[camera_id] = camera_node_output
- print(
- f"Aggregation layer received from cameras: {data_by_camera_id.keys()} with data: {data_by_camera_id.values()}")
if len(data_by_camera_id) == len(input_queues):
# TODO - process aggregated data
output_queue.put(DummyPipelineAggregationLayerOutputData(data=data_by_camera_id))
@@ -149,14 +147,14 @@ class DummyAggregationProcessNode(AggregationProcessNode):
shutdown_event.set()
-class DummyProcessingPipeline(CameraGroupProcessingPipeline):
+class DummyPipeline(BaseProcessingPipeline):
config: DummyPipelineConfig
camera_nodes: Dict[CameraId, DummyCameraProcessingNode]
aggregation_node: DummyAggregationProcessNode
@classmethod
def create(cls,
- config: PipelineConfig,
+ config: DummyPipelineConfig,
camera_shm_dtos: CameraSharedMemoryDTOs,
shutdown_event: multiprocessing.Event):
if not all(camera_id in camera_shm_dtos.keys() for camera_id in config.camera_node_configs.keys()):
@@ -181,8 +179,8 @@ class DummyProcessingPipeline(CameraGroupProcessingPipeline):
)
-class DummyProcessingServer(CameraGroupProcessingServer):
- processing_pipeline: DummyProcessingPipeline
+class DummyProcessingServer(BaseProcessingServer):
+ processing_pipeline: DummyPipeline
pipeline_config: DummyPipelineConfig
@classmethod
@@ -190,7 +188,7 @@ class DummyProcessingServer(CameraGroupProcessingServer):
pipeline_config: DummyPipelineConfig,
camera_shm_dtos: CameraSharedMemoryDTOs,
shutdown_event: multiprocessing.Event):
- processing_pipeline = DummyProcessingPipeline.create(
+ processing_pipeline = DummyPipeline.create(
config=pipeline_config,
camera_shm_dtos=camera_shm_dtos,
shutdown_event=shutdown_event,
diff --git a/freemocap/pipelines/pipeline_abcs.py b/freemocap/pipelines/pipeline_abcs.py
index d85160a7..ae64e937 100644
--- a/freemocap/pipelines/pipeline_abcs.py
+++ b/freemocap/pipelines/pipeline_abcs.py
@@ -24,34 +24,31 @@ class ReadTypes(str, Enum):
NEXT = "next"
-class PipelineStageConfig(BaseModel, ABC):
+class BasePipelineStageConfig(BaseModel, ABC):
model_config = ConfigDict(arbitrary_types_allowed=True)
pass
-class PipelineConfig(BaseModel, ABC):
- camera_node_configs: dict[CameraId, PipelineStageConfig] = Field(default_factory=dict)
- aggregation_node_config: PipelineStageConfig = Field(default_factory=PipelineStageConfig)
+class BasePipelineConfig(BaseModel, ABC):
+ camera_node_configs: dict[CameraId, BasePipelineStageConfig] = Field(default_factory=dict)
+ aggregation_node_config: BasePipelineStageConfig = Field(default_factory=BasePipelineStageConfig)
@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())
+ return cls(camera_node_configs={camera_id: BasePipelineStageConfig() for camera_id in camera_ids},
+ aggregation_node_config=BasePipelineStageConfig())
-class CameraGroupPipelineConfig(PipelineConfig):
- camera_node_configs: dict[CameraId, PipelineStageConfig]
- aggregation_node_configs: PipelineStageConfig
-class PipelineData(BaseModel, ABC):
+class BasePipelineData(BaseModel, ABC):
data: object
metadata: dict[object, object] = Field(default_factory=dict)
@dataclass
-class CameraProcessingNode(ABC):
- config: PipelineStageConfig
+class BaseCameraNode(ABC):
+ config: BasePipelineStageConfig
camera_id: CameraId
camera_ring_shm: RingBufferCameraSharedMemory
@@ -60,7 +57,7 @@ class CameraProcessingNode(ABC):
@classmethod
def create(cls,
- config: PipelineConfig,
+ config: BasePipelineStageConfig,
camera_id: CameraId,
camera_ring_shm_dto: RingBufferCameraSharedMemoryDTO,
output_queue: Queue,
@@ -89,7 +86,7 @@ class CameraProcessingNode(ABC):
@staticmethod
def _run(camera_id: CameraId,
- config: PipelineStageConfig,
+ config: BasePipelineStageConfig,
camera_shm_dto: CameraSharedMemoryDTO,
output_queue: Queue,
shutdown_event: multiprocessing.Event,
@@ -127,8 +124,8 @@ class CameraProcessingNode(ABC):
@dataclass
-class AggregationProcessNode(ABC):
- config: PipelineStageConfig
+class BaseAggregationNode(ABC):
+ config: BasePipelineStageConfig
process: Process
input_queues: dict[CameraId, Queue]
output_queue: Queue
@@ -136,7 +133,7 @@ class AggregationProcessNode(ABC):
@classmethod
def create(cls,
- config: PipelineConfig,
+ config: BasePipelineStageConfig,
input_queues: dict[CameraId, Queue],
output_queue: Queue,
shutdown_event: multiprocessing.Event):
@@ -155,7 +152,7 @@ class AggregationProcessNode(ABC):
# shutdown_event=shutdown_event)
@staticmethod
- def _run(config: PipelineConfig,
+ def _run(config: BasePipelineStageConfig,
input_queues: dict[CameraId, Queue],
output_queue: Queue,
shutdown_event: multiprocessing.Event):
@@ -185,18 +182,18 @@ class AggregationProcessNode(ABC):
@dataclass
-class CameraGroupProcessingPipeline(ABC):
- config: PipelineConfig
- camera_nodes: dict[CameraId, CameraProcessingNode]
- aggregation_node: AggregationProcessNode
- annotator: BaseImageAnnotator
+class BaseProcessingPipeline(ABC):
+ config: BasePipelineStageConfig
+ camera_nodes: dict[CameraId, BaseCameraNode]
+ aggregation_node: BaseAggregationNode
shutdown_event: multiprocessing.Event
- latest_pipeline_data: PipelineData|None = None
+ annotator: BaseImageAnnotator|None = None
+ latest_pipeline_data: BasePipelineData | None = None
@classmethod
def create(cls,
- config: PipelineConfig,
+ config: BasePipelineStageConfig,
camera_shm_dtos: dict[CameraId, RingBufferCameraSharedMemoryDTO],
shutdown_event: multiprocessing.Event):
raise NotImplementedError(
@@ -231,22 +228,23 @@ class CameraGroupProcessingPipeline(ABC):
for camera_id, frame_payload in multiframe_payload.frames.items():
self.camera_nodes[camera_id].intake_data(frame_payload)
- def get_next_data(self) -> PipelineData|None:
+ def get_next_data(self) -> BasePipelineData | None:
if self.aggregation_node.output_queue.empty():
return None
data = self.aggregation_node.output_queue.get()
return data
- def get_latest_data(self) -> PipelineData|None:
- data: PipelineData|None = None
+ def get_latest_data(self) -> BasePipelineData | None:
while not self.aggregation_node.output_queue.empty():
- data = self.aggregation_node.output_queue.get()
- self._latest_pipeline_data = data
- return data
+ self.latest_pipeline_data = self.aggregation_node.output_queue.get()
- def annotate_image(self, multiframe_payload: MultiFramePayload) -> MultiFramePayload:
- return self._annotator.annotate_image(multiframe_payload)
+ return self.latest_pipeline_data
+ def annotate_images(self, multiframe_payload: MultiFramePayload) -> MultiFramePayload:
+ for camera_id, frame in multiframe_payload.frames.items():
+ frame.image = self.annotator.annotate_image(image=frame.image,
+ latest_observation = self.latest_pipeline_data.get_camera_data(camera_id),)
+ return multiframe_payload
def start(self):
logger.debug(f"Starting {self.__class__.__name__} with camera processes {self.camera_nodes.keys()}...")
@@ -263,14 +261,14 @@ class CameraGroupProcessingPipeline(ABC):
@dataclass
-class CameraGroupProcessingServer(ABC):
+class BaseProcessingServer(ABC):
model_config = ConfigDict(arbitrary_types_allowed=True)
- processing_pipeline: CameraGroupProcessingPipeline
+ processing_pipeline: BaseProcessingPipeline
shutdown_event: multiprocessing.Event
@classmethod
def create(cls,
- processing_pipeline: CameraGroupProcessingPipeline,
+ processing_pipeline: BaseProcessingPipeline,
camera_shm_dtos: dict[CameraId, RingBufferCameraSharedMemoryDTO],
shutdown_event: multiprocessing.Event):
raise NotImplementedError(
@@ -289,11 +287,11 @@ class CameraGroupProcessingServer(ABC):
logger.debug(f"Starting {self.__class__.__name__}...")
self.processing_pipeline.start()
- def intake_data(self, multiframe_payload: MultiFramePayload, annotate_image: bool = False) -> MultiFramePayload|None:
+ def intake_data(self, multiframe_payload: MultiFramePayload):
self.processing_pipeline.intake_data(multiframe_payload)
- if annotate_image:
- return self.annotate_image(multiframe_payload)
+ def annotate_image(self, multiframe_payload: MultiFramePayload) -> MultiFramePayload:
+ return self.processing_pipeline.annotate_images(multiframe_payload)
def shutdown_pipeline(self):
logger.debug(f"Shutting down {self.__class__.__name__}...")
diff --git a/freemocap/pipelines/pipeline_types.py b/freemocap/pipelines/pipeline_types.py
index 02872c43..ca173f34 100644
--- a/freemocap/pipelines/pipeline_types.py
+++ b/freemocap/pipelines/pipeline_types.py
@@ -1,8 +1,9 @@
from enum import Enum
from freemocap.pipelines.calibration_pipeline.calibration_pipeline_main import CalibrationPipeline
+from freemocap.pipelines.dummy_pipeline import DummyPipeline
class PipelineTypes(Enum):
- DUMMY = None
+ DUMMY = DummyPipeline
CALIBRATION = CalibrationPipeline
diff --git a/uv.lock b/uv.lock
index 1f89d153..6d4857c4 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1357,7 +1357,7 @@ wheels = [
[[package]]
name = "skellycam"
version = "2023.9.1086"
-source = { git = "https://github.com/freemocap/skellycam?branch=jon%2Fdevelopment#4741f5aa4b15ac11bf2cb0f4c430178172c37103" }
+source = { git = "https://github.com/freemocap/skellycam?branch=jon%2Fdevelopment#17f98464edee3680a3f4fbf7d20a0364dbce5de5" }
dependencies = [
{ name = "fastapi" },
{ name = "httpx" },
@@ -1401,7 +1401,7 @@ dependencies = [
[[package]]
name = "skellytracker"
version = "2024.9.1019"
-source = { git = "https://github.com/freemocap/skellytracker?branch=jon%2Fdevelopment#fe0c9f401c30bd2be25faf2791ffea4beb07b810" }
+source = { git = "https://github.com/freemocap/skellytracker?branch=jon%2Fdevelopment#8ee96f3a71d34442bb12438ef035728d2ec79c62" }
dependencies = [
{ name = "mediapipe" },
{ name = "numpy" },