scriptoriumadmin/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-10-05 02:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 42fd727a4c into b6dfa3799d

Browse source
This commit is contained in:
Classic298 2026-09-30 19:07:13 +04:00 • committed by GitHub
commit e7d7e040e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backend/open_webui/main.py
View file

@ -1888,6 +1888,9 @@ generate_chat_completions = chat_completion
generate_chat_completion = chat_completion
_tool_call_resolve_locks: dict[str, asyncio.Lock] = {}
@app.post('/api/v1/chats/{id}/messages/{message_id}/resolve')
async def resolve_chat_message_tool_call(
request: Request,
@ -1897,7 +1900,14 @@ async def resolve_chat_message_tool_call(
user=Depends(get_verified_user),
db: AsyncSession = Depends(get_async_session),
):
resolution = await resolve_tool_call_output(id, message_id, form_data, user, db=db)
redis = request.app.state.redis
if redis:
resolve_lock = redis.lock(f'{REDIS_KEY_PREFIX}:tool_call:resolve_lock:{message_id}', timeout=60)
else:
resolve_lock = _tool_call_resolve_locks.setdefault(message_id, asyncio.Lock())
async with resolve_lock:
resolution = await resolve_tool_call_output(id, message_id, form_data, user, db=db)
payload = await build_tool_approval_resume_payload(id, message_id, chat=resolution['chat'])
result = await chat_completion(request, payload, user)
return {

8
backend/open_webui/utils/tool_approval.py
View file

@ -55,9 +55,11 @@ async def resolve_tool_call_output(
function_call.setdefault('call_id', form_data.call_id)
tool_name = function_call.get('name')
if any(
item.get('type') == 'function_call_output' and item.get('call_id') == form_data.call_id for item in output
) or function_call.get('status') not in {'pending', 'queued', 'requires_approval'}:
if (
any(item.get('type') == 'function_call_output' and item.get('call_id') == form_data.call_id for item in output)
or function_call.get('status') not in {'pending', 'queued', 'requires_approval'}
or function_call.get('approved') is True
):
raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail='Tool call has already been resolved.')
if form_data.action == 'approve':