AMS-BP 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

AMS_BP/__init__.py

@@ -10,4 +10,4 @@ Last updated: 2024-12-16
 
 """
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"

AMS_BP/configio/configmodels.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Literal, Union
+from typing import Any, Dict, List, Literal, Optional, Union
 
 import numpy as np
 from pydantic import BaseModel, Field, field_validator
@@ -32,18 +32,18 @@ class MoleculeParameters(BaseModel):
     state_probability_diffusion: List[List[float]]
     state_probability_hurst: List[List[float]]
 
-    @field_validator(
-        "diffusion_coefficient",
-        "hurst_exponent",
-        "state_probability_diffusion",
-        "state_probability_hurst",
-    )
-    def convert_to_array(cls, v):
-        return np.array(v)
-
-    @field_validator("diffusion_transition_matrix", "hurst_transition_matrix")
-    def convert_matrix_to_array(cls, v):
-        return np.array(v)
+    # @field_validator(
+    #     "diffusion_coefficient",
+    #     "hurst_exponent",
+    #     "state_probability_diffusion",
+    #     "state_probability_hurst",
+    # )
+    # def convert_to_array(cls, v):
+    #     return np.array(v)
+    #
+    # @field_validator("diffusion_transition_matrix", "hurst_transition_matrix")
+    # def convert_matrix_to_array(cls, v):
+    #     return np.array(v)
 
 
 class GlobalParameters(BaseModel):
@@ -57,6 +57,20 @@ class GlobalParameters(BaseModel):
     def convert_sample_plane_dim(cls, v):
         return np.array(v)
 
+    def model_post_init(self, __context):
+        if self.oversample_motion_time <= 0:
+            raise ValueError("Oversample Motion Time must be larger than 0 ms")
+        if self.exposure_time < self.oversample_motion_time:
+            if self.exposure_time > 0:
+                raise ValueError(
+                    "Exposure time must be equal to or larger than Oversample Motion Time, or 0"
+                )
+        if self.interval_time < self.oversample_motion_time:
+            if self.interval_time > 0:
+                raise ValueError(
+                    "Interval time must be equal to or larger than Oversample Motion Time, or 0"
+                )
+
 
 class CondensateParameters(BaseModel):
     initial_centers: List[List[List[float]]] = Field(
@@ -85,8 +99,8 @@ class OutputParameters(BaseModel):
 
 
 class ConfigList(BaseModel):
-    CellParameters: CellParameters
-    MoleculeParameters: MoleculeParameters
-    GlobalParameters: GlobalParameters
-    CondensateParameters: CondensateParameters
-    OutputParameters: OutputParameters
+    CellParameter: Optional[CellParameters] = None
+    MoleculeParameter: Optional[MoleculeParameters] = None
+    GlobalParameter: GlobalParameters
+    CondensateParameter: Optional[CondensateParameters] = None
+    OutputParameter: Optional[OutputParameters] = None