scriptoriumadmin/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-11-14 09:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2026-11-06 15:10:49 +09:00
parent 4955624d25
commit 7b5a7f4a98
2 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
backend/open_webui/utils/agents/output.py
View file

@ -9,13 +9,15 @@ from uuid import uuid4
from open_webui.models.chats import Chats
from open_webui.socket.main import get_event_emitter
from open_webui.utils.auth import create_token
from open_webui.utils.tool_permissions import requires_tool_approval
class Output:
"""Use WebUI's persisted output cards; provider runners retain native item data."""
def __init__(self, metadata, user, check_connection):
def __init__(self, metadata, user, check_connection, form_data):
self.metadata, self.user = metadata, user
self.form_data = form_data
self.check_connection = check_connection
self.items = []
self.state = {}
@ -136,19 +138,38 @@ class Output:
'status': 'pending',
'native': native,
}
resolution = None
# Questions need an answer even when tool execution has Full access.
if name != 'ask_user' and not await requires_tool_approval(
self.form_data,
self.metadata,
item,
{
'type': 'agent',
'tool_id': f'agent:{self.state["provider"]}:{name}',
'spec': {
'name': name,
'description': f'Native {self.state["provider"]} agent tool in {self.state["cwd"]}',
},
},
arguments,
):
resolution = {'action': 'approve'}
self.items.append(item)
await self.flush(force=True, persist=True)
if resolution is None:
await self.flush(force=True, persist=True)
deadline = time.monotonic() + timeout if timeout is not None else None
# Persisted resolutions work across workers and survive browser refreshes.
while True:
self.check_connection()
message = await Chats.get_message_by_id_and_message_id(
self.metadata['chat_id'], self.metadata['message_id']
)
if not message:
raise ValueError('Agent conversation was removed')
saved = next((i for i in message.get('output', []) if i.get('call_id') == call_id), {})
resolution = saved.get('agent_resolution')
if resolution is None:
message = await Chats.get_message_by_id_and_message_id(
self.metadata['chat_id'], self.metadata['message_id']
)
if not message:
raise ValueError('Agent conversation was removed')
saved = next((i for i in message.get('output', []) if i.get('call_id') == call_id), {})
resolution = saved.get('agent_resolution')
if not resolution and deadline is not None and time.monotonic() >= deadline:
resolution = {'action': 'reject', 'timed_out': True}
if resolution:

2
backend/open_webui/utils/agents/runner.py
View file

@ -33,7 +33,7 @@ async def run(request, form_data, user, metadata, model):
raise ValueError('Unsupported terminal agent')
metadata['terminal_id'] = agent['terminal_id']
transport = await TerminalTransport.resolve(request, user, metadata)
output = Output(metadata, user, transport.raise_if_failed)
output = Output(metadata, user, transport.raise_if_failed, form_data)
output.state = {**agent}
previous = None
parent = (metadata.get('user_message') or {}).get('parentId')