Skip to content

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

TypeScript

basic pipeline stuff

jonmatthis22f407ec0b01
diff --git a/freemocap-ui/electron-builder.json b/freemocap-ui/electron-builder.json
index 3a3872f5..cdf12804 100644
--- a/freemocap-ui/electron-builder.json
+++ b/freemocap-ui/electron-builder.json
@@ -36,7 +36,7 @@
"oneClick": false,
"perMachine": false,
"allowToChangeInstallationDirectory": true,
- "deleteAppDataOnUninstall": false
+ "deleteAppDataOnUninstall": false,
},
"publish": {
"provider": "generic",
diff --git a/freemocap-ui/postcss.config.cjs b/freemocap-ui/postcss.config.cjs
deleted file mode 100644
index 825cb186..00000000
--- a/freemocap-ui/postcss.config.cjs
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = {
- plugins: {
- 'postcss-import': {},
- 'tailwindcss/nesting': {},
- tailwindcss: {},
- autoprefixer: {},
- },
-}
diff --git a/freemocap-ui/src/components/server-settings-panel/ServerSettingsPanel.tsx b/freemocap-ui/src/components/server-settings-panel/ServerSettingsPanel.tsx
index fd82921f..194740e9 100644
--- a/freemocap-ui/src/components/server-settings-panel/ServerSettingsPanel.tsx
+++ b/freemocap-ui/src/components/server-settings-panel/ServerSettingsPanel.tsx
@@ -63,7 +63,7 @@ export const ServerSettingsPanel = () => {
<Box sx={{pl: 2, pt: 1, borderTop: '2px solid', borderColor: 'darkcyan'}}>
<ServerConnectionStatus/>
<WebsocketConnectionStatus/>
- <TreeItem itemId="server-settings" label="Server Settings" disabled={true}>
+ <TreeItem itemId="server-settings" label="Server Settings">
<Box sx={{pl: 2, pt: 1, display: 'flex', flexDirection: 'column', gap: 2}}>
<FormControlLabel
control={
@@ -81,6 +81,7 @@ export const ServerSettingsPanel = () => {
onChange={(e) => setServerExecutablePath(e.target.value)}
fullWidth
size="small"
+ disabled={true}
/>
<Box sx={{display: 'flex', alignItems: 'center', gap: 1}}>
@@ -90,6 +91,8 @@ export const ServerSettingsPanel = () => {
onChange={(e) => setHost(e.target.value)}
size="small"
sx={{flex: 1}}
+ disabled={true}
+
/>
<TextField
label="HTTP Port"
@@ -98,6 +101,8 @@ export const ServerSettingsPanel = () => {
onChange={(e) => setHttpPort(Number(e.target.value))}
size="small"
sx={{width: 100}}
+ disabled={true}
+
/>
</Box>
@@ -107,13 +112,15 @@ export const ServerSettingsPanel = () => {
</Box>
</TreeItem>
- <TreeItem itemId="display-settings" label="Display Settings" disabled={true}>
+ <TreeItem itemId="display-settings" label="Display Settings">
<Box sx={{pl: 2, pt: 1, display: 'flex', flexDirection: 'column', gap: 2}}>
<FormControlLabel
control={
<Checkbox
checked={limitFramerate}
onChange={(e) => setLimitFramerate(e.target.checked)}
+ disabled={true}
+
/>
}
label="Limit display framerate"
@@ -131,6 +138,8 @@ export const ServerSettingsPanel = () => {
max={maxFramerate}
valueLabelDisplay="auto"
size="small"
+ disabled={true}
+
/>
</Box>
)}
@@ -140,6 +149,8 @@ export const ServerSettingsPanel = () => {
<Checkbox
checked={preShrink}
onChange={(e) => setPreShrink(e.target.checked)}
+ disabled={true}
+
/>
}
label="Pre-shrink images"
@@ -158,6 +169,8 @@ export const ServerSettingsPanel = () => {
step={0.01}
valueLabelDisplay="auto"
size="small"
+ disabled={true}
+
/>
</Box>
)}
diff --git a/freemocap-ui/src/config/appUrlService.ts b/freemocap-ui/src/config/appUrlService.ts
index 8320dd10..35e15067 100644
--- a/freemocap-ui/src/config/appUrlService.ts
+++ b/freemocap-ui/src/config/appUrlService.ts
@@ -38,7 +38,7 @@ const getHttpEndpointUrls = () => {
stopRecording: getApiUrl('/skellycam/camera/group/all/record/stop'),
pauseUnpauseCameras: getApiUrl('/skellycam/camera/group/all/pause_unpause'),
connectPipeline: getApiUrl('/freemocap/pipeline/connect'),
- disconnectPipeline: getApiUrl('/freemocap/pipeline/disconnect'),
+ disconnectPipeline: getApiUrl('/freemocap/pipeline/disconnect/all'),
};
};
diff --git a/freemocap-ui/tailwind.config.js b/freemocap-ui/tailwind.config.js
deleted file mode 100644
index 42872c4f..00000000
--- a/freemocap-ui/tailwind.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-export default {
- content: [
- './index.html',
- './src/**/*.{js,ts,jsx,tsx}',
- ],
- theme: {
- extend: {},
- },
- corePlugins: {
- preflight: false,
- },
- plugins: [],
-}
diff --git a/freemocap/api/http/pipelines/pipeline_router.py b/freemocap/api/http/pipelines/pipeline_router.py
index 379aba88..57c2e92b 100644
--- a/freemocap/api/http/pipelines/pipeline_router.py
+++ b/freemocap/api/http/pipelines/pipeline_router.py
@@ -27,23 +27,39 @@ class PipelineCreateResponse(BaseModel):
@pipeline_router.post("/connect",
summary="Create a processing pipeline and attach it to a camera group"
)
-def pipeline_create_post_endpoint(
+def pipeline_connect_post_endpoint(
request: PipelineConnectRequest = Body(...,
description="Request body containing desired camera configuration",
examples=[
PipelineConnectRequest(camera_ids=['0'])]), ) -> PipelineCreateResponse:
- logger.api(f"Received `pipeline/create` POST request - \n {request.model_dump_json(indent=2)}")
+ logger.api(f"Received `pipeline/connect` POST request - \n {request.model_dump_json(indent=2)}")
try:
camera_group = get_freemocap_app().skellycam_app.camera_group_manager.camera_group_from_camera_ids(camera_ids=request.camera_ids)
- camera_group_id, pipeline_id = get_freemocap_app().create_pipeline(camera_group=camera_group)
+ camera_group_id, pipeline_id = get_freemocap_app().connect_pipeline(camera_group=camera_group)
response = PipelineCreateResponse(camera_group_id=camera_group_id,
pipeline_id=pipeline_id)
logger.api(
- f"`pipeline/create` POST request handled successfully - \n {response.model_dump_json(indent=2)}")
+ f"`pipeline/connect` POST request handled successfully - \n {response.model_dump_json(indent=2)}")
return response
except Exception as e:
- logger.error(f"Error when processing `pipeline/create` request: {type(e).__name__} - {e}")
+ logger.error(f"Error when processing `pipeline/connect` request: {type(e).__name__} - {e}")
logger.exception(e)
raise HTTPException(status_code=500,
- detail=f"Error when processing `pipeline/create` request: {type(e).__name__} - {e}")
\ No newline at end of file
+ detail=f"Error when processing `pipeline/connect` request: {type(e).__name__} - {e}")
+
+@pipeline_router.get("/disconnect/all",
+ summary="Disconnect/shutdown all processing pipelines"
+ )
+def pipeline_disconnect_post_endpoint( ):
+ logger.api(f"Received `pipeline/disconnect` GET request")
+ try:
+
+ get_freemocap_app().disconnect_pipeline()
+ logger.api(
+ f"`pipeline/disconnect` GET request handled successfully ")
+ except Exception as e:
+ logger.error(f"Error when processing `pipeline/disconnect` request: {type(e).__name__} - {e}")
+ logger.exception(e)
+ raise HTTPException(status_code=500,
+ detail=f"Error when processing `pipeline/disconnect` request: {type(e).__name__} - {e}")
\ No newline at end of file
diff --git a/freemocap/core/pipelines/dummy_pipeline.py b/freemocap/core/pipelines/dummy_pipeline.py
deleted file mode 100644
index f3803e92..00000000
--- a/freemocap/core/pipelines/dummy_pipeline.py
+++ /dev/null
@@ -1,172 +0,0 @@
-import logging
-import multiprocessing
-import time
-from multiprocessing import Queue, Process
-from typing import Dict
-
-from skellycam.core.types.type_overloads import CameraIdString
-from skellycam.core.camera.config.camera_config import CameraConfig, CameraConfigs
-from skellycam.core.ipc.shared_memory.ring_buffer_shared_memory import SharedMemoryRingBufferDTO
-from skellycam.core.ipc.shared_memory.frame_payload_shared_memory_ring_buffer import FramePayloadSharedMemoryRingBuffer
-from freemocap.core.pipelines.processing_pipeline import BaseCameraNode, BasePipelineStageConfig, BasePipelineData, \
- AggregationNode, BasePipelineConfig, BaseProcessingPipeline
-
-logger = logging.getLogger(__name__)
-
-
-class DummyPipelineCameraLayerOutputData(BasePipelineData):
- data: object
-
-
-class DummyPipelineAggregationLayerOutputData(BasePipelineData):
- pass
-
-class DummyPipelineCameraNodeConfig(BasePipelineStageConfig):
- camera_config: CameraConfig
- param1: int = 1
-
-
-class DummyPipelineAggregationNodeConfig(BasePipelineStageConfig):
- param2: int = 2
-
-
-class DummyPipelineConfig(BasePipelineConfig):
- camera_node_configs: dict[CameraIdString, DummyPipelineCameraNodeConfig]
- aggregation_node_config: DummyPipelineAggregationNodeConfig
-
- @classmethod
- def create(cls, **kwargs):
- return cls(camera_node_configs={camera_id: DummyPipelineCameraNodeConfig(camera_config = camera_config) for camera_id, camera_config in camera_configs.items()},
- aggregation_node_config=DummyPipelineAggregationNodeConfig())
-
-
-class DummyCameraProcessingNode(BaseCameraNode):
- @classmethod
- def create(cls,
- pipeline_config: DummyPipelineCameraNodeConfig,
- camera_id: CameraIdString,
- camera_shm_dto: SharedMemoryRingBufferDTO,
- output_queue: Queue,
- shutdown_event: multiprocessing.Event):
- return cls(camera_id=camera_id,
- config=config,
-
- process=Process(target=cls._run,
- kwargs=dict(camera_id=camera_id,
- config=config,
- camera_shm_dto=camera_shm_dto,
- output_queue=output_queue,
- shutdown_event=shutdown_event
- )
- ),
- shutdown_event=shutdown_event
- )
-
- @staticmethod
- def _run(camera_id: CameraIdString,
- config: DummyPipelineCameraNodeConfig,
- camera_shm_dto: SharedMemoryRingBufferDTO,
- output_queue: Queue,
- shutdown_event: multiprocessing.Event,
- ):
- logger.trace(f"Starting camera processing node for camera {camera_id}")
- camera_ring_shm = FramePayloadSharedMemoryRingBuffer.recreate(dto=camera_shm_dto,
- read_only=True),
- try:
- while not shutdown_event.is_set():
- time.sleep(0.001)
- if camera_ring_shm.new_frame_available:
- frame = camera_ring_shm.retrieve_frame()
- print(f"\t\tCamera Node for Camera#{camera_id} received frame {frame.metadata[FRAME_METADATA_MODEL.FRAME_NUMBER.value]} with image shape {frame.image.shape}")
- # TODO - process image
- output_queue.put(DummyPipelineCameraLayerOutputData(data=frame.metadata))
- except Exception as e:
- logger.exception(f"Error in camera processing node for camera {camera_id}", exc_info=e)
- raise
- finally:
- logger.trace(f"Shutting down camera processing node for camera {camera_id}")
- shutdown_event.set()
- camera_ring_shm.close()
-
-
-class DummyAggregationProcessNode(AggregationNode):
- @classmethod
- def create(cls,
- config: DummyPipelineAggregationNodeConfig,
- input_queues: dict[CameraIdString, Queue],
- output_queue: Queue,
- shutdown_event: multiprocessing.Event):
- return cls(config=config,
- process=Process(target=cls._run,
- kwargs=dict(config=config,
- input_queues=input_queues,
- output_queue=output_queue,
- shutdown_event=shutdown_event)
- ),
- input_queues=input_queues,
- output_queue=output_queue,
- shutdown_event=shutdown_event)
-
- @staticmethod
- def _run(config: DummyPipelineAggregationNodeConfig, 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, DummyCameraProcessingNode|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():
- if data_by_camera_id[camera_id] is None:
- if not input_queues[camera_id].empty():
- camera_node_output = input_queues[camera_id].get()
- if not isinstance(camera_node_output, DummyPipelineCameraLayerOutputData):
- raise ValueError(f"Unexpected data type received from camera {camera_id}: {type(camera_node_output)}")
- if not camera_node_output.camera_id or camera_node_output.camera_id != camera_id:
- 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
-
- if len(data_by_camera_id) == len(input_queues):
- # TODO - process aggregated data
- output_queue.put(DummyPipelineAggregationLayerOutputData(data=data_by_camera_id))
- else:
- raise ValueError("Not all camera data received!")
- except Exception as e:
- logger.exception(f"Error in aggregation processing node", exc_info=e)
- raise
- finally:
- logger.trace(f"Shutting down aggregation processing node")
- shutdown_event.set()
-
-
-class DummyPipeline(BaseProcessingPipeline):
- config: DummyPipelineConfig
- camera_nodes: Dict[CameraId, DummyCameraProcessingNode]
- aggregation_node: DummyAggregationProcessNode
-
- @classmethod
- def create(cls,
- config: DummyPipelineConfig,
- camera_shm_dtos: CameraGroupSharedMemoryDTO,
- shutdown_event: multiprocessing.Event):
- 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_nodes = {camera_id: DummyCameraProcessingNode.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 = DummyAggregationProcessNode.create(config=config.aggregation_node_config,
- input_queues=camera_output_queues,
- output_queue=aggregation_output_queue,
- shutdown_event=shutdown_event)
-
- return cls(config=config,
- camera_nodes=camera_nodes,
- aggregation_node=aggregation_process,
- shutdown_event=shutdown_event,
- )
-
-
diff --git a/freemocap/core/pipelines/processing_pipeline.py b/freemocap/core/pipelines/processing_pipeline.py
index 08a39010..c178ae41 100644
--- a/freemocap/core/pipelines/processing_pipeline.py
+++ b/freemocap/core/pipelines/processing_pipeline.py
@@ -421,12 +421,12 @@ class ProcessingPipeline:
self.aggregation_node.start()
for camera_id, camera_node in self.camera_nodes.items():
camera_node.start()
- self.started = True
+
def shutdown(self):
logger.debug(f"Shutting down {self.__class__.__name__}...")
- self.started = False
- self.global_kill_flag.value = True
+
+ self.ipc.global_kill_flag.value = True
self.aggregation_node.stop()
for camera_id, camera_process in self.camera_nodes.items():
camera_process.stop()
diff --git a/freemocap/freemocap_app/freemocap_application.py b/freemocap/freemocap_app/freemocap_application.py
index c0193280..5d3cac1b 100644
--- a/freemocap/freemocap_app/freemocap_application.py
+++ b/freemocap/freemocap_app/freemocap_application.py
@@ -26,7 +26,7 @@ class PipelineManager:
def close_all_pipelines(self):
for pipeline in self.pipelines.values():
- pipeline.close()
+ pipeline.shutdown()
self.pipelines.clear()
logger.info("All pipelines closed successfully")
@@ -51,12 +51,15 @@ class FreemocapApplication:
def should_continue(self) -> bool:
return not self.global_kill_flag.value
- def create_pipeline(self, camera_group: CameraGroup) -> tuple[CameraGroupIdString, PipelineIdString]:
+ def connect_pipeline(self, camera_group: CameraGroup) -> tuple[CameraGroupIdString, PipelineIdString]:
if len(self.skellycam_app.camera_group_manager.camera_groups) == 0:
raise ValueError("No camera groups available to create a processing pipeline! Start a camera group first.")
pipeline = self.pipeline_manager.create_pipeline(camera_group=camera_group)
return camera_group.id, pipeline.id
+ def disconnect_pipeline(self):
+ self.pipeline_manager.close_all_pipelines()
+
def close(self):
self.global_kill_flag.value = True
self.pipeline_shutdown_event.set()