Updating to pydantic v2.

integration_tests/setup_test_buckets.py

@@ -2,9 +2,7 @@
 
 import boto3
 
-from integration_tests.s3_utils import (
-    build_bucket,
-)
+from integration_tests.s3_utils import build_bucket
 
 
 def build(

pyproject.toml

@@ -16,7 +16,7 @@ navigator-data-ingest = 'navigator_data_ingest.main:main'
 python = "^3.9"
 click = "^8.1.2"
 cloudpathlib = { version = "^0.10.0", extras = ["s3"] }
-pydantic = "^1.9"
+pydantic = "^2.4.0"
 python-slugify = "^6.1.2"
 python-dateutil = "^2.8.2"
 python-dotenv = "^0.19.2"
@@ -26,7 +26,7 @@ json-logging = "^1.3.0"
 pytest = "^7.2.1"
 moto = {extras = ["all", "ec2", "s3"], version = "^4.1.6"}
 pytest-asyncio = "^0.21.0"
-cpr-data-access = {git = "https://github.com/climatepolicyradar/data-access.git", tag = "v0.1.9"}
+cpr-data-access = {git = "https://github.com/climatepolicyradar/data-access.git", tag = "0.4.0"}
 
 [tool.poetry.dev-dependencies]
 black = "^22.1.0"

src/navigator_data_ingest/base/api_client.py

@@ -189,7 +189,7 @@ def write_parser_input(
         output_location / f"{parser_input.document_id}.json",
     )
     with output_file_location.open("w") as output_file:
-        output_file.write(json.dumps(parser_input.to_json(), indent=2))
+        output_file.write(parser_input.model_dump_json(indent=2))
 
 
 @retry(

src/navigator_data_ingest/base/types.py

@@ -4,9 +4,7 @@
 from datetime import datetime
 from enum import Enum
 from typing import (
-    Any,
     Generator,
-    Mapping,
     Optional,
     Callable,
 )
@@ -58,14 +56,6 @@ class Event(BaseModel):  # noqa: D101
     description: str
     created_ts: datetime
 
-    def to_json(self) -> Mapping[str, Any]:
-        """Output a JSON serialising friendly dict representing this model"""
-        return {
-            "name": self.name,
-            "description": self.description,
-            "created_ts": self.created_ts.isoformat(),
-        }
-
 
 PipelineFieldMapping = {
     UpdateTypes.NAME: "document_name",

src/navigator_data_ingest/base/utils.py

@@ -27,7 +27,7 @@ def __init__(self, input_file: S3Path, output_location_path: S3Path):
         """Initialize the generator."""
         _LOGGER.info("Initializing LawPolicyGenerator")
         json_data = read_s3_json_file(input_file)
-        self.input_data = PipelineUpdates.parse_obj(json_data)
+        self.input_data = PipelineUpdates.model_validate(json_data)
         self.output_location_path = output_location_path
 
     def process_new_documents(self) -> Generator[BackendDocument, None, None]:

src/navigator_data_ingest/main.py

@@ -1,4 +1,3 @@
-import json
 import logging
 import logging.config
 import os
@@ -148,8 +147,8 @@ def main(
     )
 
     input_dir_path = S3Path(
-        ExecutionData.parse_obj(
-            json.loads(execution_data_path.read_text())
+        ExecutionData.model_validate_json(
+            execution_data_path.read_text()
         ).input_dir_path
     )