Upgrade to Pydantic v2

requirements/dev.txt

@@ -1,18 +1,22 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --allow-unsafe requirements/dev.in
 #
-attrs==23.1.0
+annotated-types==0.6.0
+    # via
+    #   -r requirements/prod.txt
+    #   pydantic
+attrs==23.2.0
     # via
     #   jsonschema
     #   referencing
-black==23.7.0
+black==24.1.1
     # via -r requirements/dev.in
-cachetools==5.3.1
+cachetools==5.3.2
     # via tox
-certifi==2023.7.22
+certifi==2024.2.2
     # via
     #   -r requirements/prod.txt
     #   requests
@@ -22,11 +26,11 @@ chardet==5.2.0
     # via
     #   diff-cover
     #   tox
-charset-normalizer==3.2.0
+charset-normalizer==3.3.2
     # via
     #   -r requirements/prod.txt
     #   requests
-click==8.1.6
+click==8.1.7
     # via
     #   -r requirements/prod.txt
     #   black
@@ -40,15 +44,13 @@ coverage[toml]==6.5.0
     #   pytest-cov
 coveralls==3.3.1
     # via -r requirements/dev.in
-diff-cover==7.7.0
+diff-cover==8.0.3
     # via -r requirements/dev.in
-distlib==0.3.7
+distlib==0.3.8
     # via virtualenv
 docopt==0.6.2
     # via coveralls
-exceptiongroup==1.1.2
-    # via pytest
-faker==19.3.0
+faker==22.6.0
     # via
     #   -r requirements/prod.txt
     #   faker-edu
@@ -60,39 +62,37 @@ faker-microservice==2.0.0
     # via -r requirements/dev.in
 faker-nonprofit==1.0.0
     # via -r requirements/prod.txt
-filelock==3.12.2
+filelock==3.13.1
     # via
     #   tox
     #   virtualenv
 ghp-import==2.1.0
     # via mkdocs
 gvgen==1.0
     # via -r requirements/prod.txt
-identify==2.5.26
+identify==2.5.33
     # via pre-commit
-idna==3.4
+idna==3.6
     # via
     #   -r requirements/prod.txt
     #   requests
     #   yarl
-importlib-metadata==6.8.0
-    # via
-    #   markdown
-    #   mkdocs
+importlib-metadata==7.0.1
+    # via mkdocs
 iniconfig==2.0.0
     # via pytest
-jinja2==3.1.2
+jinja2==3.1.3
     # via
     #   -r requirements/prod.txt
     #   diff-cover
     #   mkdocs
-jsonschema==4.19.0
+jsonschema==4.21.1
     # via -r requirements/dev.in
-jsonschema-specifications==2023.7.1
+jsonschema-specifications==2023.12.1
     # via jsonschema
-markdown==3.4.4
+markdown==3.5.2
     # via mkdocs
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via
     #   -r requirements/prod.txt
     #   jinja2
@@ -102,46 +102,50 @@ mkdocs==1.2.4
     # via
     #   -r requirements/dev.in
     #   mkdocs-exclude-search
-mkdocs-exclude-search==0.6.5
+mkdocs-exclude-search==0.6.6
     # via -r requirements/dev.in
-multidict==6.0.4
+multidict==6.0.5
     # via yarl
 mypy-extensions==1.0.0
     # via black
 nodeenv==1.8.0
     # via
     #   pre-commit
     #   pyright
-packaging==23.1
+packaging==23.2
     # via
     #   black
     #   mkdocs
     #   pyproject-api
     #   pytest
     #   tox
-pathspec==0.11.2
+pathspec==0.12.1
     # via black
-platformdirs==3.10.0
+platformdirs==4.2.0
     # via
     #   black
     #   tox
     #   virtualenv
-pluggy==1.2.0
+pluggy==1.4.0
     # via
     #   diff-cover
     #   pytest
     #   tox
-pre-commit==3.3.3
+pre-commit==3.6.0
     # via -r requirements/dev.in
-pydantic==1.10.12
+pydantic==2.6.0
     # via -r requirements/prod.txt
-pygments==2.16.1
+pydantic-core==2.16.1
+    # via
+    #   -r requirements/prod.txt
+    #   pydantic
+pygments==2.17.2
     # via diff-cover
-pyproject-api==1.5.3
+pyproject-api==1.6.1
     # via tox
-pyright==1.1.322
+pyright==1.1.349
     # via -r requirements/dev.in
-pytest==7.4.0
+pytest==8.0.0
     # via
     #   -r requirements/dev.in
     #   pytest-cov
@@ -167,7 +171,7 @@ pyyaml==6.0.1
     #   vcrpy
 pyyaml-env-tag==0.1
     # via mkdocs
-referencing==0.30.2
+referencing==0.33.0
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -178,59 +182,51 @@ requests==2.29.0
     #   responses
 responses==0.23.1
     # via -r requirements/dev.in
-rpds-py==0.9.2
+rpds-py==0.17.1
     # via
     #   jsonschema
     #   referencing
 six==1.16.0
     # via
     #   -r requirements/prod.txt
     #   python-dateutil
-sqlalchemy==1.4.49
+sqlalchemy==1.4.51
     # via -r requirements/prod.txt
-tomli==2.0.1
-    # via
-    #   black
-    #   coverage
-    #   pyproject-api
-    #   pytest
-    #   tox
-tox==4.8.0
+tox==4.12.1
     # via
     #   -r requirements/dev.in
     #   tox-gh-actions
