Skip to content

Free Motion Capture for Everyone 💀✨

TypeScript

clean up the UI a bit (a lot 😂)

jonmatthis372ab7fbaa48
diff --git a/freemocap/api/http/ui/ui.html b/freemocap/api/http/ui/ui.html
index b4b86d56..cc1e35d7 100644
--- a/freemocap/api/http/ui/ui.html
+++ b/freemocap/api/http/ui/ui.html
@@ -5,58 +5,123 @@
<meta content="width=device-width, initial-scale=1.0" name="viewport">
<title>FreeMoCap UI Tester</title>
<style>
- .image {
- width: 1000px;
- height: auto;
- }
-
- div {
- background-color: #654a7b;
+ body {
+ margin: 0;
+ font-family: Arial, sans-serif;
+ display: flex;
+ flex-direction: column;
+ height: 100vh;
+ overflow: hidden;
+ background-color: #f4f4f9;
}
h1 {
font-size: 24px;
+ background-color: #4a4e69;
+ color: white;
+ margin: 0;
+ padding: 10px;
+ text-align: center;
+ }
+
+ #controls {
+ display: flex;
+ align-items: center;
+ background-color: #4a4e69;
+ padding: 10px;
+ color: white;
+ justify-content: center;
+ }
+
+ #ws-status {
+ margin-right: 15px;
+ font-weight: bold;
}
button {
- margin-right: 10px;
+ margin: 0 10px;
padding: 10px;
font-size: small;
+ background-color: #9a8c98;
+ color: white;
+ border: none;
+ border-radius: 5px;
+ cursor: pointer;
+ transition: background-color 0.3s;
}
- #threejs-container {
- width: 40%;
- height: 400px;
+ button:hover {
+ background-color: #c9ada7;
}
#content-container {
display: flex;
- justify-content: space-between;
+ flex-grow: 1;
+ overflow: hidden;
+ position: relative;
}
#images-container {
- width: 60%;
+ flex: 1;
+ display: flex;
+ flex-wrap: wrap;
+ overflow-y: auto;
+ background-color: #22223b;
+ justify-content: center;
+ align-items: center;
+ padding: 10px;
+ }
+
+ .image {
+ max-width: 100%;
+ height: auto;
+ margin: 5px;
+ }
+
+ #threejs-container {
+ position: absolute;
+ top: 20px;
+ right: 20px;
+ width: 20%;
+ height: 20%;
+ background-color: rgba(0, 0, 0, 0.5);
+ border-radius: 8px;
+ overflow: hidden;
+ cursor: grab;
+ }
+
+ #log-container {
+ height: 100px;
+ overflow-y: auto;
+ background-color: #4a4e69;
+ color: white;
+ padding: 10px;
+ }
+
+ .log-entry {
+ margin-bottom: 5px;
}
</style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r128/three.min.js"></script>
-<!-- <script src="https://threejs.org/examples/js/controls/OrbitControls.js"></script>-->
<script>
-
let ws;
let isConnected = false;
- const websocket_url = 'ws://localhost:8005/websocket/connect';
+ const websocket_url = '{{WEBSOCKET_URL}}/websocket/connect';
+ const http_url = '{{HTTP_URL}}';
const imageElements = {};
const spheres = {};
- let scene; // Declare scene globally
+ let scene;
+ let isDragging = false;
+ let dragStartX, dragStartY;
+ let initialX, initialY;
function updateStatus() {
- document.getElementById('ws-status').innerText = isConnected ? 'Connected' : 'Disconnected';
+ document.getElementById('ws-status').innerText = isConnected ? 'Status: Connected ✔️' : 'Status: Disconnected ❌';
+ document.getElementById('ws-status').style.color = isConnected ? '#4caf50' : '#f44336';
}
function connectWebSocket() {
ws = new WebSocket(websocket_url);
-
- // websocket helpers
const decoder = new TextDecoder('utf-8');
ws.onopen = () => {
@@ -68,53 +133,37 @@
updateStatus();
};
ws.onmessage = async (event) => {
- // Ensure the event.data is a Blob
if (event.data instanceof Blob) {
- // Convert the incoming data to an ArrayBuffer
const arrayBuffer = await event.data.arrayBuffer();
-
- // Convert ArrayBuffer to a string
const jsonString = decoder.decode(arrayBuffer);
-
- // Parse the JSON string to a JavaScript object
const data = JSON.parse(jsonString);
addLogEntry(`Received message with length: ${jsonString.length} from mf_payload# ${data.multi_frame_number}`);
-
- // Now you can use the data object to update your UI
updateImages(data.jpeg_images);
updateSpheres(data.latest_pipeline_output?.aggregation_layer_output?.points3d);
- } else {
- console.log("Received data: ", event.data);
}
};
}
function updateSpheres(points3d) {
- if (!points3d) {
- return; // Exit the function if points3d is undefined or null
- }
+ if (!points3d) return;
- // Mark all spheres as not updated
for (const id in spheres) {
spheres[id].updated = false;
}
for (const [point_id, coords] of Object.entries(points3d)) {
if (!spheres[point_id]) {
- // Create a new sphere
const geometry = new THREE.SphereGeometry(1, 10, 10);
const material = new THREE.MeshBasicMaterial({color: 0xff0000});
const sphere = new THREE.Mesh(geometry, material);
scene.add(sphere);
spheres[point_id] = {mesh: sphere, updated: true};
} else {
- // Update existing sphere position
spheres[point_id].mesh.position.set(coords[0], coords[1], coords[2]);
spheres[point_id].updated = true;
}
}
- // Hide spheres not in the current payload
for (const id in spheres) {
spheres[id].mesh.visible = spheres[id].updated;
}
@@ -124,12 +173,9 @@
const container = document.getElementById('images-container');
for (const cameraId in images) {
if (!imageElements[cameraId]) {
- const imgBox = document.createElement('div');
- imgBox.className = 'image-box';
const img = document.createElement('img');
img.className = 'image';
- imgBox.appendChild(img);
- container.appendChild(imgBox);
+ container.appendChild(img);
imageElements[cameraId] = img;
}
if (images[cameraId]) {
@@ -141,10 +187,10 @@
function addLogEntry(entry) {
const logContainer = document.getElementById('log-container');
const logEntry = document.createElement('div');
+ logEntry.className = 'log-entry';
logEntry.innerText = entry;
logContainer.prepend(logEntry);
- // Limit the number of log entries to 30
if (logContainer.children.length > 30) {
logContainer.removeChild(logContainer.lastChild);
}
@@ -156,7 +202,6 @@
const data = await response.json();
document.getElementById('result').innerText = JSON.stringify(data, null, 2);
addLogEntry(`Success: ${endpoint} - ${JSON.stringify(data)}`);
-
} catch (error) {
document.getElementById('result').innerText = `Error: ${error.message}`;
addLogEntry(`Error: ${endpoint} - ${error.message}`);
@@ -167,14 +212,10 @@
const container = document.getElementById('threejs-container');
scene = new THREE.Scene();
const camera = new THREE.PerspectiveCamera(75, container.clientWidth / container.clientHeight, 0.1, 1000);
-
const renderer = new THREE.WebGLRenderer();
renderer.setSize(container.clientWidth, container.clientHeight);
container.appendChild(renderer.domElement);
- // Initialize OrbitControls
- // const controls = new THREE.OrbitControls(camera, renderer.domElement);
-
const axesHelper = new THREE.AxesHelper(5);
scene.add(axesHelper);
@@ -184,62 +225,63 @@
camera.position.y = 5;
camera.position.z = 25;
- // Add light
const light = new THREE.DirectionalLight(0xffffff, 1);
light.position.set(1, 1, 1).normalize();
scene.add(light);
function animate() {
requestAnimationFrame(animate);
- // controls.update(); // Required for damping to work
renderer.render(scene, camera);
}
animate();
+
+ // Add event listeners for dragging
+ container.addEventListener('mousedown', onMouseDown);
+ document.addEventListener('mousemove', onMouseMove);
+ document.addEventListener('mouseup', onMouseUp);
+ }
+
+ function onMouseDown(event) {
+ isDragging = true;
+ dragStartX = event.clientX;
+ dragStartY = event.clientY;
+ const rect = event.target.getBoundingClientRect();
+ initialX = rect.left;
+ initialY = rect.top;
+ event.target.style.cursor = 'grabbing';
+ }
+
+ function onMouseMove(event) {
+ if (isDragging) {
+ const dx = event.clientX - dragStartX;
+ const dy = event.clientY - dragStartY;
+ const container = document.getElementById('threejs-container');
+ container.style.left = `${initialX + dx}px`;
+ container.style.top = `${initialY + dy}px`;
+ }
+ }
+
+ function onMouseUp(event) {
+ isDragging = false;
+ event.target.style.cursor = 'grab';
}
window.onload = initThreeJS;
</script>
</head>
<body>
-<!-- Header Section -->
-<h1>FreeMoCap Test UI</h1>
-<p> WebSocket status: <span id="ws-status">Disconnected</span></p>
-
-<!-- WebSocket Section -->
-<button onclick="connectWebSocket()">Connect WebSocket</button>
-
-<!-- API Calls Section -->
-<!-- Camera Connection API Calls -->
-<button onclick="callApi('http://localhost:8005/skellycam/cameras/connect/detect')">Connect to Cameras</button>
-
-<div>
- <!-- <button onclick="callApi('http://localhost:8005/skellycam/cameras/connect/apply', 'POST')">Connect/Update Cameras-->
- <!-- </button>-->
- <!-- <button onclick="callApi('http://localhost:8005/skellycam/cameras/close')">Close Camera Connections</button>-->
-
- <!-- &lt;!&ndash; Root and App API Calls &ndash;&gt;-->
- <!-- <button onclick="sendMessage('Hello from the client')">Send WS Message</button>-->
- <!-- <button onclick="callApi('http://localhost:8005/')">Read Root</button>-->
- <!-- <button onclick="callApi('http://localhost:8005/skellycam/app/state')">App State</button>-->
- <!-- <button onclick="callApi('http://localhost:8005/skellycam/app/healthcheck')">Hello👋</button>-->
- <!-- <button onclick="callApi('http://localhost:8005/skellycam/app_state/shutdown')">goodbye👋</button>-->
-
-
- <!-- &lt;!&ndash; Camera Operation API Calls &ndash;&gt;-->
- <!-- <button onclick="callApi('http://localhost:8005/skellycam/cameras/detect')">Detect Cameras</button>-->
- <!-- <button onclick="callApi('http://localhost:8005/skellycam/cameras/record/start')">Start Recording</button>-->
- <!-- <button onclick="callApi('http://localhost:8005/skellycam/cameras/record/stop')">Stop Recording</button>-->
-</div>
-<!-- Content Container -->
-<div id="content-container">
- <!-- Images Section -->
- <div id="images-container"></div>
- <!-- Three.js Viewer Section -->
- <div id="threejs-container"></div>
-</div>
-
-<h3>Loggs</h3>
-<div id="log-container"></div>
+ <h1>FreeMoCap Test UI</h1>
+ <div id="controls">
+ <span id="ws-status">Status: Disconnected ❌</span>
+ <button onclick="connectWebSocket()">Connect WebSocket</button>
+ <button onclick="callApi(`${http_url}/skellycam/cameras/connect/detect`)">Connect to Cameras</button>
+ </div>
+ <div id="content-container">
+ <div id="images-container"></div>
+ <div id="threejs-container"></div>
+ </div>
+ <h3>Logs</h3>
+ <div id="log-container"></div>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/freemocap/api/http/ui/ui_router.py b/freemocap/api/http/ui/ui_router.py
index e36e24b3..f77d7557 100644
--- a/freemocap/api/http/ui/ui_router.py
+++ b/freemocap/api/http/ui/ui_router.py
@@ -4,6 +4,8 @@ import os
from fastapi import APIRouter
from starlette.responses import HTMLResponse
+from freemocap.api.server.server_constants import PORT, APP_URL
+
logger = logging.getLogger(__name__)
ui_router = APIRouter()
@@ -13,12 +15,14 @@ ui_router = APIRouter()
def serve_ui():
logger.info("Serving UI HTML to `/ui`")
file_path = os.path.join(os.path.dirname(__file__), 'ui.html')
- with open(file_path, 'r') as file:
+ with open(file_path, 'r', encoding='utf-8') as file:
ui_html_string = file.read()
+ ui_html_string = ui_html_string.replace("{{HTTP_URL}}", APP_URL)
+ ui_html_string = ui_html_string.replace("{{WEBSOCKET_URL}}", APP_URL.replace("http", "ws"))
return HTMLResponse(content=ui_html_string, status_code=200)
if __name__ == "__main__":
import uvicorn
- uvicorn.run(ui_router, host="localhost", port=8000)
+ uvicorn.run(ui_router, host="localhost", port=PORT)
diff --git a/freemocap/api/websocket/websocket_server.py b/freemocap/api/websocket/websocket_server.py
index 92b7d0f0..d479b20c 100644
--- a/freemocap/api/websocket/websocket_server.py
+++ b/freemocap/api/websocket/websocket_server.py
@@ -3,6 +3,7 @@ import logging
import multiprocessing
from typing import Optional
+from skellycam.core.camera_group.camera.config.camera_config import CameraConfig
from skellycam.core.frames.payloads.multi_frame_payload import MultiFramePayload
from skellycam.core.recorders.timestamps.framerate_tracker import CurrentFrameRate
from skellycam.core.recorders.videos.recording_info import RecordingInfo
@@ -10,9 +11,7 @@ from skellycam.skellycam_app.skellycam_app_state import SkellycamAppStateDTO
from skellycam.utilities.wait_functions import async_wait_1ms
from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect
-from freemocap.freemocap_app.freemocap_app_state import get_freemocap_app_state, FreemocapAppState
-from freemocap.pipelines.calibration_pipeline import CalibrationPipeline
-from freemocap.pipelines.calibration_pipeline.calibration_aggregation_node import CalibrationPipelineOutputData
+from freemocap.freemocap_app.freemocap_app_state import get_freemocap_app_state, FreemocapAppState, FreemocapAppStateDTO
from freemocap.pipelines.freemocap_frontend_payload import FreemocapFrontendPayload
from freemocap.pipelines.pipeline_abcs import ReadTypes, BaseProcessingPipeline, BasePipelineOutputData
from freemocap.pipelines.pipeline_types import PipelineTypes
@@ -72,7 +71,11 @@ class FreemocapWebsocketServer:
logger.info("Ending listener for client messages...")
async def _handle_ipc_queue_message(self, message: Optional[object] = None):
- if isinstance(message, FreemocapAppState) or isinstance(message, SkellycamAppStateDTO):
+ if isinstance(message, CameraConfig):
+ logger.trace(f"Updating device extracted camera config for camera {message.camera_id}")
+ self._freemocap_app_state.skellycam_app_state.set_device_extracted_camera_config(message)
+ message = self._freemocap_app_state.state_dto()
+ if isinstance(message, FreemocapAppStateDTO) or isinstance(message, SkellycamAppStateDTO):
logger.trace(f"Relaying AppStateDTO to frontend")
elif isinstance(message, RecordingInfo):
diff --git a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
index 9bccac87..f7418ddb 100644
--- a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
@@ -6,9 +6,6 @@ import numpy as np
import \
freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.anipose_stuff.anipose_charuco_board
-from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration import (
- run_anipose_calibration_algorithm,
-)
from freemocap.core_processes.capture_volume_calibration.charuco_stuff.charuco_board_definition import (
CharucoBoardDefinition,
)
diff --git a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_stuff/anipose_functions.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_stuff/anipose_functions.py
index cd1a16a8..66a48b45 100644
--- a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_stuff/anipose_functions.py
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_stuff/anipose_functions.py
@@ -1,25 +1,13 @@
import queue
from collections import defaultdict, Counter
-from typing import Any
import cv2
import numpy as np
-from scipy import signal
from scipy.cluster.hierarchy import linkage, fcluster
from scipy.cluster.vq import whiten
from scipy.linalg import inv as inverse
-
-
-
-
-
-
-
-
-
-
def get_connections(xs, cam_names=None, both=True):
n_cams = xs.shape[0]
n_points = xs.shape[1]
diff --git a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_stuff/anipose_triangulate_simple.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_stuff/anipose_triangulate_simple.py
index 94cba888..b28b04f6 100644
--- a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_stuff/anipose_triangulate_simple.py
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_stuff/anipose_triangulate_simple.py
@@ -1,4 +1,3 @@
-import numpy as np
-from numba import jit
+
diff --git a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/get_anipose_calibration_object.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/get_anipose_calibration_object.py
index fa28c1b5..e3d6a1a8 100644
--- a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/get_anipose_calibration_object.py
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/get_anipose_calibration_object.py
@@ -4,9 +4,6 @@ import shutil
from pathlib import Path
from typing import Union
-from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration import (
- run_anipose_calibration_algorithm,
-)
from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.run_anipose_calibration_algorithm import \
AniposeCameraGroup
from freemocap.system.paths_and_filenames.path_getters import get_last_successful_calibration_toml_path
diff --git a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/run_anipose_calibration_algorithm.py b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/run_anipose_calibration_algorithm.py
index 25c687a4..c79e97d2 100644
--- a/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/run_anipose_calibration_algorithm.py
+++ b/freemocap/core_processes/capture_volume_calibration/anipose_camera_calibration/run_anipose_calibration_algorithm.py
@@ -15,26 +15,30 @@ from scipy.sparse import dok_matrix
from skellycam import CameraId
from tqdm import trange
+from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.calibration_numpy_types import \
+ PixelPoints2DByCamera, CameraExtrinsicsMatrixByCamera
+
logger = logging.getLogger(__name__)
@jit(nopython=True, parallel=False)
-def anipose_triangulate_simple(points2d: np.ndarray, camera_matrices: np.ndarray) -> np.ndarray:
+def anipose_triangulate_simple(points2d_by_camera: PixelPoints2DByCamera,
+ camera_matrices_by_camera: CameraExtrinsicsMatrixByCamera) -> np.ndarray:
"""
Triangulate 3D point from 2D points and camera matrices using the Direct Linear Transform (DLT) method.
- :param points2d: A 2D array of shape (N, 2), where N is the number of cameras. Each row represents the
+ :param points2d_by_camera: A 2D array of shape (N, 2), where N is the number of cameras. Each row represents the
2D coordinates (x, y) of the point in the image plane of each camera.
- :param camera_matrices: A 3D array of shape (N, 3, 4), where each element is a 3x4 camera projection matrix.
+ :param camera_matrices_by_camera: A 3D array of shape (N, 3, 4), where each element is a 3x4 camera projection matrix.
:return: A 1D array of shape (3,) representing the triangulated 3D point.
"""
- num_cams = camera_matrices.shape[0]
+ num_cams = camera_matrices_by_camera.shape[0]
A = np.zeros((num_cams * 2, 4))
for i in range(num_cams):
- x, y = points2d[i]
- mat = camera_matrices[i]
+ x, y = points2d_by_camera[i]
+ mat = camera_matrices_by_camera[i]
A[i * 2] = x * mat[2] - mat[0]
A[i * 2 + 1] = y * mat[2] - mat[1]
@@ -44,7 +48,7 @@ def anipose_triangulate_simple(points2d: np.ndarray, camera_matrices: np.ndarray
points3d_xyzh = vh[-1]
points3d_xyzh /= points3d_xyzh[3] # Normalize the last element to 1
- return points3d_xyzh[:3]
+ return points3d_xyzh[:3] # Return only the first 3 elements (x, y, z)
@dataclass
diff --git a/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py b/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
index d5a10c4d..0f8a195b 100644
--- a/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
+++ b/freemocap/core_processes/capture_volume_calibration/triangulate_3d_data.py
@@ -4,7 +4,8 @@ from pathlib import Path
import numpy as np
-from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.run_anipose_calibration_algorithm import AniposeCameraGroup
+from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.run_anipose_calibration_algorithm import \
+ AniposeCameraGroup
from freemocap.core_processes.capture_volume_calibration.save_3d_data_to_npy import (
save_3d_data_to_npy,
)
diff --git a/freemocap/core_processes/post_process_skeleton_data/calculate_center_of_mass.py b/freemocap/core_processes/post_process_skeleton_data/calculate_center_of_mass.py
index bdf8e02a..305cb48f 100644
--- a/freemocap/core_processes/post_process_skeleton_data/calculate_center_of_mass.py
+++ b/freemocap/core_processes/post_process_skeleton_data/calculate_center_of_mass.py
@@ -1,5 +1,6 @@
import logging
from typing import Dict, Tuple
+
import numpy as np
from freemocap.data_layer.skeleton_models.segments import SegmentAnthropometry
diff --git a/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
index 6c586f6d..04f0c4f8 100644
--- a/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
+++ b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py
@@ -2,7 +2,6 @@ import logging
import multiprocessing
from typing import Optional
-
from freemocap.core_processes.post_process_skeleton_data.post_process_skeleton import post_process_data
from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_functions.anatomical_data_pipeline_functions import (
calculate_anatomical_data,
@@ -10,7 +9,6 @@ from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_
from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_functions.data_saving_pipeline_functions import (
save_data,
)
-
from freemocap.core_processes.process_motion_capture_videos.processing_pipeline_functions.image_tracking_pipeline_functions import (
run_image_tracking_pipeline,
)
diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py
index fea038e1..62174bbe 100644
--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py
+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py
@@ -1,8 +1,8 @@
import logging
import multiprocessing
from typing import Dict, Union
-import numpy as np
+import numpy as np
from freemocap.core_processes.post_process_skeleton_data.calculate_center_of_mass import (
calculate_center_of_mass_from_skeleton,
@@ -10,6 +10,7 @@ from freemocap.core_processes.post_process_skeleton_data.calculate_center_of_mas
from freemocap.core_processes.post_process_skeleton_data.create_skeleton import create_skeleton_model
from freemocap.core_processes.post_process_skeleton_data.enforce_rigid_bones import enforce_rigid_bones_from_skeleton
from freemocap.data_layer.recording_models.post_processing_parameter_models import ProcessingParameterModel
+
# from freemocap.system.logging.queue_logger import DirectQueueHandler
# from freemocap.system.logging.configure_logging import log_view_logging_format_string
diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/data_saving_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/data_saving_pipeline_functions.py
index 566ec135..0badb21c 100644
--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/data_saving_pipeline_functions.py
+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/data_saving_pipeline_functions.py
@@ -2,8 +2,8 @@ import logging
import multiprocessing
from pathlib import Path
from typing import Optional
-import numpy as np
+import numpy as np
from freemocap.core_processes.post_process_skeleton_data.post_process_skeleton import save_numpy_array_to_disk
from freemocap.core_processes.post_process_skeleton_data.split_and_save import split_and_save
diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/image_tracking_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/image_tracking_pipeline_functions.py
index a30e9327..8d4744c8 100644
--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/image_tracking_pipeline_functions.py
+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/image_tracking_pipeline_functions.py
@@ -14,7 +14,8 @@ from freemocap.data_layer.recording_models.post_processing_parameter_models impo
)
# from freemocap.system.logging.configure_logging import log_view_logging_format_string
# from freemocap.system.logging.queue_logger import DirectQueueHandler
-from freemocap.system.paths_and_filenames.file_and_folder_names import LOG_VIEW_PROGRESS_BAR_STRING, RAW_DATA_FOLDER_NAME
+from freemocap.system.paths_and_filenames.file_and_folder_names import LOG_VIEW_PROGRESS_BAR_STRING, \
+ RAW_DATA_FOLDER_NAME
from freemocap.tests.test_image_tracking_data_shape import test_image_tracking_data_shape
logger = logging.getLogger(__name__)
diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py
index 9d7ef72e..a5f02982 100644
--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py
+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py
@@ -2,9 +2,12 @@ import logging
import multiprocessing
from pathlib import Path
from typing import Optional
-import numpy as np
+import numpy as np
+from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.get_anipose_calibration_object import (
+ load_anipose_calibration_toml_from_path,
+)
from freemocap.core_processes.capture_volume_calibration.by_camera_reprojection_filtering import (
run_reprojection_error_filtering,
)
@@ -12,9 +15,6 @@ from freemocap.core_processes.capture_volume_calibration.save_3d_data_to_npy imp
save_3d_data_to_npy,
)
from freemocap.core_processes.capture_volume_calibration.triangulate_3d_data import triangulate_3d_data
-from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.get_anipose_calibration_object import (
- load_anipose_calibration_toml_from_path,
-)
from freemocap.core_processes.post_process_skeleton_data.process_single_camera_skeleton_data import (
process_single_camera_skeleton_data,
)
diff --git a/freemocap/freemocap_app/freemocap_app_state.py b/freemocap/freemocap_app/freemocap_app_state.py
index c9e0e340..dae28a9f 100644
--- a/freemocap/freemocap_app/freemocap_app_state.py
+++ b/freemocap/freemocap_app/freemocap_app_state.py
@@ -1,13 +1,15 @@
import logging
import multiprocessing
from dataclasses import dataclass
+from datetime import datetime
+from pydantic import BaseModel
from skellycam.core.camera_group.shmorchestrator.shared_memory.multi_frame_escape_ring_buffer import \
MultiFrameEscapeSharedMemoryRingBuffer
from skellycam.core.camera_group.shmorchestrator.shared_memory.single_slot_camera_group_shared_memory import \
SingleSlotCameraGroupSharedMemory, CameraSharedMemoryDTOs
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 skellycam.skellycam_app.skellycam_app_state import SkellycamAppState, get_skellycam_app_state, SkellycamAppStateDTO
from skellytracker.trackers.charuco_tracker import CharucoTrackerConfig
from skellytracker.trackers.mediapipe_tracker import MediapipeTrackerConfig
@@ -101,6 +103,26 @@ class FreemocapAppState:
if self.processing_camera_shms:
self.processing_camera_shms.close_and_unlink()
+ def state_dto(self) -> 'FreemocapAppStateDTO':
+ return FreemocapAppStateDTO.from_state(self)
+
+
+class FreemocapAppStateDTO(BaseModel):
+ """
+ Serializable Data Transfer Object for the FreemocapAppState
+ """
+ type: str
+ state_timestamp: str = datetime.now().isoformat()
+
+ skellycam_app_state: SkellycamAppStateDTO
+
+ @classmethod
+ def from_state(cls, state: FreemocapAppState):
+ return cls(
+ skellycam_app_state=SkellycamAppStateDTO.from_state(state.skellycam_app_state),
+ type=cls.__name__
+ )
+
FREEMOCAP_APP_STATE: FreemocapAppState | None = None
diff --git a/freemocap/pipelines/calibration_pipeline/calculate_sparse_jacobian.py b/freemocap/pipelines/calibration_pipeline/calculate_sparse_jacobian.py
new file mode 100644
index 00000000..80a85e37
--- /dev/null
+++ b/freemocap/pipelines/calibration_pipeline/calculate_sparse_jacobian.py
@@ -0,0 +1,80 @@
+import numpy as np
+from scipy.sparse import dok_matrix, csr_matrix
+
+def calculate_jacobian_sparsity(
+ pixel_points2d: np.ndarray,
+ ids: np.ndarray,
+ num_camera_params: int
+) -> csr_matrix:
+ """
+ Calculate the sparsity pattern of the Jacobian matrix for bundle adjustment.
+
+ Parameters:
+ - pixel_points2d (np.ndarray): CxNx2 array of 2D points where C is the number of cameras and N is the number of points.
+ - ids (np.ndarray): Unique identifiers for each set of 3D points (or boards? not sure what this referred to in the og code).
+ - num_camera_params (int): Number of parameters per camera.
+
+ Returns:
+ - csr_matrix: Sparse matrix representing the Jacobian sparsity pattern.
+ """
+ num_cameras, num_points, _ = pixel_points2d.shape
+
+ # Initialize indices for points and cameras
+ point_indices = np.arange(num_points)
+ camera_indices = np.arange(num_cameras)[:, np.newaxis]
+
+ # Mask valid (non-NaN) 2D points
+ valid_points_mask = ~np.isnan(pixel_points2d).any(axis=2)
+
+ # Remap unique IDs to a consecutive range
+ def remap_ids(original_ids: np.ndarray) -> np.ndarray:
+ unique_ids, remapped_ids = np.unique(original_ids, return_inverse=True)
+ return remapped_ids
+
+ remapped_ids = remap_ids(ids)
+ num_boards = int(np.max(remapped_ids)) + 1
+ board_params_per_board = 6 # 3 for rotation and 3 for translation
+ total_board_params = num_boards * board_params_per_board
+
+ # Calculate total parameters for reprojection and errors
+ total_reprojection_params = num_cameras * num_camera_params + num_points * 3
+ total_params = total_reprojection_params + total_board_params
+ num_valid_points = valid_points_mask.sum()
+ total_errors = num_valid_points + num_points * 3
+
+ # Initialize sparse matrix for Jacobian
+ jacobian_sparsity = dok_matrix((total_errors, total_params), dtype=bool)
+
+ # Populate sparse matrix based on valid points
+ valid_camera_indices = camera_indices[valid_points_mask]
+ valid_point_indices = point_indices[valid_points_mask]
+
+ # Update camera parameters based on reprojection error
+ for param_index in range(num_camera_params):
+ jacobian_sparsity[np.arange(num_valid_points), valid_camera_indices * num_camera_params + param_index] = True
+
+ # Update point positions based on reprojection error
+ for coord_index in range(3):
+ jacobian_sparsity[np.arange(num_valid_points), num_cameras * num_camera_params + valid_point_indices * 3 + coord_index] = True
+
+ # Update board parameters based on object points error
+ for coord_index in range(3):
+ for board_param_index in range(3):
+ jacobian_sparsity[
+ num_valid_points + point_indices * 3 + coord_index,
+ total_reprojection_params + remapped_ids * 3 + board_param_index
+ ] = True
+ jacobian_sparsity[
+ num_valid_points + point_indices * 3 + coord_index,
+ total_reprojection_params + num_boards * 3 + remapped_ids * 3 + board_param_index
+ ] = True
+
+ # Update point positions based on object points error
+ for coord_index in range(3):
+ jacobian_sparsity[
+ num_valid_points + point_indices * 3 + coord_index,
+ num_cameras * num_camera_params + point_indices * 3 + coord_index
+ ] = True
+
+ # Convert to csr_matrix for efficiency in future operations
+ return jacobian_sparsity.tocsr()
\ No newline at end of file
diff --git a/freemocap/pipelines/calibration_pipeline/calibration_aggregation_node.py b/freemocap/pipelines/calibration_pipeline/calibration_aggregation_node.py
index 400d6d37..e4d79e07 100644
--- a/freemocap/pipelines/calibration_pipeline/calibration_aggregation_node.py
+++ b/freemocap/pipelines/calibration_pipeline/calibration_aggregation_node.py
@@ -10,7 +10,6 @@ from skellycam import CameraId
from freemocap.pipelines.calibration_pipeline.calibration_camera_node_output_data import CalibrationCameraNodeOutputData
from freemocap.pipelines.calibration_pipeline.multi_camera_calibrator import MultiCameraCalibrator
-from freemocap.pipelines.calibration_pipeline.single_camera_calibrator import SingleCameraCalibrator
from freemocap.pipelines.pipeline_abcs import BaseAggregationLayerOutputData, BasePipelineStageConfig, \
BaseAggregationNode, BasePipelineOutputData
@@ -68,12 +67,11 @@ class CalibrationAggregationProcessNode(BaseAggregationNode):
multi_camera_calibrator = MultiCameraCalibrator.from_camera_ids(camera_ids=list(input_queues.keys()))
- camera_calibration_estimators: dict[CameraId, SingleCameraCalibrator]|None = None
try:
while not shutdown_event.is_set():
- while any([queue.empty() for queue in input_queues.values()]):
+ if any([queue.empty() for queue in input_queues.values()]):
time.sleep(0.001)
continue
@@ -93,7 +91,7 @@ class CalibrationAggregationProcessNode(BaseAggregationNode):
if not multi_camera_calibrator.has_calibration:
- if multi_frame_number % 10 == 0:
+ if multi_frame_number % 5 == 0:
# Accumulate shared views
multi_camera_calibrator.receive_camera_node_output(multi_frame_number=multi_frame_number,
camera_node_output_by_camera=camera_node_incoming_data)
@@ -116,7 +114,6 @@ class CalibrationAggregationProcessNode(BaseAggregationNode):
)
for camera_id in input_queues.keys()
},
- # data=shared_view_accumulator.model_dump()
)
)
diff --git a/freemocap/pipelines/calibration_pipeline/calibration_camera_node_output_data.py b/freemocap/pipelines/calibration_pipeline/calibration_camera_node_output_data.py
index 7f4160ce..21a9112c 100644
--- a/freemocap/pipelines/calibration_pipeline/calibration_camera_node_output_data.py
+++ b/freemocap/pipelines/calibration_pipeline/calibration_camera_node_output_data.py
@@ -1,5 +1,6 @@
from skellycam.core.frames.payloads.metadata.frame_metadata import FrameMetadata
-from skellytracker.trackers.charuco_tracker.charuco_observation import CharucoObservation
+from skellytracker.trackers.charuco_tracker.charuco_observation import CharucoObservation, \
+ DetectedCharucoCornersImageCoordinates
from freemocap.pipelines.pipeline_abcs import BaseCameraNodeOutputData
@@ -23,3 +24,7 @@ class CalibrationCameraNodeOutputData(BaseCameraNodeOutputData):
@property
def camera_id(self):
return self.frame_metadata.camera_id
+
+ @property
+ def target_pixel_points(self) -> DetectedCharucoCornersImageCoordinates:
+ return self.charuco_observation.detected_charuco_corners_image_coordinates
diff --git a/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/anipose_calibration_algorithm.py b/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/anipose_calibration_optimizer.py
similarity index 90%
rename from freemocap/pipelines/calibration_pipeline/multi_camera_calibration/anipose_calibration_algorithm.py
rename to freemocap/pipelines/calibration_pipeline/multi_camera_calibration/anipose_calibration_optimizer.py
index 4975d18e..1a9b6832 100644
--- a/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/anipose_calibration_algorithm.py
+++ b/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/anipose_calibration_optimizer.py
@@ -10,29 +10,25 @@ from scipy.sparse import dok_matrix
from skellycam import CameraId
from tqdm import trange
+from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.run_anipose_calibration_algorithm import \
+ anipose_triangulate_simple, remap_ids
from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.calibration_numpy_types import PixelPoints2D, \
ObjectPoints3D, ExtrinsicsParameters, IntrinsicsParameters, ReprojectionError, PixelPoints2DByCamera, PointIds, \
RotationVectorsByCamera, TranslationVectorsByCamera
from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.calibration_utilities import \
calculate_error_bounds, transform_points, construct_camera_extrinsics_matrix, \
get_rotation_and_translation_vector_from_extrinsics_matrix, get_error_dict
-from freemocap.pipelines.calibration_pipeline.single_camera_calibration_estimate import SingleCameraCalibrationEstimate
+from freemocap.pipelines.calibration_pipeline.single_camera_calibrator import SingleCameraCalibrator
logger = logging.getLogger(__name__)
-class MultiCameraCalibrationInputData(BaseModel):
- pixel_points2d: PixelPoints2DByCamera
- object_points3d: ObjectPoints3D
- points_ids: PointIds
- rotation_vectors: RotationVectorsByCamera
- translation_vectors: TranslationVectorsByCamera
-
-
-
-class AniposeSingleCameraCalibrationHelper(BaseModel):
- calibration_estimate: SingleCameraCalibrationEstimate
+class SingleCameraCalibrationHelper(BaseModel):
+ calibrator: SingleCameraCalibrator
+ @property
+ def pixel_points2d(self) -> PixelPoints2D:
+ return self.calibrator.image_points_views
def get_optimizable_parameters(self) -> tuple[ExtrinsicsParameters, IntrinsicsParameters]:
"""
@@ -105,10 +101,27 @@ class AniposeSingleCameraCalibrationHelper(BaseModel):
return points2d - projecting_3d_points_onto_2d_image_plane
+class MultiCameraCalibrationInputData(BaseModel):
+ pixel_points2d: PixelPoints2DByCamera
+ object_points3d: ObjectPoints3D
+ points_ids: PointIds
+ rotation_vectors: RotationVectorsByCamera
+ translation_vectors: TranslationVectorsByCamera
-class AniposeMultiCameraCalibrator(BaseModel):
-
- camera_helpers: dict[CameraId, AniposeSingleCameraCalibrationHelper]
+ @classmethod
+ def from_single_camera_helpers(cls, camera_helpers: dict[CameraId, SingleCameraCalibrationHelper]):
+ pixel_points2d = [camera_helper.calibrator.image_points_views for camera_helper in camera_helpers.values()]
+ object_points3d = [camera_helper.calibrator.object_points_views for camera_helper in camera_helpers.values()]
+ rotation_vectors = np.array([camera_helper.calibrator.rotation_vector for camera_helper in camera_helpers.values()])
+ translation_vectors = np.array([camera_helper.calibrator.translation_vector for camera_helper in camera_helpers.values()])
+ return cls(pixel_points2d=pixel_points2d,
+ object_points3d=object_points3d,
+ points_ids=points_ids,
+ rotation_vectors=rotation_vectors,
+ translation_vectors=translation_vectors)
+
+class MultiCameraCalibrationOptimizer(BaseModel):
+ camera_helpers: dict[CameraId, SingleCameraCalibrationHelper]
max_iterations: int = 10
starting_error_threshold: float = 15.0
@@ -120,9 +133,9 @@ class AniposeMultiCameraCalibrator(BaseModel):
error_threshold: float = 0.3
@classmethod
- def from_single_camera_calibrators(cls, single_camera_calibrators: dict[CameraId, SingleCameraCalibrationEstimate]):
- camera_helpers = {camera_id: AniposeSingleCameraCalibrationHelper(calibration_estimate=calibration_estimate)
- for camera_id, calibration_estimate in single_camera_calibrators.items()}
+ def from_single_camera_calibrators(cls, single_camera_calibrators: dict[CameraId, SingleCameraCalibrator]):
+ camera_helpers = {camera_id: SingleCameraCalibrationHelper(calibrator=calibrator)
+ for camera_id, calibrator in single_camera_calibrators.items()}
return cls(camera_helpers=camera_helpers)
def run_iterative_bundle_adjustment(self) -> float:
@@ -131,12 +144,19 @@ class AniposeMultiCameraCalibrator(BaseModel):
based on Anipose's iterative bundle adjustment method. (`bundle_adjust_iter`)
"""
- original_points2d = np.array([camera_helper.pixel_points2d for camera_helper in self.camera_helpers.values()])
+ # Perform bundle adjustment
+ self.bundle_adjust_points2d(
+ mc_calibration_input_data=MultiCameraCalibrationInputData.from_single_camera_helpers(self.camera_helpers),
+ loss="linear",
+ function_tolerance=self.function_tolerance,
+ maximum_number_function_evals=self.max_number_function_evals,
+ )
+
+
# Initialize
error_list = []
- # log original error before resampling
original_error = self.get_mean_reprojection_error(original_points2d, median=True)
logger.info(
f"Starting iterative bundle adjustment..."
@@ -144,15 +164,6 @@ class AniposeMultiCameraCalibrator(BaseModel):
f"\n\tNumber of points: {original_points2d.shape[1]}"
f"\n\tOriginal error: {original_error:.2f}")
- # Resample initial set of points to prioritize shared views
- # resampled_calibration_input_data = resample_points_based_on_shared_views(
- # original_calibration_input_data,
- # number_of_samples_to_return=self.number_of_samples_full
- # )
- # initial_error = self.get_mean_reprojection_error(resampled_calibration_input_data.pixel_points2d, median=True)
-
- # logger.debug("Initial error after resampling: ", initial_error)
-
# Calculate dynamic error thresholds for each iteration
error_thresholds = np.exp(
np.linspace(np.log(self.starting_error_threshold), np.log(self.ending_error_threshold),
@@ -163,9 +174,7 @@ class AniposeMultiCameraCalibrator(BaseModel):
# Iterative bundle adjustment
dynamic_error_threshold = self.starting_error_threshold
for iteration in range(self.max_iterations):
- resampled_calibration_input_data = resample_points_based_on_shared_views(
- original_calibration_input_data, number_of_samples_to_return=self.number_of_samples_full
- )
+ resampled_calibration_input_data = original_calibration_input_data
# Triangulate 3D points from resampled 2D points
triangulated_points3d = self.triangulate(resampled_calibration_input_data.pixel_points2d)
@@ -225,7 +234,7 @@ class AniposeMultiCameraCalibrator(BaseModel):
def calculate_reprojection_error(self,
points_3d: np.ndarray,
points_2d: np.ndarray,
- mean:bool=False):
+ mean: bool = False):
"""Given an Nx3 array of 3D points and an CxNx2 array of 2D points,
where N is the number of points and C is the number of cameras,
this returns an CxNx2 array of errors.
@@ -372,17 +381,16 @@ class AniposeMultiCameraCalibrator(BaseModel):
def bundle_adjust_points2d(
self,
- calibration_input_data: MultiCameraCalibrationInputData,
+ mc_calibration_input_data: MultiCameraCalibrationInputData,
loss: str = "linear",
threshold: float = 50.0,
function_tolerance: float = 1e-4,
maximum_number_function_evals: int = 1000,
- weights: np.ndarray | None = None,
start_params: np.ndarray | None = None,
) -> float:
"""Perform bundle adjustment to fine-tune camera parameters"""
- points2d = calibration_input_data.pixel_points2d
+ points2d = mc_calibration_input_data.pixel_points2d
# Validate input shapes
if not points2d.ndim == 3 and points2d.shape[2] == 2:
raise ValueError("points2d must be a CxNx2 array")
@@ -393,7 +401,7 @@ class AniposeMultiCameraCalibrator(BaseModel):
)
# Initialize parameters for bundle adjustment
- initial_params, num_camera_params = self._initalize_bundle_adjust_parameters(calibration_input_data)
+ initial_params, num_camera_params = self._initalize_bundle_adjust_parameters(mc_calibration_input_data)
# Override initial parameters if start_params are provided
if start_params is not None:
@@ -402,7 +410,7 @@ class AniposeMultiCameraCalibrator(BaseModel):
# Define error function and sparsity pattern for optimization
- jac_sparsity = self._calculate_bundle_adjustment_jacobian_sparsity(calibration_input_data, num_camera_params)
+ jac_sparsity = self._calculate_bundle_adjustment_jacobian_sparsity(mc_calibration_input_data, num_camera_params)
# Set up optimization options
optimization_result = optimize.least_squares(
@@ -473,6 +481,7 @@ class AniposeMultiCameraCalibrator(BaseModel):
"""Given an CxNx2 array of 2D points,
where N is the number of points and C is the number of cameras,
compute the sparsity structure of the jacobian for bundle adjustment"""
+
points2d = calibration_input_data.pixel_points2d
point_indices = np.zeros(points2d.shape, dtype="int32")
cam_indices = np.zeros(points2d.shape, dtype="int32")
@@ -485,7 +494,21 @@ class AniposeMultiCameraCalibrator(BaseModel):
good = ~np.isnan(points2d)
+ def remap_ids(ids: np.ndarray | list[int]) -> np.ndarray:
+ """
+ Remap the unique identifiers in the input array to a consecutive range starting from zero.
+
+ :param ids: An array-like structure containing the original identifiers.
+ :return: A NumPy array with the identifiers remapped to a consecutive range.
+ """
+ ids_array = np.asarray(ids)
+ unique_ids, remapped_ids = np.unique(ids_array, return_inverse=True)
+ return remapped_ids
+
ids = remap_ids(calibration_input_data.ids)
+
+
+
n_boards = int(np.max(ids)) + 1
total_board_params = n_boards * (3 + 3) # rotation_vectors + translation_vectors
@@ -543,7 +566,7 @@ class AniposeMultiCameraCalibrator(BaseModel):
return A_sparse
- def _initalize_bundle_adjust_parameters(self, calibration_input_data:MultiCameraCalibrationInputData):
+ def _initalize_bundle_adjust_parameters(self, calibration_input_data: MultiCameraCalibrationInputData):
"""Given an CxNx2 array of 2D points,
where N is the number of points and C is the number of cameras,
initializes the parameters for bundle adjustment"""
@@ -568,7 +591,6 @@ class AniposeMultiCameraCalibrator(BaseModel):
rotation_vectors = np.zeros((n_boards, 3), dtype="float64")
translation_vectors = np.zeros((n_boards, 3), dtype="float64")
-
rotation_vectors_all = calibration_input_data.rotation_vectors
translation_vectors_all = calibration_input_data.translation_vectors
for board_num in range(n_boards):
diff --git a/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/calibration_numpy_types.py b/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/calibration_numpy_types.py
index b2803b7e..d11579d9 100644
--- a/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/calibration_numpy_types.py
+++ b/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/calibration_numpy_types.py
@@ -1,24 +1,35 @@
import numpy as np
from numpydantic import NDArray, Shape
-RotationVector = NDArray[Shape["3"], np.float64]
-TranslationVector = NDArray[Shape["3"], np.float64]
+
PixelPoints2D = NDArray[Shape["* n_points, 2 pixelx_pixely"], np.float64]
-ReprojectionError = NDArray[Shape["* n_points"], np.float64]
-CameraMatrix = NDArray[Shape["3 rows, 3 columns"], np.float64]
-CameraDistortionCoefficients = NDArray[Shape["4-14 k1_k2_p1_p2_k3_k4_k5_k6"], np.float64] #Can be 4,5,8,12, or 14 elements
+PixelPoint2DByCamera = NDArray[Shape["* n_cams, 2 pixelx_pixely"], np.float64] # e.g. Image coordinates of a point in 3d space projected onto each camera
+PixelPoints2DByCamera = NDArray[Shape["* n_cams, * n_points, 2 pixelx_pixely"], np.float64]
+ObjectPoints3D = NDArray[Shape["* n_points, 3 xyz"], np.float64]
+PointIds = NDArray[Shape["* n_points"], np.int64]
+
+RotationVector = NDArray[Shape["3"], np.float64]
+TranslationVector = NDArray[Shape["3"], np.float64]
RotationVectorsByCamera = NDArray[Shape["* n_cams, 3"], np.float64]
TranslationVectorsByCamera = NDArray[Shape["* n_cams, 3"], np.float64]
-PixelPoints2DByCamera = NDArray[Shape["* n_cams, * n_points, 2 pixelx_pixely"], np.float64]
+
+CameraMatrix = NDArray[Shape["3 rows, 3 columns"], np.float64]
+CameraExtrinsicsMatrix = NDArray[Shape["4 rows, 4 columns"], np.float64]
CameraMatrixByCamera = NDArray[Shape["* n_cams, 3 rows, 3 columns"], np.float64]
+CameraExtrinsicsMatrixByCamera = NDArray[Shape["* n_cams, 4 rows, 4 columns"], np.float64]
+TransformationMatrix = NDArray[Shape["4 rows, 4 columns"], np.float64] # 4x4 matrix that transforms points from the camera coordinate system to the world coordinate system. 3x3 in the upper left is the rotation matrix, and the rightmost column is the translation vector. The bottom row is [0, 0, 0, 1] (where the 1 is the homogeneous coordinate, which makes the matrix invertible and provides the scale factor for the translation vector to put it in spatial coordinates
+
+CameraDistortionCoefficients = NDArray[Shape["4-14 k1_k2_p1_p2_k3_k4_k5_k6"], np.float64] # Can be 4,5,8,12, or 14 elements
+
+ReprojectionError = NDArray[Shape["* n_points"], np.float64]
-TransformationMatrix = NDArray[Shape["4 rows, 4 columns"], np.float64] # 4x4 matrix that transforms points from the camera coordinate system to the world coordinate system. 3x3 in the upper left is the rotation matrix, and the rightmost column is the translation vector. The bottom row is [0, 0, 0, 1] (where the 1 is the homogeneous coordinate, which makes the matrix invertible and provides the scale factor for the translation vector to put it in spatial coordinates
-ObjectPoints3D = NDArray[Shape["* n_points, 3 xyz"], np.float64]
-PointIds = NDArray[Shape["* n_points"], np.int64]
-ExtrinsicsParameters = NDArray[Shape["6 translation_rotation"], np.float64] # 3 for rotation, 3 for translation
-IntrinsicsParameters = NDArray[Shape["*, ..."], np.float64] # focal length, variable number of distortion coefficients (2, 4, 5, 8, 12, or 14)
+
+ExtrinsicsParameters = NDArray[Shape["6 translation_rotation"], np.float64] # 3 for rotation, 3 for translation
+IntrinsicsParameters = NDArray[Shape["*, ..."], np.float64] # focal length, variable number of distortion coefficients (2, 4, 5, 8, 12, or 14)
ExtrinsicsParametersByCamera = NDArray[Shape["* n_cams, 6 translation_rotation"], np.float64]
IntrinsicsParametersByCamera = NDArray[Shape["* n_cams, * focal_length_distortion"], np.float64]
+
+JacobianSparsityMatrix = NDArray[Shape["* m_n_error_function_returns, * n_parameters"], np.float64]
\ No newline at end of file
diff --git a/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/least_squares_optimizer.py b/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/least_squares_optimizer.py
new file mode 100644
index 00000000..94efb780
--- /dev/null
+++ b/freemocap/pipelines/calibration_pipeline/multi_camera_calibration/least_squares_optimizer.py
@@ -0,0 +1,148 @@
+from abc import ABC, abstractmethod
+
+import numpy as np
+from pydantic import BaseModel
+from scipy import optimize
+from scipy.sparse import dok_matrix, csr_matrix
+from skellycam import CameraId
+
+from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.calibration_numpy_types import \
+ CameraDistortionCoefficients, CameraMatrixByCamera, PixelPoints2DByCamera, CameraMatrix, JacobianSparsityMatrix
+
+DataPointName = str
+DataPointId = int
+DataPointValue = float | int
+DataMaxValue = DataMinValue = float | int | None
+
+
+class Datum(BaseModel):
+ """
+ A solitary data point
+
+ id should be unique within the dataset,
+ name is descriptive for humans and should specify where this datum lives within the dataset,
+ datum is a scalar representing the value of this data point
+ max and min are the maximum and minimum values this datum can take (if applicable)
+ """
+ name: DataPointName
+ id: DataPointId
+ value: DataPointValue
+ max: DataMaxValue = None
+ min: DataMinValue = None
+
+
+class RelevantDataABC(BaseModel, ABC):
+ data: dict[DataPointName, Datum]
+
+ @abstractmethod
+ def as_1d_vector(self) -> list[DataPointValue]:
+ ids = []
+ for datum in self.data.values():
+ if datum.id in ids:
+ raise ValueError(f"Duplicate id {datum.id} found in data")
+ ids.append(datum.id)
+
+ return [datum.value for datum in self.data.values()]
+
+
+class OptimizerInputDataABC(BaseModel, ABC):
+ relevant_data: RelevantDataABC
+ initial_guess: list[float]
+ jacobian_sparsity_matrix: JacobianSparsityMatrix | None = None
+
+ @abstractmethod
+ def calculate_jacobian_sparsity_matrix(self):
+ pass
+
+ @abstractmethod
+ def is_datapoint_relevant_to_this_part_of_the_initial_guess(self, data_point: Datum) -> bool:
+ pass
+
+
+class LeastSquaresOptimizerABC(BaseModel, ABC):
+ input_data: OptimizerInputDataABC
+ loss: str = "linear"
+ maximum_number_function_evals: int = 1000
+ threshold: float = 50.0
+ function_tolerance: float = 1e-4
+ jacobian_sparsity_matrix: JacobianSparsityMatrix | None = None
+
+ @classmethod
+ @abstractmethod
+ def create(cls, input_data: OptimizerInputDataABC) -> "LeastSquaresOptimizerABC":
+ pass
+
+ @abstractmethod
+ def error_function(self, current_guess: list[float], **kwargs) -> float:
+ pass
+
+ @abstractmethod
+ def get_jacobian_sparse_matrix(self, current_guess: list[float], **kwargs) -> dok_matrix:
+ pass
+
+ def optimize(self) -> optimize.OptimizeResult:
+ # Set up optimization options
+ return optimize.least_squares(
+ fun=self.error_function,
+ x0=self.starting_guess,
+ jac_sparsity=self.get_jacobian_sparse_matrix(self.starting_guess),
+ f_scale=self.threshold,
+ x_scale="jac",
+ loss=self.loss,
+ ftol=self.function_tolerance,
+ method="trf",
+ verbose=2,
+ max_nfev=self.maximum_number_function_evals,
+ args=(),
+ )
+
+
+class SparseBundleAdjustmentOptimizerInputData(OptimizerInputDataABC):
+ camera_matricies: CameraMatrixByCamera
+ image_points_2d_by_camera: PixelPoints2DByCamera
+ camera_distortion_coefficients: CameraDistortionCoefficients | None = None
+ jacobian_sparsity_matrix: JacobianSparsityMatrix | None = None
+
+ def calculate_jacobian_sparsity_matrix(self):
+ pass
+
+ def is_datapoint_relevant_to_this_part_of_the_initial_guess(self, data_point: Datum) -> bool:
+ pass
+
+ @classmethod
+ def create(cls,
+ camera_matricies: dict[CameraId, CameraMatrix],
+ input_2d_observations_in_image_coordinates_by_camera: list[PixelPoints2DByCamera],
+ camera_distortion_coefficients: CameraDistortionCoefficients | None = None,
+ ) -> "SparseBundleAdjustmentOptimizerInputData":
+ return cls(camera_matricies=np.hstack([camera_matrix for camera_matrix in camera_matricies.values()]),
+ image_points_2d_by_camera=input_2d_observations_in_image_coordinates_by_camera,
+ camera_distortion_coefficients=camera_distortion_coefficients)
+
+
+class SparseBundleAdjustmentOptimizer(LeastSquaresOptimizerABC):
+ input_data: SparseBundleAdjustmentOptimizerInputData
+
+ @classmethod
+ def create(cls, input_data: SparseBundleAdjustmentOptimizerInputData) -> "SparseBundleAdjustmentOptimizer":
+ return cls(input_data=input_data,
+ jacobian_sparsity_matrix=input_data.jacobian_sparsity_matrix)
+
+ @property
+ def starting_guess(self) -> list[float]:
+ return self.input_data.camera_matrices.flatten().tolist()
+
+ def error_function(self, current_guess: list[float], **kwargs) -> float:
+ if not all(k in kwargs for k in ("camera_matrices", "camera_distortion_coefficients")):
+ raise ValueError("Missing required kwargs 'camera_matrices' and/OR 'camera_distortion_coefficients'")
+
+ # reform 'current_guess' into camera extrinsics matricies
+
+ # triangulate 3D points from 2D points using camera extrinsics and intrinsics (provided as kwargs)
+
+ # calculate reprojection error
+ error = 0.0
+ return error
+
+ def get_jacobian_sparse_matrix(self, current_guess: list[float], **kwargs) -> dok_matrix:
+ pass
diff --git a/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py b/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py
index daa3b195..883513a6 100644
--- a/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py
+++ b/freemocap/pipelines/calibration_pipeline/multi_camera_calibrator.py
@@ -4,8 +4,8 @@ from pydantic import BaseModel
from skellycam import CameraId
from freemocap.pipelines.calibration_pipeline.calibration_camera_node_output_data import CalibrationCameraNodeOutputData
-from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.anipose_calibration_algorithm import \
- AniposeMultiCameraCalibrator
+from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.least_squares_optimizer import \
+ SparseBundleAdjustmentOptimizer, SparseBundleAdjustmentOptimizerInputData
from freemocap.pipelines.calibration_pipeline.shared_view_accumulator import SharedViewAccumulator
logger = logging.getLogger(__name__)
@@ -43,24 +43,23 @@ class MultiCameraCalibrator(BaseModel):
def receive_camera_node_output(self, multi_frame_number: int,
camera_node_output_by_camera: dict[CameraId, CalibrationCameraNodeOutputData]):
- self.add_observations_to_single_camera_calibrators(camera_node_output_by_camera, multi_frame_number)
+ self.add_observations_to_single_camera_calibrators(camera_node_output_by_camera)
self.shared_view_accumulator.receive_camera_node_output(multi_frame_number=multi_frame_number,
camera_node_output_by_camera=camera_node_output_by_camera)
logger.trace(f"Shared view accumulator: {self.shared_view_accumulator.shared_view_count_by_camera}")
- def add_observations_to_single_camera_calibrators(self, camera_node_output_by_camera, multi_frame_number):
+ def add_observations_to_single_camera_calibrators(self, camera_node_output_by_camera: dict[CameraId, CalibrationCameraNodeOutputData]):
if self.single_camera_calibrators is None:
- self.initialize_single_camera_calibrators()
+ self.initialize_single_camera_calibrators(camera_node_output_by_camera)
for camera_id, output in camera_node_output_by_camera.items():
self.single_camera_calibrators[camera_id].add_observation(observation=output.charuco_observation)
- def initialize_single_camera_calibrators(self):
- if self.latest_camera_node_output_by_camera is None:
- raise ValueError("No camera node output data to initialize single camera calibrators with!")
- self.single_camera_calibrators = {}
- for camera_id, node_output in self.latest_camera_node_output_by_camera.items():
+ def initialize_single_camera_calibrators(self, camera_node_output_by_camera: dict[CameraId, CalibrationCameraNodeOutputData]):
+
+ self.single_camera_calibrators:dict[CameraId, SingleCameraCalibrator] = {}
+ for camera_id, node_output in camera_node_output_by_camera.items():
self.single_camera_calibrators[camera_id] = SingleCameraCalibrator.create_initial(
camera_id=camera_id,
image_size=node_output.charuco_observation.image_size,
@@ -74,20 +73,23 @@ class MultiCameraCalibrator(BaseModel):
return self.shared_view_accumulator.all_cameras_have_min_shared_views(
min_shared_views=self.minimum_views_to_reconstruct if min_shared_views is None else min_shared_views)
- logger.trace(
- f"Calibrated camera {camera_id}:\n{self.single_camera_calibrators[camera_id].current_estimate.model_dump_json(indent=2)}")
def calibrate(self) -> MultiCameraCalibrationEstimate:
logger.debug(
f"Calibrating multi-camera system for cameras: {self.single_camera_calibrators.keys()} with principal camera: {self.principal_camera_id} and {len(self.shared_view_accumulator.shared_target_views)} shared views")
- self.update_single_camera_calibration_estimates()
+
+ [calibrator.update_calibration_estimate() for calibrator in self.single_camera_calibrators.values()]
+
self.run_multi_camera_optimization()
logger.success(
f"Multi-camera calibration complete! \n {self.multi_camera_calibration_estimate.model_dump_json(indent=2)}")
return self.multi_camera_calibration_estimate
def run_multi_camera_optimization(self):
- self.multi_camera_calibration_estimate = AniposeMultiCameraCalibrator.from_single_camera_calibrators(
- single_camera_calibrators=self.single_camera_calibrators).run_iterative_bundle_adjustment()
+ input_data = SparseBundleAdjustmentOptimizerInputData.create(camera_matricies={camera_id:calibrator.camera_matrix for camera_id, calibrator in self.single_camera_calibrators.items()},
+ input_2d_observations_in_image_coordinates_by_camera=self.shared_view_accumulator.to_image_points_by_camera(),
+ )
+ mc_calibrator = SparseBundleAdjustmentOptimizer.create(input_data=input_data)
+ self.multi_camera_calibration_estimate = mc_calibrator.run_iterative_bundle_adjustment()
return self.multi_camera_calibration_estimate
diff --git a/freemocap/pipelines/calibration_pipeline/shared_view_accumulator.py b/freemocap/pipelines/calibration_pipeline/shared_view_accumulator.py
index 93fa70b4..f4912900 100644
--- a/freemocap/pipelines/calibration_pipeline/shared_view_accumulator.py
+++ b/freemocap/pipelines/calibration_pipeline/shared_view_accumulator.py
@@ -2,15 +2,22 @@ from pydantic import BaseModel, Field
from skellycam import CameraId
from freemocap.pipelines.calibration_pipeline.calibration_camera_node_output_data import CalibrationCameraNodeOutputData
+from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.calibration_numpy_types import \
+ PixelPoint2DByCamera
MultiFrameNumber = int
+
+
class MultiFrameTargetViews(BaseModel):
multi_frame_number: MultiFrameNumber
- camera_node_output_by_camera: dict[CameraId, CalibrationCameraNodeOutputData] = Field(description="Key: CameraId of cameras that can see the target, Value: CameraNodeOutputData from that camera")
+ camera_node_output_by_camera: dict[CameraId, CalibrationCameraNodeOutputData] = Field(
+ description="Key: CameraId of all cameras, Value: CalibrationCameraNodeOutputData of the camera IFF "
+ "the camera can see the target in the frame, else None")
@property
def cameras_that_can_see_target(self) -> list[CameraId]:
- return [camera_id for camera_id, camera_node_output in self.camera_node_output_by_camera.items() if camera_node_output.can_see_target]
+ return [camera_id for camera_id, camera_node_output in self.camera_node_output_by_camera.items() if
+ camera_node_output.can_see_target]
@property
def multiple_cameras_can_see_target(self) -> bool:
@@ -20,6 +27,12 @@ class MultiFrameTargetViews(BaseModel):
def number_of_cameras_that_can_see_target(self) -> int:
return len(self.cameras_that_can_see_target)
+ def to_image_points_by_camera(self) -> list[PixelPoint2DByCamera]:
+ return [camera_node_output.target_pixel_points
+ for camera_node_output in self.camera_node_output_by_camera.values()
+ if camera_node_output is not None]
+
+
class SharedViewAccumulator(BaseModel):
"""
Keeps track of the data feeds from each camera, and keeps track of the frames where each can see the calibration target,
@@ -28,12 +41,10 @@ class SharedViewAccumulator(BaseModel):
camera_ids: list[CameraId]
target_views_by_frame: dict[MultiFrameNumber, MultiFrameTargetViews]
-
@classmethod
def create(cls, camera_ids: list[CameraId]):
return cls(camera_ids=camera_ids, target_views_by_frame={})
-
@property
def shared_view_count_by_camera(self) -> dict[CameraId, int]:
shared_view_count_by_camera = {camera_id: 0 for camera_id in self.camera_ids}
@@ -45,13 +56,34 @@ class SharedViewAccumulator(BaseModel):
@property
def shared_target_views(self) -> list[MultiFrameTargetViews]:
- return [shared_view_by_frame for shared_view_by_frame in self.target_views_by_frame.values() if shared_view_by_frame.multiple_cameras_can_see_target]
+ return [shared_view_by_frame
+ for shared_view_by_frame in self.target_views_by_frame.values()
+ if shared_view_by_frame.multiple_cameras_can_see_target]
def receive_camera_node_output(self, multi_frame_number: int,
camera_node_output_by_camera: dict[CameraId, CalibrationCameraNodeOutputData]):
- cameras_that_can_see_target = {camera_id: camera_node_output for camera_id, camera_node_output in camera_node_output_by_camera.items() if camera_node_output.can_see_target}
- self.target_views_by_frame[multi_frame_number] = MultiFrameTargetViews(multi_frame_number=multi_frame_number, camera_node_output_by_camera=cameras_that_can_see_target)
+ cameras_that_can_see_target = {}
+ target_view_count = 0
+ for camera_id, camera_node_output in camera_node_output_by_camera.items():
+ if camera_node_output.can_see_target:
+ cameras_that_can_see_target = {camera_id: camera_node_output}
+ target_view_count += 1
+ else:
+ cameras_that_can_see_target = {camera_id: None}
+ if target_view_count >= 2:
+ # only add to shared view accumulator if at least two cameras can see the target
+ self.target_views_by_frame[multi_frame_number] = MultiFrameTargetViews(
+ multi_frame_number=multi_frame_number,
+ camera_node_output_by_camera=cameras_that_can_see_target)
def all_cameras_have_min_shared_views(self, min_shared_views: int = 10) -> bool:
return all(shared_views >= min_shared_views for shared_views in self.shared_view_count_by_camera.values())
+ def to_image_points_by_camera(self) -> list[PixelPoint2DByCamera]:
+ # PixelPoints2DByCamera = NDArray[Shape["* n_cams, * n_points, 2 pixelx_pixely"], np.float64]
+ all_pixel_points_by_camera = []
+ for shared_view_by_frame in self.shared_target_views:
+ if shared_view_by_frame.multiple_cameras_can_see_target:
+ all_pixel_points_by_camera.extend(shared_view_by_frame.to_image_points_by_camera())
+
+ return all_pixel_points_by_camera
diff --git a/freemocap/pipelines/calibration_pipeline/single_camera_calibration_estimate.py b/freemocap/pipelines/calibration_pipeline/single_camera_calibration_estimate.py
index ff241960..87781837 100644
--- a/freemocap/pipelines/calibration_pipeline/single_camera_calibration_estimate.py
+++ b/freemocap/pipelines/calibration_pipeline/single_camera_calibration_estimate.py
@@ -30,4 +30,5 @@ class SingleCameraCalibrationEstimate(BaseModel):
self.camera_matrix[1, 1] = fy
def extrinsic_matrix(self) -> TransformationMatrix:
- return self.positional_6dof.transformation_matrix
\ No newline at end of file
+ return self.positional_6dof.transformation_matrix
+
diff --git a/freemocap/pipelines/calibration_pipeline/single_camera_calibrator.py b/freemocap/pipelines/calibration_pipeline/single_camera_calibrator.py
index 7f5bddfe..7be23984 100644
--- a/freemocap/pipelines/calibration_pipeline/single_camera_calibrator.py
+++ b/freemocap/pipelines/calibration_pipeline/single_camera_calibrator.py
@@ -5,9 +5,13 @@ import numpy as np
from numpydantic import NDArray, Shape
from pydantic import BaseModel, Field
from skellycam import CameraId
-from skellytracker.trackers.charuco_tracker.charuco_observation import CharucoObservations, CharucoObservation
+from skellytracker.trackers.charuco_tracker.charuco_observation import CharucoObservations, CharucoObservation, \
+ AllCharucoCorners3DByIdInObjectCoordinates, AllArucoCorners3DByIdInObjectCoordinates
from freemocap.pipelines.calibration_pipeline.calibration_camera_node_output_data import CalibrationCameraNodeOutputData
+from freemocap.pipelines.calibration_pipeline.multi_camera_calibration.calibration_numpy_types import ObjectPoints3D, \
+ PixelPoints2D, RotationVector, TranslationVector, CameraDistortionCoefficients, CameraMatrix, \
+ ReprojectionError
from freemocap.pipelines.calibration_pipeline.single_camera_calibration_estimate import SingleCameraCalibrationEstimate
logger = logging.getLogger(__name__)
@@ -29,25 +33,26 @@ class SingleCameraCalibrator(BaseModel):
cv2.calibrateCamera docs: https://docs.opencv.org/4.10.0/d9/d0c/group__calib3d.html#ga687a1ab946686f0d85ae0363b5af1d7b
"""
+
camera_id: CameraId
image_size: tuple[int, ...]
- object_points_views: list[NDArray[Shape["* , 3"], np.float32]]
- image_points_views: list[NDArray[Shape["*, 2"], np.float32]]
- rotation_vectors: list[NDArray[Shape["*, 3"], np.float32]]
- translation_vectors: list[NDArray[Shape["*, 3"], np.float32]]
+ object_points_views: list[ObjectPoints3D]
+ image_points_views: list[PixelPoints2D]
+ rotation_vectors: list[RotationVector]
+ translation_vectors: list[TranslationVector]
charuco_corner_ids: list[int]
- charuco_corners_in_object_coordinates: NDArray[Shape["*, 3"], np.float32]
+ charuco_corners_in_object_coordinates: AllCharucoCorners3DByIdInObjectCoordinates
aruco_marker_ids: list[int]
- aruco_corners_in_object_coordinates: NDArray[Shape["* aruco_ids, 4 corners, 3 xyz"], np.float32]
+ aruco_corners_in_object_coordinates: AllArucoCorners3DByIdInObjectCoordinates
- distortion_coefficients: NDArray[Shape["5"], np.float64]
- camera_matrix: NDArray[Shape["3 rows, 3 columns"], np.float64]
+ distortion_coefficients: CameraDistortionCoefficients
+ camera_matrix: CameraMatrix
charuco_observations: CharucoObservations = Field(default_factory=CharucoObservations)
reprojection_error_by_view: list[float]
- reprojection_error_per_point_by_view: list[NDArray[Shape["* n_points, 2 xy"], np.float32]]
+ reprojection_error_per_point_by_view: list[ReprojectionError]
mean_reprojection_error: float|None = None
camera_calibration_residuals: list[float]
diff --git a/freemocap/pipelines/freemocap_frontend_payload.py b/freemocap/pipelines/freemocap_frontend_payload.py
index 197bf97e..89e6f522 100644
--- a/freemocap/pipelines/freemocap_frontend_payload.py
+++ b/freemocap/pipelines/freemocap_frontend_payload.py
@@ -1,13 +1,13 @@
import numpy as np
-from freemocap.pipelines.pipeline_abcs import BasePipelineOutputData
+from numpydantic import NDArray, Shape
from pydantic import BaseModel
+from skellycam import CameraId
from skellycam.core.frames.payloads.frontend_image_payload import FrontendFramePayload
-
-from freemocap.pipelines.calibration_pipeline.calibration_aggregation_node import CalibrationPipelineOutputData
from skellycam.core.frames.payloads.multi_frame_payload import MultiFramePayload
-from numpydantic import NDArray, Shape
-from skellycam import CameraId
+from freemocap.pipelines.pipeline_abcs import BasePipelineOutputData
+
+
class CharucoBoardPayload(BaseModel):
charuco_corners_in_object_coordinates: NDArray[Shape["* charuco_corners, 3 xyz"], np.float64]
charuco_ids: NDArray[Shape["* ch0aruco_corners, ..."], np.int32]
diff --git a/freemocap/pipelines/mocap_pipeline/__mocap_pipeline.py b/freemocap/pipelines/mocap_pipeline/__mocap_pipeline.py
index e7ec0f7b..5faff655 100644
--- a/freemocap/pipelines/mocap_pipeline/__mocap_pipeline.py
+++ b/freemocap/pipelines/mocap_pipeline/__mocap_pipeline.py
@@ -4,10 +4,6 @@ from dataclasses import dataclass
from multiprocessing import Queue
from typing import Dict
-from freemocap.pipelines.mocap_pipeline.mocap_aggregation_node import MocapAggregationNodeConfig, \
- MocapPipelineOutputData, MocapAggregationProcessNode
-from freemocap.pipelines.mocap_pipeline.mocap_camera_node import MocapPipelineCameraNodeConfig, MocapCameraNode
-from freemocap.pipelines.pipeline_abcs import BasePipelineConfig, PipelineImageAnnotator, BaseProcessingPipeline
from skellycam import CameraId
from skellycam.core.camera_group.camera.config.camera_config import CameraConfigs
from skellycam.core.camera_group.shmorchestrator.shared_memory.single_slot_camera_group_shared_memory import \
@@ -17,6 +13,11 @@ from skellytracker.trackers.mediapipe_tracker import MediapipeTrackerConfig
from skellytracker.trackers.mediapipe_tracker.mediapipe_annotator import MediapipeImageAnnotator, \
MediapipeAnnotatorConfig
+from freemocap.pipelines.mocap_pipeline.mocap_aggregation_node import MocapAggregationNodeConfig, \
+ MocapPipelineOutputData, MocapAggregationProcessNode
+from freemocap.pipelines.mocap_pipeline.mocap_camera_node import MocapPipelineCameraNodeConfig, MocapCameraNode
+from freemocap.pipelines.pipeline_abcs import BasePipelineConfig, PipelineImageAnnotator, BaseProcessingPipeline
+
logger = logging.getLogger(__name__)
diff --git a/freemocap/pipelines/mocap_pipeline/point_trangulator.py b/freemocap/pipelines/mocap_pipeline/point_trangulator.py
index eefa9ec9..9ac8b35d 100644
--- a/freemocap/pipelines/mocap_pipeline/point_trangulator.py
+++ b/freemocap/pipelines/mocap_pipeline/point_trangulator.py
@@ -4,7 +4,6 @@ import cv2
import numpy as np
import toml
from skellycam import CameraId
-from skellytracker.trackers.mediapipe_tracker import MediapipeObservation
from freemocap.system.paths_and_filenames.path_getters import get_last_successful_calibration_toml_path
diff --git a/freemocap/pipelines/pipeline_abcs.py b/freemocap/pipelines/pipeline_abcs.py
index f4304f02..edaa5858 100644
--- a/freemocap/pipelines/pipeline_abcs.py
+++ b/freemocap/pipelines/pipeline_abcs.py
@@ -8,7 +8,7 @@ from multiprocessing import Process, Queue
import numpy as np
from numpydantic import NDArray, Shape
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel
from skellycam.core import CameraId
from skellycam.core.camera_group.shmorchestrator.shared_memory.single_slot_camera_group_shared_memory import \
SingleSlotCameraSharedMemory
diff --git a/freemocap/utilities/convert_pydantic_to_zod.py b/freemocap/utilities/convert_pydantic_to_zod.py
index 33dd915d..1a9fd5a0 100644
--- a/freemocap/utilities/convert_pydantic_to_zod.py
+++ b/freemocap/utilities/convert_pydantic_to_zod.py
@@ -1,5 +1,3 @@
-import logging
-
import pydantic2zod
from pydantic2zod.model import BuiltinType, ClassDecl
diff --git a/uv.lock b/uv.lock
index b6bf677f..e188468f 100644
--- a/uv.lock
+++ b/uv.lock
@@ -105,11 +105,11 @@ wheels = [
[[package]]
name = "certifi"
-version = "2024.12.14"
+version = "2025.1.31"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/0f/bd/1d41ee578ce09523c81a15426705dd20969f5abf006d1afe8aeff0dd776a/certifi-2024.12.14.tar.gz", hash = "sha256:b650d30f370c2b724812bee08008be0c4163b163ddaec3f2546c1caf65f191db", size = 166010 }
+sdist = { url = "https://files.pythonhosted.org/packages/1c/ab/c9f1e32b7b1bf505bf26f0ef697775960db7932abeb7b516de930ba2705f/certifi-2025.1.31.tar.gz", hash = "sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651", size = 167577 }
wheels = [
- { url = "https://files.pythonhosted.org/packages/a5/32/8f6669fc4798494966bf446c8c4a162e0b5d893dff088afddf76414f70e1/certifi-2024.12.14-py3-none-any.whl", hash = "sha256:1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56", size = 164927 },
+ { url = "https://files.pythonhosted.org/packages/38/fc/bce832fd4fd99766c04d1ee0eead6b0ec6486fb100ae5e74c1d91292b982/certifi-2025.1.31-py3-none-any.whl", hash = "sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe", size = 166393 },
]
[[package]]
@@ -297,16 +297,16 @@ wheels = [
[[package]]
name = "fastapi"
-version = "0.115.7"
+version = "0.115.8"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "pydantic" },
{ name = "starlette" },
{ name = "typing-extensions" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/a2/f5/3f921e59f189e513adb9aef826e2841672d50a399fead4e69afdeb808ff4/fastapi-0.115.7.tar.gz", hash = "sha256:0f106da6c01d88a6786b3248fb4d7a940d071f6f488488898ad5d354b25ed015", size = 293177 }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/b2/5a5dc4affdb6661dea100324e19a7721d5dc524b464fe8e366c093fd7d87/fastapi-0.115.8.tar.gz", hash = "sha256:0ce9111231720190473e222cdf0f07f7206ad7e53ea02beb1d2dc36e2f0741e9", size = 295403 }
wheels = [
- { url = "https://files.pythonhosted.org/packages/e6/7f/bbd4dcf0faf61bc68a01939256e2ed02d681e9334c1a3cef24d5f77aba9f/fastapi-0.115.7-py3-none-any.whl", hash = "sha256:eb6a8c8bf7f26009e8147111ff15b5177a0e19bb4a45bc3486ab14804539d21e", size = 94777 },
+ { url = "https://files.pythonhosted.org/packages/8f/7d/2d6ce181d7a5f51dedb8c06206cbf0ec026a99bf145edd309f9e17c3282f/fastapi-0.115.8-py3-none-any.whl", hash = "sha256:753a96dd7e036b34eeef8babdfcfe3f28ff79648f86551eb36bfc1b0bf4a8cbf", size = 94814 },
]
[[package]]
@@ -320,35 +320,35 @@ wheels = [
[[package]]
name = "fonttools"
-version = "4.55.7"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/55/55/3b1566c6186a5e58a17a19ad63195f87c6ca4039ef10ff5318a1b9fc5639/fonttools-4.55.7.tar.gz", hash = "sha256:6899e3d97225a8218f525e9754da0376e1c62953a0d57a76c5abaada51e0d140", size = 3458372 }
-wheels = [
- { url = "https://files.pythonhosted.org/packages/07/cb/f1dd2e31553bd03dcb4eb3af1ac6acc7fe41f26067d1bba104005ec1bb04/fonttools-4.55.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:916e1d926823b4b3b3815c59fc79f4ed670696fdd5fd9a5e690a0503eef38f79", size = 2753201 },
- { url = "https://files.pythonhosted.org/packages/21/84/f9f82093789947547b4bc86242669cde816ef4d949b23f472e47e85f125d/fonttools-4.55.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b89da448e0073408d7b2c44935f9fdae4fdc93644899f99f6102ef883ecf083c", size = 2281418 },
- { url = "https://files.pythonhosted.org/packages/46/e1/e0398d2aa7bf5400c84650fc7d85708502289bb92a40f8090e6e71cfe315/fonttools-4.55.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:087ace2d06894ccdb03e6975d05da6bb9cec0c689b2a9983c059880e33a1464a", size = 4869132 },
- { url = "https://files.pythonhosted.org/packages/d4/2d/9d86cd653c758334285a5c95d1bc0a7f13b6a72fc674c6b33fef3b8e3f77/fonttools-4.55.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:775ed0700ee6f781436641f18a0c61b1846a8c1aecae6da6b395c4417e2cb567", size = 4898375 },
- { url = "https://files.pythonhosted.org/packages/48/ce/f49fccb7d9f7c9c6d239434fc48546a0b37a91ba8310c7bcd5127cfeb5f6/fonttools-4.55.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:9ec71d0cc0242899f87e4c230ed0b22c7b8681f288fb80e3d81c2c54c5bd2c79", size = 4877574 },
- { url = "https://files.pythonhosted.org/packages/cc/85/afe73e96a1572ba0acc86e82d52554bf69f384b431acd7a15b8c3890833b/fonttools-4.55.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d4b1c5939c0521525f45522823508e6fad21175bca978583688ea3b3736e6625", size = 5045681 },
- { url = "https://files.pythonhosted.org/packages/b8/37/dc59bc5a2f049d39b62996c806c147ae2eee5316f047a37bcf4cb9dbc4ef/fonttools-4.55.7-cp311-cp311-win32.whl", hash = "sha256:23df0f1003abaf8a435543f59583fc247e7ae1b047ee2263510e0654a5f207e0", size = 2154302 },
- { url = "https://files.pythonhosted.org/packages/86/33/281989403a57945c7871df144af3512ad3d1cd223e025b08b7f377847e6d/fonttools-4.55.7-cp311-cp311-win_amd64.whl", hash = "sha256:82163d58b43eff6e2025a25c32905fdb9042a163cc1ff82dab393e7ffc77a7d5", size = 2200818 },
- { url = "https://files.pythonhosted.org/packages/c3/f5/80ba2cef5358b0984ac1ad576daba6449f81bc44ecc0244db78210c1dc38/fonttools-4.55.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:12e81d44f762156d28b5c93a6b65d98ed73678be45b22546de8ed29736c3cb96", size = 2747631 },
- { url = "https://files.pythonhosted.org/packages/67/a3/ed291ca43193c6b4e0c69ebd01505a9a0f16c06b18d2d3f2560397a4813f/fonttools-4.55.7-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c26445a7be689f8b70df7d5d2e2c85ec4407bdb769902a23dd45ac44f767575d", size = 2278884 },
- { url = "https://files.pythonhosted.org/packages/04/d6/a6dbce3eb296eecba1cac8f5957863d4329d174c8e96cf6453ba82e1e11f/fonttools-4.55.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2cbafedb9462be7cf68c66b6ca1d8309842fe36b729f1b1969595f5d660e5c2", size = 4783859 },
- { url = "https://files.pythonhosted.org/packages/6b/3b/a6f66be6dc6c056bd57443d2f02b6cc123b15d67d7952f7fecfa1da64a19/fonttools-4.55.7-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4bde87985012adbd7559bc363d802fb335e92a07ff86a76cf02bebb0b8566d1", size = 4854977 },
- { url = "https://files.pythonhosted.org/packages/1e/a9/cc5ca0681177a47c155df732a94e7f0ef4331641dcc66250fd382505ce8f/fonttools-4.55.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:69ed0660750993150f7c4d966c0c1ffaa0385f23ccef85c2ff108062d80dd7ea", size = 4762366 },
- { url = "https://files.pythonhosted.org/packages/3f/5f/a4fb68c13e0ffffc3ad732e955a45ec1f01047fdadf8adcb48eac6a1330b/fonttools-4.55.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:3098355e7a7b5ac48d5dc29684a65271187b865b85675033958b57c40364ee34", size = 4989955 },
- { url = "https://files.pythonhosted.org/packages/c9/58/325d278535405f99ca1b39d360dc255126fa9dd0e3648a046982f10f4246/fonttools-4.55.7-cp312-cp312-win32.whl", hash = "sha256:ee7aa8bb716318e3d835ef473978e22b7a39c0f1b3b08cc0b0ee1bba6f73bc1e", size = 2142771 },
- { url = "https://files.pythonhosted.org/packages/49/2f/806c4b86ccfc0a5e48bc78ea3730ca9f6207c6deeab5a57bf87e6b8596f0/fonttools-4.55.7-cp312-cp312-win_amd64.whl", hash = "sha256:e696d6e2baf4cc57ded34bb87e5d3a9e4da9732f3d9e8e2c6db0746e57a6dc0b", size = 2189608 },
- { url = "https://files.pythonhosted.org/packages/63/19/6d2f97d52a3355b713d01854f35c01d712489af6b764432697c76dc042f8/fonttools-4.55.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:e10c7fb80cdfdc32244514cbea0906e9f53e3cc80d64d3389da09502fd999b55", size = 2734996 },
- { url = "https://files.pythonhosted.org/packages/48/28/1f5753fb43eb9ee3919027d1f8de52ea19698083a17ff4013e636b2d82fb/fonttools-4.55.7-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1101976c703ff4008a928fc3fef42caf06d035bfc4614230d7e797cbe356feb0", size = 2272393 },
- { url = "https://files.pythonhosted.org/packages/f1/2f/0a1cd55dac0ec49e42c9a03a56114ae863bc3b652e2f40743151c45b1569/fonttools-4.55.7-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e6dffe9cbcd163ef617fab1f81682e4d1629b7a5b9c5e598274dc2d03e88bcd", size = 4762292 },
- { url = "https://files.pythonhosted.org/packages/7d/59/30c3842759e051fc100d3fc2f9722cf9b3d1db7b1fa803c7237fd2f552fc/fonttools-4.55.7-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77e5115a425d53be6e31cd0fe9210f62a488bccf81eb113ab5dd7f4fa88e4d81", size = 4834310 },
- { url = "https://files.pythonhosted.org/packages/a5/10/91a9e18315116bff26c4e96abcfbdb279b147fe54e55772b119dce5d8963/fonttools-4.55.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f0c45eae32d090763820756b18322a70571dada3f1cbe003debc37a9c35bc260", size = 4742671 },
- { url = "https://files.pythonhosted.org/packages/b0/6c/117aac028ad47ac375033e6113930a096db685461cbd28909d3a246b1191/fonttools-4.55.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fd4ebc475d43f3de2b26e0cf551eff92c24e22d1aee03dc1b33adb52fc2e6cb2", size = 4963611 },
- { url = "https://files.pythonhosted.org/packages/06/28/47518cf6f69ac07184c6d61d1ef663e22b871d549d7f2b97b08bd104859b/fonttools-4.55.7-cp313-cp313-win32.whl", hash = "sha256:371197de1283cc99f5f10eb91496520eb0e2d079312d014fd6cef9e802174c6a", size = 2140803 },
- { url = "https://files.pythonhosted.org/packages/a4/9d/df15fc73e33b30eaa3c1b1304952d7b0b6a64e0b10dc4778b65b46506d38/fonttools-4.55.7-cp313-cp313-win_amd64.whl", hash = "sha256:418ece624fbc04e199f58398ffef3eaad645baba65434871b09eb7350a3a346b", size = 2186591 },
- { url = "https://files.pythonhosted.org/packages/7b/6d/304a16caf63a8c193ec387b1fae1cb10072a59d34549f2eefe7e3fa9f364/fonttools-4.55.7-py3-none-any.whl", hash = "sha256:3304dfcf9ca204dd0ef691a287bd851ddd8e8250108658c0677c3fdfec853a20", size = 1089677 },
+version = "4.56.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1c/8c/9ffa2a555af0e5e5d0e2ed7fdd8c9bef474ed676995bb4c57c9cd0014248/fonttools-4.56.0.tar.gz", hash = "sha256:a114d1567e1a1586b7e9e7fc2ff686ca542a82769a296cef131e4c4af51e58f4", size = 3462892 }
+wheels = [
+ { url = "https://files.pythonhosted.org/packages/35/56/a2f3e777d48fcae7ecd29de4d96352d84e5ea9871e5f3fc88241521572cf/fonttools-4.56.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7ef04bc7827adb7532be3d14462390dd71287644516af3f1e67f1e6ff9c6d6df", size = 2753325 },
+ { url = "https://files.pythonhosted.org/packages/71/85/d483e9c4e5ed586b183bf037a353e8d766366b54fd15519b30e6178a6a6e/fonttools-4.56.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ffda9b8cd9cb8b301cae2602ec62375b59e2e2108a117746f12215145e3f786c", size = 2281554 },
+ { url = "https://files.pythonhosted.org/packages/09/67/060473b832b2fade03c127019794df6dc02d9bc66fa4210b8e0d8a99d1e5/fonttools-4.56.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2e993e8db36306cc3f1734edc8ea67906c55f98683d6fd34c3fc5593fdbba4c", size = 4869260 },
+ { url = "https://files.pythonhosted.org/packages/28/e9/47c02d5a7027e8ed841ab6a10ca00c93dadd5f16742f1af1fa3f9978adf4/fonttools-4.56.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:003548eadd674175510773f73fb2060bb46adb77c94854af3e0cc5bc70260049", size = 4898508 },
+ { url = "https://files.pythonhosted.org/packages/bf/8a/221d456d1afb8ca043cfd078f59f187ee5d0a580f4b49351b9ce95121f57/fonttools-4.56.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:bd9825822e7bb243f285013e653f6741954d8147427aaa0324a862cdbf4cbf62", size = 4877700 },
+ { url = "https://files.pythonhosted.org/packages/a4/8c/e503863adf7a6aeff7b960e2f66fa44dd0c29a7a8b79765b2821950d7b05/fonttools-4.56.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b23d30a2c0b992fb1c4f8ac9bfde44b5586d23457759b6cf9a787f1a35179ee0", size = 5045817 },
+ { url = "https://files.pythonhosted.org/packages/2b/50/79ba3b7e42f4eaa70b82b9e79155f0f6797858dc8a97862428b6852c6aee/fonttools-4.56.0-cp311-cp311-win32.whl", hash = "sha256:47b5e4680002ae1756d3ae3b6114e20aaee6cc5c69d1e5911f5ffffd3ee46c6b", size = 2154426 },
+ { url = "https://files.pythonhosted.org/packages/3b/90/4926e653041c4116ecd43e50e3c79f5daae6dcafc58ceb64bc4f71dd4924/fonttools-4.56.0-cp311-cp311-win_amd64.whl", hash = "sha256:14a3e3e6b211660db54ca1ef7006401e4a694e53ffd4553ab9bc87ead01d0f05", size = 2200937 },
+ { url = "https://files.pythonhosted.org/packages/39/32/71cfd6877999576a11824a7fe7bc0bb57c5c72b1f4536fa56a3e39552643/fonttools-4.56.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:d6f195c14c01bd057bc9b4f70756b510e009c83c5ea67b25ced3e2c38e6ee6e9", size = 2747757 },
+ { url = "https://files.pythonhosted.org/packages/15/52/d9f716b072c5061a0b915dd4c387f74bef44c68c069e2195c753905bd9b7/fonttools-4.56.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fa760e5fe8b50cbc2d71884a1eff2ed2b95a005f02dda2fa431560db0ddd927f", size = 2279007 },
+ { url = "https://files.pythonhosted.org/packages/d1/97/f1b3a8afa9a0d814a092a25cd42f59ccb98a0bb7a295e6e02fc9ba744214/fonttools-4.56.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d54a45d30251f1d729e69e5b675f9a08b7da413391a1227781e2a297fa37f6d2", size = 4783991 },
+ { url = "https://files.pythonhosted.org/packages/95/70/2a781bedc1c45a0c61d29c56425609b22ed7f971da5d7e5df2679488741b/fonttools-4.56.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:661a8995d11e6e4914a44ca7d52d1286e2d9b154f685a4d1f69add8418961563", size = 4855109 },
+ { url = "https://files.pythonhosted.org/packages/0c/02/a2597858e61a5e3fb6a14d5f6be9e6eb4eaf090da56ad70cedcbdd201685/fonttools-4.56.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9d94449ad0a5f2a8bf5d2f8d71d65088aee48adbe45f3c5f8e00e3ad861ed81a", size = 4762496 },
+ { url = "https://files.pythonhosted.org/packages/f2/00/aaf00100d6078fdc73f7352b44589804af9dc12b182a2540b16002152ba4/fonttools-4.56.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f59746f7953f69cc3290ce2f971ab01056e55ddd0fb8b792c31a8acd7fee2d28", size = 4990094 },
+ { url = "https://files.pythonhosted.org/packages/bf/dc/3ff1db522460db60cf3adaf1b64e0c72b43406717d139786d3fa1eb20709/fonttools-4.56.0-cp312-cp312-win32.whl", hash = "sha256:bce60f9a977c9d3d51de475af3f3581d9b36952e1f8fc19a1f2254f1dda7ce9c", size = 2142888 },
+ { url = "https://files.pythonhosted.org/packages/6f/e3/5a181a85777f7809076e51f7422e0dc77eb04676c40ec8bf6a49d390d1ff/fonttools-4.56.0-cp312-cp312-win_amd64.whl", hash = "sha256:300c310bb725b2bdb4f5fc7e148e190bd69f01925c7ab437b9c0ca3e1c7cd9ba", size = 2189734 },
+ { url = "https://files.pythonhosted.org/packages/a5/55/f06b48d48e0b4ec3a3489efafe9bd4d81b6e0802ac51026e3ee4634e89ba/fonttools-4.56.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:f20e2c0dfab82983a90f3d00703ac0960412036153e5023eed2b4641d7d5e692", size = 2735127 },
+ { url = "https://files.pythonhosted.org/packages/59/db/d2c7c9b6dd5cbd46f183e650a47403ffb88fca17484eb7c4b1cd88f9e513/fonttools-4.56.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f36a0868f47b7566237640c026c65a86d09a3d9ca5df1cd039e30a1da73098a0", size = 2272519 },
+ { url = "https://files.pythonhosted.org/packages/4d/a2/da62d779c34a0e0c06415f02eab7fa3466de5d46df459c0275a255cefc65/fonttools-4.56.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62b4c6802fa28e14dba010e75190e0e6228513573f1eeae57b11aa1a39b7e5b1", size = 4762423 },
+ { url = "https://files.pythonhosted.org/packages/be/6a/fd4018e0448c8a5e12138906411282c5eab51a598493f080a9f0960e658f/fonttools-4.56.0-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a05d1f07eb0a7d755fbe01fee1fd255c3a4d3730130cf1bfefb682d18fd2fcea", size = 4834442 },
+ { url = "https://files.pythonhosted.org/packages/6d/63/fa1dec8efb35bc11ef9c39b2d74754b45d48a3ccb2cf78c0109c0af639e8/fonttools-4.56.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0073b62c3438cf0058488c002ea90489e8801d3a7af5ce5f7c05c105bee815c3", size = 4742800 },
+ { url = "https://files.pythonhosted.org/packages/dd/f4/963247ae8c73ccc4cf2929e7162f595c81dbe17997d1d0ea77da24a217c9/fonttools-4.56.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e2cad98c94833465bcf28f51c248aaf07ca022efc6a3eba750ad9c1e0256d278", size = 4963746 },
+ { url = "https://files.pythonhosted.org/packages/ea/e0/46f9600c39c644b54e4420f941f75fa200d9288c9ae171e5d80918b8cbb9/fonttools-4.56.0-cp313-cp313-win32.whl", hash = "sha256:d0cb73ccf7f6d7ca8d0bc7ea8ac0a5b84969a41c56ac3ac3422a24df2680546f", size = 2140927 },
+ { url = "https://files.pythonhosted.org/packages/27/6d/3edda54f98a550a0473f032d8050315fbc8f1b76a0d9f3879b72ebb2cdd6/fonttools-4.56.0-cp313-cp313-win_amd64.whl", hash = "sha256:62cc1253827d1e500fde9dbe981219fea4eb000fd63402283472d38e7d8aa1c6", size = 2186709 },
+ { url = "https://files.pythonhosted.org/packages/bf/ff/44934a031ce5a39125415eb405b9efb76fe7f9586b75291d66ae5cbfc4e6/fonttools-4.56.0-py3-none-any.whl", hash = "sha256:1088182f68c303b50ca4dc0c82d42083d176cba37af1937e1a976a31149d4d14", size = 1089800 },
]
[[package]]
@@ -1103,15 +1103,15 @@ wheels = [
[[package]]
name = "pyinstaller-hooks-contrib"
-version = "2025.0"
+version = "2025.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "packaging" },
{ name = "setuptools" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/92/2e/eb876675aa5338f6ebb2d86dd91cc530542e054e9b6bce1ee938c14fdc07/pyinstaller_hooks_contrib-2025.0.tar.gz", hash = "sha256:6dc0b55a1acaab2ffee36ed4a05b073aa0a22e46f25fb5c66a31e217454135ed", size = 146002 }
+sdist = { url = "https://files.pythonhosted.org/packages/2f/1b/dc256d42f4217db99b50d6d32dbbf841a41b9615506cde77d2345d94f4a5/pyinstaller_hooks_contrib-2025.1.tar.gz", hash = "sha256:130818f9e9a0a7f2261f1fd66054966a3a50c99d000981c5d1db11d3ad0c6ab2", size = 147043 }
wheels = [
- { url = "https://files.pythonhosted.org/packages/23/46/f0654c01d3e16ee652e62dd59c8e80b67842d83d9c103d69d0654507954a/pyinstaller_hooks_contrib-2025.0-py3-none-any.whl", hash = "sha256:3c0623799c3f81a37293127f485d65894c20fd718f722cb588785a3e52581ad1", size = 344671 },
+ { url = "https://files.pythonhosted.org/packages/b7/48/833d67a585275e395f351e5787b4b7a8d462d87bca22a8c038f6ffdc2b3c/pyinstaller_hooks_contrib-2025.1-py3-none-any.whl", hash = "sha256:d3c799470cbc0bda60dcc8e6b4ab976777532b77621337f2037f558905e3a8e9", size = 346409 },
]
[[package]]
@@ -1125,59 +1125,55 @@ wheels = [
[[package]]
name = "pyqt6"
-version = "6.8.0"
+version = "6.8.1"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "pyqt6-qt6" },
{ name = "pyqt6-sip" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/e9/0a/accbebed526158ab2aedd5c84d238159754bd99f481082b3fe7f374c6a3b/PyQt6-6.8.0.tar.gz", hash = "sha256:6d8628de4c2a050f0b74462e4c9cb97f839bf6ffabbca91711722ffb281570d9", size = 1061357 }
+sdist = { url = "https://files.pythonhosted.org/packages/ce/bf/ff284a136b39cb1873c18e4fca4a40a8847c84a1910c5fb38c6a77868968/pyqt6-6.8.1.tar.gz", hash = "sha256:91d937d6166274fafd70f4dee11a8da6dbfdb0da53de05f5d62361ddf775e256", size = 1064723 }
wheels = [
- { url = "https://files.pythonhosted.org/packages/d6/ae/30f6f40c8cdf3d5319ec7add820c6edf96d8ed2461984fd548af9e2d9b51/PyQt6-6.8.0-cp39-abi3-macosx_10_14_universal2.whl", hash = "sha256:8c5c05f5fdff31a5887dbc29b27615b09df467631238d7b449283809ffca6228", size = 12104917 },
- { url = "https://files.pythonhosted.org/packages/06/07/08229a8ae164a0538b2c1ab16c47d39979eb306feab641280194b3d7938b/PyQt6-6.8.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3a4354816f11e812b727206a9ea6e79ff3774f1bb7228ad4b9318442d2c64ff9", size = 8165074 },
- { url = "https://files.pythonhosted.org/packages/b4/7a/a3ecac3327345dde8f34e781d6db1339e4e3b8411ac8ae9747822a0d44e9/PyQt6-6.8.0-cp39-abi3-manylinux_2_35_x86_64.whl", hash = "sha256:452bae5840077bf0f146c798d7777f70d7bdd0c7dcfa9ee7a415c1daf2d10038", size = 8322144 },
- { url = "https://files.pythonhosted.org/packages/d0/52/1e60e38d216c232af83ac16bedf1ece419812368220485fc25af80c7a5d7/PyQt6-6.8.0-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:cf7123caea14e7ecf10bd12cae48e8d9970ef7caf627bc7d7988b0baa209adb3", size = 8101586 },
- { url = "https://files.pythonhosted.org/packages/eb/73/9bae1b8daedf2acff5a3668eae84783720ff513e402b0448a906ab3d5479/PyQt6-6.8.0-cp39-abi3-win_amd64.whl", hash = "sha256:a9913d479f1ffee804bf7f232079baea4fb4b221a8f4890117588917a54ea30d", size = 6661265 },
- { url = "https://files.pythonhosted.org/packages/23/a0/f564279285ed92b4fe38ed7b2a8fcddab414512391088b6a0f67a1107f24/PyQt6-6.8.0-cp39-abi3-win_arm64.whl", hash = "sha256:48bace7b87676bba5e6114482f3a20ca20be90c7f261b5d340464313f5f2bf5e", size = 5409032 },
+ { url = "https://files.pythonhosted.org/packages/09/da/70971b3d7f53a68644ea32544d3786dfbbb162d18572ac1defcf5a6481d5/PyQt6-6.8.1-cp39-abi3-macosx_10_14_universal2.whl", hash = "sha256:0425f9eebdd5d4e57ab36424c9382f2ea06670c3c550fa0028c2b19bd0a1d7bd", size = 12213924 },
+ { url = "https://files.pythonhosted.org/packages/be/25/a4392c323a0fb97eb5f449b7594f37e93d9794b900756b43cd65772def77/PyQt6-6.8.1-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:36bf48e3df3a6ff536e703315d155480ef4e260396eb5469eb7a875bc5bb7ab4", size = 8238120 },
+ { url = "https://files.pythonhosted.org/packages/de/a3/e528b4cc3394f2ae15b531c17f27b53de756a8c0404dfa9c184502367c48/PyQt6-6.8.1-cp39-abi3-manylinux_2_39_aarch64.whl", hash = "sha256:2eac2267a34828b8db7660dd3cc3b3b5fd76a92e61ad45471565b01221cb558b", size = 8173996 },
+ { url = "https://files.pythonhosted.org/packages/f2/69/11404cfcb916bd7207805c21432ecab0401779361d48b67f28ae9337f70d/PyQt6-6.8.1-cp39-abi3-win_amd64.whl", hash = "sha256:70bad7b890a8f9e9e5fb9598c544b832d9d9d99a9519e0009cb29c1e15e96632", size = 6723466 },
+ { url = "https://files.pythonhosted.org/packages/00/2a/21a555aea9bc8abc4f09017b922dbdf509c421f70506d4c83d2e8f4315b2/PyQt6-6.8.1-cp39-abi3-win_arm64.whl", hash = "sha256:a40f878e8e5eeeb0bba995152d07eeef9375ea0116df0f4aad0a6b97c8ad1175", size = 5463379 },
]
[[package]]
name = "pyqt6-qt6"
-version = "6.8.1"
+version = "6.8.2"
source = { registry = "https://pypi.org/simple" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/1d/19/b89eb6cecbdf1e65a44658a083693a967e9d428370026711b624e928a8ca/PyQt6_Qt6-6.8.1-1-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:2f4b8b55b1414b93f340f22e8c88d25550efcdebc4b65a3927dd947b73bd4358", size = 80877444 },
- { url = "https://files.pythonhosted.org/packages/87/1b/94d3710ee7ef93ee99c1dac512f631de5e310f6b21e43f474ef269f840b6/PyQt6_Qt6-6.8.1-1-py3-none-manylinux_2_39_aarch64.whl", hash = "sha256:98aa99fe38ae68c5318284cd28f3479ba538c40bf6ece293980abae0925c1b24", size = 79473622 },
- { url = "https://files.pythonhosted.org/packages/df/0a/c47a1cc272b418faff8af79b121f0cecd32b09d634253254e3a990432220/PyQt6_Qt6-6.8.1-py3-none-macosx_10_14_x86_64.whl", hash = "sha256:1eb8460a1fdb38d0b2458c2974c01d471c1e59e4eb19ea63fc447aaba3ad530e", size = 65754939 },
- { url = "https://files.pythonhosted.org/packages/b1/e6/cc4fbc97a7d0955185e33add3ce00480f0023424d17ac6f864a504f60251/PyQt6_Qt6-6.8.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:9f3790c4ce4dc576e48b8718d55fb8743057e6cbd53a6ca1dd253ffbac9b7287", size = 59956028 },
- { url = "https://files.pythonhosted.org/packages/01/22/c2997fe76d765d9ba960e9a099238cb419a316362bdde50fedacc23e7c7d/PyQt6_Qt6-6.8.1-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:d6ca5d2b9d2ec0ee4a814b2175f641a5c4299cb80b45e0f5f8356632663f89b3", size = 72561636 },
- { url = "https://files.pythonhosted.org/packages/a1/24/907c7451901e56e5b713d70c6f65191d80a3a3caac1095fea7f2a4b0b25b/PyQt6_Qt6-6.8.1-py3-none-manylinux_2_35_x86_64.whl", hash = "sha256:08065d595f1e6fc2dde9f4450eeff89082f4bad26f600a8e9b9cc5966716bfcf", size = 72573711 },
- { url = "https://files.pythonhosted.org/packages/2b/a8/d942bb9f83ad4abd4c296cd4bbf752d1147eaa14523cc132a2b8511a3960/PyQt6_Qt6-6.8.1-py3-none-manylinux_2_39_aarch64.whl", hash = "sha256:20843cb86bd94942d1cd99e39bf1aeabb875b241a35a8ab273e4bbbfa63776db", size = 71077917 },
- { url = "https://files.pythonhosted.org/packages/ab/2c/0d45a74ea8eedf5a2a5a2628396fb2e26107ae07f6c73d6d22c7fa3d4403/PyQt6_Qt6-6.8.1-py3-none-win_amd64.whl", hash = "sha256:006d786693d0511fbcf184a862edbd339c6ed1bb3bd9de363d73a19ed4b23dff", size = 71647964 },
- { url = "https://files.pythonhosted.org/packages/c9/0d/b86b64f0ac5e08b1bd18edac9e949897a4626196725e9a86af4e9f628c80/PyQt6_Qt6-6.8.1-py3-none-win_arm64.whl", hash = "sha256:a8bc2ed4ee5e7c6ff4dd1c7db0b27705d151fee5dc232bbd1bf17618f937f515", size = 47836492 },
+ { url = "https://files.pythonhosted.org/packages/1e/a4/3d764e05955382b3dc7227cbfde090700edd63431147f1c66d428ccac45c/PyQt6_Qt6-6.8.2-py3-none-macosx_10_14_x86_64.whl", hash = "sha256:470dd4211fe5a67b0565e0202e7aa67816e5dcf7d713528b88327adaebd0934e", size = 66121240 },
+ { url = "https://files.pythonhosted.org/packages/d6/b3/6d4f8257b46554fb2c89b33a6773a3f05ed961b3cd83828caee5dc79899f/PyQt6_Qt6-6.8.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:40cda901a3e1617e79225c354fe9d89b80249f0a6c6aaa18b40938e05bbf7d1f", size = 60286219 },
+ { url = "https://files.pythonhosted.org/packages/92/95/0036435b9e2cbd22e08f14eec2362c32fc641660c6e4aea6f59d165cb5fc/PyQt6_Qt6-6.8.2-py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:fb6d0acdd7d43c33fb8b9d2dd7922d381cdedd00da316049fbe01fc1973e6f05", size = 81263397 },
+ { url = "https://files.pythonhosted.org/packages/6e/fb/c01dde044eca1542d88cac72fc99369af76a981cc2f52790236efa566e01/PyQt6_Qt6-6.8.2-py3-none-manylinux_2_39_aarch64.whl", hash = "sha256:5970c85d22cbe5c476418994549161b23ed938e25b04fc4ca8fabf6dcac7b03f", size = 79832921 },
+ { url = "https://files.pythonhosted.org/packages/1a/f7/31f03a9f5e6c7cc23ceb2bd0d9c2df0518837f7af0e693e15b6e0881b8b0/PyQt6_Qt6-6.8.2-py3-none-win_amd64.whl", hash = "sha256:28e2bb641f05b01e498503c3ef01c8a919d6e0e96b50230301c0baac2b7d1433", size = 71934164 },
+ { url = "https://files.pythonhosted.org/packages/00/c9/102c9537795ca11c12120ec9d5f554d9437787f52d8e23fbc8269e6a2699/PyQt6_Qt6-6.8.2-py3-none-win_arm64.whl", hash = "sha256:912afdddd0dfc666ce1c16bc4695e2acd680db72343e4f7a2b7c053a0146b4bc", size = 48120018 },
]
[[package]]
name = "pyqt6-sip"
-version = "13.9.1"
+version = "13.10.0"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/2a/e4/f39ca1fd6de7d4823d964a3ec33e85b6f51a9c2a7a1e95956b7a92c8acc9/pyqt6_sip-13.9.1.tar.gz", hash = "sha256:15be741d1ae8c82bb7afe9a61f3cf8c50457f7d61229a1c39c24cd6e8f4d86dc", size = 92358 }
+sdist = { url = "https://files.pythonhosted.org/packages/90/18/0405c54acba0c8e276dd6f0601890e6e735198218d031a6646104870fe22/pyqt6_sip-13.10.0.tar.gz", hash = "sha256:d6daa95a0bd315d9ec523b549e0ce97455f61ded65d5eafecd83ed2aa4ae5350", size = 92464 }
wheels = [
- { url = "https://files.pythonhosted.org/packages/73/07/342ea1c95367d714eb86ae4b2159798347b80535dcba6c7f60256fc7c5e5/PyQt6_sip-13.9.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:57b5312ef13c1766bdf69b317041140b184eb24a51e1e23ce8fc5386ba8dffb2", size = 110717 },
- { url = "https://files.pythonhosted.org/packages/89/f2/13159c98929d2dec84cb98021a8de9e66e9429ebe44be08476779130af25/PyQt6_sip-13.9.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5004514b08b045ad76425cf3618187091a668d972b017677b1b4b193379ef553", size = 316880 },
- { url = "https://files.pythonhosted.org/packages/76/92/47fc35401d7f192bd690ed3552242909c6e77db5a97d8b2d980a948400fe/PyQt6_sip-13.9.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:accab6974b2758296400120fdcc9d1f37785b2ea2591f00656e1776f058ded6c", size = 294518 },
- { url = "https://files.pythonhosted.org/packages/39/7c/3c775c219d9c17bda783e1dbab1d16f09f7713b93920f761d2cc61aa3ad0/PyQt6_sip-13.9.1-cp311-cp311-win_amd64.whl", hash = "sha256:1ec52e962f54137a19208b6e95b6bd9f7a403eb25d7237768a99306cd9db26d1", size = 53368 },
- { url = "https://files.pythonhosted.org/packages/81/bf/0700d0f5832e6e54ec56dbbdc912c63662ae54d1571f3241377b5acb37fa/PyQt6_sip-13.9.1-cp311-cp311-win_arm64.whl", hash = "sha256:6e6c1e2592187934f4e790c0c099d0033e986dcef7bdd3c06e3895ffa995e9fc", size = 45013 },
- { url = "https://files.pythonhosted.org/packages/34/19/6df209c4f1a3fbae0a90c8f37b0205ce42d61d8d762e4a539fceeabee340/PyQt6_sip-13.9.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:1fb405615970e85b622b13b4cad140ff1e4182eb8334a0b27a4698e6217b89b0", size = 112248 },
- { url = "https://files.pythonhosted.org/packages/6b/81/9df86e90a8dd1f6f5faa1199af03e208f5dd3193e462e541e276001d098c/PyQt6_sip-13.9.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c800db3464481e87b1d2b84523b075df1e8fc7856c6f9623dc243f89be1cb604", size = 322310 },
- { url = "https://files.pythonhosted.org/packages/dd/4d/e263f045c97c2398fbd762d07295140b628a611da5f37744324080a86a1d/PyQt6_sip-13.9.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c1942e107b0243ced9e510d507e0f27aeea9d6b13e0a1b7c06fd52a62e0d41f7", size = 303638 },
- { url = "https://files.pythonhosted.org/packages/28/9f/047a3b28265b39ff151981da84fde7895b87b94131db4b044a6125df9a4a/PyQt6_sip-13.9.1-cp312-cp312-win_amd64.whl", hash = "sha256:552ff8fdc41f5769d3eccc661f022ed496f55f6e0a214c20aaf56e56385d61b6", size = 53498 },
- { url = "https://files.pythonhosted.org/packages/92/af/17a92b67db31a086bd693bf97d98aa2f45427e7982df53f59cdc26899979/PyQt6_sip-13.9.1-cp312-cp312-win_arm64.whl", hash = "sha256:976c7758f668806d4df7a8853f390ac123d5d1f73591ed368bdb8963574ff589", size = 45335 },
- { url = "https://files.pythonhosted.org/packages/4b/10/43eab7a9cd26f3ba81220f2ec7a7c471c232df738dd5787affcc00d75aa9/PyQt6_sip-13.9.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:56ce0afb19cd8a8c63ff93ae506dffb74f844b88adaa6673ebc0dec43af48a76", size = 112278 },
- { url = "https://files.pythonhosted.org/packages/31/ba/b0cb5ad4d44265213d50b8e7b24a9c1605baf242019e51104dd87499d68f/PyQt6_sip-13.9.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d7726556d1ca7a7ed78e19ba53285b64a2a8f6ad7ff4cb18a1832efca1a3102", size = 322531 },
- { url = "https://files.pythonhosted.org/packages/ba/73/556391d6115e87972d8c88b757b4db614af4fb8579ce28030965fe793fe7/PyQt6_sip-13.9.1-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:14f95c6352e3b85dc26bf59cfbf77a470ecbd5fcdcf00af4b648f0e1b9eefb9e", size = 303760 },
- { url = "https://files.pythonhosted.org/packages/d8/5b/7321bb2564673bc4facfed338553bc42542f2ae05cbea1c8b57a596ab28d/PyQt6_sip-13.9.1-cp313-cp313-win_amd64.whl", hash = "sha256:3c269052c770c09b61fce2f2f9ea934a67dfc65f443d59629b4ccc8f89751890", size = 53509 },
- { url = "https://files.pythonhosted.org/packages/cf/b6/eabe1d0fdcc56c80325c5a2cc361ae3e57b3346cb7700b707481d3977a24/PyQt6_sip-13.9.1-cp313-cp313-win_arm64.whl", hash = "sha256:8b2ac36d6e04db6099614b9c1178a2f87788c7ffc3826571fb63d36ddb4c401d", size = 45358 },
+ { url = "https://files.pythonhosted.org/packages/7a/c4/97446339ff086ad6530af0970b6905a6930d8868214c182a0ca0e0e9638e/PyQt6_sip-13.10.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6e78fb8036b18f6258a1af0956c5a3cec1dd3d8dd5196ecd89a31b529bf40e82", size = 110770 },
+ { url = "https://files.pythonhosted.org/packages/2b/4b/d41d9d1a5496948426b1a30b778df1d87625245d4ba5b7aa55810f2899c5/PyQt6_sip-13.10.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e19d5887fa3003a635419644dfed3158cb15eb566fc27b1ed56913a5767a71dc", size = 316994 },
+ { url = "https://files.pythonhosted.org/packages/ff/81/62e36cddb4641c7ce6e2779e0783635555a3ecfdb50f46f9200f61af24be/PyQt6_sip-13.10.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:079bb946edc3960f08d92b3a8eebff55d3abb51bc2a0583b6683dfd9f77a616a", size = 293804 },
+ { url = "https://files.pythonhosted.org/packages/2f/4d/23e9e23a331d5a608217349c931b1d9b5cf9419640033e73ae9895e7f5bd/PyQt6_sip-13.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:90974f5dbba1f5d1d2ca9b1cfdfd5258e5e3cfacead03f0df674d54c69973ea7", size = 53444 },
+ { url = "https://files.pythonhosted.org/packages/2a/0c/2caff1607ddf7dcb8d53f1657160d3b334a8e9d9a9bf700e79971677ab89/PyQt6_sip-13.10.0-cp311-cp311-win_arm64.whl", hash = "sha256:bbefd5539eeda4dec37e8b6dfc362ba240ec31279060336bcceaff572807dac8", size = 45057 },
+ { url = "https://files.pythonhosted.org/packages/69/81/66d9bdacb790592a0641378749a047f12e3b254cdc2cb51f7ed636cf01d2/PyQt6_sip-13.10.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:48791db2914fc39c3218519a02d2a5fd3fcd354a1be3141a57bf2880701486f2", size = 112334 },
+ { url = "https://files.pythonhosted.org/packages/26/2c/4796c209009a018e0d4a5c406d5a519234c5a378f370dc679d0ad5f455b2/PyQt6_sip-13.10.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:466d6b4791973c9fcbdc2e0087ed194b9ea802a8c3948867a849498f0841c70c", size = 322334 },
+ { url = "https://files.pythonhosted.org/packages/99/34/2ec54bd475f0a811df1d32be485f2344cf9e8b388ce7adb26b46ce5552d4/PyQt6_sip-13.10.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:ae15358941f127cd3d1ab09c1ebd45c4dabb0b2e91587b9eebde0279d0039c54", size = 303798 },
+ { url = "https://files.pythonhosted.org/packages/0c/e4/82099bb4ab8bc152b5718541e93c0b3adf7566c0f307c9e58e2368b8c517/PyQt6_sip-13.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:ad573184fa8b00041944e5a17d150ab0d08db2d2189e39c9373574ebab3f2e58", size = 53569 },
+ { url = "https://files.pythonhosted.org/packages/e3/09/90e0378887a3cb9664da77061229cf8e97e6ec25a5611b7dbc9cc3e02c78/PyQt6_sip-13.10.0-cp312-cp312-win_arm64.whl", hash = "sha256:2d579d810d0047d40bde9c6aef281d6ed218db93c9496ebc9e55b9e6f27a229d", size = 45430 },
+ { url = "https://files.pythonhosted.org/packages/6b/0c/8d1de48b45b565a46bf4757341f13f9b1853a7d2e6b023700f0af2c213ab/PyQt6_sip-13.10.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:7b6e250c2e7c14702a623f2cc1479d7fb8db2b6eee9697cac10d06fe79c281bb", size = 112343 },
+ { url = "https://files.pythonhosted.org/packages/af/13/e2cc2b667a9f5d44c2d0e18fa6e1066fca3f4521dcb301f4b5374caeb33e/PyQt6_sip-13.10.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fcb30756568f8cd59290f9ef2ae5ee3e72ff9cdd61a6f80c9e3d3b95ae676be", size = 322527 },
+ { url = "https://files.pythonhosted.org/packages/20/1a/5c6fcae85edb65cf236c9dc6d23b279b5316e94cdca1abdee6d0a217ddbb/PyQt6_sip-13.10.0-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:757ac52c92b2ef0b56ecc7cd763b55a62d3c14271d7ea8d03315af85a70090ff", size = 303407 },
+ { url = "https://files.pythonhosted.org/packages/b9/db/6924ec985be7d746772806b96ab81d24263ef72f0249f0573a82adaed75e/PyQt6_sip-13.10.0-cp313-cp313-win_amd64.whl", hash = "sha256:571900c44a3e38738d696234d94fe2043972b9de0633505451c99e2922cb6a34", size = 53580 },
+ { url = "https://files.pythonhosted.org/packages/77/c3/9e44729b582ee7f1d45160e8c292723156889f3e38ce6574f88d5ab8fa02/PyQt6_sip-13.10.0-cp313-cp313-win_arm64.whl", hash = "sha256:39cba2cc71cf80a99b4dc8147b43508d4716e128f9fb99f5eb5860a37f082282", size = 45446 },
]
[[package]]
@@ -1266,11 +1262,11 @@ wheels = [
[[package]]
name = "pytz"
-version = "2024.2"
+version = "2025.1"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/3a/31/3c70bf7603cc2dca0f19bdc53b4537a797747a58875b552c8c413d963a3f/pytz-2024.2.tar.gz", hash = "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a", size = 319692 }
+sdist = { url = "https://files.pythonhosted.org/packages/5f/57/df1c9157c8d5a05117e455d66fd7cf6dbc46974f832b1058ed4856785d8a/pytz-2025.1.tar.gz", hash = "sha256:c2db42be2a2518b28e65f9207c4d05e6ff547d1efa4086469ef855e4ab70178e", size = 319617 }
wheels = [
- { url = "https://files.pythonhosted.org/packages/11/c3/005fcca25ce078d2cc29fd559379817424e94885510568bc1bc53d7d5846/pytz-2024.2-py2.py3-none-any.whl", hash = "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725", size = 508002 },
+ { url = "https://files.pythonhosted.org/packages/eb/38/ac33370d784287baa1c3d538978b5e2ea064d4c1b93ffbd12826c190dd10/pytz-2025.1-py2.py3-none-any.whl", hash = "sha256:89dd22dca55b46eac6eda23b2d72721bf1bdfef212645d81513ef5d03038de57", size = 507930 },
]
[[package]]
@@ -1416,7 +1412,7 @@ wheels = [
[[package]]
name = "skellycam"
version = "2023.9.1086"
-source = { git = "https://github.com/freemocap/skellycam?branch=jon%2Fdevelopment#ea8905476cd8bb7dce67e2b5935203271db0c9ca" }
+source = { git = "https://github.com/freemocap/skellycam?branch=jon%2Fdevelopment#6ae1a9f3148109c1d5a68afe0c2fc523d1dfde02" }
dependencies = [
{ name = "fastapi" },
{ name = "httpx" },
@@ -1461,7 +1457,7 @@ dependencies = [
[[package]]
name = "skellytracker"
version = "2024.9.1019"
-source = { git = "https://github.com/freemocap/skellytracker?branch=jon%2Fdevelopment#22ce5f13a2f293ec6564abde952008651667ea82" }
+source = { git = "https://github.com/freemocap/skellytracker?branch=jon%2Fdevelopment#73259871f2d2e84bc0e962a9a2cca66e58d5f062" }
dependencies = [
{ name = "mediapipe" },
{ name = "numpy" },