Migrate to pydantic >= 2.0 (#613)

* Revert to v1 api

* Use 2.0.0 as the minimum version

(cherry picked from commit 128ee90)

Author: Vectorrent

examples/albert/utils.py

@@ -1,6 +1,6 @@
 from typing import Dict, List, Tuple
 
-from pydantic import BaseModel, StrictFloat, confloat, conint
+from pydantic.v1 import BaseModel, StrictFloat, confloat, conint
 
 from hivemind.dht.crypto import RSASignatureValidator
 from hivemind.dht.schema import BytesWithPublicKey, SchemaValidator

hivemind/dht/schema.py

@@ -1,7 +1,7 @@
 import re
 from typing import Any, Dict, Optional, Type
 
-import pydantic
+import pydantic.v1 as pydantic
 
 from hivemind.dht.crypto import RSASignatureValidator
 from hivemind.dht.protocol import DHTProtocol

hivemind/optim/progress_tracker.py

@@ -6,7 +6,7 @@
 from typing import Dict, Optional
 
 import numpy as np
-from pydantic import BaseModel, StrictBool, StrictFloat, confloat, conint
+from pydantic.v1 import BaseModel, StrictBool, StrictFloat, confloat, conint
 
 from hivemind.dht import DHT
 from hivemind.dht.schema import BytesWithPublicKey, RSASignatureValidator, SchemaValidator

requirements.txt

@@ -12,5 +12,5 @@ configargparse>=1.2.3
 py-multihash>=0.2.3
 multiaddr @ git+https://github.com/multiformats/py-multiaddr.git@e01dbd38f2c0464c0f78b556691d655265018cce
 cryptography>=3.4.6
-pydantic>=1.8.1,<2.0
+pydantic>=2.0.0
 packaging>=20.9

tests/test_dht_schema.py

@@ -2,7 +2,7 @@
 from typing import Dict
 
 import pytest
-from pydantic import BaseModel, StrictInt, conint
+from pydantic.v1 import BaseModel, StrictInt, conint
 
 import hivemind
 from hivemind.dht.node import DHTNode

tests/test_dht_validation.py

@@ -2,7 +2,7 @@
 from typing import Dict
 
 import pytest
-from pydantic import BaseModel, StrictInt
+from pydantic.v1 import BaseModel, StrictInt
 
 import hivemind
 from hivemind.dht.crypto import RSASignatureValidator