From 121bc0ec50f784eeaa8267be1c4c6364d8a06f41 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Sat, 14 Nov 2026 00:14:28 +0900 Subject: [PATCH] refac --- backend/open_webui/models/folders.py | 9 +++++- backend/open_webui/utils/agents/__init__.py | 7 ++++ backend/open_webui/utils/agents/acp.py | 30 +++++++++++++++-- .../open_webui/utils/agents/claude_code.py | 32 ++++++++++++------- backend/open_webui/utils/agents/pi.py | 5 +++ src/lib/utils/folders.ts | 17 +++++++++- 6 files changed, 84 insertions(+), 16 deletions(-) diff --git a/backend/open_webui/models/folders.py b/backend/open_webui/models/folders.py index aa2fef8ffd..cf89bd4734 100644 --- a/backend/open_webui/models/folders.py +++ b/backend/open_webui/models/folders.py @@ -79,10 +79,17 @@ class SharedFolderResponse(BaseModel): # Forms +# Folders that never set up statuses get this preset; an explicit empty list means none. +DEFAULT_FOLDER_STATUS_IDS = ('backlog', 'todo', 'in_progress', 'waiting', 'done') + + def folder_status_ids(meta: dict | None) -> tuple[str, ...]: """The statuses this folder defines in meta.statuses, in order. Chats may also have none (null).""" + statuses = (meta or {}).get('statuses') + if statuses is None: + return DEFAULT_FOLDER_STATUS_IDS ids: list[str] = [] - for item in (meta or {}).get('statuses') or []: + for item in statuses if isinstance(statuses, list) else []: if ( isinstance(item, dict) and isinstance(item.get('id'), str) diff --git a/backend/open_webui/utils/agents/__init__.py b/backend/open_webui/utils/agents/__init__.py index b40eed987d..e66b945231 100644 --- a/backend/open_webui/utils/agents/__init__.py +++ b/backend/open_webui/utils/agents/__init__.py @@ -1 +1,8 @@ """Native coding agent support for Open Terminal environments.""" + + +def reasoning_effort(options): + params = options.get('params') or {} + params = {**params, **(params.get('custom_params') or {})} + value = params.get('reasoningEffort') or params.get('reasoning_effort') + return value.strip() if isinstance(value, str) and value.strip() else None diff --git a/backend/open_webui/utils/agents/acp.py b/backend/open_webui/utils/agents/acp.py index 58fd1a9bc5..5ba418e3a2 100644 --- a/backend/open_webui/utils/agents/acp.py +++ b/backend/open_webui/utils/agents/acp.py @@ -4,6 +4,8 @@ import asyncio import contextlib import json +from . import reasoning_effort + class Client: def __init__(self, transport, handle): @@ -92,8 +94,10 @@ async def run(transport, output, prompt, images, options, *, auth_method=None): session_id = None streaming = False tools = {} + config_options = [] async def handle(message): + nonlocal config_options method, params = message.get('method'), message.get('params') or {} if params.get('sessionId') and session_id and params['sessionId'] != session_id: if 'id' in message: @@ -118,9 +122,13 @@ async def run(transport, output, prompt, images, options, *, auth_method=None): ) return await client.send({'id': message['id'], 'result': result}) - elif method == 'session/update' and streaming: + elif method == 'session/update': update = params.get('update') or {} kind = update.get('sessionUpdate') + if kind == 'config_option_update': + config_options = update.get('configOptions', []) + if not streaming: + return if kind in {'agent_message_chunk', 'agent_thought_chunk'}: content = update.get('content') or {} if content.get('type') == 'text': @@ -182,22 +190,38 @@ async def run(transport, output, prompt, images, options, *, auth_method=None): if capabilities.get('loadSession') or 'resume' in capabilities.get('sessionCapabilities', {}): output.state['session_id'] = session_id await output.flush(force=True) + config_options = session.get('configOptions', config_options) config = next( - (c for c in session.get('configOptions', []) if c.get('category') == 'model' or c.get('id') == 'model'), + (c for c in config_options if c.get('category') == 'model' or c.get('id') == 'model'), None, ) if not config and not session.get('models') and options.get('resume_state', {}).get('model_config'): config = {'id': options['resume_state']['model_config']} if config: output.state['model_config'] = config['id'] - await client.request( + configured = await client.request( 'session/set_config_option', {'sessionId': session_id, 'configId': config['id'], 'value': options['model']}, ) + config_options = configured.get('configOptions', config_options) elif session.get('models') or options.get('resume'): await client.request('session/set_model', {'sessionId': session_id, 'modelId': options['model']}) else: raise ValueError('Agent did not advertise model selection for this session') + effort = reasoning_effort(options) + if effort is not None: + config = next((c for c in config_options if c.get('category') == 'thought_level'), None) + values = [ + value['value'] + for group in (config or {}).get('options', []) + for value in (group['options'] if 'group' in group else [group]) + ] + if not config or effort not in values: + raise ValueError('Agent does not support the selected reasoning effort for this model') + await client.request( + 'session/set_config_option', + {'sessionId': session_id, 'configId': config['id'], 'value': effort}, + ) await output.flush(force=True, persist=True) if images and not capabilities.get('promptCapabilities', {}).get('image'): raise ValueError('This agent does not support image prompts') diff --git a/backend/open_webui/utils/agents/claude_code.py b/backend/open_webui/utils/agents/claude_code.py index dcc18317e6..71359046c6 100644 --- a/backend/open_webui/utils/agents/claude_code.py +++ b/backend/open_webui/utils/agents/claude_code.py @@ -5,23 +5,33 @@ import contextlib import json from uuid import uuid4 +from . import reasoning_effort + async def run(transport, output, prompt, images, options): async def send(message): await transport.write(json.dumps(message) + '\n') - initialize_id = uuid4().hex - await send({'type': 'control_request', 'request_id': initialize_id, 'request': {'subtype': 'initialize'}}) messages = transport.read_messages() - async with asyncio.timeout(60): - async for message in messages: - if ( - message.get('type') == 'control_response' - and message.get('response', {}).get('request_id') == initialize_id - ): - if message['response'].get('subtype') == 'error': - raise ValueError(message['response'].get('error', 'Claude initialization failed')) - break + + async def request(control): + request_id = uuid4().hex + await send({'type': 'control_request', 'request_id': request_id, 'request': control}) + async with asyncio.timeout(60): + async for message in messages: + if ( + message.get('type') == 'control_response' + and message.get('response', {}).get('request_id') == request_id + ): + if message['response'].get('subtype') == 'error': + raise ValueError(message['response'].get('error', 'Claude request failed')) + return + raise ValueError('Claude ended before replying') + + await request({'subtype': 'initialize'}) + effort = reasoning_effort(options) + if effort is not None: + await request({'subtype': 'apply_flag_settings', 'settings': {'effortLevel': effort}}) content = [{'type': 'text', 'text': prompt}] for image in images: prefix, data = image.split(',', 1) diff --git a/backend/open_webui/utils/agents/pi.py b/backend/open_webui/utils/agents/pi.py index 125a6a9b32..f30cbe0935 100644 --- a/backend/open_webui/utils/agents/pi.py +++ b/backend/open_webui/utils/agents/pi.py @@ -5,6 +5,8 @@ import contextlib import json from uuid import uuid4 +from . import reasoning_effort + async def run(transport, output, prompt, images, options): messages = transport.read_messages() @@ -118,6 +120,9 @@ async def run(transport, output, prompt, images, options): if not separator or not model: raise ValueError('Pi models must include their provider') await request('set_model', {'provider': provider, 'modelId': model}) + effort = reasoning_effort(options) + if effort is not None: + await request('set_thinking_level', {'level': effort}) state = await request('get_state') output.state['session_id'] = state['sessionId'] if options.get('resume') and state['sessionId'] != options['resume']: diff --git a/src/lib/utils/folders.ts b/src/lib/utils/folders.ts index 6816fb6a09..16771bf373 100644 --- a/src/lib/utils/folders.ts +++ b/src/lib/utils/folders.ts @@ -21,7 +21,18 @@ export type CustomStatus = { }; export type StatusDef = CustomStatus & { custom: boolean }; +// Ready-made statuses for folders that never set up their own; an empty list means none. +export const defaultStatuses: CustomStatus[] = [ + { id: 'backlog', name: 'Backlog', glyph: 'backlog', color: 'gray' }, + { id: 'todo', name: 'To do', glyph: 'todo', color: 'gray' }, + { id: 'in_progress', name: 'In progress', glyph: 'in_progress', color: 'amber' }, + { id: 'waiting', name: 'Waiting', glyph: 'waiting', color: 'blue' }, + { id: 'done', name: 'Done', glyph: 'done', color: 'violet' } +]; +const usesDefaultStatuses = (meta?: { statuses?: unknown } | null) => meta?.statuses == null; + export const customStatuses = (meta?: { statuses?: unknown } | null): CustomStatus[] => { + if (usesDefaultStatuses(meta)) return defaultStatuses; const seen = new Set([NO_STATUS]); return (Array.isArray(meta?.statuses) ? meta.statuses : []) .filter( @@ -47,7 +58,11 @@ export const statusDefs = ( t: (key: string) => string ): StatusDef[] => [ { id: NO_STATUS, name: t('No status'), custom: false }, - ...customStatuses(meta).map((item) => ({ ...item, custom: true })) + ...customStatuses(meta).map((item) => ({ + ...item, + name: usesDefaultStatuses(meta) ? t(item.name) : item.name, + custom: true + })) ]; export const newStatusId = () => `s_${Math.random().toString(36).slice(2, 10)}`;