From 198170d5c4231545d3ce7a8d0dfe217ac66e2f9b Mon Sep 17 00:00:00 2001 From: appleb_m Date: Wed, 22 Apr 2026 17:00:46 +0200 Subject: [PATCH] models: reformated DCP model to be easier to read --- src/aare/common/models.py | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/aare/common/models.py b/src/aare/common/models.py index 8f0c6be0..697e24ec 100644 --- a/src/aare/common/models.py +++ b/src/aare/common/models.py @@ -57,31 +57,17 @@ class DataCollectionParameters(BaseModel): oscillation: Optional[float] = None # Only accept positive float exposure: Optional[float] = None # Only accept positive floats between 0 and 1 totalrange: Optional[int] = None # Only accept positive integers between 0 and 360 - transmission: Optional[ - int - ] = None # Only accept positive integers between 0 and 100 + transmission: Optional[int] = None # Only accept positive integers between 0 and 100 targetresolution: Optional[float] = None # Only accept positive float aperture: Optional[int] = None # Optional string field - datacollectiontype: Optional[ - str - ] = None # Only accept "standard", other types might be added later - processingpipeline: Optional[ - str - ] = "" # Only accept "gopy", "autoproc", "xia2dials" - spacegroupnumber: Optional[ - int - ] = None # Only accept positive integers between 1 and 230 - cellparameters: Optional[ - str - ] = None # Must be a set of six positive floats or integers + datacollectiontype: Optional[str] = None # Only accept "standard", other types might be added later + processingpipeline: Optional[str] = "" # Only accept "gopy", "autoproc", "xia2dials" + spacegroupnumber: Optional[int] = None # Only accept positive integers between 1 and 230 + cellparameters: Optional[str] = None # Must be a set of six positive floats or integers rescutkey: Optional[str] = None # Only accept "is" or "cchalf" - rescutvalue: Optional[ - float - ] = None # Must be a positive float if rescutkey is provided + rescutvalue: Optional[float] = None # Must be a positive float if rescutkey is provided userresolution: Optional[float] = None - pdbid: Optional[ - str - ] = "" # Accepts either the format of the protein data bank code or {provided} + pdbid: Optional[str] = "" # Accepts either the format of the protein data bank code or {provided} autoprocfull: Optional[bool] = None procfull: Optional[bool] = None adpenabled: Optional[bool] = None