-tox-gh-actions==3.1.3
+tox-gh-actions==3.2.0
     # via -r requirements/dev.in
-types-pyyaml==6.0.12.11
+types-pyyaml==6.0.12.12
     # via responses
-typing-extensions==4.7.1
+typing-extensions==4.9.0
     # via
     #   -r requirements/prod.txt
-    #   black
     #   pydantic
-urllib3==1.26.16
+    #   pydantic-core
+urllib3==1.26.18
     # via
     #   -r requirements/prod.txt
     #   requests
     #   responses
-    #   vcrpy
-vcrpy==5.1.0
+vcrpy==6.0.1
     # via
     #   -r requirements/dev.in
     #   pytest-vcr
-virtualenv==20.24.3
+virtualenv==20.25.0
     # via
     #   pre-commit
     #   tox
 watchdog==3.0.0
     # via mkdocs
-wrapt==1.15.0
+wrapt==1.16.0
     # via vcrpy
-yarl==1.9.2
+yarl==1.9.4
     # via vcrpy
-zipp==3.16.2
+zipp==3.17.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==68.0.0
+setuptools==69.0.3
     # via nodeenv

requirements/prod.in

@@ -7,6 +7,6 @@ PyYAML
 click
 python-dateutil
 gvgen
-pydantic<2.0.0
+pydantic
 python-baseconv
 requests<=2.29.0 # There are issues with urllib on latest version

requirements/prod.txt

@@ -1,16 +1,18 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --allow-unsafe requirements/prod.in
 #
-certifi==2023.7.22
+annotated-types==0.6.0
+    # via pydantic
+certifi==2024.2.2
     # via requests
-charset-normalizer==3.2.0
+charset-normalizer==3.3.2
     # via requests
-click==8.1.6
+click==8.1.7
     # via -r requirements/prod.in
-faker==19.3.0
+faker==22.6.0
     # via
     #   -r requirements/prod.in
     #   faker-edu
@@ -21,14 +23,16 @@ faker-nonprofit==1.0.0
     # via -r requirements/prod.in
 gvgen==1.0
     # via -r requirements/prod.in
-idna==3.4
+idna==3.6
     # via requests
-jinja2==3.1.2
+jinja2==3.1.3
     # via -r requirements/prod.in
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via jinja2
-pydantic==1.10.12
+pydantic==2.6.0
     # via -r requirements/prod.in
+pydantic-core==2.16.1
+    # via pydantic
 python-baseconv==1.2.2
     # via -r requirements/prod.in
 python-dateutil==2.8.2
@@ -41,9 +45,11 @@ requests==2.29.0
     # via -r requirements/prod.in
 six==1.16.0
     # via python-dateutil
-sqlalchemy==1.4.49
+sqlalchemy==1.4.51
     # via -r requirements/prod.in
-typing-extensions==4.7.1
-    # via pydantic
-urllib3==1.26.16
+typing-extensions==4.9.0
+    # via
+    #   pydantic
+    #   pydantic-core
+urllib3==1.26.18
     # via requests

snowfakery/cci_mapping_files/declaration_parser.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 
 import yaml
-from pydantic import BaseModel, Extra, validator, PositiveInt
+from pydantic import field_validator, ConfigDict, BaseModel, RootModel, PositiveInt
 
 
 class AtomicDecl(T.NamedTuple):
@@ -67,16 +67,15 @@ class SObjectRuleDeclaration(BaseModel):
     anchor_date: T.Union[str, date] = None
 
     load_after: str = None
-
-    class Config:
-        extra = Extra.forbid
+    model_config = ConfigDict(extra="forbid")
 
     @property
     def priority_number(self):
         values = {"low": 1, "medium": 2, "high": 3, None: 2}
         return values[self.priority]
 
-    @validator("priority", "api", "bulk_mode", pre=True)
+    @field_validator("priority", "api", "bulk_mode", mode="before")
+    @classmethod
     def case_normalizer(cls, val):
         if hasattr(val, "lower"):
             return val.lower()
@@ -108,9 +107,7 @@ class ChannelDeclaration(BaseModel):
     recipe_options: T.Dict[str, T.Any] = None
     num_generators: PositiveInt = None
     num_loaders: PositiveInt = None
-
-    class Config:
-        extra = Extra.forbid
+    model_config = ConfigDict(extra="forbid")
 
 
 class ChannelDeclarationList(BaseModel):
@@ -125,8 +122,8 @@ class LoadDeclarationsTuple(T.NamedTuple):
     ]  # Channel declarations are only of relevance to Salesforce employees
 
 
-class SObjectRuleDeclarationFile(BaseModel):
-    __root__: T.List[T.Union[ChannelDeclarationList, SObjectRuleDeclaration]]
+class SObjectRuleDeclarationFile(RootModel):
+    root: T.List[T.Union[ChannelDeclarationList, SObjectRuleDeclaration]]
 
     @classmethod
     def parse_from_yaml(cls, f: T.Union[Path, T.TextIO]):
@@ -139,12 +136,12 @@ def parse_from_yaml(cls, f: T.Union[Path, T.TextIO]):
 
         sobject_decls = [
             obj
-            for obj in cls.parse_obj(data).__root__
+            for obj in cls.parse_obj(data).root
             if isinstance(obj, SObjectRuleDeclaration)
         ]
         channel_decls = [
             obj
-            for obj in cls.parse_obj(data).__root__
+            for obj in cls.parse_obj(data).root
             if isinstance(obj, ChannelDeclarationList)
         ]
         if len(channel_decls) > 1: