Merge pull request #124 from rom-py/forbid-extra

Forbid extra

rompy/core/types.py

@@ -12,7 +12,7 @@
 
 class RompyBaseModel(BaseModel):
     # The config below prevents https://github.com/pydantic/pydantic/discussions/7121
-    model_config = ConfigDict(protected_namespaces=())
+    model_config = ConfigDict(protected_namespaces=(), extra="forbid")
 
 
 class Latitude(BaseModel):
@@ -312,6 +312,7 @@ class DatasetCoords(RompyBaseModel):
     x: Optional[str] = Field("longitude", description="Name of the x coordinate")
     y: Optional[str] = Field("latitude", description="Name of the y coordinate")
     z: Optional[str] = Field("depth", description="Name of the z coordinate")
+    s: Optional[str] = Field("site", description="Name of the site coordinate")
 
 
 class Slice(BaseModel):

rompy/schism/data.py

@@ -54,7 +54,8 @@ def outfile(self) -> str:
 
     @property
     def namelist(self) -> dict:
-        ret = self.model_dump()
+        # ret = self.model_dump()
+        ret = {}
         for key, value in self.model_dump().items():
             if key in ["relative_weight", "max_window_hours", "fail_if_missing"]:
                 ret.update({f"{self.id}_{key}": value})

rompy/swan/data.py

@@ -210,7 +210,7 @@ def grid(
 
         """
         return SwanGrid(
-            gridtype="REG",
+            grid_type="REG",
             x0=float(self._obj[x].min()),
             y0=float(self._obj[y].min()),
             dx=float(np.diff(self._obj[x]).mean()),

tests/test_templates.py

@@ -42,7 +42,6 @@ def test_custom_template(tmpdir):
     runtime = ModelRun(
         run_id="test_base",
         output_dir=str(tmpdir),
-        template="simple_templates/base",
         config=config,
     )
     runtime.generate()