[WIP] Getting the first example of InterpolationOptions serializable

Author: Leguark

gempy_engine/core/data/options/evaluation_options.py

@@ -14,7 +14,7 @@ class MeshExtractionMaskingOptions(enum.Enum):
 class EvaluationOptions:
     _number_octree_levels: int = 1
     _number_octree_levels_surface: int = 4
-    octree_curvature_threshold: float = -1  #: Threshold to do octree refinement due to curvature to deal with angular geometries. This curvature assumes that 1 is the maximum curvature of any voxel
+    octree_curvature_threshold: float = -1.  #: Threshold to do octree refinement due to curvature to deal with angular geometries. This curvature assumes that 1 is the maximum curvature of any voxel
     octree_error_threshold: float = 1.  #: Number of standard deviations to consider a voxel as candidate to refine
     octree_min_level: int = 2
 

gempy_engine/core/data/options/interpolation_options.py

@@ -1,6 +1,7 @@
 import enum
 import warnings
-from dataclasses import dataclass, asdict, field
+
+from pydantic import BaseModel, ConfigDict, Field, model_validator, PrivateAttr
 
 import gempy_engine.config
 from .evaluation_options import MeshExtractionMaskingOptions, EvaluationOptions
@@ -10,40 +11,46 @@
 from ..raw_arrays_solution import RawArraysSolution
 
 
-@dataclass
-class InterpolationOptions:
-    __slots__ = ['kernel_options', 'evaluation_options', 'temp_interpolation_values', 'debug',
-                 'cache_mode', 'cache_model_name', 'block_solutions_type', 'sigmoid_slope']
-
+class InterpolationOptions(BaseModel):
     class CacheMode(enum.Enum):
         """ Cache mode for the interpolation"""
         NO_CACHE: int = enum.auto()  #: No cache at all even during the interpolation computation. This is quite expensive for no good reason.
         CACHE = enum.auto()
         IN_MEMORY_CACHE = enum.auto()
         CLEAR_CACHE = enum.auto()
 
+    model_config = ConfigDict(
+        arbitrary_types_allowed=False,
+        use_enum_values=False,
+        json_encoders={
+                CacheMode: lambda e: e.value
+        }
+    )
+
     # @off
-    kernel_options: KernelOptions  # * This is the compression of the fields above and the way to go in the future
-    evaluation_options: EvaluationOptions
-    temp_interpolation_values: TempInterpolationValues
+    kernel_options: KernelOptions = Field(init=True)  # * This is the compression of the fields above and the way to go in the future
+    evaluation_options: EvaluationOptions = Field(init=True)
 
     debug: bool
     cache_mode: CacheMode
     cache_model_name: str  # : Model name for the cache
-
     block_solutions_type: RawArraysSolution.BlockSolutionType
-
     sigmoid_slope: int
-
     debug_water_tight: bool = False
 
