fix(#254): PR feedback reuse bbox validation

Co-authored-by: Vincent Sarago <vincent.sarago@gmail.com>

Author: captaincoordinates

tests/test_collections.py

@@ -808,17 +808,32 @@ def test_bbox_validation(app) -> None:
         },
     )
     assert valid_response_3d.status_code == 200
+
     valid_response_2d = app.get(
         f"/collections/{collection_id}/tiles",
         params={
             "bbox": "-180,-90,180,90",
         },
     )
     assert valid_response_2d.status_code == 200
-    invalid_response = app.get(
+
+    invalid_format_1_response = app.get(
         f"/collections/{collection_id}/tiles",
         params={
             "bbox": "invalid bbox string",
         },
     )
-    assert invalid_response.status_code == 422
+    assert invalid_format_1_response.status_code == 422
+
+    invalid_format_2_response = app.get(
+        f"/collections/{collection_id}/tiles",
+        params={
+            "bbox": "-180,-90,180",
+        },
+    )
+    assert invalid_format_2_response.status_code == 422
+
+    invalid_values_response = app.get(
+        f"/collections/{collection_id}/tiles", params={"bbox": "180,-90,-180,90"}
+    )
+    assert invalid_values_response.status_code == 422

titiler/pgstac/dependencies.py

@@ -28,7 +28,7 @@
 from titiler.pgstac.errors import MosaicNotFoundError, ReadOnlyPgSTACError
 from titiler.pgstac.settings import CacheSettings, RetrySettings
 from titiler.pgstac.utils import retry
-from titiler.pgstac.validation import validate_bbox, validate_filter
+from titiler.pgstac.validation import parse_and_validate_bbox, validate_filter
 
 cache_config = CacheSettings()
 retry_config = RetrySettings()
@@ -219,7 +219,7 @@ def CollectionIdParams(
     ] = None,
     bbox: Annotated[
         str | None,
-        BeforeValidator(validate_bbox),
+        BeforeValidator(parse_and_validate_bbox),
         Query(
             description="Filters items intersecting this bounding box",
             openapi_examples={

titiler/pgstac/model.py

@@ -203,36 +203,6 @@ def validate_spatial(cls, v: Geometry | None, info: ValidationInfo):
 
         return v
 
-    @field_validator("bbox")
-    def validate_bbox(cls, v: BBox):
-        """Validate BBOX."""
-        if v:
-            # Validate order
-            if len(v) == 4:
-                xmin, ymin, xmax, ymax = v
-            else:
-                xmin, ymin, min_elev, xmax, ymax, max_elev = v
-                if max_elev < min_elev:
-                    raise ValueError(
-                        "Maximum elevation must greater than minimum elevation"
-                    )
-
-            if xmax < xmin:
-                raise ValueError(
-                    "Maximum longitude must be greater than minimum longitude"
-                )
-
-            if ymax < ymin:
-                raise ValueError(
-                    "Maximum longitude must be greater than minimum longitude"
-                )
-
-            # Validate against WGS84
-            if xmin < -180 or ymin < -90 or xmax > 180 or ymax > 90:
-                raise ValueError("Bounding box must be within (-180, -90, 180, 90)")
-
-        return v
-
 
 class RegisterMosaic(PgSTACSearch):
     """Model of /register endpoint input."""

titiler/pgstac/validation.py

@@ -2,10 +2,10 @@
 Validation functions for caller-provided data.
 """
 
-import re
-from typing import Literal
+from typing import Literal, cast
 
 from cql2 import Expr
+from geojson_pydantic.types import BBox
 from pydantic import ValidationError
 
 from titiler.core.validation import validate_json
@@ -35,22 +35,47 @@ def validate_filter(
             raise ValidationError(str(e), []) from e
 
 
-def validate_bbox(bbox_str: str | None) -> str | None:
-    """
-    Verify that a BBOX string can be parsed.
-    :param bbox_str: Caller-provided bbox value.
-    :type bbox_str: str | None
-    :return: Caller-provided bbox value if validated, otherwise an exception is raised.
-    :rtype: str
+def validate_bbox(v: BBox):
+    """Validate BBOX values."""
+    if v:
+        # Validate order
+        if len(v) == 4:
+            xmin, ymin, xmax, ymax = v
+        elif len(v) == 6:
+            xmin, ymin, min_elev, xmax, ymax, max_elev = v
+            if max_elev < min_elev:
+                raise ValueError(
+                    "Maximum elevation must greater than minimum elevation"
+                )
+        else:
+            raise ValueError("Bounding box must have 4 or 6 numbers")
 
-    """
-    if bbox_str is None:
+        if xmax < xmin:
+            raise ValueError("Maximum longitude must be greater than minimum longitude")
+
+        if ymax < ymin:
+            raise ValueError("Maximum longitude must be greater than minimum longitude")
+
+        # Validate against WGS84
+        if xmin < -180 or ymin < -90 or xmax > 180 or ymax > 90:
+            raise ValueError("Bounding box must be within (-180, -90, 180, 90)")
+
+    return v
+
+
+def parse_and_validate_bbox(value: str | BBox | None):
+    """Validate BBOX format and values."""
+    if value is None:
         return None
-    parseable_float_regex = r"\s*(-)?\d+((\.\d+)(e\d+)?)?\s*"  # can simply call titiler.core.validation.validate_bbox on titiler.core > 1.1.1 when released
-    if re.match(
-        "^{}$".format(",".join([parseable_float_regex for _ in range(4)])), bbox_str
-    ) or re.match(
-        "^{}$".format(",".join([parseable_float_regex for _ in range(6)])), bbox_str
-    ):
-        return bbox_str
-    raise ValueError("invalid bbox content")
+    if isinstance(value, str):
+        try:
+            parsed_value = [float(x) for x in value.split(",")]
+        except ValueError as e:
+            raise ValueError(
+                "Bounding box must be a comma-separated list of numbers"
+            ) from e
+    else:
+        parsed_value = value
+
+    validate_bbox(cast(BBox, parsed_value))
+    return value