Cleanup

Author: ax3l

src/pals/kinds/BeamLine.py

@@ -3,39 +3,38 @@
 
 from .BaseElement import BaseElement
 from .ThickElement import ThickElement
-from .Drift import Drift
-from .Quadrupole import Quadrupole
 
-# Import schema elements
-from .Marker import Marker
-from .Sextupole import Sextupole
-from .Octupole import Octupole
-from .Multipole import Multipole
-from .RBend import RBend
-from .SBend import SBend
-from .Solenoid import Solenoid
-from .RFCavity import RFCavity
-from .Patch import Patch
-from .FloorShift import FloorShift
-from .Fork import Fork
+from .ACKicker import ACKicker
 from .BeamBeam import BeamBeam
 from .BeginningEle import BeginningEle
-from .Fiducial import Fiducial
-from .NullEle import NullEle
-from .Kicker import Kicker
-from .ACKicker import ACKicker
+from .Converter import Converter
 from .CrabCavity import CrabCavity
+from .Drift import Drift
 from .EGun import EGun
 from .Feedback import Feedback
+from .Fiducial import Fiducial
+from .FloorShift import FloorShift
+from .Foil import Foil
+from .Fork import Fork
 from .Girder import Girder
 from .Instrument import Instrument
+from .Kicker import Kicker
+from .Marker import Marker
 from .Mask import Mask
 from .Match import Match
+from .Multipole import Multipole
+from .NullEle import NullEle
+from .Octupole import Octupole
+from .Patch import Patch
+from .Quadrupole import Quadrupole
+from .RBend import RBend
+from .RFCavity import RFCavity
+from .SBend import SBend
+from .Sextupole import Sextupole
+from .Solenoid import Solenoid
 from .Taylor import Taylor
-from .Wiggler import Wiggler
-from .Converter import Converter
-from .Foil import Foil
 from .UnionEle import UnionEle
+from .Wiggler import Wiggler
 
 
 class BeamLine(BaseElement):

src/pals/parameters/ApertureParameters.py

@@ -1,18 +1,20 @@
 from typing import Literal
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 
 
 class ApertureParameters(BaseModel):
     """Aperture parameters"""
 
-    x_limits: list[float | None, float | None] = Field(
-        default=[None, None],
-        validate_args=lambda x: (x[0] is None or x[1] is None or x[0] < x[1]),
-    )
-    y_limits: list[float | None, float | None] = Field(
-        default=[None, None],
-        validate_args=lambda x: (x[0] is None or x[1] is None or x[0] < x[1]),
-    )
+    @field_validator("x_limits", "y_limits")
+    @classmethod
+    def validate_limits(cls, v):
+        """Validate that limits are None or that min < max"""
+        if v[0] is not None and v[1] is not None and v[0] >= v[1]:
+            raise ValueError("Lower limit must be less than upper limit")
+        return v
+
+    x_limits: list[float | None, float | None] = Field(default=[None, None])
+    y_limits: list[float | None, float | None] = Field(default=[None, None])
     shape: Literal["RECTANGULAR", "ELLIPTICAL", "VERTICES", "CUSTOM_SHAPE"] = (
         "RECTANGULAR"
     )