From 7e399cc5e15477f828858d10afd124ae2932e8a8 Mon Sep 17 00:00:00 2001 From: Ruben Thoms Date: Wed, 12 Feb 2025 13:29:48 +0100 Subject: [PATCH] fix: mypy --- .../primary/routers/seismic/converters.py | 20 ++++++------ .../services/sumo_access/seismic_access.py | 32 ++++++++++--------- .../primary/services/vds_access/vds_access.py | 2 +- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/backend_py/primary/primary/routers/seismic/converters.py b/backend_py/primary/primary/routers/seismic/converters.py index ea37862f4..44463dd40 100644 --- a/backend_py/primary/primary/routers/seismic/converters.py +++ b/backend_py/primary/primary/routers/seismic/converters.py @@ -53,14 +53,14 @@ def to_api_vds_slice_data( return schemas.SeismicSliceData( slice_traces_b64arr=b64_encode_float_array_as_float32(flattened_slice_traces_array), bbox_utm=metadata.geospatial, - u_min=metadata.x_axis["min"], - u_max=metadata.x_axis["max"], - u_num_samples=metadata.x_axis["samples"], - u_unit=metadata.x_axis["unit"], - v_min=metadata.y_axis["min"], - v_max=metadata.y_axis["max"], - v_num_samples=metadata.y_axis["samples"], - v_unit=metadata.y_axis["unit"], - value_min=np.nanmin(flattened_slice_traces_array), - value_max=np.nanmax(flattened_slice_traces_array), + u_min=metadata.x_axis.min, + u_max=metadata.x_axis.max, + u_num_samples=metadata.x_axis.samples, + u_unit=metadata.x_axis.unit, + v_min=metadata.y_axis.min, + v_max=metadata.y_axis.max, + v_num_samples=metadata.y_axis.samples, + v_unit=metadata.y_axis.unit, + value_min=np.nanmin(flattened_slice_traces_array).astype(float), + value_max=np.nanmax(flattened_slice_traces_array).astype(float), ) diff --git a/backend_py/primary/primary/services/sumo_access/seismic_access.py b/backend_py/primary/primary/services/sumo_access/seismic_access.py index 0f315e990..fa3a7340d 100644 --- a/backend_py/primary/primary/services/sumo_access/seismic_access.py +++ b/backend_py/primary/primary/services/sumo_access/seismic_access.py @@ -7,7 +7,7 @@ from fmu.sumo.explorer.objects.cube_collection import CubeCollection from ._helpers import create_sumo_client, create_sumo_case_async -from .seismic_types import SeismicCubeMeta, VdsHandle +from .seismic_types import SeismicCubeMeta, SeismicCubeSpec, VdsHandle LOGGER = logging.getLogger(__name__) @@ -42,6 +42,21 @@ async def get_seismic_cube_meta_list_async(self) -> List[SeismicCubeMeta]: else: iso_string_or_time_interval = f"{t_start}/{t_end}" + + seismic_spec = SeismicCubeSpec( + num_cols=cube["data"]["spec"]["ncol"], + num_rows=cube["data"]["spec"]["nrow"], + num_layers=cube["data"]["spec"]["nlay"], + x_origin=cube["data"]["spec"]["xori"], + y_origin=cube["data"]["spec"]["yori"], + z_origin=cube["data"]["spec"]["zori"], + x_inc=cube["data"]["spec"]["xinc"], + y_inc=cube["data"]["spec"]["yinc"], + z_inc=cube["data"]["spec"]["zinc"], + y_flip=cube["data"]["spec"]["yflip"], + z_flip=cube["data"]["spec"]["zflip"], + rotation=cube["data"]["spec"]["rotation"], + ) seismic_meta = SeismicCubeMeta( seismic_attribute=cube["data"].get("tagname"), unit=cube["data"].get("unit"), @@ -49,20 +64,7 @@ async def get_seismic_cube_meta_list_async(self) -> List[SeismicCubeMeta]: is_observation=cube["data"]["is_observation"], is_depth=cube["data"].get("vertical_domain", "depth") == "depth", bbox=cube["data"]["bbox"], - spec={ - "num_cols": cube["data"]["spec"]["ncol"], - "num_rows": cube["data"]["spec"]["nrow"], - "num_layers": cube["data"]["spec"]["nlay"], - "x_origin": cube["data"]["spec"]["xori"], - "y_origin": cube["data"]["spec"]["yori"], - "z_origin": cube["data"]["spec"]["zori"], - "x_inc": cube["data"]["spec"]["xinc"], - "y_inc": cube["data"]["spec"]["yinc"], - "z_inc": cube["data"]["spec"]["zinc"], - "y_flip": cube["data"]["spec"]["yflip"], - "z_flip": cube["data"]["spec"]["zflip"], - "rotation": cube["data"]["spec"]["rotation"], - }, + spec=seismic_spec, ) seismic_cube_meta_list.append(seismic_meta) return seismic_cube_meta_list diff --git a/backend_py/primary/primary/services/vds_access/vds_access.py b/backend_py/primary/primary/services/vds_access/vds_access.py index b1a9beff5..82bbb725a 100644 --- a/backend_py/primary/primary/services/vds_access/vds_access.py +++ b/backend_py/primary/primary/services/vds_access/vds_access.py @@ -155,7 +155,7 @@ async def get_crossline_slice(self, line_no: int) -> Tuple[NDArray[np.float32], return (flattened_fence_traces_float32_array, metadata) - async def get_depth_slice(self, depth: float) -> Tuple[NDArray[np.float32], VdsSliceMetadata]: + async def get_depth_slice(self, depth: int) -> Tuple[NDArray[np.float32], VdsSliceMetadata]: endpoint = "slice" hard_coded_fill_value = -999.25 slice_request = VdsSliceRequest(