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

backend/open_webui/models/functions.py

@@ -1,13 +1,14 @@
+from __future__ import annotations
+
 import logging
 import time
 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 Users, UserModel, UserResponse
+from open_webui.models.users import UserModel, UserResponse, Users
 from pydantic import BaseModel, ConfigDict
-from sqlalchemy import BigInteger, Boolean, Column, String, Text, Index
+from sqlalchemy import BigInteger, Boolean, Column, Index, String, Text, delete, select, update
+from sqlalchemy.ext.asyncio import AsyncSession
 
 log = logging.getLogger(__name__)
 
@@ -37,8 +38,8 @@ class Function(Base):
 
 
 class FunctionMeta(BaseModel):
-    description: Optional[str] = None
-    manifest: Optional[dict] = {}
+    description: str | None = None
+    manifest: dict | None = {}
     model_config = ConfigDict(extra='allow')
 
 
@@ -64,7 +65,7 @@ class FunctionWithValvesModel(BaseModel):
     type: str
     content: str
     meta: FunctionMeta
-    valves: Optional[dict] = None
+    valves: dict | None = None
     is_active: bool = False
     is_global: bool = False
     updated_at: int  # timestamp in epoch
@@ -93,7 +94,7 @@ class FunctionResponse(BaseModel):
 
 
 class FunctionUserResponse(FunctionResponse):
-    user: Optional[UserResponse] = None
+    user: UserResponse | None = None
 
 
 class FunctionForm(BaseModel):
@@ -104,7 +105,7 @@ class FunctionForm(BaseModel):
 
 
 class FunctionValves(BaseModel):
-    valves: Optional[dict] = None
+    valves: dict | None = None
 
 
 class FunctionsTable:
@@ -113,8 +114,8 @@ class FunctionsTable:
         user_id: str,
         type: str,
         form_data: FunctionForm,
-        db: Optional[AsyncSession] = None,
-    ) -> Optional[FunctionModel]:
+        db: AsyncSession | None = None,
+    ) -> FunctionModel | None:
         function = FunctionModel(
             **{
                 **form_data.model_dump(),
@@ -143,7 +144,7 @@ class FunctionsTable:
         self,
         user_id: str,
         functions: list[FunctionWithValvesModel],
-        db: Optional[AsyncSession] = None,
+        db: AsyncSession | None = None,
     ) -> list[FunctionWithValvesModel]:
         # Synchronize functions for a user by updating existing ones, inserting new ones, and removing those that are no longer present.
         try:
@@ -191,7 +192,7 @@ class FunctionsTable:
             log.exception(f'Error syncing functions for user {user_id}: {e}')
             return []
 
-    async def get_function_by_id(self, id: str, db: Optional[AsyncSession] = None) -> Optional[FunctionModel]:
+    async def get_function_by_id(self, id: str, db: AsyncSession | None = None) -> FunctionModel | None:
         try:
             async with get_async_db_context(db) as db:
                 function = await db.get(Function, id)
@@ -199,7 +200,7 @@ class FunctionsTable:
         except Exception:
             return None
 
-    async def get_functions_by_ids(self, ids: list[str], db: Optional[AsyncSession] = None) -> list[FunctionModel]:
+    async def get_functions_by_ids(self, ids: list[str], db: AsyncSession | None = None) -> list[FunctionModel]:
         """
         Batch fetch multiple functions by their IDs in a single query.
         Returns functions in the same order as the input IDs (None entries filtered out).
@@ -218,7 +219,7 @@ class FunctionsTable:
             return []
 
     async def get_functions(
-        self, active_only=False, include_valves=False, db: Optional[AsyncSession] = None
+        self, active_only=False, include_valves=False, db: AsyncSession | None = None
     ) -> list[FunctionModel | FunctionWithValvesModel]:
         async with get_async_db_context(db) as db:
             if active_only:
@@ -233,7 +234,7 @@ class FunctionsTable:
             else:
                 return [FunctionModel.model_validate(function) for function in functions]
 
-    async def get_function_list(self, db: Optional[AsyncSession] = None) -> list[FunctionUserResponse]:
+    async def get_function_list(self, db: AsyncSession | None = None) -> list[FunctionUserResponse]:
         async with get_async_db_context(db) as db:
             result = await db.execute(select(Function).order_by(Function.updated_at.desc()))
             functions = result.scalars().all()
@@ -262,7 +263,7 @@ class FunctionsTable:
             ]
 
     async def get_functions_by_type(
-        self, type: str, active_only=False, db: Optional[AsyncSession] = None
+        self, type: str, active_only=False, db: AsyncSession | None = None
     ) -> list[FunctionModel]:
         async with get_async_db_context(db) as db:
             if active_only:
@@ -271,17 +272,17 @@ class FunctionsTable:
                 result = await db.execute(select(Function).filter_by(type=type))
             return [FunctionModel.model_validate(function) for function in result.scalars().all()]
 
-    async def get_global_filter_functions(self, db: Optional[AsyncSession] = None) -> list[FunctionModel]:
+    async def get_global_filter_functions(self, db: AsyncSession | None = None) -> list[FunctionModel]:
         async with get_async_db_context(db) as db:
             result = await db.execute(select(Function).filter_by(type='filter', is_active=True, is_global=True))
             return [FunctionModel.model_validate(function) for function in result.scalars().all()]
 
-    async def get_global_action_functions(self, db: Optional[AsyncSession] = None) -> list[FunctionModel]:
+    async def get_global_action_functions(self, db: AsyncSession | None = None) -> list[FunctionModel]:
         async with get_async_db_context(db) as db:
             result = await db.execute(select(Function).filter_by(type='action', is_active=True, is_global=True))
             return [FunctionModel.model_validate(function) for function in result.scalars().all()]
 
-    async def get_function_valves_by_id(self, id: str, db: Optional[AsyncSession] = None) -> Optional[dict]:
+    async def get_function_valves_by_id(self, id: str, db: AsyncSession | None = None) -> dict | None:
         async with get_async_db_context(db) as db:
             try:
                 function = await db.get(Function, id)
@@ -290,7 +291,7 @@ class FunctionsTable:
                 log.exception(f'Error getting function valves by id {id}: {e}')
                 return None
 
-    async def get_function_valves_by_ids(self, ids: list[str], db: Optional[AsyncSession] = None) -> dict[str, dict]:
+    async def get_function_valves_by_ids(self, ids: list[str], db: AsyncSession | None = None) -> dict[str, dict]:
         """
         Batch fetch valves for multiple functions in a single query.
         Returns a dict mapping function_id -> valves dict.
@@ -308,8 +309,8 @@ class FunctionsTable:
             return {}
 
     async def update_function_valves_by_id(
-        self, id: str, valves: dict, db: Optional[AsyncSession] = None
-    ) -> Optional[FunctionValves]:
+        self, id: str, valves: dict, db: AsyncSession | None = None
+    ) -> FunctionValves | None:
         async with get_async_db_context(db) as db:
             try:
                 function = await db.get(Function, id)
