update to use pydantic v2

Author: francesco086

pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
 
 dependencies = [
   "build~=0.9",
-  "pydantic~=1.10",
+  "pydantic~=2.1",
   "toml~=0.10",
   "typer[all]~=0.7",
   "wheel~=0.38"

src/dac/_input/config.py

@@ -2,10 +2,10 @@
 import inspect
 import sys
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Optional
 
 import pandera as pa
-from pydantic import BaseModel, root_validator, validator
+from pydantic import BaseModel, field_validator, model_validator
 
 from dac._file_helper import temporarily_copied_file
 from dac._input.pyproject import PyProjectConfig
@@ -18,13 +18,15 @@ class PackConfig(BaseModel):
     wheel_dir: Path
     pyproject: PyProjectConfig
 
-    @validator("data_path", "load_path", "schema_path", "wheel_dir")
+    @field_validator("data_path", "load_path", "schema_path", "wheel_dir")
+    @classmethod
     def path_exists(cls, path: Path) -> Path:  # pylint: disable=no-self-argument,no-self-use
         if path is not None and not path.exists():
             raise ValueError((f"Path {path.as_posix()} is not valid"))
         return path
 
-    @validator("load_path")
+    @field_validator("load_path")
+    @classmethod
     def load_contains_expected_function(cls, path: Path) -> Path:  # pylint: disable=no-self-argument,no-self-use
         try:
             sys.path.append(path.parent.as_posix())
@@ -46,7 +48,8 @@ def load_contains_expected_function(cls, path: Path) -> Path:  # pylint: disable
             raise ValueError((f"{path.as_posix()} does not contain the required `def load()`")) from e
         return path
 
-    @validator("schema_path")
+    @field_validator("schema_path")
+    @classmethod
     def schema_contains_expected_class(cls, path: Path) -> Path:  # pylint: disable=no-self-argument,no-self-use
         try:
             sys.path.append(path.parent.as_posix())
@@ -67,32 +70,28 @@ def schema_contains_expected_class(cls, path: Path) -> Path:  # pylint: disable=
             raise ValueError((f"{path.as_posix()} does not contain the required `class Schema(pa.SchemaModel)`")) from e
         return path
 
-    @root_validator
-    def schema_match_data(  # pylint: disable=no-self-argument,no-self-use
-        cls, values: Dict[str, Path]
-    ) -> Dict[str, Path]:
+    @model_validator(mode="after")
+    def schema_match_data(self) -> "PackConfig":
         try:
-            sys.path.append(values["load_path"].parent.as_posix())
-            load_module = importlib.import_module(name=values["load_path"].stem)
+            sys.path.append(self.load_path.parent.as_posix())
+            load_module = importlib.import_module(name=self.load_path.stem)
         except Exception as e:
             raise ValueError(
                 "Validation of the schema against the data has failed because the load module could not be imported"
             ) from e
 
         try:
-            if values.get("data_path", None) is not None:
-                with temporarily_copied_file(
-                    src=values["data_path"], dst=values["load_path"].parent / values["data_path"].name
-                ):
+            if self.data_path is not None:
+                with temporarily_copied_file(src=self.data_path, dst=self.load_path.parent / self.data_path.name):
                     data = load_module.load()
             else:
                 data = load_module.load()
         except Exception as e:
             raise ValueError("`load()` failed due to the following error:" "\n" f"{e}") from e
 
         try:
-            sys.path.append(values["schema_path"].parent.as_posix())
-            schema_module = importlib.import_module(name=values["schema_path"].stem)
+            sys.path.append(self.schema_path.parent.as_posix())
+            schema_module = importlib.import_module(name=self.schema_path.stem)
         except Exception as e:
             raise ValueError(
                 "Validation of the schema against the data has failed because the schema module could not be imported"
@@ -107,4 +106,4 @@ def schema_match_data(  # pylint: disable=no-self-argument,no-self-use
                 "Validation of the schema against the data has failed for unexpected reasons:" "\n" f"{e}"
             ) from e
 
-        return values
+        return self

src/dac/_input/pyproject.py

@@ -1,15 +1,16 @@
 from typing import List
 
 import toml  # type: ignore
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 
 
 class PyProjectConfig(BaseModel):
     project_name: str
     project_version: str
     project_dependencies: str
 
-    @validator("project_name")
+    @field_validator("project_name")
+    @classmethod
     def valid_project_name(cls, name: str) -> str:  # pylint: disable=no-self-argument,no-self-use
         if not name.isidentifier() or "\xb7" in name:
             raise ValueError(f"Invalid project name: {name} (hint: only '_' are allowed, no '-')")

test/unit_test/_cli/pack_test.py

@@ -63,7 +63,7 @@ def test_if_load_returns_wrong_type_then_error_contains_meaningful_info():
     result = invoke_dac_pack(load=get_path_to_return_wrong_type_load().as_posix())
     assert result.exit_code != 0
     error_message = str(result.exception)
-    assert "Backend not found" in error_message
+    assert "expected pd.DataFrame" in error_message
 
 
 def test_if_load_miss_credentials_then_error_contains_meaningful_info():