Rename element as kind

Author: EZoni

schema/BaseElement.py

@@ -6,7 +6,7 @@ class BaseElement(BaseModel):
     """A custom base element defining common properties"""
 
     # Discriminator field
-    element: Literal["BaseElement"] = "BaseElement"
+    kind: Literal["BaseElement"] = "BaseElement"
 
     # Validate every time a new value is assigned to an attribute,
     # not only when an instance of BaseElement is created

schema/DriftElement.py

@@ -7,4 +7,4 @@ class DriftElement(ThickElement):
     """A field free region"""
 
     # Discriminator field
-    element: Literal["DriftElement"] = "DriftElement"
+    kind: Literal["DriftElement"] = "DriftElement"

schema/Item.py

@@ -11,7 +11,7 @@ class Item(BaseModel):
     """An element of a line or a line itself"""
 
     # Discriminator field
-    element: Literal["Item"] = "Item"
+    kind: Literal["Item"] = "Item"
 
     # Validate every time a new value is assigned to an attribute,
     # not only when an instance of Line is created
@@ -26,5 +26,5 @@ class Item(BaseModel):
             DriftElement,
             QuadrupoleElement,
         ],
-        Field(discriminator="element"),
+        Field(discriminator="kind"),
     ]

schema/Line.py

@@ -9,13 +9,13 @@ class Line(BaseModel):
     """A line of elements and/or other lines"""
 
     # Discriminator field
-    element: Literal["Line"] = "Line"
+    kind: Literal["Line"] = "Line"
 
     # Validate every time a new value is assigned to an attribute,
     # not only when an instance of Line is created
     model_config = ConfigDict(validate_assignment=True)
 
-    line: List[Annotated[Item, Field(discriminator="element")]]
+    line: List[Annotated[Item, Field(discriminator="kind")]]
 
 
 # Avoid circular import issues

schema/QuadrupoleElement.py

@@ -8,7 +8,7 @@ class QuadrupoleElement(ThickElement):
     """A quadrupole element"""
 
     # Discriminator field
-    element: Literal["QuadrupoleElement"] = "QuadrupoleElement"
+    kind: Literal["QuadrupoleElement"] = "QuadrupoleElement"
 
     # Magnetic multipole parameters
     MagneticMultipoleP: MagneticMultipoleParameters

schema/ThickElement.py

@@ -8,7 +8,7 @@ class ThickElement(BaseElement):
     """A thick base element with finite segment length"""
 
     # Discriminator field
-    element: Literal["ThickElement"] = "ThickElement"
+    kind: Literal["ThickElement"] = "ThickElement"
 
     # Segment length in meters (m)
     length: Annotated[float, Gt(0)]