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

backend/open_webui/routers/functions.py

@@ -1,32 +1,33 @@
-import os
-import re
+from __future__ import annotations
 
 import logging
-import aiohttp
+import os
+import re
 from pathlib import Path
 from typing import Optional
 
+import aiohttp
+from fastapi import APIRouter, Depends, HTTPException, Request, status
+from open_webui.config import CACHE_DIR
+from open_webui.constants import ERROR_MESSAGES
 from open_webui.env import AIOHTTP_CLIENT_SESSION_SSL, AIOHTTP_CLIENT_TIMEOUT
+from open_webui.internal.db import get_async_session
 from open_webui.models.functions import (
     FunctionForm,
     FunctionModel,
     FunctionResponse,
+    Functions,
     FunctionUserResponse,
     FunctionWithValvesModel,
-    Functions,
 )
+from open_webui.utils.auth import get_admin_user, get_verified_user
 from open_webui.utils.plugin import (
+    get_function_module_from_cache,
     load_function_module_by_id,
     replace_imports,
-    get_function_module_from_cache,
     resolve_valves_schema_options,
 )
-from open_webui.config import CACHE_DIR
-from open_webui.constants import ERROR_MESSAGES
-from fastapi import APIRouter, Depends, HTTPException, Request, status
-from open_webui.utils.auth import get_admin_user, get_verified_user
 from pydantic import BaseModel, HttpUrl
-from open_webui.internal.db import get_async_session
 from sqlalchemy.ext.asyncio import AsyncSession
 
 log = logging.getLogger(__name__)
@@ -91,7 +92,7 @@ def github_url_to_raw_url(url: str) -> str:
     return url
 
 
-@router.post('/load/url', response_model=Optional[dict])
+@router.post('/load/url', response_model=dict | None)
 async def load_function_from_url(request: Request, form_data: LoadUrlForm, user=Depends(get_admin_user)):
     # NOTE: This is NOT a SSRF vulnerability:
     # This endpoint is admin-only (see get_admin_user), meant for *trusted* internal use,
@@ -179,7 +180,7 @@ async def sync_functions(
 ############################
 
 
-@router.post('/create', response_model=Optional[FunctionResponse])
+@router.post('/create', response_model=FunctionResponse | None)
 async def create_new_function(
     request: Request,
     form_data: FunctionForm,
@@ -240,7 +241,7 @@ async def create_new_function(
 ############################
 
 
-@router.get('/id/{id}', response_model=Optional[FunctionModel])
+@router.get('/id/{id}', response_model=FunctionModel | None)
 async def get_function_by_id(id: str, user=Depends(get_admin_user), db: AsyncSession = Depends(get_async_session)):
     function = await Functions.get_function_by_id(id, db=db)
 
@@ -258,7 +259,7 @@ async def get_function_by_id(id: str, user=Depends(get_admin_user), db: AsyncSes
 ############################
 
 
-@router.post('/id/{id}/toggle', response_model=Optional[FunctionModel])
+@router.post('/id/{id}/toggle', response_model=FunctionModel | None)
 async def toggle_function_by_id(id: str, user=Depends(get_admin_user), db: AsyncSession = Depends(get_async_session)):
     function = await Functions.get_function_by_id(id, db=db)
     if function:
@@ -283,7 +284,7 @@ async def toggle_function_by_id(id: str, user=Depends(get_admin_user), db: Async
 ############################
 
 
-@router.post('/id/{id}/toggle/global', response_model=Optional[FunctionModel])
+@router.post('/id/{id}/toggle/global', response_model=FunctionModel | None)
 async def toggle_global_by_id(id: str, user=Depends(get_admin_user), db: AsyncSession = Depends(get_async_session)):
     function = await Functions.get_function_by_id(id, db=db)
     if function:
@@ -308,7 +309,7 @@ async def toggle_global_by_id(id: str, user=Depends(get_admin_user), db: AsyncSe
 ############################
 
 
-@router.post('/id/{id}/update', response_model=Optional[FunctionModel])
+@router.post('/id/{id}/update', response_model=FunctionModel | None)
 async def update_function_by_id(
     request: Request,
     id: str,
@@ -374,7 +375,7 @@ async def delete_function_by_id(
 ############################
 
 
-@router.get('/id/{id}/valves', response_model=Optional[dict])
+@router.get('/id/{id}/valves', response_model=dict | None)
 async def get_function_valves_by_id(
     id: str, user=Depends(get_admin_user), db: AsyncSession = Depends(get_async_session)
 ):
@@ -400,7 +401,7 @@ async def get_function_valves_by_id(
 ############################
 
 
-@router.get('/id/{id}/valves/spec', response_model=Optional[dict])
+@router.get('/id/{id}/valves/spec', response_model=dict | None)
 async def get_function_valves_spec_by_id(
     request: Request,
     id: str,
@@ -430,7 +431,7 @@ async def get_function_valves_spec_by_id(
 ############################
 
 
-@router.post('/id/{id}/valves/update', response_model=Optional[dict])
+@router.post('/id/{id}/valves/update', response_model=dict | None)
 async def update_function_valves_by_id(
     request: Request,
     id: str,
@@ -476,7 +477,7 @@ async def update_function_valves_by_id(
 ############################
 
 
-@router.get('/id/{id}/valves/user', response_model=Optional[dict])
+@router.get('/id/{id}/valves/user', response_model=dict | None)
 async def get_function_user_valves_by_id(
     id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)
 ):
@@ -497,7 +498,7 @@ async def get_function_user_valves_by_id(
         )
 
 
-@router.get('/id/{id}/valves/user/spec', response_model=Optional[dict])
+@router.get('/id/{id}/valves/user/spec', response_model=dict | None)
 async def get_function_user_valves_spec_by_id(
     request: Request,
     id: str,
@@ -522,7 +523,7 @@ async def get_function_user_valves_spec_by_id(
         )
 
 
-@router.post('/id/{id}/valves/user/update', response_model=Optional[dict])
+@router.post('/id/{id}/valves/user/update', response_model=dict | None)
 async def update_function_user_valves_by_id(
     request: Request,
     id: str,