Skip to content

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

TypeScript

Pydantic 2 Upgrade (#588)

philipqueen1c7c9d1393ab
diff --git a/freemocap/data_layer/data_saver/data_models.py b/freemocap/data_layer/data_saver/data_models.py
index c17070f7..7d2e1775 100644
--- a/freemocap/data_layer/data_saver/data_models.py
+++ b/freemocap/data_layer/data_saver/data_models.py
@@ -2,7 +2,7 @@ import pprint
from typing import List, Dict, Tuple
from typing import Optional, Any
-from pydantic import BaseModel, Field, root_validator
+from pydantic import BaseModel, Field, model_validator
from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.data_models.mediapipe_skeleton_names_and_connections import (
mediapipe_skeleton_schema,
@@ -31,7 +31,7 @@ class VirtualMarkerDefinition(BaseModel):
default_factory=list, description="The weights of the markers that define this virtual marker, must sum to 1"
)
- @root_validator
+ @model_validator(mode="before")
def check_weights(cls, values):
marker_weights = values.get("marker_weights")
if sum(marker_weights) != 1:
diff --git a/freemocap/data_layer/recording_models/post_processing_parameter_models.py b/freemocap/data_layer/recording_models/post_processing_parameter_models.py
index e493e2e2..4eea9f77 100644
--- a/freemocap/data_layer/recording_models/post_processing_parameter_models.py
+++ b/freemocap/data_layer/recording_models/post_processing_parameter_models.py
@@ -1,6 +1,6 @@
import logging
-from pydantic import BaseModel
+from pydantic import ConfigDict, BaseModel
from skellytracker.trackers.mediapipe_tracker.mediapipe_model_info import (
MediapipeTrackingParams
)
@@ -35,10 +35,8 @@ class PostProcessingParametersModel(BaseModel):
class ProcessingParameterModel(BaseModel):
+ model_config = ConfigDict(arbitrary_types_allowed=True)
recording_info_model: RecordingInfoModel = None
mediapipe_parameters_model: MediapipeTrackingParams = MediapipeTrackingParams()
anipose_triangulate_3d_parameters_model: AniposeTriangulate3DParametersModel = AniposeTriangulate3DParametersModel()
post_processing_parameters_model: PostProcessingParametersModel = PostProcessingParametersModel()
-
- class Config:
- arbitrary_types_allowed = True
diff --git a/pyproject.toml b/pyproject.toml
index 11b3b076..18fe3f37 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -67,11 +67,11 @@ keywords = [
]
dependencies = [
- "skellycam==2023.12.1090",
+ "skellycam==2024.07.1092",
"skelly_viewer==2024.04.1022",
"skellyforge==2023.12.1005",
- "skelly_synchronize==2023.12.1029",
- "skellytracker[all]==2024.06.1015",
+ "skelly_synchronize==2024.07.1032",
+ "skellytracker[all]==2024.06.1016",
"ajc27_freemocap_blender_addon==2023.10.1017",
"opencv-contrib-python==4.8.*",
"toml==0.10.2",
@@ -79,7 +79,7 @@ dependencies = [
"libsass==0.21.0",
"ipykernel==6.23.1",
"plotly==5.14.1",
- "pydantic==1.*",
+ "pydantic==2.*",
"PySide6>=6.6, <6.8",
"packaging===23.2",
]