Nest information on milling steps under the 'steps' field in 'LamellaSiteInfo'; store project name and site number as well

Author: tieneupin

src/murfey/util/models.py

@@ -178,16 +178,7 @@ class MillingStepInfo(BaseModel):
     width_overlap_rear_right: float | None = None
 
 
-class LamellaSiteInfo(BaseModel):
-    """
-    Pydantic model that stores all the metadata of interest for a single lamella
-    site.
-    """
-
-    # Values not associated with a single step
-    site_name: str | None = None
-    stage_info: StagePositionInfo | None = None
-
+class MillingSteps(BaseModel):
     # Processing steps supported by AutoTEM
     # Preparation stage
     eucentric_tilt: MillingStepInfo | None = None
@@ -219,6 +210,20 @@ class LamellaSiteInfo(BaseModel):
     polishing_2_electron: MillingStepInfo | None = None
 
 
+class LamellaSiteInfo(BaseModel):
+    """
+    Pydantic model that stores all the metadata of interest for a single lamella
+    site.
+    """
+
+    # Values not associated with a single step
+    project_name: str | None = None
+    site_name: str | None = None
+    site_number: int | None = None
+    stage_info: StagePositionInfo | None = None
+    steps: MillingSteps | None = None
+
+
 """
 =======================================================================================
 Single Particle Analysis