Merge pull request #16 from Authress/pydantic-upgrade

Remove version conflict with usage of pydantic v2. fix #15

CHANGELOG.md

@@ -15,6 +15,7 @@ This is the changelog for [Authress SDK](readme.md).
 * [Breaking] Renamed `AccessRecordResource` model to `Resource` in `models.resource.py`.
 * Add missing `If-Unmodified-Since` support to the `update_group` in the `Groups` API.
 * Improve caching in `verify_token`
+* Support additionally pydantic v2 dependencies. Support for v1 will be removed in a future version.
 
 ## 2.0 ##
 * Add support for users and groups at the statement level of access records.

authress/api/access_records_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictStr, conint, constr, validator
+try:
+    from pydantic.v1 import Field, StrictStr, conint, constr, validator
+except ImportError:
+    from pydantic import Field, StrictStr, conint, constr, validator
 
 from typing import Any, Dict, Optional
 

authress/api/accounts_api.py

@@ -17,12 +17,18 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError, constr
+try:
+    from pydantic.v1 import validate_arguments, ValidationError, constr
+except ImportError:
+    from pydantic import validate_arguments, ValidationError, constr
 from typing_extensions import Annotated
 
 from datetime import datetime
 
-from pydantic import Field, StrictStr
+try:
+    from pydantic.v1 import Field, StrictStr
+except ImportError:
+    from pydantic import Field, StrictStr
 
 from typing import Optional
 

authress/api/applications_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, constr
+try:
+    from pydantic.v1 import Field, constr
+except ImportError:
+    from pydantic import Field, constr
 
 from authress.models.application_delegation import ApplicationDelegation
 

authress/api/connections_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, constr
+try:
+    from pydantic.v1 import Field, constr
+except ImportError:
+    from pydantic import Field, constr
 
 from authress.models.connection import Connection
 from authress.models.connection_collection import ConnectionCollection

authress/api/extensions_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictStr, constr
+try:
+    from pydantic.v1 import Field, StrictStr, constr
+except ImportError:
+    from pydantic import Field, StrictStr, constr
 
 from typing import Optional
 

authress/api/groups_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictStr, conint, constr
+try:
+    from pydantic.v1 import Field, StrictStr, conint, constr
+except ImportError:
+    from pydantic import Field, StrictStr, conint, constr
 
 from typing import Optional
 

authress/api/invites_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, constr
+try:
+    from pydantic.v1 import Field, constr
+except ImportError:
+    from pydantic import Field, constr
 
 from authress.models.account import Account
 from authress.models.invite import Invite

authress/api/resource_permissions_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictStr, conint, constr, validator
+try:
+    from pydantic.v1 import Field, StrictStr, conint, constr, validator
+except ImportError:
+    from pydantic import Field, StrictStr, conint, constr, validator
 
 from typing import Optional
 

authress/api/roles_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, constr, validator
+try:
+    from pydantic.v1 import Field, constr, validator
+except ImportError:
+    from pydantic import Field, constr, validator
 
 from authress.models.role import Role
 from authress.models.role_collection import RoleCollection

authress/api/service_clients_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictStr, conint, constr
+try:
+    from pydantic.v1 import Field, StrictStr, conint, constr
+except ImportError:
+    from pydantic import Field, StrictStr, conint, constr
 
 from typing import Optional
 

authress/api/tenants_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError, constr
+try:
+    from pydantic.v1 import validate_arguments, ValidationError, constr
+except ImportError:
+    from pydantic import validate_arguments, ValidationError, constr
 from typing_extensions import Annotated
 
-from pydantic import Field
+try:
+    from pydantic.v1 import Field
+except ImportError:
+    from pydantic import Field
 
 from authress.models.tenant import Tenant
 from authress.models.tenant_collection import TenantCollection

authress/api/user_permissions_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictStr, conint, constr, validator
+try:
+    from pydantic.v1 import Field, StrictStr, conint, constr, validator
+except ImportError:
+    from pydantic import Field, StrictStr, conint, constr, validator
 
 from typing import Optional
 

authress/api/users_api.py

@@ -17,10 +17,16 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictStr, conint, constr
+try:
+    from pydantic.v1 import Field, StrictStr, conint, constr
+except ImportError:
+    from pydantic import Field, StrictStr, conint, constr
 
 from typing import Optional
 

authress/api_response.py

@@ -2,7 +2,10 @@
 
 from __future__ import annotations
 from typing import Any, Dict, Optional
