[DPF]: Extend and refactor 3D viewer to DataProviderFramework

backend_py/primary/primary/routers/seismic/router.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Optional, Tuple
 
 from fastapi import APIRouter, Body, Depends, HTTPException, Query
 from webviz_pkg.core_utils.b64 import b64_encode_float_array_as_float32
@@ -41,7 +41,7 @@ async def get_inline_slice(
     seismic_attribute: str = Query(description="Seismic cube attribute"),
     time_or_interval_str: str = Query(description="Timestamp or timestep"),
     observed: bool = Query(description="Observed or simulated"),
-    inline_no: int = Query(description="Inline number"),
+    inline_number: int = Query(description="Inline number"),
 ) -> schemas.SeismicSliceData:
     """Get a seismic inline from a seismic cube."""
     seismic_access = SeismicAccess.from_ensemble_name(
@@ -64,7 +64,7 @@ async def get_inline_slice(
 
     vds_access = VdsAccess(sas_token=vds_handle.sas_token, vds_url=vds_handle.vds_url)
 
-    flattened_slice_traces_array, metadata = await vds_access.get_inline_slice_async(line_no=inline_no)
+    flattened_slice_traces_array, metadata = await vds_access.get_inline_slice_async(line_no=inline_number)
 
     return converters.to_api_vds_slice_data(
         flattened_slice_traces_array=flattened_slice_traces_array, metadata=metadata
@@ -80,7 +80,7 @@ async def get_crossline_slice(
     seismic_attribute: str = Query(description="Seismic cube attribute"),
     time_or_interval_str: str = Query(description="Timestamp or timestep"),
     observed: bool = Query(description="Observed or simulated"),
-    crossline_no: int = Query(description="Crossline number"),
+    crossline_num: int = Query(description="Crossline number"),
 ) -> schemas.SeismicSliceData:
     """Get a seismic crossline from a seismic cube."""
     seismic_access = SeismicAccess.from_ensemble_name(
@@ -103,7 +103,7 @@ async def get_crossline_slice(
 
     vds_access = VdsAccess(sas_token=vds_handle.sas_token, vds_url=vds_handle.vds_url)
 
-    flattened_slice_traces_array, metadata = await vds_access.get_crossline_slice_async(line_no=crossline_no)
+    flattened_slice_traces_array, metadata = await vds_access.get_crossline_slice_async(line_no=crossline_num)
 
     return converters.to_api_vds_slice_data(
         flattened_slice_traces_array=flattened_slice_traces_array, metadata=metadata
@@ -119,7 +119,7 @@ async def get_depth_slice(
     seismic_attribute: str = Query(description="Seismic cube attribute"),
     time_or_interval_str: str = Query(description="Timestamp or timestep"),
     observed: bool = Query(description="Observed or simulated"),
-    depth_slice_no: int = Query(description="Depth slice no"),
+    depth_slice_num: int = Query(description="Depth slice number"),
 ) -> schemas.SeismicSliceData:
     """Get a seismic depth slice from a seismic cube."""
     seismic_access = SeismicAccess.from_ensemble_name(
@@ -142,13 +142,61 @@ async def get_depth_slice(
 
     vds_access = VdsAccess(sas_token=vds_handle.sas_token, vds_url=vds_handle.vds_url)
 
-    flattened_slice_traces_array, metadata = await vds_access.get_depth_slice_async(depth_slice_no=depth_slice_no)
+    flattened_slice_traces_array, metadata = await vds_access.get_depth_slice_async(depth_slice_no=depth_slice_num)
 
     return converters.to_api_vds_slice_data(
         flattened_slice_traces_array=flattened_slice_traces_array, metadata=metadata
     )
 
 
+@router.get("/get_seismic_slices/")
+# pylint: disable=too-many-arguments
+async def get_seismic_slices(
+    authenticated_user: AuthenticatedUser = Depends(AuthHelper.get_authenticated_user),
+    case_uuid: str = Query(description="Sumo case uuid"),
+    ensemble_name: str = Query(description="Ensemble name"),
+    realization_num: int = Query(description="Realization number"),
+    seismic_attribute: str = Query(description="Seismic cube attribute"),
+    time_or_interval_str: str = Query(description="Timestamp or timestep"),
+    observed: bool = Query(description="Observed or simulated"),
+    inline_number: int = Query(description="Inline number"),
+    crossline_number: int = Query(description="Crossline number"),
+    depth_slice_number: int = Query(description="Depth slice number"),
+) -> Tuple[schemas.SeismicSliceData, schemas.SeismicSliceData, schemas.SeismicSliceData]:
+    """Get a seismic depth slice from a seismic cube."""
+    seismic_access = SeismicAccess.from_ensemble_name(
+        authenticated_user.get_sumo_access_token(), case_uuid, ensemble_name
+    )
+
+    vds_handle: Optional[VdsHandle] = None
+    try:
+        vds_handle = await seismic_access.get_vds_handle_async(
+            realization=realization_num,
+            seismic_attribute=seismic_attribute,
+            time_or_interval_str=time_or_interval_str,
+            observed=observed,
+        )
+    except ValueError as err:
+        raise HTTPException(status_code=404, detail=str(err)) from err
+
+    if vds_handle is None:
+        raise HTTPException(status_code=404, detail="Vds handle not found")
+
+    vds_access = VdsAccess(sas_token=vds_handle.sas_token, vds_url=vds_handle.vds_url)
+
+    inline_tuple = await vds_access.get_inline_slice_async(line_no=inline_number)
+    crossline_tuple = await vds_access.get_crossline_slice_async(line_no=crossline_number)
+    depth_slice_tuple = await vds_access.get_depth_slice_async(depth_slice_no=depth_slice_number)
+
+    return (
+        converters.to_api_vds_slice_data(flattened_slice_traces_array=inline_tuple[0], metadata=inline_tuple[1]),
+        converters.to_api_vds_slice_data(flattened_slice_traces_array=crossline_tuple[0], metadata=crossline_tuple[1]),
+        converters.to_api_vds_slice_data(
+            flattened_slice_traces_array=depth_slice_tuple[0], metadata=depth_slice_tuple[1]
+        ),
+    )
+
+
 @router.post("/get_seismic_fence/")
 async def post_get_seismic_fence(
     authenticated_user: AuthenticatedUser = Depends(AuthHelper.get_authenticated_user),

backend_py/primary/primary/services/vds_access/vds_access.py

@@ -11,6 +11,7 @@
 
 from primary import config
 from primary.services.utils.httpx_async_client_wrapper import HTTPX_ASYNC_CLIENT_WRAPPER
+from primary.services.service_exceptions import ServiceRequestError
 
 from .response_types import VdsArray, VdsAxis, VdsMetadata, VdsFenceMetadata, VdsSliceMetadata
 from .request_types import (
@@ -60,16 +61,21 @@ def __init__(
     @staticmethod
     async def _query_async(endpoint: str, request: VdsRequestedResource) -> httpx.Response:
         """Query the service"""
+        try:
+            response = await HTTPX_ASYNC_CLIENT_WRAPPER.client.post(
+                f"{config.VDS_HOST_ADDRESS}/{endpoint}",
+                headers={"Content-Type": "application/json"},
+                content=json.dumps(request.request_parameters()),
+                timeout=60,
+            )
 
-        response = await HTTPX_ASYNC_CLIENT_WRAPPER.client.post(
-            f"{config.VDS_HOST_ADDRESS}/{endpoint}",
-            headers={"Content-Type": "application/json"},
-            content=json.dumps(request.request_parameters()),
-            timeout=60,
-        )
+            if response.is_error:
+                raise ServiceRequestError(
+                    f"({str(response.status_code)})-{response.reason_phrase}-{response.text}", service=Service.VDS
+                )
 
-        if response.is_error:
-            raise RuntimeError(f"({str(response.status_code)})-{response.reason_phrase}-{response.text}")
+        except httpx.RequestError as error:
+            raise ServiceRequestError(f"{error}", service=Service.VDS) from error
 
         return response
 
@@ -94,8 +100,14 @@ async def get_inline_slice_async(self, line_no: int) -> Tuple[NDArray[np.float32
         response = await self._query_async(endpoint, slice_request)
 
         parts = self._extract_and_validate_body_parts_from_response(response)
-
-        metadata = VdsSliceMetadata(**json.loads(parts[0].content))
+        response_metadata = json.loads(parts[0].content)
+        metadata = VdsSliceMetadata(
+            format=response_metadata["format"],
+            shape=response_metadata["shape"],
+            x_axis=VdsAxis(**response_metadata["x"]),
+            y_axis=VdsAxis(**response_metadata["y"]),
+            geospatial=response_metadata["geospatial"],
+        )
         self._assert_valid_metadata_format_and_shape(metadata)
 
         byte_array = parts[1].content
@@ -254,7 +266,6 @@ async def get_flattened_fence_traces_array_and_metadata_async(
 
         # Convert every value of `hard_coded_fill_value` to np.nan
         flattened_fence_traces_float32_array[flattened_fence_traces_float32_array == hard_coded_fill_value] = np.nan
-
         return (flattened_fence_traces_float32_array, num_traces, num_samples_per_trace)
 
     def _extract_and_validate_body_parts_from_response(self, response: httpx.Response) -> Tuple[BodyPart, BodyPart]:

frontend/.dependency-cruiser.cjs

@@ -47,6 +47,21 @@ module.exports = {
                 path: "^src/(?!$1/).*(/_[^/]+/)",
             },
         },
+        {
+            name: "no-cross-module-imports",
+            severity: "error",
+            from: {
+                path: "^src/modules/([^/]+)/",
+            },
+            to: {
+                path: "^src/modules/([^/]+)/",
+                pathNot: [
+                    "^src/modules/_shared/",
+                    // This should allow same-module imports
+                    "($1)",
+                ],
+            },
+        },
     ],
     options: {
         /* conditions specifying which files not to follow further when encountered: