DAQ+GUI: Work in progress

common/pyproject.toml

@@ -8,7 +8,7 @@ dependencies = [
     "pydantic==2.11.4",
     "numpy==2.2.5",
     "jfjoch_client==1.0.0rc51",
-    "aareDB==0.1.1a9"
+    "aareDB==0.1.1a11"
 ]
 
 [lint]

common/src/aaredaqlib/raster_grid.py

@@ -1,4 +1,4 @@
-from typing import Annotated, List
+from typing import Annotated
 
 from jfjoch_client.models.scan_result import ScanResult
 from pydantic import Field, AfterValidator, BaseModel
@@ -6,6 +6,7 @@ from pydantic import Field, AfterValidator, BaseModel
 from aaredaqlib.coordinate import Coordinate, positive_coords, SmargonCoordinate
 from aaredaqlib.sample_geometry import SampleGeometryModel
 
+
 class RasterGridRequest(BaseModel):
     dtz: float | None = None
     transmission: float | None = None

common/src/aaredaqlib/rotation_scan.py

@@ -1,3 +1,4 @@
+from jfjoch_client.models.scan_result import ScanResult
 from pydantic import BaseModel
 
 from aaredaqlib.coordinate import SmargonCoordinate
@@ -18,3 +19,7 @@ class RotationScanRequest(BaseModel):
 
     screening: bool = False
     wedge_omega_deg: float | None = None
+
+class CompletedRotationScan(BaseModel):
+    request: RotationScanRequest
+    result: ScanResult