Update pydantic syntax to v2

Author: francbartoli

pygeoapi/models/config.py

@@ -6,7 +6,7 @@
 #          Francesco Bartoli <xbartolone@gmail.com>
 #
 # Copyright (c) 2023 Sander Schaminee
-# Copyright (c) 2024 Francesco Bartoli
+# Copyright (c) 2025 Francesco Bartoli
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -36,7 +36,7 @@
 
 class APIRules(BaseModel):
     """ Pydantic model for API design rules that must be adhered to. """
-    api_version: str = Field(regex=r'^\d+\.\d+\..+$',
+    api_version: str = Field(pattern=r'^\d+\.\d+\..+$',
                              description="Semantic API version number.")
     url_prefix: str = Field(
         "",
@@ -62,11 +62,11 @@ def create(**rules_config) -> 'APIRules':
         """ Returns a new APIRules instance for the current API version
         and configured rules. """
         obj = {
-            k: v for k, v in rules_config.items() if k in APIRules.__fields__
+            k: v for k, v in rules_config.items() if k in APIRules.model_fields
         }
         # Validation will fail if required `api_version` is missing
         # or if `api_version` is not a semantic version number
-        return APIRules.parse_obj(obj)
+        return APIRules.model_validate(obj)
 
     @property
     def response_headers(self) -> dict:

pygeoapi/models/openapi.py

@@ -4,7 +4,7 @@
 #
 # Authors: Francesco Bartoli <xbartolone@gmail.com>
 #
-# Copyright (c) 2024 Francesco Bartoli
+# Copyright (c) 2025 Francesco Bartoli
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -40,4 +40,4 @@ class SupportedFormats(Enum):
 
 
 class OAPIFormat(BaseModel):
-    __root__: SupportedFormats = SupportedFormats.YAML
+    root: SupportedFormats = SupportedFormats.YAML

pygeoapi/provider/mvt_tippecanoe.py

@@ -1,8 +1,10 @@
 # =================================================================
 #
 # Authors: Joana Simoes <jo@byteroad.net>
+#          Francesco Bartoli <xbartolone@gmail.com>
 #
 # Copyright (c) 2023 Joana Simoes
+# Copyright (c) 2025 Francesco Bartoli
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -294,8 +296,8 @@ def get_html_metadata(self, dataset, server_url, layer, tileset,
             content = MVTTilesJson(**metadata_json_content)
             content.tiles = service_url
             content.vector_layers = json.loads(
-                    metadata_json_content["json"])["vector_layers"]
-            metadata['metadata'] = content.dict()
+                metadata_json_content["json"])["vector_layers"]
+            metadata['metadata'] = content.model_dump()
             # Some providers may not implement tilejson metadata
             metadata['tilejson_url'] = f'{metadata_url}?f=tilejson'
         except ProviderConnectionError:
@@ -357,7 +359,7 @@ def get_default_metadata(self, dataset, server_url, layer, tileset,
 
         content.links = links
 
-        return content.dict(exclude_none=True)
+        return content.model_dump(exclude_none=True)
 
     def get_vendor_metadata(self, dataset, server_url, layer, tileset,
                             title, description, keywords, **kwargs):
@@ -375,8 +377,8 @@ def get_vendor_metadata(self, dataset, server_url, layer, tileset,
             content = MVTTilesJson(**metadata_json_content)
             content.tiles = service_url
             content.vector_layers = json.loads(
-                    metadata_json_content["json"])["vector_layers"]
-            return content.dict()
+                metadata_json_content["json"])["vector_layers"]
+            return content.model_dump()
         except ProviderConnectionError:
             msg = f'No tiles metadata json available: {self.service_metadata_url}'  # noqa
             LOGGER.error(msg)

requirements-django.txt

@@ -1,2 +1,2 @@
 Django
-pydantic<2.0
+pydantic>2.0

requirements.txt

@@ -4,7 +4,7 @@ filelock
 Flask
 jinja2
 jsonschema
-pydantic<2.0
+pydantic>2.0
 pygeofilter
 pygeoif
 pyproj

tests/test_models.py

@@ -3,7 +3,7 @@
 # Authors: Francesco Bartoli <xbartolone@gmail.com>
 #          Tom Kralidis: <tomkralidis@gmail.com>
 #
-# Copyright (c) 2024 Francesco Bartoli
+# Copyright (c) 2025 Francesco Bartoli
 # Copyright (c) 2024 Tom Kralidis
 #
 # Permission is hereby granted, free of charge, to any person
@@ -43,5 +43,5 @@ class GeospatialDataTypeFactory(ModelFactory[GeospatialDataType]):
 def test_provider_base_geospatial_data_type(
         geospatial_data_type_factory: GeospatialDataTypeFactory) -> None:
     gdt_instance = geospatial_data_type_factory.build()
-    assert gdt_instance.dict()
+    assert gdt_instance.model_dump()
     assert isinstance(gdt_instance, GeospatialDataType)