chore(pydantic): make it compatible with future pydantic release

alice-biometrics · Jun 26, 2023 · 00bc882 · 00bc882
1 parent 1995fde
commit 00bc882
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 44 deletions.
diff --git a/alice/config.py b/alice/config.py
@@ -1,7 +1,6 @@
 from typing import Union
 
-from pydantic.fields import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 from requests import Session
 
 
@@ -20,4 +19,4 @@ class Config:
     )
     send_agent: bool = Field(default=True)
     verbose: bool = Field(default=False)
-    session: Union[Session, None] = None
+    session: Union[Session, None] = Field(default=None)
diff --git a/alice/onboarding/models/bounding_box.py b/alice/onboarding/models/bounding_box.py
@@ -1,5 +1,4 @@
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 
 class BoundingBox(BaseModel):

diff --git a/alice/onboarding/models/report/checks/check.py b/alice/onboarding/models/report/checks/check.py
@@ -1,7 +1,6 @@
 from typing import Optional
 
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 
 class Check(BaseModel):

diff --git a/alice/onboarding/models/report/compliance/device_out.py b/alice/onboarding/models/report/compliance/device_out.py
@@ -1,7 +1,6 @@
-from typing import Optional
+from typing import Union
 
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 
 class DeviceOut(BaseModel):
@@ -14,7 +13,7 @@ class DeviceOut(BaseModel):
     platform: str
     platform_version: str
     model: str
-    ip: Optional[str] = None
+    ip: Union[str, None] = Field(default=None)
 
     def __hash__(self) -> int:
         return hash((type(self),) + tuple(self.__dict__.values()))
diff --git a/alice/onboarding/models/report/compliance/domain_events_report.py b/alice/onboarding/models/report/compliance/domain_events_report.py
@@ -1,6 +1,6 @@
 from typing import List
 
-from pydantic.main import BaseModel
+from pydantic import BaseModel
 
 from alice.onboarding.models.report.compliance.device_out import DeviceOut
 from alice.onboarding.models.report.compliance.user_event_out import UserEventOut

diff --git a/alice/onboarding/models/report/document/document_field.py b/alice/onboarding/models/report/document/document_field.py
@@ -1,7 +1,7 @@
 from typing import List, Optional
 
 from meiga import Error, Result, Success, isFailure
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 from alice.onboarding.models.report.checks.check import Check
 
@@ -14,7 +14,7 @@ class ReportV1Field(BaseModel):
     name: str
     value: Optional[str]
     score: Optional[int]
-    checks: List[Check] = []
+    checks: List[Check] = Field(default=[])
 
     def get_check(self, check_key: str) -> Result[Check, Error]:
         for doc_check in self.checks:

diff --git a/alice/onboarding/models/report/document/document_report.py b/alice/onboarding/models/report/document/document_report.py
@@ -2,8 +2,7 @@
 from typing import List, Union
 
 from meiga import Error, Result, Success, isFailure
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 from alice.onboarding.models.report.checks.check import Check
 from alice.onboarding.models.report.document.document_field import ReportV1Field
@@ -16,9 +15,9 @@
 
 
 class DocumentSidesDetailReport(BaseModel):
-    front: Union[DocumentSideReport, None] = None
-    back: Union[DocumentSideReport, None] = None
-    internal: Union[DocumentSideReport, None] = None
+    front: Union[DocumentSideReport, None] = Field(default=None)
+    back: Union[DocumentSideReport, None] = Field(default=None)
+    internal: Union[DocumentSideReport, None] = Field(default=None)
 
     def get_completed_sides(self) -> int:
         completed_sides = 0

diff --git a/alice/onboarding/models/report/document/document_report_meta.py b/alice/onboarding/models/report/document/document_report_meta.py
@@ -1,5 +1,4 @@
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 from alice.onboarding.models.report.document.document_type import DocumentType
 

diff --git a/alice/onboarding/models/report/document/document_side_report.py b/alice/onboarding/models/report/document/document_side_report.py
@@ -2,8 +2,7 @@
 from typing import Any, Dict, List, Optional
 
 from meiga import Error, Result, Success, isFailure
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 from alice.onboarding.models.report.document.document_field import ReportV1Field
 from alice.onboarding.models.report.document.document_side import DocumentSide

