diff --git a/common/pyproject.toml b/common/pyproject.toml index ecf06340..e27ed15c 100644 --- a/common/pyproject.toml +++ b/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] diff --git a/common/src/aaredaqlib/raster_grid.py b/common/src/aaredaqlib/raster_grid.py index fa57801e..b3692cf2 100644 --- a/common/src/aaredaqlib/raster_grid.py +++ b/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 diff --git a/daq/pyproject.toml b/daq/pyproject.toml index bb12a0a5..ff6c7e10 100644 --- a/daq/pyproject.toml +++ b/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" ]