-from pydantic import Field, StrictInt, StrictStr
+try:
+    from pydantic.v1 import Field, StrictInt, StrictStr
+except ImportError:
+    from pydantic import Field, StrictInt, StrictStr
 
 class ApiResponse:
     """

authress/models/access_record.py

@@ -20,7 +20,10 @@
 
 from datetime import datetime
 from typing import Dict, List, Optional, Union
-from pydantic import BaseModel, Field, StrictStr, confloat, conint, conlist, constr, validator
+try:
+    from pydantic.v1 import BaseModel, Field, StrictStr, confloat, conint, conlist, constr, validator
+except ImportError:
+    from pydantic import BaseModel, Field, StrictStr, confloat, conint, conlist, constr, validator
 from authress.models.access_record_account import AccessRecordAccount
 from authress.models.account_links import AccountLinks
 from authress.models.linked_group import LinkedGroup

authress/models/access_record_account.py

@@ -20,7 +20,10 @@
 
 
 
-from pydantic import BaseModel, Field, StrictStr
+try:
+    from pydantic.v1 import BaseModel, Field, StrictStr
+except ImportError:
+    from pydantic import BaseModel, Field, StrictStr
 
 class AccessRecordAccount(BaseModel):
     """

authress/models/access_record_collection.py

@@ -20,7 +20,10 @@
 
 
 from typing import List, Optional
-from pydantic import BaseModel, Field, conlist
+try:
+    from pydantic.v1 import BaseModel, Field, conlist
+except ImportError:
+    from pydantic import BaseModel, Field, conlist
 from authress.models.access_record import AccessRecord
 from authress.models.collection_links import CollectionLinks
 from authress.models.pagination import Pagination

authress/models/access_request.py

@@ -20,7 +20,10 @@
 
 from datetime import datetime
 from typing import Dict, Optional
-from pydantic import BaseModel, Field, StrictStr, constr, validator
+try:
+    from pydantic.v1 import BaseModel, Field, StrictStr, constr, validator
+except ImportError:
+    from pydantic import BaseModel, Field, StrictStr, constr, validator
 from authress.models.access_template import AccessTemplate
 from authress.models.account_links import AccountLinks
 

authress/models/access_request_collection.py

@@ -20,7 +20,10 @@
 
 
 from typing import List, Optional
-from pydantic import BaseModel, Field, conlist
+try:
+    from pydantic.v1 import BaseModel, Field, conlist
+except ImportError:
+    from pydantic import BaseModel, Field, conlist
 from authress.models.access_request import AccessRequest
 from authress.models.collection_links import CollectionLinks
 from authress.models.pagination import Pagination

authress/models/access_request_response.py

@@ -20,7 +20,10 @@
 
 
 
-from pydantic import BaseModel, Field, StrictStr, validator
+try:
+    from pydantic.v1 import BaseModel, Field, StrictStr, validator
+except ImportError:
+    from pydantic import BaseModel, Field, StrictStr, validator
 
 class AccessRequestResponse(BaseModel):
     """

authress/models/access_template.py

@@ -20,7 +20,10 @@
 
 
 from typing import List
-from pydantic import BaseModel, Field, conlist
+try:
+    from pydantic.v1 import BaseModel, Field, conlist
+except ImportError:
+    from pydantic import BaseModel, Field, conlist
 from authress.models.statement import Statement
 from authress.models.user import User
 

authress/models/account.py

@@ -20,7 +20,10 @@
 
 from datetime import datetime
 from typing import Any, Dict, Optional
-from pydantic import BaseModel, Field, constr
+try:
+    from pydantic.v1 import BaseModel, Field, constr
+except ImportError:
+    from pydantic import BaseModel, Field, constr
 from authress.models.account_links import AccountLinks
 
 class Account(BaseModel):

authress/models/account_collection.py

@@ -20,7 +20,10 @@
 
 
 
-from pydantic import BaseModel, Field
+try:
+    from pydantic.v1 import BaseModel, Field
+except ImportError:
+    from pydantic import BaseModel, Field
 from authress.models.account import Account
 
 class AccountCollection(BaseModel):

authress/models/account_links.py

@@ -20,7 +20,10 @@
 
 
 from typing import Optional
-from pydantic import BaseModel, Field
+try:
+    from pydantic.v1 import BaseModel, Field
+except ImportError:
+    from pydantic import BaseModel, Field
 from authress.models.link import Link
 
 class AccountLinks(BaseModel):