chore: format
This commit is contained in:
@@ -994,9 +994,7 @@ class ChannelTable:
|
|||||||
) -> Optional[ChannelWebhookModel]:
|
) -> Optional[ChannelWebhookModel]:
|
||||||
with get_db_context(db) as db:
|
with get_db_context(db) as db:
|
||||||
webhook = (
|
webhook = (
|
||||||
db.query(ChannelWebhook)
|
db.query(ChannelWebhook).filter(ChannelWebhook.id == webhook_id).first()
|
||||||
.filter(ChannelWebhook.id == webhook_id)
|
|
||||||
.first()
|
|
||||||
)
|
)
|
||||||
return ChannelWebhookModel.model_validate(webhook) if webhook else None
|
return ChannelWebhookModel.model_validate(webhook) if webhook else None
|
||||||
|
|
||||||
@@ -1022,9 +1020,7 @@ class ChannelTable:
|
|||||||
) -> Optional[ChannelWebhookModel]:
|
) -> Optional[ChannelWebhookModel]:
|
||||||
with get_db_context(db) as db:
|
with get_db_context(db) as db:
|
||||||
webhook = (
|
webhook = (
|
||||||
db.query(ChannelWebhook)
|
db.query(ChannelWebhook).filter(ChannelWebhook.id == webhook_id).first()
|
||||||
.filter(ChannelWebhook.id == webhook_id)
|
|
||||||
.first()
|
|
||||||
)
|
)
|
||||||
if not webhook:
|
if not webhook:
|
||||||
return None
|
return None
|
||||||
@@ -1039,9 +1035,7 @@ class ChannelTable:
|
|||||||
) -> bool:
|
) -> bool:
|
||||||
with get_db_context(db) as db:
|
with get_db_context(db) as db:
|
||||||
webhook = (
|
webhook = (
|
||||||
db.query(ChannelWebhook)
|
db.query(ChannelWebhook).filter(ChannelWebhook.id == webhook_id).first()
|
||||||
.filter(ChannelWebhook.id == webhook_id)
|
|
||||||
.first()
|
|
||||||
)
|
)
|
||||||
if not webhook:
|
if not webhook:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -1908,6 +1908,7 @@ async def get_webhook_profile_image(
|
|||||||
# Return default favicon if no profile image
|
# Return default favicon if no profile image
|
||||||
return FileResponse(f"{STATIC_DIR}/favicon.png")
|
return FileResponse(f"{STATIC_DIR}/favicon.png")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{id}/webhooks", response_model=list[ChannelWebhookModel])
|
@router.get("/{id}/webhooks", response_model=list[ChannelWebhookModel])
|
||||||
async def get_channel_webhooks(
|
async def get_channel_webhooks(
|
||||||
request: Request,
|
request: Request,
|
||||||
|
|||||||
@@ -377,7 +377,9 @@ async def search_files(
|
|||||||
),
|
),
|
||||||
content: bool = Query(True),
|
content: bool = Query(True),
|
||||||
skip: int = Query(0, ge=0, description="Number of files to skip"),
|
skip: int = Query(0, ge=0, description="Number of files to skip"),
|
||||||
limit: int = Query(100, ge=1, le=1000, description="Maximum number of files to return"),
|
limit: int = Query(
|
||||||
|
100, ge=1, le=1000, description="Maximum number of files to return"
|
||||||
|
),
|
||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
db: Session = Depends(get_session),
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
|
|||||||
@@ -334,7 +334,8 @@ async def update_user_settings_by_session_user(
|
|||||||
@router.get("/user/status")
|
@router.get("/user/status")
|
||||||
async def get_user_status_by_session_user(
|
async def get_user_status_by_session_user(
|
||||||
request: Request,
|
request: Request,
|
||||||
user=Depends(get_verified_user), db: Session = Depends(get_session)
|
user=Depends(get_verified_user),
|
||||||
|
db: Session = Depends(get_session),
|
||||||
):
|
):
|
||||||
if not request.app.state.config.ENABLE_USER_STATUS:
|
if not request.app.state.config.ENABLE_USER_STATUS:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
|
|||||||
@@ -238,8 +238,11 @@ async def generate_chat_completion(
|
|||||||
yield chunk
|
yield chunk
|
||||||
|
|
||||||
response = await generate_chat_completion(
|
response = await generate_chat_completion(
|
||||||
request, form_data, user, bypass_filter=True,
|
request,
|
||||||
bypass_system_prompt=bypass_system_prompt
|
form_data,
|
||||||
|
user,
|
||||||
|
bypass_filter=True,
|
||||||
|
bypass_system_prompt=bypass_system_prompt,
|
||||||
)
|
)
|
||||||
return StreamingResponse(
|
return StreamingResponse(
|
||||||
stream_wrapper(response.body_iterator),
|
stream_wrapper(response.body_iterator),
|
||||||
@@ -250,8 +253,11 @@ async def generate_chat_completion(
|
|||||||
return {
|
return {
|
||||||
**(
|
**(
|
||||||
await generate_chat_completion(
|
await generate_chat_completion(
|
||||||
request, form_data, user, bypass_filter=True,
|
request,
|
||||||
bypass_system_prompt=bypass_system_prompt
|
form_data,
|
||||||
|
user,
|
||||||
|
bypass_filter=True,
|
||||||
|
bypass_system_prompt=bypass_system_prompt,
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
"selected_model_id": selected_model_id,
|
"selected_model_id": selected_model_id,
|
||||||
|
|||||||
@@ -93,7 +93,11 @@ from open_webui.utils.misc import (
|
|||||||
convert_logit_bias_input_to_json,
|
convert_logit_bias_input_to_json,
|
||||||
get_content_from_message,
|
get_content_from_message,
|
||||||
)
|
)
|
||||||
from open_webui.utils.tools import get_tools, get_updated_tool_function, has_tool_server_access
|
from open_webui.utils.tools import (
|
||||||
|
get_tools,
|
||||||
|
get_updated_tool_function,
|
||||||
|
has_tool_server_access,
|
||||||
|
)
|
||||||
from open_webui.utils.plugin import load_function_module_by_id
|
from open_webui.utils.plugin import load_function_module_by_id
|
||||||
from open_webui.utils.filter import (
|
from open_webui.utils.filter import (
|
||||||
get_sorted_filter_ids,
|
get_sorted_filter_ids,
|
||||||
@@ -1665,7 +1669,9 @@ async def process_chat_payload(request, form_data, user, metadata, model):
|
|||||||
|
|
||||||
# Check access control for MCP server
|
# Check access control for MCP server
|
||||||
if not has_tool_server_access(user, mcp_server_connection):
|
if not has_tool_server_access(user, mcp_server_connection):
|
||||||
log.warning(f"Access denied to MCP server {server_id} for user {user.id}")
|
log.warning(
|
||||||
|
f"Access denied to MCP server {server_id} for user {user.id}"
|
||||||
|
)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
auth_type = mcp_server_connection.get("auth_type", "")
|
auth_type = mcp_server_connection.get("auth_type", "")
|
||||||
|
|||||||
Reference in New Issue
Block a user