Remove Optional

Author: jonasrenault

.github/workflows/test.yml

@@ -80,7 +80,7 @@ jobs:
           cache: "poetry"
 
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.8.0
+        uses: supercharge/mongodb-github-action@1.11.0
         with:
           mongodb-version: ${{ env.MONGODB_VERSION }}
 

backend/app/models/users.py

@@ -1,25 +1,17 @@
-from typing import Annotated, Optional
+from typing import Annotated
 from uuid import UUID, uuid4
 
 from beanie import Document, Indexed
 from pydantic import EmailStr, Field
-from pymongo import IndexModel
 
 
 class User(Document):
     uuid: Annotated[UUID, Field(default_factory=uuid4), Indexed(unique=True)]
     email: Annotated[EmailStr, Indexed(unique=True)]
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    hashed_password: Optional[str] = None
-    provider: Optional[str] = None
-    picture: Optional[str] = None
+    first_name: str | None = None
+    last_name: str | None = None
+    hashed_password: str | None = None
+    provider: str | None = None
+    picture: str | None = None
     is_active: bool = True
     is_superuser: bool = False
-
-    class Settings:
-        # Set unique index on uuid here instead of using Indexed
-        # because of https://github.com/roman-right/beanie/issues/701
-        indexes = [
-            IndexModel("uuid", unique=True),
-        ]

backend/app/schemas/tokens.py

@@ -1,4 +1,3 @@
-from typing import Optional
 from uuid import UUID
 
 from pydantic import BaseModel
@@ -10,4 +9,4 @@ class Token(BaseModel):
 
 
 class TokenPayload(BaseModel):
-    uuid: Optional[UUID] = None
+    uuid: UUID | None = None

backend/app/schemas/users.py

@@ -1,4 +1,3 @@
-from typing import Optional
 from uuid import UUID
 
 from beanie import PydanticObjectId
@@ -10,31 +9,31 @@ class UserBase(BaseModel):
     Shared User properties. Visible by anyone.
     """
 
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    picture: Optional[str] = None
+    first_name: str | None = None
+    last_name: str | None = None
+    picture: str | None = None
 
 
 class PrivateUserBase(UserBase):
     """
     Shared User properties. Visible only by admins and self.
     """
 
-    email: Optional[EmailStr] = None
-    is_active: Optional[bool] = True
-    is_superuser: bool = False
-    provider: Optional[str] = None
+    email: EmailStr | None = None
+    is_active: bool | None = None
+    is_superuser: bool | None = None
+    provider: str | None = None
 
 
 class UserUpdate(UserBase):
     """
     User properties to receive via API on update.
     """
 
-    password: Optional[str] = None
-    email: Optional[EmailStr] = None
-    is_active: Optional[bool] = True
-    is_superuser: bool = False
+    password: str | None = None
+    email: EmailStr | None = None
+    is_active: bool | None = None
+    is_superuser: bool | None = None
 
 
 class User(PrivateUserBase):