build(deps): Update Pydantic to V2, but use V1 API (#588)

hydrolib/core/basemodel.py

@@ -26,10 +26,10 @@
 )
 from weakref import WeakValueDictionary
 
-from pydantic import BaseModel as PydanticBaseModel
-from pydantic import validator
-from pydantic.error_wrappers import ErrorWrapper, ValidationError
-from pydantic.fields import ModelField, PrivateAttr
+from pydantic.v1 import BaseModel as PydanticBaseModel
+from pydantic.v1 import validator
+from pydantic.v1.error_wrappers import ErrorWrapper, ValidationError
+from pydantic.v1.fields import ModelField, PrivateAttr
 
 from hydrolib.core.base import DummmyParser, DummySerializer
 from hydrolib.core.utils import (

hydrolib/core/config.py

@@ -1,4 +1,4 @@
-from pydantic import BaseSettings
+from pydantic.v1 import BaseSettings
 
 
 class Settings(BaseSettings):

hydrolib/core/dflowfm/bc/models.py

@@ -14,9 +14,9 @@
 from pathlib import Path
 from typing import Callable, Dict, Iterator, List, Literal, Optional, Set, Union
 
-from pydantic import Extra
-from pydantic.class_validators import root_validator, validator
-from pydantic.fields import Field
+from pydantic.v1 import Extra
+from pydantic.v1.class_validators import root_validator, validator
+from pydantic.v1.fields import Field
 
 from hydrolib.core.basemodel import BaseModel, ModelSaveSettings
 from hydrolib.core.dflowfm.ini.io_models import Property, Section

hydrolib/core/dflowfm/crosssection/models.py

@@ -1,8 +1,8 @@
 import logging
 from typing import Dict, List, Literal, Optional
 
-from pydantic import Field, root_validator
-from pydantic.class_validators import validator
+from pydantic.v1 import Field, root_validator
+from pydantic.v1.class_validators import validator
 
 from hydrolib.core.dflowfm.friction.models import FrictionType
 from hydrolib.core.dflowfm.ini.models import INIBasedModel, INIGeneral, INIModel

hydrolib/core/dflowfm/ext/models.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Dict, List, Literal, Optional, Union
 
-from pydantic import Field, root_validator, validator
+from pydantic.v1 import Field, root_validator, validator
 
 from hydrolib.core.basemodel import (
     DiskOnlyFileModel,

hydrolib/core/dflowfm/extold/models.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Union
 
-from pydantic import Field, root_validator, validator
+from pydantic.v1 import Field, root_validator, validator
 
 from hydrolib.core.basemodel import (
     BaseModel,

hydrolib/core/dflowfm/friction/models.py

@@ -3,8 +3,8 @@
 from pathlib import Path
 from typing import List, Literal, Optional
 
-from pydantic import Field, NonNegativeInt, PositiveInt
-from pydantic.class_validators import validator
+from pydantic.v1 import Field, NonNegativeInt, PositiveInt
+from pydantic.v1.class_validators import validator
 
 from hydrolib.core.basemodel import (
     DiskOnlyFileModel,

hydrolib/core/dflowfm/gui/models.py

@@ -6,8 +6,8 @@
 import logging
 from typing import List, Literal, Optional
 
-from pydantic.class_validators import root_validator, validator
-from pydantic.fields import Field
+from pydantic.v1.class_validators import root_validator, validator
+from pydantic.v1.fields import Field
 
 from hydrolib.core.dflowfm.ini.models import INIBasedModel, INIGeneral, INIModel
 from hydrolib.core.dflowfm.ini.util import make_list_validator

hydrolib/core/dflowfm/ini/io_models.py

@@ -2,7 +2,7 @@
 from typing import Any, Dict, Iterable, List, Optional, Sequence, Tuple, Union
 from xmlrpc.client import Boolean
 
-from pydantic import Field, validator
+from pydantic.v1 import Field, validator
 
 from hydrolib.core.basemodel import BaseModel
 from hydrolib.core.utils import to_key

hydrolib/core/dflowfm/ini/models.py

@@ -4,9 +4,9 @@
 from math import isnan
 from typing import Any, Callable, List, Literal, Optional, Set, Type, Union
 
-from pydantic import Extra, Field, root_validator
-from pydantic.class_validators import validator
-from pydantic.fields import ModelField
+from pydantic.v1 import Extra, Field, root_validator
+from pydantic.v1.class_validators import validator
+from pydantic.v1.fields import ModelField
 
 from hydrolib.core import __version__ as version
 from hydrolib.core.basemodel import (

hydrolib/core/dflowfm/ini/parser.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Callable, Dict, List, Optional, Tuple, Union
 
-from pydantic import validator
+from pydantic.v1 import validator
 
 from hydrolib.core.basemodel import BaseModel
 from hydrolib.core.dflowfm.ini.io_models import (

hydrolib/core/dflowfm/ini/util.py

@@ -5,9 +5,9 @@
 from operator import eq
 from typing import Any, Callable, Dict, List, Optional, Type
 
-from pydantic.class_validators import root_validator, validator
-from pydantic.fields import ModelField
-from pydantic.main import BaseModel
+from pydantic.v1.class_validators import root_validator, validator
+from pydantic.v1.fields import ModelField
+from pydantic.v1.main import BaseModel
 
 from hydrolib.core.dflowfm.common.models import LocationType
 from hydrolib.core.utils import operator_str, str_is_empty_or_none, to_list

hydrolib/core/dflowfm/inifield/models.py

@@ -3,9 +3,9 @@
 from enum import Enum
 from typing import Dict, List, Literal, Optional
 
-from pydantic import Field
-from pydantic.class_validators import root_validator, validator
-from pydantic.types import NonNegativeFloat, PositiveInt
+from pydantic.v1 import Field
+from pydantic.v1.class_validators import root_validator, validator
+from pydantic.v1.types import NonNegativeFloat, PositiveInt
 
 from hydrolib.core.basemodel import DiskOnlyFileModel
 from hydrolib.core.dflowfm.common import LocationType

hydrolib/core/dflowfm/mdu/models.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional, Union
 
-from pydantic import Field, validator
+from pydantic.v1 import Field, validator
 
 from hydrolib.core.basemodel import (
     DiskOnlyFileModel,

hydrolib/core/dflowfm/net/models.py

@@ -9,7 +9,7 @@
 import numpy as np
 import numpy.typing as npt
 from meshkernel.py_structures import GeometryList
-from pydantic import Field
+from pydantic.v1 import Field
 
 from hydrolib.core import __version__
 from hydrolib.core.basemodel import (

hydrolib/core/dflowfm/obs/models.py

@@ -1,7 +1,7 @@
 from typing import Dict, List, Literal, Optional
 
-from pydantic.class_validators import root_validator
-from pydantic.fields import Field
+from pydantic.v1.class_validators import root_validator
+from pydantic.v1.fields import Field
 
 from hydrolib.core.dflowfm.common.models import LocationType
 from hydrolib.core.dflowfm.ini.models import INIBasedModel, INIGeneral, INIModel

hydrolib/core/dflowfm/obscrosssection/models.py

@@ -1,7 +1,7 @@
 from typing import Dict, List, Literal, Optional
 
-from pydantic.class_validators import root_validator
-from pydantic.fields import Field
+from pydantic.v1.class_validators import root_validator
+from pydantic.v1.fields import Field
 
 from hydrolib.core.dflowfm.ini.models import INIBasedModel, INIGeneral, INIModel
 from hydrolib.core.dflowfm.ini.util import (

hydrolib/core/dflowfm/onedfield/models.py

@@ -1,9 +1,9 @@
 import logging
 from typing import List, Literal, Optional
 
-from pydantic import Field
-from pydantic.class_validators import root_validator
-from pydantic.types import NonNegativeInt
+from pydantic.v1 import Field
+from pydantic.v1.class_validators import root_validator
+from pydantic.v1.types import NonNegativeInt
 
 from hydrolib.core.dflowfm.ini.models import INIBasedModel, INIGeneral, INIModel
 from hydrolib.core.dflowfm.ini.util import (

hydrolib/core/dflowfm/storagenode/models.py

@@ -1,8 +1,8 @@
 from enum import Enum
 from typing import Dict, List, Literal, Optional
 
-from pydantic.class_validators import root_validator, validator
-from pydantic.fields import Field
+from pydantic.v1.class_validators import root_validator, validator
+from pydantic.v1.fields import Field
 
 from hydrolib.core.dflowfm.ini.models import INIBasedModel, INIGeneral, INIModel
 from hydrolib.core.dflowfm.ini.util import (

hydrolib/core/dflowfm/structure/models.py

@@ -9,8 +9,8 @@
 from operator import gt, ne
 from typing import Dict, List, Literal, Optional, Set, Union
 
-from pydantic import Field
-from pydantic.class_validators import root_validator, validator
+from pydantic.v1 import Field
+from pydantic.v1.class_validators import root_validator, validator
 
 from hydrolib.core.basemodel import DiskOnlyFileModel
 from hydrolib.core.dflowfm.bc.models import ForcingModel

hydrolib/core/dflowfm/tim/models.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Callable, Dict, List
 
-from pydantic.class_validators import validator
+from pydantic.v1.class_validators import validator
 
 from hydrolib.core.basemodel import BaseModel, ModelSaveSettings, ParsableFileModel
 

hydrolib/core/dflowfm/xyn/models.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Callable, Dict, List, Optional
 
-from pydantic import validator
+from pydantic.v1 import validator
 
 from hydrolib.core.basemodel import (
     BaseModel,

hydrolib/core/dflowfm/xyz/models.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import Callable, Dict, List, Optional
 
-from pydantic import Field
+from pydantic.v1 import Field
 
 from hydrolib.core.basemodel import (
     BaseModel,

hydrolib/core/dimr/models.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Callable, Dict, List, Literal, Optional, Type, Union
 
-from pydantic import Field, validator
+from pydantic.v1 import Field, validator
 
 from hydrolib.core import __version__
 from hydrolib.core.basemodel import (

hydrolib/core/rr/models.py

@@ -3,8 +3,8 @@
 from pathlib import Path
 from typing import Any, Callable, Dict, Iterable, Optional
 
-from pydantic import Field, validator
-from pydantic.types import FilePath
+from pydantic.v1 import Field, validator
+from pydantic.v1.types import FilePath
 
 from hydrolib.core.basemodel import (
     DiskOnlyFileModel,

hydrolib/core/rr/parser.py

@@ -2,7 +2,7 @@
 
 from typing import Dict, Iterable, Optional
 
-from pydantic.types import FilePath
+from pydantic.v1.types import FilePath
 
 
 def _strip(lines: Iterable[str]) -> Iterable[str]:

hydrolib/core/rr/topology/models.py

@@ -1,8 +1,8 @@
 from pathlib import Path
 from typing import Callable, Dict, List, Optional
 
-from pydantic.class_validators import root_validator
-from pydantic.fields import Field
+from pydantic.v1.class_validators import root_validator
+from pydantic.v1.fields import Field
 
 from hydrolib.core.basemodel import (
     BaseModel,