[WIP] Being able to compute

Author: Leguark

gempy_engine/API/server/_server_functions.py

@@ -32,18 +32,14 @@ def setup_logger():
 
 
 def process_input(gempy_input: GemPyInput, logger: logging.Logger) -> (InputDataDescriptor, InterpolationInput, int):
-    
-    logger.debug("Input grid:", gempy_input.interpolation_input.grid)
 
-    regular_grid: EngineGrid = EngineGrid.from_regular_grid(regular_grid=RegularGrid.from_schema(gempy_input.interpolation_input.grid))
-    
-    # BUG: Adapt this to the new grid
-    # gempy_input.interpolation_input.grid = regular_grid
+    logger.debug(f"Input grid: {gempy_input.interpolation_input.grid}")
 
     interpolation_input: InterpolationInput = InterpolationInput.from_schema(gempy_input.interpolation_input)
     input_data_descriptor: InputDataDescriptor = InputDataDescriptor.from_schema(gempy_input.input_data_descriptor)
     n_stack = len(input_data_descriptor.stack_structure.masking_descriptor)
-    logger.debug("masking descriptor: ", input_data_descriptor.stack_structure.masking_descriptor)
-    logger.debug("stack structure: ", input_data_descriptor.stack_structure)
+
+    logger.debug(f"masking descriptor: {input_data_descriptor.stack_structure.masking_descriptor}")
+    logger.debug(f"stack structure: {input_data_descriptor.stack_structure}")
     return input_data_descriptor, interpolation_input, n_stack
 

gempy_engine/API/server/main_server_pro.py

@@ -56,19 +56,21 @@ def compute_gempy_model(gempy_input: GemPyInput):
     print("Running gempy model...")
     logger.info("Running GemPy Engine")
 
+    interpolation_input: InterpolationInput
+    input_data_descriptor: InputDataDescriptor
     input_data_descriptor, interpolation_input, n_stack = process_input(
         gempy_input=gempy_input,
         logger=logger
     )
-
+    
     # region Set new fancy triangulation TODO: This has to be move to the interpolation options coming from the client
-    FANCY_TRIANGULATION = True
-    if FANCY_TRIANGULATION:
-        default_interpolation_options.mesh_extraction_fancy = True
+    # FANCY_TRIANGULATION = True
+    # if FANCY_TRIANGULATION:
+    #     default_interpolation_options.mesh_extraction_fancy = True
         # default_interpolation_options.mesh_extraction_masking_options = MeshExtractionMaskingOptions.RAW  # * To Date only raw making is supported
     # endregion
 
-    default_interpolation_options.mesh_extraction_masking_options = MeshExtractionMaskingOptions.RAW  # * To Date only raw making is supported
+    # default_interpolation_options.mesh_extraction_masking_options = MeshExtractionMaskingOptions.RAW  # * To Date only raw making is supported
 
     solutions: Solutions = _compute_model(
         interpolation_input=interpolation_input,

gempy_engine/core/data/interpolation_input.py

@@ -102,10 +102,18 @@ def from_interpolation_input_subset(cls, all_interpolation_input: "Interpolation
 
     @classmethod
     def from_schema(cls, schema: InterpolationInputSchema) -> "InterpolationInput":
+
+        octree_grid = RegularGrid(
+            orthogonal_extent=schema.grid.extent,
+            regular_grid_shape=np.array([2, 2, 2])
+        )
+        grid: EngineGrid = EngineGrid(  # * Here we convert the GemPy grid to the
+            octree_grid=octree_grid
+        )
         return cls(
             surface_points=SurfacePoints.from_schema(schema.surface_points),
             orientations=Orientations.from_schema(schema.orientations),
-            grid=schema.grid,
+            grid=grid
         )
 
 

requirements/server-requirements.txt

@@ -4,3 +4,5 @@ fastapi
 uvicorn[standard]
 subsurface
 pandas
+httpx
+subsurface-terra

tests/test_server/example.json

@@ -65,7 +65,10 @@
         ]
       ]
     },
-    "grid": null
+    "grid": {
+      "extent": [ 0.0, 1.0, 0.0, 1.0, 0.0, 1.0 ],
+      "octree_levels": 2
+    }
   },
   "input_data_descriptor": {
     "number_of_points_per_surface": [7],

tests/test_server/tests_server_I.py

@@ -41,6 +41,7 @@ def test_post_example_json(client):
         headers={"Content-Type": "application/json"}
     )
 
+    print(response.json())
     assert response.status_code == 200
     result = response.json()
     assert "result" in result or "scalar_field" in result