diff --git a/alice/onboarding/models/report/document/document_side_report_meta.py b/alice/onboarding/models/report/document/document_side_report_meta.py
@@ -1,5 +1,4 @@
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 
 class DocumentSideReportMeta(BaseModel):

diff --git a/alice/onboarding/models/report/face_matching/face_matching.py b/alice/onboarding/models/report/face_matching/face_matching.py
@@ -1,7 +1,6 @@
 from datetime import datetime
 
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 from alice.onboarding.models.report.document.document_side import DocumentSide
 

diff --git a/alice/onboarding/models/report/other_trusted_document/other_trusted_document_report.py b/alice/onboarding/models/report/other_trusted_document/other_trusted_document_report.py
@@ -11,7 +11,7 @@
 
 class OtherTrustedDocumentReport(BaseModel):
     """
-    A other trusted document report_v1 collects all the information extracted for a document during the onboarding process
+    The other trusted document report_v1 collects all the information extracted for a document during the onboarding process
     """
 
     id: str = Field(

diff --git a/alice/onboarding/models/report/other_trusted_document/other_trusted_document_report_meta.py b/alice/onboarding/models/report/other_trusted_document/other_trusted_document_report_meta.py
@@ -1,7 +1,6 @@
 from typing import Optional
 
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 
 class OtherTrustedDocumentReportMeta(BaseModel):

diff --git a/alice/onboarding/models/report/report.py b/alice/onboarding/models/report/report.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import List
+from typing import List, Literal
 
 from pydantic import BaseModel, Field
 
@@ -27,7 +27,7 @@ class Report(BaseModel):
         min_length=16,
         max_length=36,
     )
-    version: int = Field(default=1, description="Report version", const=True)
+    version: int = Field(default=Literal[1], description="Report version")
     created_at: datetime = Field(description="Report creation time in ISO 8601 format")
     summary: ReportSummary = Field(description="User summary")
     selfies: List[SelfieReport] = Field(description="It collects all user selfies")

diff --git a/alice/onboarding/models/report/selfie/selfie_report.py b/alice/onboarding/models/report/selfie/selfie_report.py
@@ -2,8 +2,7 @@
 from typing import Dict, List, Optional
 
 from meiga import Error, Result, Success, isFailure
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 from alice.onboarding.models.report.checks.check import Check
 from alice.onboarding.models.report.shared.href import Href

diff --git a/alice/onboarding/models/report/shared/bounding_box.py b/alice/onboarding/models/report/shared/bounding_box.py
@@ -1,5 +1,4 @@
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 
 class BoundingBox(BaseModel):

diff --git a/alice/onboarding/models/report/shared/href.py b/alice/onboarding/models/report/shared/href.py
@@ -1,7 +1,6 @@
 from typing import Dict, Optional
 
-from pydantic import Field
-from pydantic.main import BaseModel
+from pydantic import BaseModel, Field
 
 from alice.onboarding.models.report.shared.bounding_box import BoundingBox
 

diff --git a/alice/onboarding/models/report/summary/external_user_data.py b/alice/onboarding/models/report/summary/external_user_data.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic.main import BaseModel
+from pydantic import BaseModel
 
 
 class ExternalUserData(BaseModel):

diff --git a/alice/onboarding/models/user_info.py b/alice/onboarding/models/user_info.py
@@ -1,9 +1,9 @@
 from typing import Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 
 class UserInfo(BaseModel):
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    email: Optional[str] = None
+    first_name: Optional[str] = Field(default=None)
+    last_name: Optional[str] = Field(default=None)
+    email: Optional[str] = Field(default=None)
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,4 +1,4 @@
 pyjwt>=2.3.0,<3.0.0
-pydantic>=1.8.2,<2.0.0
+pydantic>=1.8.2,<3
 requests>=2.26.0,<3.0.0
 meiga>=1.2.12,<1.9.0