Upgrade datamodel-code-generator and manifest v12 (#154)

Signed-off-by: Yu Ishikawa <yu-iskw@users.noreply.github.com>

Author: yu-iskw

dbt_artifacts_parser/parsers/manifest/manifest_v1.py

@@ -3,10 +3,11 @@
 
 from __future__ import annotations
 
+from datetime import datetime
 from enum import Enum
 from typing import Any, Dict, List, Optional, Union
 
-from pydantic import AwareDatetime, ConfigDict, Field, constr
+from pydantic import ConfigDict, Field, constr
 
 from dbt_artifacts_parser.parsers.base import BaseParserModel
 
@@ -15,11 +16,11 @@ class ManifestMetadata(BaseParserModel):
     model_config = ConfigDict(
         extra='forbid',
     )
-    dbt_schema_version: Optional[
-        str
-    ] = 'https://schemas.getdbt.com/dbt/manifest/v1.json'
+    dbt_schema_version: Optional[str] = (
+        'https://schemas.getdbt.com/dbt/manifest/v1.json'
+    )
     dbt_version: Optional[str] = '0.19.0'
-    generated_at: Optional[AwareDatetime] = '2021-02-10T04:42:33.683996Z'
+    generated_at: Optional[datetime] = '2021-02-10T04:42:33.683996Z'
     invocation_id: Optional[str] = None
     env: Optional[Dict[str, str]] = {}
     project_id: Optional[str] = Field(
@@ -113,9 +114,9 @@ class TestConfig(BaseParserModel):
     database: Optional[str] = None
     tags: Optional[Union[List[str], str]] = []
     full_refresh: Optional[bool] = None
-    severity: Optional[
-        constr(pattern=r'^([Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr])$')
-    ] = 'ERROR'
+    severity: Optional[constr(pattern=r'^([Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr])$')] = (
+        'ERROR'
+    )
 
 
 class ResourceType2(Enum):
@@ -430,8 +431,7 @@ class CheckSnapshotConfig(BaseParserModel):
     check_cols: Union[CheckCols, List[str]]
 
 
-class Strategy2(BaseParserModel):
-    pass
+Strategy2 = BaseParserModel
 
 
 class GenericSnapshotConfig(BaseParserModel):
@@ -477,7 +477,7 @@ class FreshnessMetadata(BaseParserModel):
     )
     dbt_schema_version: Optional[str] = 'https://schemas.getdbt.com/dbt/sources/v1.json'
     dbt_version: Optional[str] = '0.19.0'
-    generated_at: Optional[AwareDatetime] = '2021-02-10T04:42:33.675309Z'
+    generated_at: Optional[datetime] = '2021-02-10T04:42:33.675309Z'
     invocation_id: Optional[str] = None
     env: Optional[Dict[str, str]] = {}
 
@@ -1307,8 +1307,8 @@ class SourceFreshnessOutput(BaseParserModel):
         extra='forbid',
     )
     unique_id: str
-    max_loaded_at: AwareDatetime
-    snapshotted_at: AwareDatetime
+    max_loaded_at: datetime
+    snapshotted_at: datetime
     max_loaded_at_time_ago_in_s: float
     status: Status1
     criteria: FreshnessThreshold

dbt_artifacts_parser/parsers/manifest/manifest_v10.py

@@ -3,10 +3,11 @@
 
 from __future__ import annotations
 
+from datetime import datetime
 from enum import Enum
 from typing import Any, Dict, List, Optional, Union
 
-from pydantic import AwareDatetime, ConfigDict, Field, constr
+from pydantic import ConfigDict, Field, constr
 
 from dbt_artifacts_parser.parsers.base import BaseParserModel
 
@@ -15,11 +16,11 @@ class ManifestMetadata(BaseParserModel):
     model_config = ConfigDict(
         extra='forbid',
     )
-    dbt_schema_version: Optional[
-        str
-    ] = 'https://schemas.getdbt.com/dbt/manifest/v10.json'
+    dbt_schema_version: Optional[str] = (
+        'https://schemas.getdbt.com/dbt/manifest/v10.json'
+    )
     dbt_version: Optional[str] = '1.6.0'
-    generated_at: Optional[AwareDatetime] = '2023-08-07T20:10:03.381822Z'
+    generated_at: Optional[datetime] = '2023-08-07T20:10:03.381822Z'
     invocation_id: Optional[str] = '03dee192-ff77-43cc-bc3f-5eeaf6d36344'
     env: Optional[Dict[str, str]] = {}
     project_name: Optional[str] = Field(None, description='Name of the root project')
@@ -149,9 +150,9 @@ class TestConfig(BaseParserModel):
     meta: Optional[Dict[str, Any]] = {}
     group: Optional[str] = None
     materialized: Optional[str] = 'test'
-    severity: Optional[
-        constr(pattern=r'^([Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr])$')
-    ] = 'ERROR'
+    severity: Optional[constr(pattern=r'^([Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr])$')] = (
+        'ERROR'
+    )
     store_failures: Optional[bool] = None
     where: Optional[str] = None
     limit: Optional[int] = None
@@ -898,7 +899,7 @@ class ModelNode(BaseParserModel):
     constraints: Optional[List[ModelLevelConstraint]] = []
     version: Optional[Union[str, float]] = None
     latest_version: Optional[Union[str, float]] = None
-    deprecation_date: Optional[AwareDatetime] = None
+    deprecation_date: Optional[datetime] = None
     defer_relation: Optional[DeferRelation] = None
 
 

dbt_artifacts_parser/parsers/manifest/manifest_v11.py

@@ -231,9 +231,9 @@ class TestConfig(BaseParserModel):
     meta: Optional[Dict[str, Any]] = None
     group: Optional[str] = None
     materialized: Optional[str] = 'test'
-    severity: Optional[
-        constr(pattern=r'^([Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr])$')
-    ] = 'ERROR'
+    severity: Optional[constr(pattern=r'^([Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr])$')] = (
+        'ERROR'
+    )
     store_failures: Optional[bool] = None
     store_failures_as: Optional[str] = None
     where: Optional[str] = None
@@ -1447,8 +1447,3 @@ class ManifestV11(BaseParserModel):
     semantic_models: Dict[str, SemanticModel] = Field(
         ..., description='The semantic models defined in the dbt project'
     )
-
-
-# NOTE: We manually change the class, as the generated code is not correct.
-# class ManifestV11(RootModel[WritableManifest]):
-#     root: WritableManifest