refac: modernize type annotations (PEP 604 / PEP 585)

backend/open_webui/models/auths.py

@@ -1,14 +1,15 @@
+from __future__ import annotations
+
 import logging
 import uuid
 from typing import Optional
 
-from sqlalchemy import select, delete, update
-from sqlalchemy.ext.asyncio import AsyncSession
 from open_webui.internal.db import Base, JSONField, get_async_db_context
 from open_webui.models.users import User, UserModel, UserProfileImageResponse, Users
 from open_webui.utils.validate import validate_profile_image_url
 from pydantic import BaseModel, field_validator
-from sqlalchemy import Boolean, Column, String, Text
+from sqlalchemy import Boolean, Column, String, Text, delete, select, update
+from sqlalchemy.ext.asyncio import AsyncSession
 
 log = logging.getLogger(__name__)
 
@@ -44,7 +45,7 @@ class Token(BaseModel):
 
 
 class ApiKey(BaseModel):
-    api_key: Optional[str] = None
+    api_key: str | None = None
 
 
 class SigninResponse(Token, UserProfileImageResponse):
@@ -74,18 +75,18 @@ class SignupForm(BaseModel):
     name: str
     email: str
     password: str
-    profile_image_url: Optional[str] = '/user.png'
+    profile_image_url: str | None = '/user.png'
 
     @field_validator('profile_image_url')
     @classmethod
-    def check_profile_image_url(cls, v: Optional[str]) -> Optional[str]:
+    def check_profile_image_url(cls, v: str | None) -> str | None:
         if v is not None:
             return validate_profile_image_url(v)
         return v
 
 
 class AddUserForm(SignupForm):
-    role: Optional[str] = 'pending'
+    role: str | None = 'pending'
 
 
 class AuthsTable:
@@ -96,9 +97,9 @@ class AuthsTable:
         name: str,
         profile_image_url: str = '/user.png',
         role: str = 'pending',
-        oauth: Optional[dict] = None,
-        db: Optional[AsyncSession] = None,
-    ) -> Optional[UserModel]:
+        oauth: dict | None = None,
+        db: AsyncSession | None = None,
+    ) -> UserModel | None:
         async with get_async_db_context(db) as db:
             log.info('insert_new_auth')
 
@@ -119,8 +120,8 @@ class AuthsTable:
                 return None
 
     async def authenticate_user(
-        self, email: str, verify_password: callable, db: Optional[AsyncSession] = None
-    ) -> Optional[UserModel]:
+        self, email: str, verify_password: callable, db: AsyncSession | None = None
+    ) -> UserModel | None:
         log.info(f'authenticate_user: {email}')
 
         user = await Users.get_user_by_email(email, db=db)
@@ -141,9 +142,7 @@ class AuthsTable:
         except Exception:
             return None
 
-    async def authenticate_user_by_api_key(
-        self, api_key: str, db: Optional[AsyncSession] = None
-    ) -> Optional[UserModel]:
+    async def authenticate_user_by_api_key(self, api_key: str, db: AsyncSession | None = None) -> UserModel | None:
         log.info(f'authenticate_user_by_api_key')
         # if no api_key, return None
         if not api_key:
@@ -155,7 +154,7 @@ class AuthsTable:
         except Exception:
             return False
 
-    async def authenticate_user_by_email(self, email: str, db: Optional[AsyncSession] = None) -> Optional[UserModel]:
+    async def authenticate_user_by_email(self, email: str, db: AsyncSession | None = None) -> UserModel | None:
         log.info(f'authenticate_user_by_email: {email}')
         try:
             async with get_async_db_context(db) as db:
@@ -171,7 +170,7 @@ class AuthsTable:
         except Exception:
             return None
 
-    async def update_user_password_by_id(self, id: str, new_password: str, db: Optional[AsyncSession] = None) -> bool:
+    async def update_user_password_by_id(self, id: str, new_password: str, db: AsyncSession | None = None) -> bool:
         try:
             async with get_async_db_context(db) as db:
                 result = await db.execute(update(Auth).filter_by(id=id).values(password=new_password))
@@ -180,7 +179,7 @@ class AuthsTable:
         except Exception:
             return False
 
-    async def update_email_by_id(self, id: str, email: str, db: Optional[AsyncSession] = None) -> bool:
+    async def update_email_by_id(self, id: str, email: str, db: AsyncSession | None = None) -> bool:
         try:
             async with get_async_db_context(db) as db:
                 result = await db.execute(update(Auth).filter_by(id=id).values(email=email))
@@ -192,7 +191,7 @@ class AuthsTable:
         except Exception:
             return False
 
-    async def delete_auth_by_id(self, id: str, db: Optional[AsyncSession] = None) -> bool:
+    async def delete_auth_by_id(self, id: str, db: AsyncSession | None = None) -> bool:
         try:
             async with get_async_db_context(db) as db:
                 # Delete User