refac: modernize type annotations (PEP 604 / PEP 585)
This commit is contained in:
1 parent
a59c967d7e
commit
6d0295588e
197 files changed
+3265
-3488
No files matched your search
@@ -1,43 +1,41 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
from typing import Optional
|
||||
from uuid import uuid4
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
import asyncio
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request, status
|
||||
from fastapi.responses import StreamingResponse
|
||||
|
||||
|
||||
from open_webui.utils.misc import get_message_list
|
||||
from open_webui.utils.middleware import serialize_output
|
||||
from open_webui.socket.main import get_event_emitter
|
||||
from open_webui.models.chats import (
|
||||
ChatForm,
|
||||
ChatImportForm,
|
||||
ChatUsageStatsListResponse,
|
||||
ChatsImportForm,
|
||||
ChatResponse,
|
||||
Chats,
|
||||
ChatTitleIdResponse,
|
||||
ChatStatsExport,
|
||||
AggregateChatStats,
|
||||
ChatBody,
|
||||
ChatHistoryStats,
|
||||
MessageStats,
|
||||
)
|
||||
from open_webui.models.shared_chats import SharedChats, SharedChatResponse
|
||||
from open_webui.models.access_grants import AccessGrants
|
||||
from open_webui.models.tags import TagModel, Tags
|
||||
from open_webui.models.folders import Folders
|
||||
from open_webui.internal.db import get_async_session
|
||||
|
||||
from open_webui.config import ENABLE_ADMIN_CHAT_ACCESS, ENABLE_ADMIN_EXPORT
|
||||
from open_webui.constants import ERROR_MESSAGES
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request, status
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
from open_webui.internal.db import get_async_session
|
||||
from open_webui.models.access_grants import AccessGrants
|
||||
from open_webui.models.chats import (
|
||||
AggregateChatStats,
|
||||
ChatBody,
|
||||
ChatForm,
|
||||
ChatHistoryStats,
|
||||
ChatImportForm,
|
||||
ChatResponse,
|
||||
Chats,
|
||||
ChatsImportForm,
|
||||
ChatStatsExport,
|
||||
ChatTitleIdResponse,
|
||||
ChatUsageStatsListResponse,
|
||||
MessageStats,
|
||||
)
|
||||
from open_webui.models.folders import Folders
|
||||
from open_webui.models.shared_chats import SharedChatResponse, SharedChats
|
||||
from open_webui.models.tags import TagModel, Tags
|
||||
from open_webui.socket.main import get_event_emitter
|
||||
from open_webui.utils.access_control import filter_allowed_access_grants, has_permission
|
||||
from open_webui.utils.auth import get_admin_user, get_verified_user
|
||||
from open_webui.utils.access_control import has_permission, filter_allowed_access_grants
|
||||
from open_webui.utils.middleware import serialize_output
|
||||
from open_webui.utils.misc import get_message_list
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@@ -54,9 +52,9 @@ router = APIRouter()
|
||||
@router.get('/list', response_model=list[ChatTitleIdResponse])
|
||||
async def get_session_user_chat_list(
|
||||
user=Depends(get_verified_user),
|
||||
page: Optional[int] = None,
|
||||
include_pinned: Optional[bool] = False,
|
||||
include_folders: Optional[bool] = False,
|
||||
page: int | None = None,
|
||||
include_pinned: bool | None = False,
|
||||
include_folders: bool | None = False,
|
||||
db: AsyncSession = Depends(get_async_session),
|
||||
):
|
||||
try:
|
||||
@@ -92,8 +90,8 @@ async def get_session_user_chat_list(
|
||||
|
||||
@router.get('/stats/usage', response_model=ChatUsageStatsListResponse)
|
||||
async def get_session_user_chat_usage_stats(
|
||||
items_per_page: Optional[int] = 50,
|
||||
page: Optional[int] = 1,
|
||||
items_per_page: int | None = 50,
|
||||
page: int | None = 1,
|
||||
user=Depends(get_verified_user),
|
||||
db: AsyncSession = Depends(get_async_session),
|
||||
):
|
||||
@@ -210,7 +208,7 @@ class ChatStatsExportList(BaseModel):
|
||||
page: int
|
||||
|
||||
|
||||
def _process_chat_for_export(chat) -> Optional[ChatStatsExport]:
|
||||
def _process_chat_for_export(chat) -> ChatStatsExport | None:
|
||||
try:
|
||||
|
||||
def get_message_content_length(message):
|
||||
@@ -395,8 +393,8 @@ async def generate_chat_stats_jsonl_generator(user_id, filter):
|
||||
@router.get('/stats/export', response_model=ChatStatsExportList)
|
||||
async def export_chat_stats(
|
||||
request: Request,
|
||||
updated_at: Optional[int] = None,
|
||||
page: Optional[int] = 1,
|
||||
updated_at: int | None = None,
|
||||
page: int | None = 1,
|
||||
stream: bool = False,
|
||||
user=Depends(get_verified_user),
|
||||
):
|
||||
@@ -438,7 +436,7 @@ async def export_chat_stats(
|
||||
############################
|
||||
|
||||
|
||||
@router.get('/stats/export/{chat_id}', response_model=Optional[ChatStatsExport])
|
||||
@router.get('/stats/export/{chat_id}', response_model=ChatStatsExport | None)
|
||||
async def export_single_chat_stats(
|
||||
request: Request,
|
||||
chat_id: str,
|
||||
@@ -516,10 +514,10 @@ async def delete_all_user_chats(
|
||||
@router.get('/list/user/{user_id}', response_model=list[ChatTitleIdResponse])
|
||||
async def get_user_chat_list_by_user_id(
|
||||
user_id: str,
|
||||
page: Optional[int] = None,
|
||||
query: Optional[str] = None,
|
||||
order_by: Optional[str] = None,
|
||||
direction: Optional[str] = None,
|
||||
page: int | None = None,
|
||||
query: str | None = None,
|
||||
order_by: str | None = None,
|
||||
direction: str | None = None,
|
||||
user=Depends(get_admin_user),
|
||||
db: AsyncSession = Depends(get_async_session),
|
||||
):
|
||||
@@ -553,7 +551,7 @@ async def get_user_chat_list_by_user_id(
|
||||
############################
|
||||
|
||||
|
||||
@router.post('/new', response_model=Optional[ChatResponse])
|
||||
@router.post('/new', response_model=ChatResponse | None)
|
||||
async def create_new_chat(
|
||||
form_data: ChatForm,
|
||||
user=Depends(get_verified_user),
|
||||
@@ -594,7 +592,7 @@ async def import_chats(
|
||||
@router.get('/search', response_model=list[ChatTitleIdResponse])
|
||||
async def search_user_chats(
|
||||
text: str,
|
||||
page: Optional[int] = None,
|
||||
page: int | None = None,
|
||||
user=Depends(get_verified_user),
|
||||
db: AsyncSession = Depends(get_async_session),
|
||||
):
|
||||
@@ -644,7 +642,7 @@ async def get_chats_by_folder_id(
|
||||
@router.get('/folder/{folder_id}/list')
|
||||
async def get_chat_list_by_folder_id(
|
||||
folder_id: str,
|
||||
page: Optional[int] = 1,
|
||||
page: int | None = 1,
|
||||
user=Depends(get_verified_user),
|
||||
db: AsyncSession = Depends(get_async_session),
|
||||
):
|
||||
@@ -766,10 +764,10 @@ async def get_all_user_chats_in_db(user=Depends(get_admin_user), db: AsyncSessio
|
||||
|
||||
@router.get('/archived', response_model=list[ChatTitleIdResponse])
|
||||
async def get_archived_session_user_chat_list(
|
||||
page: Optional[int] = None,
|
||||
query: Optional[str] = None,
|
||||
order_by: Optional[str] = None,
|
||||
direction: Optional[str] = None,
|
||||
page: int | None = None,
|
||||
query: str | None = None,
|
||||
order_by: str | None = None,
|
||||
direction: str | None = None,
|
||||
user=Depends(get_verified_user),
|
||||
db: AsyncSession = Depends(get_async_session),
|
||||
):
|
||||
@@ -823,10 +821,10 @@ async def unarchive_all_chats(user=Depends(get_verified_user), db: AsyncSession
|
||||
|
||||
@router.get('/shared', response_model=list[SharedChatResponse])
|
||||
async def get_shared_session_user_chat_list(
|
||||
page: Optional[int] = None,
|
||||
query: Optional[str] = None,
|
||||
order_by: Optional[str] = None,
|
||||
direction: Optional[str] = None,
|
||||
page: int | None = None,
|
||||
query: str | None = None,
|
||||
order_by: str | None = None,
|
||||
direction: str | None = None,
|
||||
user=Depends(get_verified_user),
|
||||
db: AsyncSession = Depends(get_async_session),
|
||||
):
|
||||
@@ -858,7 +856,7 @@ async def get_shared_session_user_chat_list(
|
||||
############################
|
||||
|
||||
|
||||
@router.get('/share/{share_id}', response_model=Optional[ChatResponse])
|
||||
@router.get('/share/{share_id}', response_model=ChatResponse | None)
|
||||
async def get_shared_chat_by_id(
|
||||
share_id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)
|
||||
):
|
||||
@@ -904,8 +902,8 @@ class TagForm(BaseModel):
|
||||
|
||||
|
||||
class TagFilterForm(TagForm):
|
||||
skip: Optional[int] = 0
|
||||
limit: Optional[int] = 50
|
||||
skip: int | None = 0
|
||||
limit: int | None = 50
|
||||
|
||||
|
||||
@router.post('/tags', response_model=list[ChatTitleIdResponse])
|
||||
@@ -928,7 +926,7 @@ async def get_user_chat_list_by_tag_name(
|
||||
############################
|
||||
|
||||
|
||||
@router.get('/{id}', response_model=Optional[ChatResponse])
|
||||
@router.get('/{id}', response_model=ChatResponse | None)
|
||||
async def get_chat_by_id(id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)):
|
||||
chat = await Chats.get_chat_by_id_and_user_id(id, user.id, db=db)
|
||||
|
||||
@@ -958,7 +956,7 @@ async def get_chat_by_id(id: str, user=Depends(get_verified_user), db: AsyncSess
|
||||
############################
|
||||
|
||||
|
||||
@router.post('/{id}', response_model=Optional[ChatResponse])
|
||||
@router.post('/{id}', response_model=ChatResponse | None)
|
||||
async def update_chat_by_id(
|
||||
id: str,
|
||||
form_data: ChatForm,
|
||||
@@ -992,7 +990,7 @@ class MessageForm(BaseModel):
|
||||
content: str
|
||||
|
||||
|
||||
@router.post('/{id}/messages/{message_id}', response_model=Optional[ChatResponse])
|
||||
@router.post('/{id}/messages/{message_id}', response_model=ChatResponse | None)
|
||||
async def update_chat_message_by_id(
|
||||
id: str,
|
||||
message_id: str,
|
||||
@@ -1054,7 +1052,7 @@ class EventForm(BaseModel):
|
||||
data: dict
|
||||
|
||||
|
||||
@router.post('/{id}/messages/{message_id}/event', response_model=Optional[bool])
|
||||
@router.post('/{id}/messages/{message_id}/event', response_model=bool | None)
|
||||
async def send_chat_message_event_by_id(
|
||||
id: str,
|
||||
message_id: str,
|
||||
@@ -1142,7 +1140,7 @@ async def delete_chat_by_id(
|
||||
############################
|
||||
|
||||
|
||||
@router.get('/{id}/pinned', response_model=Optional[bool])
|
||||
@router.get('/{id}/pinned', response_model=bool | None)
|
||||
async def get_pinned_status_by_id(
|
||||
id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)
|
||||
):
|
||||
@@ -1158,7 +1156,7 @@ async def get_pinned_status_by_id(
|
||||
############################
|
||||
|
||||
|
||||
@router.post('/{id}/pin', response_model=Optional[ChatResponse])
|
||||
@router.post('/{id}/pin', response_model=ChatResponse | None)
|
||||
async def pin_chat_by_id(id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)):
|
||||
chat = await Chats.get_chat_by_id_and_user_id(id, user.id, db=db)
|
||||
if chat:
|
||||
@@ -1174,10 +1172,10 @@ async def pin_chat_by_id(id: str, user=Depends(get_verified_user), db: AsyncSess
|
||||
|
||||
|
||||
class CloneForm(BaseModel):
|
||||
title: Optional[str] = None
|
||||
title: str | None = None
|
||||
|
||||
|
||||
@router.post('/{id}/clone', response_model=Optional[ChatResponse])
|
||||
@router.post('/{id}/clone', response_model=ChatResponse | None)
|
||||
async def clone_chat_by_id(
|
||||
form_data: CloneForm,
|
||||
id: str,
|
||||
@@ -1225,7 +1223,7 @@ async def clone_chat_by_id(
|
||||
############################
|
||||
|
||||
|
||||
@router.post('/{id}/clone/shared', response_model=Optional[ChatResponse])
|
||||
@router.post('/{id}/clone/shared', response_model=ChatResponse | None)
|
||||
async def clone_shared_chat_by_id(
|
||||
id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)
|
||||
):
|
||||
@@ -1294,7 +1292,7 @@ async def clone_shared_chat_by_id(
|
||||
############################
|
||||
|
||||
|
||||
@router.post('/{id}/archive', response_model=Optional[ChatResponse])
|
||||
@router.post('/{id}/archive', response_model=ChatResponse | None)
|
||||
async def archive_chat_by_id(id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)):
|
||||
chat = await Chats.get_chat_by_id_and_user_id(id, user.id, db=db)
|
||||
if chat:
|
||||
@@ -1318,7 +1316,7 @@ async def archive_chat_by_id(id: str, user=Depends(get_verified_user), db: Async
|
||||
############################
|
||||
|
||||
|
||||
@router.post('/{id}/share', response_model=Optional[ChatResponse])
|
||||
@router.post('/{id}/share', response_model=ChatResponse | None)
|
||||
async def share_chat_by_id(
|
||||
request: Request,
|
||||
id: str,
|
||||
@@ -1372,7 +1370,7 @@ async def share_chat_by_id(
|
||||
############################
|
||||
|
||||
|
||||
@router.delete('/{id}/share', response_model=Optional[bool])
|
||||
@router.delete('/{id}/share', response_model=bool | None)
|
||||
async def delete_shared_chat_by_id(
|
||||
id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)
|
||||
):
|
||||
@@ -1404,7 +1402,7 @@ class ChatAccessGrantsForm(BaseModel):
|
||||
access_grants: list[dict]
|
||||
|
||||
|
||||
@router.post('/shared/{id}/access/update', response_model=Optional[ChatResponse])
|
||||
@router.post('/shared/{id}/access/update', response_model=ChatResponse | None)
|
||||
async def update_shared_chat_access_by_id(
|
||||
request: Request,
|
||||
id: str,
|
||||
@@ -1474,10 +1472,10 @@ async def get_shared_chat_access_by_id(
|
||||
|
||||
|
||||
class ChatFolderIdForm(BaseModel):
|
||||
folder_id: Optional[str] = None
|
||||
folder_id: str | None = None
|
||||
|
||||
|
||||
@router.post('/{id}/folder', response_model=Optional[ChatResponse])
|
||||
@router.post('/{id}/folder', response_model=ChatResponse | None)
|
||||
async def update_chat_folder_id_by_id(
|
||||
id: str,
|
||||
form_data: ChatFolderIdForm,
|
||||
@@ -1571,7 +1569,7 @@ async def delete_tag_by_id_and_tag_name(
|
||||
############################
|
||||
|
||||
|
||||
@router.delete('/{id}/tags/all', response_model=Optional[bool])
|
||||
@router.delete('/{id}/tags/all', response_model=bool | None)
|
||||
async def delete_all_tags_by_id(
|
||||
id: str, user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)
|
||||
):
|
||||
|
||||
Reference in new issue
Block a user