Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b4548f2
feat: Add JSON I/O functionality for surface points
flohorovicic Mar 19, 2025
e27ca15
feat: Add orientation data loading functionality
flohorovicic Mar 19, 2025
cb34e62
feat: Add horizontal stratigraphic model tutorial
flohorovicic Mar 19, 2025
f91fa03
fix: Update JSON loading to use surface names from series data - Add …
flohorovicic Mar 19, 2025
9b78ac2
fix: Update horizontal stratigraphic tutorial with correct data and m…
flohorovicic Mar 19, 2025
49b4f25
fix: correct IDs and positions for fault and rock1 in multiple series…
flohorovicic Mar 19, 2025
1e7b405
Added .json input file
flohorovicic Mar 19, 2025
c926296
Updated .json input file
flohorovicic Mar 19, 2025
f82abf2
Adjustments in stack-mapping for more flexible handling of faults
flohorovicic Mar 19, 2025
0f1734b
Added modules __init__ and minor changes in json module
flohorovicic Mar 19, 2025
6cf9a44
fix: Fix metadata handling in JSON I/O for proper preservation when l…
flohorovicic Mar 22, 2025
4c1d177
Updated .gitignore (only to ignore files generated by new tutorial)
flohorovicic Mar 22, 2025
61b7dec
Extended functionality to save .json and adjusted tests. Simple model…
flohorovicic Mar 23, 2025
6a40125
Added structural relations to .json and fixed error in second example
flohorovicic Mar 23, 2025
2a7d8f8
Fixed problem with loading of surface layer stack
flohorovicic Mar 23, 2025
e6fade1
Fixed stratigraphic pile handling in JSON I/O by reverting to working…
flohorovicic Mar 23, 2025
660ae65
Included name-id mapping in .json
flohorovicic Mar 24, 2025
1637ddb
Fix JSON serialization for NumPy types and update example data
flohorovicic Mar 24, 2025
e31bda4
Adjusted date format
flohorovicic Mar 24, 2025
c92878b
Simplified required json input further and added "minimal working exa…
flohorovicic Mar 25, 2025
6d1e029
Simplified minimal input even further: now only points and orientatio…
flohorovicic Mar 25, 2025
84d3332
Updated minimal json examples and comparison to minimal GemPy model
flohorovicic Mar 25, 2025
0386163
Additional fixes to get defaults right
flohorovicic Mar 25, 2025
360a103
Added default nugget value to minimize input even further
flohorovicic Mar 25, 2025
36fec0d
Updated tests and fixed code to pass tests.
flohorovicic Mar 28, 2025
949f7e0
fix: Update fault model example with correct series mapping and visua…
flohorovicic Apr 5, 2025
601e523
Improve scalar field visualization in fault model example - Add prope…
flohorovicic Apr 6, 2025
94f6fd3
Example model for a combination of series and faults from json
flohorovicic Apr 6, 2025
593dbbd
Add combination model JSON files to gitignore
flohorovicic Apr 6, 2025
a4f4264
fix: preserve colors when loading models from JSON - Added color pres…
flohorovicic Apr 6, 2025
cb5693c
test: update JSON I/O tests to verify color preservation - Added colo…
flohorovicic Apr 6, 2025
0e95fb7
Added TODOs for PR.
javoha Apr 11, 2025
369ef46
Added TODOs for PR.
javoha Apr 11, 2025
20ad605
fix: ensure NotRequired import works for both Python 3.11+ and earlie…
flohorovicic Apr 27, 2025
9d9f304
[BUG] Ensure compatibility with older Python versions
Leguark May 1, 2025
040d84a
Merge branch 'main' into fork/flohorovicic/feature/json_io
Leguark May 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: ensure NotRequired import works for both Python 3.11+ and earlie…
…r via typing_extensions fallback
  • Loading branch information
flohorovicic committed Apr 27, 2025
commit 20ad605aef65420d26b6ec879da0910233a7d26f
70 changes: 35 additions & 35 deletions gempy/modules/json_io/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,48 +23,48 @@ class Orientation(TypedDict):
nugget: float
polarity: int # 1 for normal, -1 for reverse

class Surface(TypedDict):
name: str
id: int
color: Optional[str] # Hex color code
vertices: Optional[List[List[float]]] # List of [x, y, z] coordinates
class Surface(TypedDict, total=False):
name: str # Required
id: NotRequired[int] # Optional, will be auto-generated if not provided
color: NotRequired[Optional[str]] # Optional hex color code
vertices: NotRequired[Optional[List[List[float]]]] # Optional list of [x, y, z] coordinates

class Fault(TypedDict):
name: str
id: int
is_active: bool
class Fault(TypedDict, total=False):
name: str # Required
id: NotRequired[int] # Optional, will be auto-generated
is_active: NotRequired[bool] # Optional, defaults to True
surface: Surface

class Series(TypedDict, total=False):
name: str # Required
id: int
is_active: bool
is_fault: bool
order_series: int
surfaces: List[str] # Required, list of surface names
faults: List[Fault]
surfaces: Union[List[str], List[Surface]] # Required, can be list of names or Surface objects
id: NotRequired[int] # Optional, will be auto-generated
is_active: NotRequired[bool] # Optional, defaults to True
is_fault: NotRequired[bool] # Optional, defaults to False
order_series: NotRequired[int] # Optional, will be auto-generated
faults: NotRequired[List[Fault]] # Optional, defaults to empty list
structural_relation: NotRequired[str] # Optional, defaults to "ONLAP"
colors: NotRequired[Optional[List[str]]] # Optional list of hex color codes
colors: NotRequired[Optional[List[str]]] # Optional

class GridSettings(TypedDict):
regular_grid_resolution: List[int]
regular_grid_extent: List[float]
octree_levels: Optional[int]
class GridSettings(TypedDict, total=False):
regular_grid_resolution: NotRequired[List[int]] # Optional, defaults to [10, 10, 10]
regular_grid_extent: NotRequired[List[float]] # Optional, auto-calculated from data
octree_levels: NotRequired[Optional[int]] # Optional

class ModelMetadata(TypedDict):
name: str
creation_date: str
last_modification_date: str
owner: Optional[str]
class ModelMetadata(TypedDict, total=False):
name: NotRequired[str] # Optional, defaults to "GemPy Model"
creation_date: NotRequired[str] # Optional, defaults to current date
last_modification_date: NotRequired[str] # Optional, defaults to current date
owner: NotRequired[Optional[str]] # Optional, defaults to "GemPy Team"

class IdNameMapping(TypedDict):
name_to_id: Dict[str, int]
class IdNameMapping(TypedDict, total=False):
name_to_id: Dict[str, int] # Required if id_name_mapping is provided

class GemPyModelJson(TypedDict, total=False):
metadata: ModelMetadata
surface_points: List[SurfacePoint]
orientations: List[Orientation]
series: List[Series]
grid_settings: Optional[GridSettings]
interpolation_options: Optional[Dict[str, Any]]
id_name_mapping: IdNameMapping
class GemPyModelJson(TypedDict):
surface_points: List[SurfacePoint] # Required
orientations: List[Orientation] # Required
series: List[Series] # Required but with minimal required fields
metadata: NotRequired[ModelMetadata] # Optional
grid_settings: NotRequired[Optional[GridSettings]] # Optional
interpolation_options: NotRequired[Optional[Dict[str, Any]]] # Optional
id_name_mapping: NotRequired[IdNameMapping] # Optional