refactor: improve Pydantic model definitions and streamline imports in S1 RTC module

Author: emmanuelmathot

src/eopf_geozarr/data_api/s1_rtc.py

@@ -1,5 +1,5 @@
 """
-Pydantic-zarr integrated models for Sentinel-1 GRD γ0T RTC GeoZarr stores.
+Pydantic-zarr integrated models for Sentinel-1 GRD gamma0T RTC GeoZarr stores.
 
 Uses the pyz.v3 GroupSpec/ArraySpec with TypedDict members to enforce strict
 structure validation — same pattern as s2.py (which uses pyz.v2 for Zarr V2).
@@ -35,7 +35,9 @@
 
 from pydantic import BaseModel, Field, model_validator
 from typing_extensions import TypedDict
-from zarr_cm import geo_proj, multiscales as multiscales_cm, spatial as spatial_cm
+from zarr_cm import geo_proj
+from zarr_cm import multiscales as multiscales_cm
+from zarr_cm import spatial as spatial_cm
 
 from eopf_geozarr.data_api.geozarr.common import DatasetAttrs
 from eopf_geozarr.pyz.v3 import ArraySpec, GroupSpec
@@ -59,7 +61,7 @@
 # ============================================================================
 
 
-class S1RtcOrbitGroupAttrs(BaseModel, extra="allow"):
+class S1RtcOrbitGroupAttrs(BaseModel):
     """Attributes for an orbit-direction group (ascending or descending).
 
     Carries the three GeoZarr conventions plus proj:/spatial:/multiscales metadata.
@@ -71,7 +73,7 @@ class S1RtcOrbitGroupAttrs(BaseModel, extra="allow"):
     spatial_dimensions: list[str] = Field(alias="spatial:dimensions")
     spatial_bbox: list[float] = Field(alias="spatial:bbox")
 
-    model_config = {"populate_by_name": True, "serialize_by_alias": True}
+    model_config = {"extra": "allow", "populate_by_name": True, "serialize_by_alias": True}
 
     @model_validator(mode="after")
     def validate_zarr_conventions(self) -> Self:
@@ -108,13 +110,13 @@ def validate_spatial_bbox(self) -> Self:
         return self
 
 
-class S1RtcResolutionAttrs(BaseModel, extra="allow"):
-    """Attributes for a resolution-level group (r10m, r20m, …)."""
+class S1RtcResolutionAttrs(BaseModel):
+    """Attributes for a resolution-level group (r10m, r20m, ...)."""
 
     spatial_shape: list[int] = Field(alias="spatial:shape")
     spatial_transform: list[float] = Field(alias="spatial:transform")
 
-    model_config = {"populate_by_name": True, "serialize_by_alias": True}
+    model_config = {"extra": "allow", "populate_by_name": True, "serialize_by_alias": True}
 
     @model_validator(mode="after")
     def validate_shape(self) -> Self:
@@ -131,14 +133,14 @@ def validate_transform(self) -> Self:
         return self
 
 
-class S1RtcConditionsAttrs(BaseModel, extra="allow"):
+class S1RtcConditionsAttrs(BaseModel):
     """Attributes for the conditions group."""
 
     proj_code: str = Field(alias="proj:code")
     spatial_dimensions: list[str] = Field(alias="spatial:dimensions")
     spatial_transform: list[float] = Field(alias="spatial:transform")
 
-    model_config = {"populate_by_name": True, "serialize_by_alias": True}
+    model_config = {"extra": "allow", "populate_by_name": True, "serialize_by_alias": True}
 
 
 # ============================================================================
@@ -207,21 +209,17 @@ def border_mask(self) -> ArraySpec[Any]:
 class S1RtcOverviewResolutionDataset(
     GroupSpec[S1RtcResolutionAttrs, S1RtcOverviewResolutionMembers]  # type: ignore[type-var]
 ):
-    """An overview resolution dataset (r20m–r720m): data variables only."""
+    """An overview resolution dataset (r20m-r720m): data variables only."""
 
 
-class S1RtcConditionsGroup(
-    GroupSpec[S1RtcConditionsAttrs, dict[str, ArraySpec[Any]]]  # type: ignore[type-var]
-):
+class S1RtcConditionsGroup(GroupSpec[S1RtcConditionsAttrs, dict[str, ArraySpec[Any]]]):
     """Time-invariant condition arrays, keyed by name (e.g. gamma_area_008)."""
 
     @model_validator(mode="after")
     def validate_has_gamma_area(self) -> Self:
         """At least one gamma_area_* array should be present."""
         if not any(k.startswith("gamma_area_") for k in self.members):
-            raise ValueError(
-                "Conditions group must contain at least one 'gamma_area_*' array"
-            )
+            raise ValueError("Conditions group must contain at least one 'gamma_area_*' array")
         return self
 
 

tests/conftest.py

@@ -21,9 +21,7 @@
 optimized_geozarr_example_paths = tuple(
     pathlib.Path("tests/_test_data/optimized_geozarr_examples").glob("*.json")
 )
-s1_rtc_example_json_paths = tuple(
-    pathlib.Path("tests/_test_data/s1_rtc_examples").glob("*.json")
-)
+s1_rtc_example_json_paths = tuple(pathlib.Path("tests/_test_data/s1_rtc_examples").glob("*.json"))
 
 
 def read_json(path: pathlib.Path) -> dict[str, object]:

tests/test_data_api/test_s1_rtc.py

@@ -46,7 +46,7 @@ def test_s1_rtc_r10m_has_data_arrays(s1_rtc_json_example: dict[str, object]) ->
 
 
 def test_s1_rtc_overview_levels(s1_rtc_json_example: dict[str, object]) -> None:
-    """Test that overview levels r20m–r720m exist and have vv/vh/border_mask."""
+    """Test that overview levels r20m-r720m exist and have vv/vh/border_mask."""
     model = S1RtcRoot(**s1_rtc_json_example)
     orbit = model.descending
     for level in ("r20m", "r60m", "r120m", "r360m", "r720m"):
@@ -123,7 +123,7 @@ def test_s1_rtc_rejects_conditions_without_gamma_area(
     cond_members = data["members"]["descending"]["members"]["conditions"]["members"]
     # Replace all keys with non-gamma_area names
     data["members"]["descending"]["members"]["conditions"]["members"] = {
-        "some_other": list(cond_members.values())[0]
+        "some_other": next(iter(cond_members.values()))
     }
     with pytest.raises(Exception, match="gamma_area"):
         S1RtcRoot(**data)