Merge remote-tracking branch 'rubenthoms/drag-list-components' into 2…

…d-viewer
rubenthoms · Aug 28, 2024 · 760ddae · 760ddae
2 parents 7f6d852 + 548e20c
commit 760ddae
Show file tree

Hide file tree

Showing 35 changed files with 256 additions and 2,368 deletions.
diff --git a/backend_py/primary/poetry.lock b/backend_py/primary/poetry.lock
diff --git a/backend_py/primary/primary/main.py b/backend_py/primary/primary/main.py
@@ -18,7 +18,6 @@
 from primary.routers.general import router as general_router
 from primary.routers.graph.router import router as graph_router
 from primary.routers.grid3d.router import router as grid3d_router
-from primary.routers.grid3d.router_vtk import router as grid3d_router_vtk
 from primary.routers.group_tree.router import router as group_tree_router
 from primary.routers.inplace_volumetrics.router import router as inplace_volumetrics_router
 from primary.routers.observations.router import router as observations_router
@@ -79,7 +78,6 @@ def custom_generate_unique_id(route: APIRoute) -> str:
 app.include_router(parameters_router, prefix="/parameters", tags=["parameters"])
 app.include_router(correlations_router, prefix="/correlations", tags=["correlations"])
 app.include_router(grid3d_router, prefix="/grid3d", tags=["grid3d"])
-app.include_router(grid3d_router_vtk, prefix="/grid3d", tags=["grid3d"])
 app.include_router(group_tree_router, prefix="/group_tree", tags=["group_tree"])
 app.include_router(pvt_router, prefix="/pvt", tags=["pvt"])
 app.include_router(well_completions_router, prefix="/well_completions", tags=["well_completions"])

diff --git a/backend_py/primary/primary/routers/grid3d/router_vtk.py b/backend_py/primary/primary/routers/grid3d/router_vtk.py
diff --git a/backend_py/primary/primary/routers/grid3d/schemas_vtk.py b/backend_py/primary/primary/routers/grid3d/schemas_vtk.py
diff --git a/backend_py/primary/primary/services/user_session_manager/user_session_manager.py b/backend_py/primary/primary/services/user_session_manager/user_session_manager.py
@@ -20,7 +20,6 @@
 
 class UserComponent(str, Enum):
     GRID3D_RI = "GRID3D_RI"
-    GRID3D_VTK = "GRID3D_VTK"
     MOCK = "MOCK"
 
 
@@ -53,12 +52,6 @@ class _UserSessionDef:
         resource_req=RadixResourceRequests(cpu="4", memory="16Gi"),
         payload_dict={"ri_omp_num_treads": 4},
     ),
-    UserComponent.GRID3D_VTK: _UserSessionDef(
-        job_component_name="user-grid3d-vtk",
-        port=8003,
-        resource_req=RadixResourceRequests(cpu="200m", memory="400Mi"),
-        payload_dict=None,
-    ),
 }
 
 

diff --git a/backend_py/primary/pyproject.toml b/backend_py/primary/pyproject.toml
@@ -20,7 +20,7 @@ numpy = "^1.24.1"
 orjson = "^3.8.10"
 pandas = {version = "2.0.1", extras = ["performance"]}
 httpx = "^0.24.0"
-fmu-sumo = "1.2.4"
+fmu-sumo = "1.2.5"
 sumo-wrapper-python = "1.0.9"
 azure-monitor-opentelemetry = "^1.1.0"
 requests-toolbelt = "^1.0.0"

diff --git a/backend_py/user_grid3d_vtk/Dockerfile b/backend_py/user_grid3d_vtk/Dockerfile