From 05ce9de8bd6babc63c386ed77a857973421f7bba Mon Sep 17 00:00:00 2001
From: Sigurd Pettersen <sigurd.pettersen@ceetronsolutions.com>
Date: Thu, 28 Sep 2023 08:20:23 +0200
Subject: [PATCH] Housekeeping: removed unused/misused B64EncodedNumpyArray
 pydantic model (#370)

---
 backend/src/backend/primary/routers/grid/router.py  |  6 +++---
 backend/src/backend/primary/routers/grid/schemas.py |  6 ------
 frontend/src/api/index.ts                           |  1 -
 frontend/src/api/models/B64EncodedNumpyArray.ts     | 10 ----------
 frontend/src/api/services/GridService.ts            |  9 ++++-----
 5 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 frontend/src/api/models/B64EncodedNumpyArray.ts

diff --git a/backend/src/backend/primary/routers/grid/router.py b/backend/src/backend/primary/routers/grid/router.py
index 456cc25a1..f6533c6d2 100644
--- a/backend/src/backend/primary/routers/grid/router.py
+++ b/backend/src/backend/primary/routers/grid/router.py
@@ -8,7 +8,7 @@
 from src.backend.primary.user_session_proxy import proxy_to_user_session
 
 from src.services.sumo_access.grid_access import GridAccess
-from .schemas import GridSurface, B64EncodedNumpyArray, GridIntersection
+from .schemas import GridSurface, GridIntersection
 
 router = APIRouter()
 
@@ -84,7 +84,7 @@ async def grid_parameter(
     parameter_name: str = Query(description="Grid parameter"),
     realization: str = Query(description="Realization"),
     authenticated_user: AuthenticatedUser = Depends(AuthHelper.get_authenticated_user),
-) -> B64EncodedNumpyArray:
+) -> List[float]:
     """Get a grid parameter"""
 
     query_params = {
@@ -192,7 +192,7 @@ async def statistical_grid_parameter(
     parameter_name: str = Query(description="Grid parameter"),
     realizations: List[str] = Query(description="Realizations"),
     authenticated_user: AuthenticatedUser = Depends(AuthHelper.get_authenticated_user),
-) -> B64EncodedNumpyArray:
+) -> List[float]:
     """Get a grid parameter"""
 
     query_params = {
diff --git a/backend/src/backend/primary/routers/grid/schemas.py b/backend/src/backend/primary/routers/grid/schemas.py
index dc4e75295..b88cba289 100644
--- a/backend/src/backend/primary/routers/grid/schemas.py
+++ b/backend/src/backend/primary/routers/grid/schemas.py
@@ -3,12 +3,6 @@
 from pydantic import BaseModel
 
 
-class B64EncodedNumpyArray(BaseModel):
-    bvals: str
-    dtype: str
-    shape: List[int]
-
-
 class GridSurface(BaseModel):
     polys: dict
     points: dict
diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts
index dc0b00887..5a0f9a529 100644
--- a/frontend/src/api/index.ts
+++ b/frontend/src/api/index.ts
@@ -9,7 +9,6 @@ export { CancelablePromise, CancelError } from './core/CancelablePromise';
 export { OpenAPI } from './core/OpenAPI';
 export type { OpenAPIConfig } from './core/OpenAPI';
 
-export type { B64EncodedNumpyArray as B64EncodedNumpyArray_api } from './models/B64EncodedNumpyArray';
 export type { Body_get_realizations_response as Body_get_realizations_response_api } from './models/Body_get_realizations_response';
 export type { CaseInfo as CaseInfo_api } from './models/CaseInfo';
 export type { Completions as Completions_api } from './models/Completions';
diff --git a/frontend/src/api/models/B64EncodedNumpyArray.ts b/frontend/src/api/models/B64EncodedNumpyArray.ts
deleted file mode 100644
index aee1ee266..000000000
--- a/frontend/src/api/models/B64EncodedNumpyArray.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-export type B64EncodedNumpyArray = {
-    bvals: string;
-    dtype: string;
-    shape: Array<number>;
-};
-
diff --git a/frontend/src/api/services/GridService.ts b/frontend/src/api/services/GridService.ts
index 66bcfc665..6772457ba 100644
--- a/frontend/src/api/services/GridService.ts
+++ b/frontend/src/api/services/GridService.ts
@@ -1,7 +1,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { B64EncodedNumpyArray } from '../models/B64EncodedNumpyArray';
 import type { GridIntersection } from '../models/GridIntersection';
 import type { GridSurface } from '../models/GridSurface';
 
@@ -104,7 +103,7 @@ export class GridService {
      * @param gridName Grid name
      * @param parameterName Grid parameter
      * @param realization Realization
-     * @returns B64EncodedNumpyArray Successful Response
+     * @returns number Successful Response
      * @throws ApiError
      */
     public gridParameter(
@@ -113,7 +112,7 @@ export class GridService {
         gridName: string,
         parameterName: string,
         realization: string,
-    ): CancelablePromise<B64EncodedNumpyArray> {
+    ): CancelablePromise<Array<number>> {
         return this.httpRequest.request({
             method: 'GET',
             url: '/grid/grid_parameter',
@@ -206,7 +205,7 @@ export class GridService {
      * @param gridName Grid name
      * @param parameterName Grid parameter
      * @param realizations Realizations
-     * @returns B64EncodedNumpyArray Successful Response
+     * @returns number Successful Response
      * @throws ApiError
      */
     public statisticalGridParameter(
@@ -215,7 +214,7 @@ export class GridService {
         gridName: string,
         parameterName: string,
         realizations: Array<string>,
-    ): CancelablePromise<B64EncodedNumpyArray> {
+    ): CancelablePromise<Array<number>> {
         return this.httpRequest.request({
             method: 'GET',
             url: '/grid/statistical_grid_parameter',