feat: bump pydantic version 2.4.2

etebase_server/fastapi/exceptions.py

@@ -11,7 +11,7 @@ class HttpErrorField(BaseModel):
     detail: str
 
     class Config:
-        orm_mode = True
+        from_attributes = True
 
 
 class HttpErrorOut(BaseModel):
@@ -20,7 +20,7 @@ class HttpErrorOut(BaseModel):
     errors: t.Optional[t.List[HttpErrorField]]
 
     class Config:
-        orm_mode = True
+        from_attributes = True
 
 
 class CustomHttpException(HTTPException):

etebase_server/fastapi/routers/authentication.py

@@ -75,7 +75,7 @@ class LoginOut(BaseModel):
 
 class Authentication(BaseModel):
     class Config:
-        keep_untouched = (cached_property,)
+        ignored_types = (cached_property,)
 
     response: bytes
     signature: bytes

etebase_server/fastapi/routers/collection.py

@@ -51,7 +51,7 @@ class CollectionItemRevisionInOut(BaseModel):
     chunks: t.List[ChunkType]
 
     class Config:
-        orm_mode = True
+        from_attributes = True
 
     @classmethod
     def from_orm_context(
@@ -77,7 +77,7 @@ class CollectionItemCommon(BaseModel):
 
 class CollectionItemOut(CollectionItemCommon):
     class Config:
-        orm_mode = True
+        from_attributes = True
 
     @classmethod
     def from_orm_context(

etebase_server/fastapi/routers/invitation.py

@@ -33,7 +33,7 @@ class UserInfoOut(BaseModel):
     pubkey: bytes
 
     class Config:
-        orm_mode = True
+        from_attributes = True
 
     @classmethod
     def from_orm(cls: t.Type["UserInfoOut"], obj: models.UserInfo) -> "UserInfoOut":
@@ -66,7 +66,7 @@ class CollectionInvitationOut(CollectionInvitationCommon):
     fromPubkey: bytes
 
     class Config:
-        orm_mode = True
+        from_attributes = True
 
     @classmethod
     def from_orm(cls: t.Type["CollectionInvitationOut"], obj: models.CollectionInvitation) -> "CollectionInvitationOut":

etebase_server/fastapi/routers/member.py

@@ -39,7 +39,7 @@ class CollectionMemberOut(BaseModel):
     accessLevel: models.AccessLevels
 
     class Config:
-        orm_mode = True
+        from_attributes = True
 
     @classmethod
     def from_orm(cls: t.Type["CollectionMemberOut"], obj: models.CollectionMember) -> "CollectionMemberOut":

requirements.txt

@@ -32,7 +32,7 @@ msgpack==1.0.4
     # via -r requirements.in/base.txt
 pycparser==2.21
     # via cffi
-pydantic==1.10.2
+pydantic==2.4.2
     # via fastapi
 pynacl==1.5.0
     # via -r requirements.in/base.txt