-    def __init__(
-            self,
+    # region Volatile
+    _temp_interpolation_values: TempInterpolationValues = PrivateAttr(default_factory=TempInterpolationValues)
+
+    # endregion
+
+    @classmethod
+    def from_args(
+            cls,
             range: int | float,
             c_o: float,
             uni_degree: int = 1,
-            i_res: float = 4,
-            gi_res: float = 2,  # ! This should be DEP
+            i_res: float = 4.,
+            gi_res: float = 2.,  # ! This should be DEP
             number_dimensions: int = 3,  # ? This probably too
             number_octree_levels: int = 1,
             kernel_function: AvailableKernelFunctions = AvailableKernelFunctions.cubic,
@@ -52,7 +59,7 @@ def __init__(
             compute_condition_number: bool = False,
     ):
 
-        self.kernel_options = KernelOptions(
+        kernel_options = KernelOptions(
             range=range,
             c_o=c_o,
             uni_degree=uni_degree,
@@ -63,7 +70,7 @@ def __init__(
             compute_condition_number=compute_condition_number
         )
 
-        self.evaluation_options = EvaluationOptions(
+        evaluation_options = EvaluationOptions(
             _number_octree_levels=number_octree_levels,
             _number_octree_levels_surface=4,
             mesh_extraction=mesh_extraction,
@@ -73,12 +80,24 @@ def __init__(
 
         )
 
-        self.temp_interpolation_values = TempInterpolationValues()
-        self.debug = gempy_engine.config.DEBUG_MODE
-        self.cache_mode = InterpolationOptions.CacheMode.IN_MEMORY_CACHE
-        self.cache_model_name = ""
-        self.block_solutions_type = RawArraysSolution.BlockSolutionType.OCTREE
-        self.sigmoid_slope = 5_000_000
+        temp_interpolation_values = TempInterpolationValues()
+        debug = gempy_engine.config.DEBUG_MODE
+        cache_mode = InterpolationOptions.CacheMode.IN_MEMORY_CACHE
+        cache_model_name = ""
+        block_solutions_type = RawArraysSolution.BlockSolutionType.OCTREE
+        sigmoid_slope = 5_000_000
+
+        return InterpolationOptions(
+            kernel_options=kernel_options,
+            evaluation_options=evaluation_options,
+            # temp_interpolation_values=temp_interpolation_values,
+            debug=debug,
+            cache_mode=cache_mode,
+            cache_model_name=cache_model_name,
+            block_solutions_type=block_solutions_type,
+            sigmoid_slope=sigmoid_slope,
+            debug_water_tight=False,
+        )
 
     # @on
 
@@ -107,17 +126,17 @@ def probabilistic_options(cls):
         # TODO: This should have the sigmoid slope different
         raise NotImplementedError("Probabilistic interpolation is not yet implemented.")
 
-    def __repr__(self):
-        return f"InterpolationOptions({', '.join(f'{k}={v}' for k, v in asdict(self).items())})"
+    # def __repr__(self):
+    #     return f"InterpolationOptions({', '.join(f'{k}={v}' for k, v in asdict(self).items())})"
 
-    def _repr_html_(self):
-        html = f"""
-                <table>
-                    <tr><td colspan='2' style='text-align:center'><b>InterpolationOptions</b></td></tr>
-                    {''.join(f'<tr><td>{k}</td><td>{v._repr_html_() if isinstance(v, KernelOptions) else v}</td></tr>' for k, v in asdict(self).items())}
-                </table>
-                """
-        return html
+    # def _repr_html_(self):
+    #     html = f"""
+    #             <table>
+    #                 <tr><td colspan='2' style='text-align:center'><b>InterpolationOptions</b></td></tr>
+    #                 {''.join(f'<tr><td>{k}</td><td>{v._repr_html_() if isinstance(v, KernelOptions) else v}</td></tr>' for k, v in asdict(self).items())}
+    #             </table>
+    #             """
+    #     return html
 
     def update_options(self, **kwargs):
         """
@@ -147,6 +166,10 @@ def update_options(self, **kwargs):
             else:
                 warnings.warn(f"{key} is not a recognized attribute and will be ignored.")
 
+    @property
+    def temp_interpolation_values(self):
+        return self._temp_interpolation_values
+
     @property
     def number_octree_levels(self):
         return self.evaluation_options.number_octree_levels

gempy_engine/core/data/options/kernel_options.py

@@ -1,14 +1,15 @@
 import warnings
 
 from dataclasses import dataclass, asdict
+from typing import Optional
 
 from gempy_engine.core.data.kernel_classes.kernel_functions import AvailableKernelFunctions
 from gempy_engine.core.data.kernel_classes.solvers import Solvers
 
 
 @dataclass(frozen=False)
 class KernelOptions:
-    range: int  # TODO: have constructor from RegularGrid
+    range: int | float # TODO: have constructor from RegularGrid
     c_o: float  # TODO: This should be a property
     uni_degree: int = 1
     i_res: float = 4.
@@ -20,7 +21,7 @@ class KernelOptions:
 
     compute_condition_number: bool = False
     optimizing_condition_number: bool = False
-    condition_number: float = None
+    condition_number: Optional[float] = None
 
     @property
     def n_uni_eq(self):