From e504d7b248e9c7519f26173729ce50f4b14a0277 Mon Sep 17 00:00:00 2001
From: Moreno Giussani <giussani.moreno@gmail.com>
Date: Fri, 6 Oct 2023 01:00:41 +0200
Subject: [PATCH] feat: bump pydantic version 2.4.2

---
 etebase_server/fastapi/exceptions.py             | 4 ++--
 etebase_server/fastapi/routers/authentication.py | 2 +-
 etebase_server/fastapi/routers/collection.py     | 4 ++--
 etebase_server/fastapi/routers/invitation.py     | 4 ++--
 etebase_server/fastapi/routers/member.py         | 2 +-
 requirements.txt                                 | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/etebase_server/fastapi/exceptions.py b/etebase_server/fastapi/exceptions.py
index 1a98fcb..92fd30b 100644
--- a/etebase_server/fastapi/exceptions.py
+++ b/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):
diff --git a/etebase_server/fastapi/routers/authentication.py b/etebase_server/fastapi/routers/authentication.py
index d771a5c..baa9212 100644
--- a/etebase_server/fastapi/routers/authentication.py
+++ b/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
diff --git a/etebase_server/fastapi/routers/collection.py b/etebase_server/fastapi/routers/collection.py
index 97dbbf4..089546d 100644
--- a/etebase_server/fastapi/routers/collection.py
+++ b/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(
diff --git a/etebase_server/fastapi/routers/invitation.py b/etebase_server/fastapi/routers/invitation.py
index adb51c6..2fdb2d7 100644
--- a/etebase_server/fastapi/routers/invitation.py
+++ b/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":
diff --git a/etebase_server/fastapi/routers/member.py b/etebase_server/fastapi/routers/member.py
index 123357b..aa4107f 100644
--- a/etebase_server/fastapi/routers/member.py
+++ b/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":
diff --git a/requirements.txt b/requirements.txt
index 51fa812..1652380 100644
--- a/requirements.txt
+++ b/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