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,37 +1,34 @@
|
||||
import logging
|
||||
import copy
|
||||
from fastapi import APIRouter, Depends, Request, HTTPException
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
import aiohttp
|
||||
from __future__ import annotations
|
||||
|
||||
import copy
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
import aiohttp
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
||||
from mcp.shared.auth import OAuthMetadata
|
||||
from open_webui.config import BannerModel, async_save_config, get_config, save_config
|
||||
from open_webui.env import AIOHTTP_CLIENT_SESSION_SSL, AIOHTTP_CLIENT_TIMEOUT
|
||||
from open_webui.models.oauth_sessions import OAuthSessions
|
||||
from open_webui.utils.auth import get_admin_user, get_verified_user
|
||||
from open_webui.utils.headers import get_custom_headers
|
||||
from open_webui.config import get_config, save_config, async_save_config
|
||||
from open_webui.config import BannerModel
|
||||
|
||||
from open_webui.utils.tools import (
|
||||
get_tool_server_data,
|
||||
get_tool_server_url,
|
||||
set_tool_servers,
|
||||
set_terminal_servers,
|
||||
)
|
||||
from open_webui.utils.mcp.client import MCPClient
|
||||
from open_webui.models.oauth_sessions import OAuthSessions
|
||||
|
||||
|
||||
from open_webui.utils.oauth import (
|
||||
OAuthClientInformationFull,
|
||||
decrypt_data,
|
||||
encrypt_data,
|
||||
get_discovery_urls,
|
||||
get_oauth_client_info_with_dynamic_client_registration,
|
||||
get_oauth_client_info_with_static_credentials,
|
||||
encrypt_data,
|
||||
decrypt_data,
|
||||
resolve_oauth_client_info,
|
||||
OAuthClientInformationFull,
|
||||
)
|
||||
from mcp.shared.auth import OAuthMetadata
|
||||
from open_webui.utils.tools import (
|
||||
get_tool_server_data,
|
||||
get_tool_server_url,
|
||||
set_terminal_servers,
|
||||
set_tool_servers,
|
||||
)
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@@ -102,16 +99,16 @@ async def set_connections_config(
|
||||
class OAuthClientRegistrationForm(BaseModel):
|
||||
url: str
|
||||
client_id: str
|
||||
client_name: Optional[str] = None
|
||||
client_secret: Optional[str] = None
|
||||
oauth_server_url: Optional[str] = None
|
||||
client_name: str | None = None
|
||||
client_secret: str | None = None
|
||||
oauth_server_url: str | None = None
|
||||
|
||||
|
||||
@router.post('/oauth/clients/register')
|
||||
async def register_oauth_client(
|
||||
request: Request,
|
||||
form_data: OAuthClientRegistrationForm,
|
||||
type: Optional[str] = None,
|
||||
type: str | None = None,
|
||||
user=Depends(get_admin_user),
|
||||
):
|
||||
try:
|
||||
@@ -154,12 +151,12 @@ async def register_oauth_client(
|
||||
class ToolServerConnection(BaseModel):
|
||||
url: str
|
||||
path: str
|
||||
type: Optional[str] = 'openapi' # openapi, mcp
|
||||
auth_type: Optional[str]
|
||||
headers: Optional[dict | str] = None
|
||||
key: Optional[str]
|
||||
config: Optional[dict]
|
||||
info: Optional[dict] = None
|
||||
type: str | None = 'openapi' # openapi, mcp
|
||||
auth_type: str | None
|
||||
headers: dict | str | None = None
|
||||
key: str | None
|
||||
config: dict | None
|
||||
info: dict | None = None
|
||||
|
||||
model_config = ConfigDict(extra='allow')
|
||||
|
||||
@@ -225,23 +222,23 @@ async def set_tool_servers_config(
|
||||
|
||||
|
||||
class TerminalServerConnection(BaseModel):
|
||||
id: Optional[str] = ''
|
||||
name: Optional[str] = ''
|
||||
id: str | None = ''
|
||||
name: str | None = ''
|
||||
|
||||
enabled: Optional[bool] = True
|
||||
enabled: bool | None = True
|
||||
|
||||
url: str
|
||||
path: Optional[str] = '/openapi.json'
|
||||
path: str | None = '/openapi.json'
|
||||
|
||||
key: Optional[str] = ''
|
||||
auth_type: Optional[str] = 'bearer'
|
||||
key: str | None = ''
|
||||
auth_type: str | None = 'bearer'
|
||||
|
||||
config: Optional[dict] = None
|
||||
config: dict | None = None
|
||||
|
||||
# Orchestrator policy fields
|
||||
server_type: Optional[str] = None # "orchestrator", "terminal"
|
||||
policy_id: Optional[str] = None
|
||||
policy: Optional[dict] = None # cached policy data
|
||||
server_type: str | None = None # "orchestrator", "terminal"
|
||||
policy_id: str | None = None
|
||||
policy: dict | None = None # cached policy data
|
||||
|
||||
model_config = ConfigDict(extra='allow')
|
||||
|
||||
@@ -325,8 +322,8 @@ async def verify_terminal_server_connection(
|
||||
|
||||
class TerminalServerPolicyForm(BaseModel):
|
||||
url: str
|
||||
key: Optional[str] = ''
|
||||
auth_type: Optional[str] = 'bearer'
|
||||
key: str | None = ''
|
||||
auth_type: str | None = 'bearer'
|
||||
policy_id: str
|
||||
policy_data: dict
|
||||
|
||||
@@ -504,19 +501,19 @@ async def verify_tool_servers_config(request: Request, form_data: ToolServerConn
|
||||
class CodeInterpreterConfigForm(BaseModel):
|
||||
ENABLE_CODE_EXECUTION: bool
|
||||
CODE_EXECUTION_ENGINE: str
|
||||
CODE_EXECUTION_JUPYTER_URL: Optional[str]
|
||||
CODE_EXECUTION_JUPYTER_AUTH: Optional[str]
|
||||
CODE_EXECUTION_JUPYTER_AUTH_TOKEN: Optional[str]
|
||||
CODE_EXECUTION_JUPYTER_AUTH_PASSWORD: Optional[str]
|
||||
CODE_EXECUTION_JUPYTER_TIMEOUT: Optional[int]
|
||||
CODE_EXECUTION_JUPYTER_URL: str | None
|
||||
CODE_EXECUTION_JUPYTER_AUTH: str | None
|
||||
CODE_EXECUTION_JUPYTER_AUTH_TOKEN: str | None
|
||||
CODE_EXECUTION_JUPYTER_AUTH_PASSWORD: str | None
|
||||
CODE_EXECUTION_JUPYTER_TIMEOUT: int | None
|
||||
ENABLE_CODE_INTERPRETER: bool
|
||||
CODE_INTERPRETER_ENGINE: str
|
||||
CODE_INTERPRETER_PROMPT_TEMPLATE: Optional[str]
|
||||
CODE_INTERPRETER_JUPYTER_URL: Optional[str]
|
||||
CODE_INTERPRETER_JUPYTER_AUTH: Optional[str]
|
||||
CODE_INTERPRETER_JUPYTER_AUTH_TOKEN: Optional[str]
|
||||
CODE_INTERPRETER_JUPYTER_AUTH_PASSWORD: Optional[str]
|
||||
CODE_INTERPRETER_JUPYTER_TIMEOUT: Optional[int]
|
||||
CODE_INTERPRETER_PROMPT_TEMPLATE: str | None
|
||||
CODE_INTERPRETER_JUPYTER_URL: str | None
|
||||
CODE_INTERPRETER_JUPYTER_AUTH: str | None
|
||||
CODE_INTERPRETER_JUPYTER_AUTH_TOKEN: str | None
|
||||
CODE_INTERPRETER_JUPYTER_AUTH_PASSWORD: str | None
|
||||
CODE_INTERPRETER_JUPYTER_TIMEOUT: int | None
|
||||
|
||||
|
||||
@router.get('/code_execution', response_model=CodeInterpreterConfigForm)
|
||||
@@ -588,11 +585,11 @@ async def set_code_execution_config(
|
||||
# SetDefaultModels
|
||||
############################
|
||||
class ModelsConfigForm(BaseModel):
|
||||
DEFAULT_MODELS: Optional[str]
|
||||
DEFAULT_PINNED_MODELS: Optional[str]
|
||||
MODEL_ORDER_LIST: Optional[list[str]]
|
||||
DEFAULT_MODEL_METADATA: Optional[dict] = None
|
||||
DEFAULT_MODEL_PARAMS: Optional[dict] = None
|
||||
DEFAULT_MODELS: str | None
|
||||
DEFAULT_PINNED_MODELS: str | None
|
||||
MODEL_ORDER_LIST: list[str | None]
|
||||
DEFAULT_MODEL_METADATA: dict | None = None
|
||||
DEFAULT_MODEL_PARAMS: dict | None = None
|
||||
|
||||
|
||||
@router.get('/models/defaults')
|
||||
|
||||
Reference in new issue
Block a user