[ENH] Getting the first serialization seemingly completed

Author: Leguark

gempy/core/data/geo_model.py

@@ -64,10 +64,8 @@ class GeoModel(BaseModel):
         }
     )
 
-    meta: GeoModelMeta | None = Field(exclude=False)  #: Meta-information about the geological model, like its name, creation and modification dates, and owner.
-
-    # BUG: Remove None option for structural frame and meta
-    structural_frame: Optional[StructuralFrame] | None = Field(exclude=False, default=None)  #: The structural information of the geological model.
+    meta: GeoModelMeta = Field(exclude=False)  #: Meta-information about the geological model, like its name, creation and modification dates, and owner.
+    structural_frame: StructuralFrame = Field(exclude=False)  #: The structural information of the geological model.
     grid: Grid = Field(exclude=False, default=None)  #: The general grid used in the geological model.
 
     # region GemPy engine data types
@@ -85,7 +83,7 @@ def interpolation_options(self, value):
         self._interpolation_options = value
 
     geophysics_input: GeophysicsInput = Field(default=None, exclude=True)  #: The geophysics input of the geological model.
-    input_transform: Transform = Field(default=None, exclude=True)  #: The transformation used in the geological model for input points.
+    input_transform: Transform = Field(default=None, exclude=False)  #: The transformation used in the geological model for input points.
 
     interpolation_grid: EngineGrid = Field(default=None, exclude=True)  #: ptional grid used for interpolation. Can be seen as a cache field.
     _interpolationInput: InterpolationInput = PrivateAttr(default=None)  #: Input data for interpolation. Fed by the structural frame and can be seen as a cache field.

test/test_modules/test_serialize_model.py

@@ -1,11 +1,7 @@
-import numpy as np
 import os
-import pandas as pd
 import pprint
-import tempfile
 
 import gempy as gp
-from gempy.core.data import SurfacePointsTable
 from gempy.core.data.encoders.converters import loading_model_injection
 from gempy.core.data.enumerators import ExampleModel
 from gempy_engine.core.data import InterpolationOptions
@@ -16,7 +12,7 @@ def test_generate_horizontal_stratigraphic_model():
     model: gp.data.GeoModel = gp.generate_example_model(ExampleModel.HORIZONTAL_STRAT, compute_model=False)
 
     model_json = model.model_dump_json(by_alias=True)
-    
+
     # Pretty print JSON
     pprint.pp(model_json)
 
@@ -28,73 +24,27 @@ def test_generate_horizontal_stratigraphic_model():
     with open(file_path, "w") as f:
         f.write(model_json)
 
-    if False:  # * Use this to debug which fields are giving problems
-        # model_deserialized = gp.data.GeoModel.model_validate(from_json(model_json, allow_partial=True))
-        pass
-    else:
-        with loading_model_injection(
-            surface_points_binary = model.structural_frame.surface_points_copy.data,# TODO: Here we need to pass the binary array
-            orientations_binary = model.structural_frame.orientations_copy.data
-        ):
-            model_deserialized = gp.data.GeoModel.model_validate_json(model_json)
+    with loading_model_injection(
+            surface_points_binary=model.structural_frame.surface_points_copy.data,  # TODO: Here we need to pass the binary array
+            orientations_binary=model.structural_frame.orientations_copy.data
+    ):
+        model_deserialized = gp.data.GeoModel.model_validate_json(model_json)
 
     a = hash(model.structural_frame.structural_elements[1].surface_points.data.tobytes())
     b = hash(model_deserialized.structural_frame.structural_elements[1].surface_points.data.tobytes())
-    
+
     o_a = hash(model.structural_frame.structural_elements[1].orientations.data.tobytes())
     o_b = hash(model_deserialized.structural_frame.structural_elements[1].orientations.data.tobytes())
-    
+
     assert a == b, "Hashes for surface points are not equal"
     assert o_a == o_b, "Hashes for orientations are not equal"
-    
-    # TODO: [ ] Structural frame?
-    # TODO: [ ] Input transform?
     assert model_deserialized.__str__() == model.__str__()
 
     # # Validate json against schema
     if False:
         verify_json(model_json, name="verify/Horizontal Stratigraphic Model serialization")
 
 
-
-
-def test_generate_horizontal_stratigraphic_model_binary():
-    model: gp.data.GeoModel = gp.generate_example_model(ExampleModel.HORIZONTAL_STRAT, compute_model=False)
-    sp = model.surface_points_copy
-    element_id_map: dict[int, str] = model.structural_frame.element_id_name_map
-
-    # * So basically we have 12 elements of a very complex type
-    data = sp.data
-    assert data.shape[0] == 12
-    assert data.dtype == np.dtype([('X', 'f8'), ('Y', 'f8'), ('Z', 'f8'), ('id', 'i4'), ('nugget', 'f8')])  #: The custom data type for the data array.
-    
-    df = pd.DataFrame(data)
-    ds = df.to_xarray()
-    pass
-
-
-def test_split_input_data_tables():
-    model: gp.data.GeoModel = gp.generate_example_model(ExampleModel.HORIZONTAL_STRAT, compute_model=False)
-    sp: gp.data.SurfacePointsTable = model.surface_points_copy
-    # Temp save sp numpy array 
-
-    with tempfile.NamedTemporaryFile(delete=False, suffix='.npy') as temp:
-        np.save(
-            file=temp,
-            arr=sp.data
-        )
-        temp_path = temp.name
-    
-    # Load 
-    loaded_array = np.load(temp_path)
-    loaded_table = SurfacePointsTable(
-        data=loaded_array,
-        name_id_map=sp.name_id_map
-    )
-    
-    model.structural_frame.surface_points = loaded_table
-
-
 def test_interpolation_options():
     options = InterpolationOptions.from_args(
         range=1.7,