[BUG] Improve computation timestamp handling and fix uninitialized WeightCache issues

Author: Leguark

gempy_engine/API/interp_single/_interp_scalar_field.py

@@ -29,10 +29,14 @@ def interpolate_scalar_field(solver_input: SolverInput, options: InterpolationOp
                 key=weights_key,
                 look_in_disk= not options.cache_mode == InterpolationOptions.CacheMode.IN_MEMORY_CACHE
             )
+            ts = options.temp_interpolation_values.start_computation_ts
+            if ts == -1:
+                raise ValueError("ts not set")
+            
             weights_hash = generate_cache_key(
                 name="",
                 parameters={
-                        "ts": options.temp_interpolation_values.start_computation_ts
+                        "ts": ts
                 }
             )
         case  InterpolationOptions.CacheMode.CLEAR_CACHE:

gempy_engine/API/model/model_api.py

@@ -23,58 +23,63 @@
 def compute_model(interpolation_input: InterpolationInput, options: InterpolationOptions,
                   data_descriptor: InputDataDescriptor, *, geophysics_input: Optional[GeophysicsInput] = None) -> Solutions:
 
-    WeightCache.initialize_cache_dir()
-    options.temp_interpolation_values.start_computation_ts = int(time.time())
-    
-    # ! If we inline this it seems the deepcopy does not work
-    if BackendTensor.engine_backend is not AvailableBackends.PYTORCH and NOT_MAKE_INPUT_DEEP_COPY is False:
-        interpolation_input = copy.deepcopy(interpolation_input)
+    try:
+        WeightCache.initialize_cache_dir()
+        options.temp_interpolation_values.start_computation_ts = int(time.time())
 
-    # Check input is valid
-    _check_input_validity(interpolation_input, options, data_descriptor)
-
-    output: list[OctreeLevel] = interpolate_n_octree_levels(
-        interpolation_input=interpolation_input,
-        options=options,
-        data_descriptor=data_descriptor
-    )
-    # region Geophysics
-    # ---------------------
-    # TODO: [x] Gravity
-    # TODO: [ ] Magnetics
-
-    if geophysics_input is not None:
-        first_level_last_field: InterpOutput = output[0].outputs_centers[-1]
-        gravity = compute_gravity(
-            geophysics_input=geophysics_input,
-            root_ouput=first_level_last_field
-        )
-    else:
-        gravity = None
-
-    # endregion
+        # ! If we inline this it seems the deepcopy does not work
+        if BackendTensor.engine_backend is not AvailableBackends.PYTORCH and NOT_MAKE_INPUT_DEEP_COPY is False:
+            interpolation_input = copy.deepcopy(interpolation_input)
+            
+        # Check input is valid
+        _check_input_validity(interpolation_input, options, data_descriptor)
 
-    meshes: Optional[list[DualContouringMesh]] = None
-    if options.mesh_extraction:
-        if interpolation_input.grid.octree_grid is None:
-            raise ValueError("Octree grid must be defined to extract the mesh")
-        
-        meshes: list[DualContouringMesh] = dual_contouring_multi_scalar(
-            data_descriptor=data_descriptor,
+        output: list[OctreeLevel] = interpolate_n_octree_levels(
             interpolation_input=interpolation_input,
             options=options,
-            octree_list=output[:options.number_octree_levels_surface]
+            data_descriptor=data_descriptor
         )
+        # region Geophysics
+        # ---------------------
+        # TODO: [x] Gravity
+        # TODO: [ ] Magnetics
+
+        if geophysics_input is not None:
+            first_level_last_field: InterpOutput = output[0].outputs_centers[-1]
+            gravity = compute_gravity(
+                geophysics_input=geophysics_input,
+                root_ouput=first_level_last_field
+            )
+        else:
+            gravity = None
+
+        # endregion
 
-    solutions = Solutions(
-        octrees_output=output,
-        dc_meshes=meshes,
-        fw_gravity=gravity,
-        block_solution_type=options.block_solutions_type
-    )
+        meshes: Optional[list[DualContouringMesh]] = None
+        if options.mesh_extraction:
+            if interpolation_input.grid.octree_grid is None:
+                raise ValueError("Octree grid must be defined to extract the mesh")
+            
+            meshes: list[DualContouringMesh] = dual_contouring_multi_scalar(
+                data_descriptor=data_descriptor,
+                interpolation_input=interpolation_input,
+                options=options,
+                octree_list=output[:options.number_octree_levels_surface]
+            )
+
+        solutions = Solutions(
+            octrees_output=output,
+            dc_meshes=meshes,
+            fw_gravity=gravity,
+            block_solution_type=options.block_solutions_type
+        )
 
-    if options.debug:
-        solutions.debug_input_data["stack_interpolation_input"] = interpolation_input
+        if options.debug:
+            solutions.debug_input_data["stack_interpolation_input"] = interpolation_input
+    except Exception as e:
+        raise e
+    finally:
+        options.temp_interpolation_values.start_computation_ts = -1
 
     return solutions
 

tests/fixtures/complex_geometries.py

@@ -21,8 +21,6 @@
 
 @pytest.fixture(scope="session")
 def one_fault_model():
-    from gempy_engine.modules.weights_cache.weights_cache_interface import WeightCache
-    WeightCache.initialize_cache_dir()
     centers = np.array([500, 500, -550])
     rescaling_factor = 240
 

tests/test_common/test_api/test_faults/test_one_fault.py

@@ -107,6 +107,9 @@ def test_one_fault_model_thickness(one_fault_model, n_oct_levels=2):
 
 
 def test_one_fault_model_finite_fault(one_fault_model, n_oct_levels=4):
+    from gempy_engine.modules.weights_cache.weights_cache_interface import WeightCache
+    WeightCache.initialize_cache_dir()
+    
     interpolation_input: InterpolationInput
     structure: InputDataDescriptor
     options: InterpolationOptions
@@ -171,6 +174,9 @@ def test_one_fault_model_finite_fault(one_fault_model, n_oct_levels=4):
 
 
 def test_implicit_ellipsoid_projection_on_fault(one_fault_model):
+    from gempy_engine.modules.weights_cache.weights_cache_interface import WeightCache
+    WeightCache.initialize_cache_dir()
+    
     interpolation_input: InterpolationInput
     structure: InputDataDescriptor
     options: InterpolationOptions