ENH: Use Masterdata model from fmu-datamodels

Author: tnatt

src/fmu/settings/models/project_config.py

@@ -5,23 +5,12 @@
 from typing import Self
 from uuid import UUID  # noqa TC003
 
-from pydantic import AwareDatetime, BaseModel, Field
+from pydantic import AwareDatetime, Field
 
+from fmu.datamodels.fmu_results.fields import Masterdata
 from fmu.settings import __version__
 from fmu.settings.types import ResettableBaseModel, VersionStr  # noqa TC001
 
-from .smda import Smda
-
-
-class Masterdata(BaseModel):
-    """The ``masterdata`` block contains information related to masterdata.
-
-    Currently, SMDA holds the masterdata.
-    """
-
-    smda: Smda | None = Field(default=None)
-    """Block containing SMDA-related attributes. See :class:`Smda`."""
-
 
 class ProjectConfig(ResettableBaseModel):
     """The configuration file in a .fmu directory.
@@ -32,7 +21,7 @@ class ProjectConfig(ResettableBaseModel):
     version: VersionStr
     created_at: AwareDatetime
     created_by: str
-    masterdata: Masterdata
+    masterdata: Masterdata | None = Field(default=None)
 
     @classmethod
     def reset(cls: type[Self]) -> Self:
@@ -45,5 +34,5 @@ def reset(cls: type[Self]) -> Self:
             version=__version__,
             created_at=datetime.now(UTC),
             created_by=getpass.getuser(),
-            masterdata=Masterdata(),
+            masterdata=None,
         )

src/fmu/settings/models/smda.py

@@ -27,9 +27,7 @@ def config_dict(unix_epoch_utc: datetime) -> dict[str, Any]:
         "version": __version__,
         "created_at": unix_epoch_utc,
         "created_by": "user",
-        "masterdata": {
-            "smda": None,
-        },
+        "masterdata": None,
     }
 
 

tests/conftest.py

@@ -7,9 +7,9 @@
 
 import pytest
 
+from fmu.datamodels.fmu_results.fields import Smda
 from fmu.settings._fmu_dir import ProjectFMUDirectory, UserFMUDirectory
 from fmu.settings.models.project_config import ProjectConfig
-from fmu.settings.models.smda import Smda
 from fmu.settings.models.user_config import UserConfig
 from fmu.settings.resources.config_managers import (
     ProjectConfigManager,
@@ -238,7 +238,7 @@ def test_set_smda(
     assert fmu_dir.config.get("masterdata.smda") is None
     with open(fmu_dir.path / fmu_dir.config.relative_path, encoding="utf-8") as f:
         config_on_disk = json.loads(f.read())
-    assert config_on_disk["masterdata"]["smda"] is None
+    assert config_on_disk["masterdata"] is None
 
     fmu_dir.set_config_value("masterdata", masterdata_dict)
 
@@ -250,6 +250,7 @@ def test_set_smda(
 
     config_on_disk_model = ProjectConfig.model_validate(config_on_disk)
     assert fmu_dir.config._cache is not None
+    assert fmu_dir.config._cache.masterdata is not None
     assert fmu_dir.config._cache.masterdata.smda == smda_model
     assert config_on_disk_model == fmu_dir.config._cache