Models: Use jfjoch client result structure (WIP)

common/pyproject.toml

@@ -7,6 +7,7 @@ requires-python = ">=3.11"
 dependencies = [
     "pydantic==2.11.4",
     "numpy==2.2.5",
+    "jfjoch_client==1.0.0rc44"
 ]
 
 [lint]

common/src/aaredaqlib/raster_grid.py

@@ -1,5 +1,6 @@
 from typing import Annotated, List
 
+from jfjoch_client.models.scan_result import ScanResult
 from pydantic import Field, AfterValidator, BaseModel
 
 from aaredaqlib.coordinate import Coordinate, positive_coords, SmargonCoordinate
@@ -35,10 +36,4 @@ class RasterGridRequest(BaseModel):
 
 class CompletedRasterGrid(BaseModel):
     request: RasterGridRequest
-    filename: str | None = None
-    image_number: List[int]
-    bkg_estimate: List[float]
-    spot_count: List[int]
-    indexed: List[int]
-    b_factor: List[float]
-    mosaicity: List[float]
+    result: ScanResult

daq/pyproject.toml

@@ -14,7 +14,6 @@ dependencies = [
     "uvicorn==0.34.2",
     "ultralytics==8.3.133",
     "aareDB==0.1.1a4",
-    "jfjoch_client==1.0.0rc37",
     "opencv-python-headless==4.11.0.86",
     "python_multipart==0.0.20"
 ]