Use Pydantic v1 from v2 backdoor

alchemiscale/_pydantic.py

@@ -0,0 +1,18 @@
+try:
+    from pydantic.v1 import (
+        BaseModel,
+        Field,
+        validator,
+        root_validator,
+        BaseSettings,
+        ValidationError,
+    )
+except ImportError:
+    from pydantic import (
+        BaseModel,
+        Field,
+        validator,
+        root_validator,
+        BaseSettings,
+        ValidationError,
+    )

alchemiscale/compute/settings.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from typing import Union, Optional, List, Dict, Tuple
-from pydantic import BaseModel, Field
+from alchemiscale._pydantic import BaseModel, Field
 
 from ..models import Scope, ScopedKey
 

alchemiscale/models.py

@@ -5,7 +5,7 @@
 """
 
 from typing import Optional, Union
-from pydantic import BaseModel, Field, validator, root_validator
+from alchemiscale._pydantic import BaseModel, Field, validator, root_validator
 from gufe.tokenization import GufeKey
 from re import fullmatch
 

alchemiscale/security/auth.py

@@ -12,7 +12,7 @@
 from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
 from passlib.context import CryptContext
-from pydantic import BaseModel
+from alchemiscale._pydantic import BaseModel
 
 from .models import Token, TokenData, CredentialedEntity
 

alchemiscale/security/models.py

@@ -7,7 +7,7 @@
 from datetime import datetime, timedelta
 from typing import List, Union, Optional
 
-from pydantic import BaseModel, validator
+from alchemiscale._pydantic import BaseModel, validator
 
 from ..models import Scope
 

alchemiscale/settings.py

@@ -7,7 +7,7 @@
 from functools import lru_cache
 from typing import Optional
 
-from pydantic import BaseSettings
+from alchemiscale._pydantic import BaseSettings
 
 
 class FrozenSettings(BaseSettings):

alchemiscale/storage/models.py

@@ -13,7 +13,7 @@
 import hashlib
 
 
-from pydantic import BaseModel, Field
+from alchemiscale._pydantic import BaseModel, Field
 from gufe.tokenization import GufeTokenizable, GufeKey
 
 from ..models import ScopedKey, Scope

alchemiscale/tests/unit/test_base_api.py

@@ -1,7 +1,7 @@
 import pytest
 
 from fastapi import HTTPException
-from pydantic import ValidationError
+from alchemiscale._pydantic import ValidationError
 
 from alchemiscale.base.api import validate_scopes, validate_scopes_query
 from alchemiscale.models import Scope, ScopedKey

alchemiscale/tests/unit/test_models.py

@@ -1,6 +1,6 @@
 import pytest
 
-from pydantic import ValidationError
+from alchemiscale._pydantic import ValidationError
 
 from alchemiscale.models import Scope
 

devtools/conda-envs/alchemiscale-client.yml

@@ -15,7 +15,7 @@ dependencies:
   - requests
   - click
   - httpx
-  - pydantic<2.0
+  - pydantic<3.0
 
   ## user client printing
   - rich

devtools/conda-envs/alchemiscale-compute.yml

@@ -15,7 +15,7 @@ dependencies:
   - requests
   - click
   - httpx
-  - pydantic<2.0
+  - pydantic<3.0
 
   # perses dependencies
   - openeye-toolkits

devtools/conda-envs/alchemiscale-server.yml

@@ -15,7 +15,7 @@ dependencies:
   - openmmforcefields>=0.12.0
   - requests
   - click
-  - pydantic<2.0
+  - pydantic<3.0
 
   ## state store
   - neo4j-python-driver

devtools/conda-envs/test.yml

@@ -10,7 +10,7 @@ dependencies:
   - gufe>=1.0.0
   - openfe>=1.0.1
   - openmmforcefields>=0.12.0
-  - pydantic<2.0
+  - pydantic<3.0
 
   ## state store
   - neo4j-python-driver