@@ -322,8 +323,8 @@ class FunctionsTable:
                 return None
 
     async def update_function_metadata_by_id(
-        self, id: str, metadata: dict, db: Optional[AsyncSession] = None
-    ) -> Optional[FunctionModel]:
+        self, id: str, metadata: dict, db: AsyncSession | None = None
+    ) -> FunctionModel | None:
         async with get_async_db_context(db) as db:
             try:
                 function = await db.get(Function, id)
@@ -345,8 +346,8 @@ class FunctionsTable:
                 return None
 
     async def get_user_valves_by_id_and_user_id(
-        self, id: str, user_id: str, db: Optional[AsyncSession] = None
-    ) -> Optional[dict]:
+        self, id: str, user_id: str, db: AsyncSession | None = None
+    ) -> dict | None:
         try:
             user = await Users.get_user_by_id(user_id, db=db)
             user_settings = user.settings.model_dump() if user.settings else {}
@@ -363,8 +364,8 @@ class FunctionsTable:
             return None
 
     async def update_user_valves_by_id_and_user_id(
-        self, id: str, user_id: str, valves: dict, db: Optional[AsyncSession] = None
-    ) -> Optional[dict]:
+        self, id: str, user_id: str, valves: dict, db: AsyncSession | None = None
+    ) -> dict | None:
         try:
             user = await Users.get_user_by_id(user_id, db=db)
             user_settings = user.settings.model_dump() if user.settings else {}
@@ -386,8 +387,8 @@ class FunctionsTable:
             return None
 
     async def update_function_by_id(
-        self, id: str, updated: dict, db: Optional[AsyncSession] = None
-    ) -> Optional[FunctionModel]:
+        self, id: str, updated: dict, db: AsyncSession | None = None
+    ) -> FunctionModel | None:
         async with get_async_db_context(db) as db:
             try:
                 await db.execute(
@@ -404,7 +405,7 @@ class FunctionsTable:
             except Exception:
                 return None
 
-    async def deactivate_all_functions(self, db: Optional[AsyncSession] = None) -> Optional[bool]:
+    async def deactivate_all_functions(self, db: AsyncSession | None = None) -> bool | None:
         async with get_async_db_context(db) as db:
             try:
                 await db.execute(
@@ -418,7 +419,7 @@ class FunctionsTable:
             except Exception:
                 return None
 
-    async def delete_function_by_id(self, id: str, db: Optional[AsyncSession] = None) -> bool:
+    async def delete_function_by_id(self, id: str, db: AsyncSession | None = None) -> bool:
         async with get_async_db_context(db) as db:
             try:
                 await db.execute(delete(Function).filter_by(id=id))