Skip to content

Commit 7eba5ef

Browse files
committed
update pydantic for breaking changes
1 parent e2c5332 commit 7eba5ef

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ repos:
3131
additional_dependencies:
3232
- types-cachetools
3333
- types-attrs
34-
- pydantic~=2.0
34+
- pydantic>=2.4

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies = [
3030
"titiler.core>=0.14.0,<0.15",
3131
"titiler.mosaic>=0.14.0,<0.15",
3232
"geojson-pydantic~=1.0",
33-
"pydantic~=2.0",
33+
"pydantic>=2.4,<3.0",
3434
"pydantic-settings~=2.0",
3535
]
3636
dynamic = ["version"]

titiler/pgstac/model.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@
99

1010
from geojson_pydantic.geometries import Geometry
1111
from geojson_pydantic.types import BBox
12-
from pydantic import (
13-
BaseModel,
14-
Field,
15-
FieldValidationInfo,
16-
field_validator,
17-
model_validator,
18-
)
12+
from pydantic import BaseModel, Field, ValidationInfo, field_validator, model_validator
1913
from typing_extensions import Annotated
2014

2115
from titiler.core.resources.enums import MediaType
@@ -95,7 +89,7 @@ def validate_datetime(cls, v):
9589
return v
9690

9791
@field_validator("intersects")
98-
def validate_spatial(cls, v: Optional[Geometry], info: FieldValidationInfo):
92+
def validate_spatial(cls, v: Optional[Geometry], info: ValidationInfo):
9993
"""Make sure bbox is not used with Intersects."""
10094
if v and info.data["bbox"]:
10195
raise ValueError("intersects and bbox parameters are mutually exclusive")
@@ -200,7 +194,7 @@ class Context(BaseModel):
200194
matched: Optional[int] = None
201195

202196
@field_validator("limit")
203-
def validate_limit(cls, v, info: FieldValidationInfo):
197+
def validate_limit(cls, v, info: ValidationInfo):
204198
"""validate limit."""
205199
if info.data["returned"] > v:
206200
raise ValueError(

titiler/pgstac/settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
from pydantic import (
77
Field,
8-
FieldValidationInfo,
98
PostgresDsn,
9+
ValidationInfo,
1010
field_validator,
1111
model_validator,
1212
)
@@ -68,7 +68,7 @@ class PostgresSettings(BaseSettings):
6868
model_config = {"env_file": ".env", "extra": "ignore"}
6969

7070
@field_validator("database_url", mode="before")
71-
def assemble_db_connection(cls, v: Optional[str], info: FieldValidationInfo) -> Any:
71+
def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
7272
"""Validate database config."""
7373
if isinstance(v, str):
7474
return v

0 commit comments

Comments
 (0)