Rename class var and add more tests.

Author: eseglem

geojson_pydantic/base.py

@@ -13,7 +13,7 @@ class _GeoJsonBase(BaseModel):
 
     # These fields will not be included when serializing in json mode
     # `.model_dump_json()` or `.model_dump(mode="json")`
-    __exclude_if_none__: Set[str] = {"bbox"}
+    __geojson_exclude_if_none__: Set[str] = {"bbox"}
 
     @property
     def __geo_interface__(self) -> Dict[str, Any]:
@@ -62,7 +62,7 @@ def clean_model(self, serializer: Any, _info: SerializationInfo) -> Dict[str, An
         # We want to avoid forcing values in `exclude_none` or `exclude_unset` which could
         # cause issues or unexpected behavior for downstream users.
         data: Dict[str, Any] = serializer(self)
-        for field in self.__exclude_if_none__:
+        for field in self.__geojson_exclude_if_none__:
             if field in data and data[field] is None:
                 del data[field]
         return data

geojson_pydantic/features.py

@@ -19,7 +19,7 @@ class Feature(_GeoJsonBase, Generic[Geom, Props]):
     properties: Union[Props, None] = Field(...)
     id: Optional[Union[StrictInt, StrictStr]] = None
 
-    __exclude_if_none__ = {"bbox", "id"}
+    __geojson_exclude_if_none__ = {"bbox", "id"}
 
     @field_validator("geometry", mode="before")
     def set_geometry(cls, geometry: Any) -> Any:

tests/test_base.py

@@ -5,21 +5,41 @@
 
 from geojson_pydantic.base import _GeoJsonBase
 
-
-@pytest.mark.parametrize(
-    "values",
-    (
-        (100, 0, 0, 0),  # Incorrect Order
-        (0, 100, 0, 0),
-        (0, 0, 100, 0, 0, 0),
-        (0, "a", 0, 0),  # Invalid Type
-    ),
+BBOXES = (
+    (100, 0, 0, 0),  # Incorrect Order
+    (0, 100, 0, 0),
+    (0, 0, 100, 0, 0, 0),
+    (0, "a", 0, 0),  # Invalid Type
 )
+
+
+@pytest.mark.parametrize("values", BBOXES)
 def test_bbox_validation(values: Tuple) -> None:
+    # Ensure validation is happening correctly on the base model
     with pytest.raises(ValidationError):
         _GeoJsonBase(bbox=values)
 
 
+@pytest.mark.parametrize("values", BBOXES)
+def test_bbox_validation_subclass(values: Tuple) -> None:
+    # Ensure validation is happening correctly when subclassed
+    class TestClass(_GeoJsonBase):
+        test_field: str = None
+
+    with pytest.raises(ValidationError):
+        TestClass(bbox=values)
+
+
+@pytest.mark.parametrize("values", BBOXES)
+def test_bbox_validation_field(values: Tuple) -> None:
+    # Ensure validation is happening correctly when used as a field
+    class TestClass(_GeoJsonBase):
+        geo: _GeoJsonBase
+
+    with pytest.raises(ValidationError):
+        TestClass(geo={"bbox": values})
+
+
 def test_exclude_if_none() -> None:
     model = _GeoJsonBase()
     # Included in default dump