mirror of
https://github.com/open-webui/open-webui.git
synced 2026-11-16 09:41:23 +00:00
refac
This commit is contained in:
parent
6da3e7a5d6
commit
70e4b9a52f
9 changed files with 376 additions and 103 deletions
|
|
@ -879,6 +879,7 @@ async def get_models(
|
|||
refresh: bool = False,
|
||||
terminal_id: str | None = None,
|
||||
chat_id: str | None = None,
|
||||
cwd: str | None = None,
|
||||
user=Depends(get_verified_user),
|
||||
):
|
||||
all_models = await get_all_models(request, refresh=refresh, user=user)
|
||||
|
|
@ -928,7 +929,7 @@ async def get_models(
|
|||
from open_webui.utils.agents.discovery import get_models as get_agent_models
|
||||
|
||||
try:
|
||||
models.extend(await get_agent_models(request, user, terminal_id, chat_id))
|
||||
models.extend(await get_agent_models(request, user, terminal_id, chat_id, cwd=cwd))
|
||||
except Exception as exc:
|
||||
log.debug('Agent discovery unavailable: %s', type(exc).__name__)
|
||||
return {'data': models}
|
||||
|
|
@ -1111,6 +1112,15 @@ async def chat_completion(
|
|||
model_item = form_data.pop('model_item', {})
|
||||
tasks = form_data.pop('background_tasks', None)
|
||||
|
||||
from open_webui.utils.terminals import get_folder_terminal_defaults, initialize_folder_terminal
|
||||
|
||||
folder_defaults = {}
|
||||
requested_directory = form_data.pop('terminal_cwd', None)
|
||||
if 'parent_id' in form_data and form_data['parent_id'] is None and not form_data.get('chat_id'):
|
||||
folder_defaults = await get_folder_terminal_defaults(user, form_data.get('folder_id'))
|
||||
if 'terminal_id' not in form_data and folder_defaults.get('terminal_id'):
|
||||
form_data['terminal_id'] = folder_defaults['terminal_id']
|
||||
|
||||
agent_model = None
|
||||
if isinstance(model_id, str) and model_id.startswith('agent:'):
|
||||
from open_webui.utils.agents.discovery import get_models as get_agent_models
|
||||
|
|
@ -1119,7 +1129,9 @@ async def chat_completion(
|
|||
if len(parts) != 4:
|
||||
raise HTTPException(400, 'Invalid agent model')
|
||||
candidates = await get_agent_models(
|
||||
request, user, form_data.get('terminal_id'), form_data.get('chat_id'), provider=parts[2]
|
||||
request, user, form_data.get('terminal_id'), form_data.get('chat_id'), provider=parts[2],
|
||||
cwd=(requested_directory or folder_defaults.get('working_directory'))
|
||||
if form_data.get('terminal_id') == folder_defaults.get('terminal_id') else None,
|
||||
)
|
||||
agent_model = next((item for item in candidates if item['id'] == model_id), None)
|
||||
if agent_model is None:
|
||||
|
|
@ -1658,6 +1670,10 @@ async def chat_completion(
|
|||
model_controls.get(form_data['model'], {}),
|
||||
)
|
||||
ctx = None
|
||||
if is_new_chat:
|
||||
await initialize_folder_terminal(
|
||||
request, user, metadata, folder_defaults, form_data.get('terminal_id'), requested_directory
|
||||
)
|
||||
if model.get('agent'):
|
||||
from open_webui.utils.agents.runner import run as run_agent
|
||||
|
||||
|
|
|
|||
|
|
@ -32,14 +32,16 @@ def model_controls(model):
|
|||
return controls
|
||||
|
||||
|
||||
async def get_models(request, user, terminal_id, chat_id=None, *, provider=None):
|
||||
async def get_models(request, user, terminal_id, chat_id=None, *, provider=None, cwd=None):
|
||||
if not terminal_id:
|
||||
return []
|
||||
metadata = {'terminal_id': terminal_id, 'chat_id': chat_id}
|
||||
cwd = await get_terminal_json(request, user, metadata, '/files/cwd')
|
||||
if not cwd:
|
||||
directory = await get_terminal_json(request, user, metadata, '/files/cwd')
|
||||
cwd = (directory or {}).get('cwd')
|
||||
params = {'provider': provider} if provider else {}
|
||||
if cwd and cwd.get('cwd'):
|
||||
params['cwd'] = cwd['cwd']
|
||||
if cwd:
|
||||
params['cwd'] = cwd
|
||||
path = '/agents' + ('?' + urlencode(params) if params else '')
|
||||
catalog = await get_terminal_json(request, user, metadata, path)
|
||||
if not catalog or catalog.get('protocol_version') != 1:
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ async def run(request, form_data, user, metadata, model):
|
|||
):
|
||||
raise ValueError('Agent history cannot be branched in place. Start a new chat instead.')
|
||||
# Browsing files must not move an existing agent conversation's workspace.
|
||||
cwd = (previous or {}).get('cwd')
|
||||
cwd = (previous or {}).get('cwd') or metadata.get('initial_terminal_cwd')
|
||||
if not cwd:
|
||||
directory = await get_terminal_json(request, user, metadata, '/files/cwd')
|
||||
cwd = (directory or {}).get('cwd')
|
||||
|
|
|
|||
|
|
@ -178,7 +178,15 @@ async def resolve_terminal_connection(request, user, metadata):
|
|||
|
||||
|
||||
async def get_terminal_json(
|
||||
request, user, metadata: dict, path: str, extra_params: dict | None = None, *, file: dict | None = None
|
||||
request,
|
||||
user,
|
||||
metadata: dict,
|
||||
path: str,
|
||||
extra_params: dict | None = None,
|
||||
*,
|
||||
file: dict | None = None,
|
||||
method: str = 'GET',
|
||||
body: dict | None = None,
|
||||
):
|
||||
"""Read JSON or upload a file through an admin terminal or a personal terminal's browser."""
|
||||
metadata = metadata or {}
|
||||
|
|
@ -193,6 +201,7 @@ async def get_terminal_json(
|
|||
resolved = await resolve_terminal_connection(request, user, metadata)
|
||||
if resolved:
|
||||
connection, headers, cookies = resolved
|
||||
json_body = body
|
||||
body = None
|
||||
if file:
|
||||
from open_webui.models.files import Files
|
||||
|
|
@ -219,11 +228,12 @@ async def get_terminal_json(
|
|||
trust_env=True,
|
||||
) as session:
|
||||
async with session.request(
|
||||
'POST' if file else 'GET',
|
||||
'POST' if file else method,
|
||||
f'{get_terminal_server_url(connection)}{path}',
|
||||
headers=headers,
|
||||
cookies=cookies,
|
||||
data=body,
|
||||
json=None if file else json_body,
|
||||
ssl=AIOHTTP_CLIENT_SESSION_TOOL_SERVER_SSL,
|
||||
allow_redirects=False,
|
||||
) as response:
|
||||
|
|
@ -251,6 +261,46 @@ async def get_terminal_json(
|
|||
return None
|
||||
|
||||
|
||||
async def get_folder_terminal_defaults(user, folder_id):
|
||||
if not folder_id:
|
||||
return {}
|
||||
from fastapi import HTTPException
|
||||
from open_webui.models.folders import Folders
|
||||
from open_webui.utils.access_control.folders import has_folder_access
|
||||
|
||||
folder = await Folders.get_folder_by_id(folder_id)
|
||||
if not folder or not await has_folder_access(user.id, folder, 'write', None):
|
||||
raise HTTPException(403, 'Folder is unavailable')
|
||||
data = folder.data or {}
|
||||
return {
|
||||
'terminal_id': data.get('terminal_id'),
|
||||
'working_directory': data.get('working_directory'),
|
||||
}
|
||||
|
||||
|
||||
async def initialize_folder_terminal(request, user, metadata, defaults, terminal_id, directory=None):
|
||||
if not terminal_id or terminal_id != defaults.get('terminal_id'):
|
||||
return
|
||||
path = directory or defaults.get('working_directory')
|
||||
if not path:
|
||||
return
|
||||
from fastapi import HTTPException
|
||||
|
||||
if not isinstance(path, str):
|
||||
raise HTTPException(400, 'Invalid folder working directory')
|
||||
result = await get_terminal_json(
|
||||
request,
|
||||
user,
|
||||
{**metadata, 'terminal_id': terminal_id},
|
||||
'/files/cwd',
|
||||
method='POST',
|
||||
body={'path': path},
|
||||
)
|
||||
if not result or not result.get('cwd'):
|
||||
raise HTTPException(400, 'Folder working directory is unavailable. Check the terminal connection and path.')
|
||||
metadata['initial_terminal_cwd'] = result['cwd']
|
||||
|
||||
|
||||
async def filter_user_terminal_tools(request, user, tools: dict, metadata: dict, extra_params: dict):
|
||||
"""Let Open Terminal, which owns the shells, confirm availability for this user and chat."""
|
||||
terminal_id = metadata.get('terminal_id')
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { get } from 'svelte/store';
|
||||
import { config, selectedTerminalId, chatId } from '$lib/stores';
|
||||
import { config, selectedTerminalId, selectedFolder, chatId } from '$lib/stores';
|
||||
import { WEBUI_BASE_URL } from '$lib/constants';
|
||||
import { convertOpenApiToToolPayload, resolveSchema } from '$lib/utils';
|
||||
import { normalizeTags } from '$lib/utils/tags';
|
||||
|
|
@ -32,6 +32,14 @@ export const getModels = async (
|
|||
if (!base && get(selectedTerminalId)) {
|
||||
searchParams.set('terminal_id', get(selectedTerminalId)!);
|
||||
if (get(chatId)) searchParams.set('chat_id', get(chatId));
|
||||
const folder = get(selectedFolder);
|
||||
if (
|
||||
!get(chatId) &&
|
||||
folder?.data?.terminal_id === get(selectedTerminalId) &&
|
||||
folder?.data?.working_directory
|
||||
) {
|
||||
searchParams.set('cwd', folder.data.working_directory);
|
||||
}
|
||||
}
|
||||
if (refresh) {
|
||||
searchParams.append('refresh', 'true');
|
||||
|
|
|
|||
|
|
@ -1143,7 +1143,8 @@
|
|||
const defaultFeature = (feature: 'web_search' | 'image_generation' | 'code_interpreter') =>
|
||||
featureAvailable(feature) &&
|
||||
currentModels.every((model) => model.info?.meta?.defaultFeatureIds?.includes(feature));
|
||||
const terminalId = currentModels[0]?.info?.meta?.terminalId;
|
||||
const folderTerminalId = !history.currentId ? $selectedFolder?.data?.terminal_id : null;
|
||||
const terminalId = folderTerminalId || currentModels[0]?.info?.meta?.terminalId;
|
||||
const defaults: Record<string, any> = {
|
||||
selectedToolIds: [
|
||||
...new Set(
|
||||
|
|
@ -1174,7 +1175,8 @@
|
|||
terminalId:
|
||||
terminalId &&
|
||||
isTerminalAvailable(terminalId) &&
|
||||
currentModels.every((model) => model.info?.meta?.terminalId === terminalId)
|
||||
(folderTerminalId ||
|
||||
currentModels.every((model) => model.info?.meta?.terminalId === terminalId))
|
||||
? terminalId
|
||||
: $selectedTerminalId
|
||||
};
|
||||
|
|
@ -2000,8 +2002,13 @@
|
|||
|
||||
const selectedFolderSubscribe = selectedFolder.subscribe(async (folder) => {
|
||||
await tick();
|
||||
// Folder default models apply to new chats only.
|
||||
// Folder defaults apply to new chats only.
|
||||
if (!history.currentId && folder) {
|
||||
if (folder.data?.terminal_id) {
|
||||
selectedTerminalId.set(folder.data.terminal_id);
|
||||
await refreshAgentModels();
|
||||
if (history.currentId || $selectedFolder?.id !== folder.id) return;
|
||||
}
|
||||
const folderModels = normalizeSelectedModels(folder.data?.model_ids ?? []);
|
||||
if (!equal(selectedModels, folderModels)) {
|
||||
selectedModels = folderModels;
|
||||
|
|
@ -2770,6 +2777,10 @@
|
|||
} else {
|
||||
if ($selectedFolder) {
|
||||
// Folder defaults are explicit; never inherit a previous chat's selection.
|
||||
if ($selectedFolder.data?.terminal_id) {
|
||||
selectedTerminalId.set($selectedFolder.data.terminal_id);
|
||||
await refreshAgentModels();
|
||||
}
|
||||
selectedModels = normalizeSelectedModels($selectedFolder.data?.model_ids ?? []);
|
||||
} else {
|
||||
if (sessionStorage.selectedModels) {
|
||||
|
|
@ -4554,7 +4565,11 @@
|
|||
: $config?.features?.enable_tools
|
||||
),
|
||||
skill_ids: skillIds.length > 0 ? skillIds : undefined,
|
||||
terminal_id: terminalEnabled && requestTerminalId ? requestTerminalId : undefined,
|
||||
terminal_id: terminalEnabled && requestTerminalId ? requestTerminalId : null,
|
||||
terminal_cwd:
|
||||
!_chatId && terminalContext?.terminalId === requestTerminalId
|
||||
? terminalContext.currentDirectory
|
||||
: undefined,
|
||||
tool_servers: $config?.features?.enable_tool_servers
|
||||
? [
|
||||
...($toolServers ?? []).filter(
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
settings,
|
||||
showFileNavPath,
|
||||
showFileNavDir,
|
||||
selectedFolder,
|
||||
selectedTerminalId
|
||||
} from '$lib/stores';
|
||||
import {
|
||||
|
|
@ -61,6 +62,10 @@
|
|||
let savedPath = '/';
|
||||
// savedPath is only a placeholder until a directory has loaded.
|
||||
let savedPathLoaded = false;
|
||||
$: folderDirectory =
|
||||
!onSelectDirectory && !chatId && $selectedFolder?.data?.terminal_id === effectiveTerminalId
|
||||
? $selectedFolder.data.working_directory
|
||||
: null;
|
||||
let savedFileRoot: TerminalFileRoot | null = null;
|
||||
const treeExpandedCache = new Map<string, string[]>();
|
||||
const treeContentsCache = new Map<string, [string, FileEntry[]][]>();
|
||||
|
|
@ -78,6 +83,7 @@
|
|||
export let terminalId: string | null = null;
|
||||
export let initialFile: { path: string; page?: number | null } | null = null;
|
||||
export let initialDirectory: string | null = null;
|
||||
export let onSelectDirectory: ((path: string) => void) | null = null;
|
||||
export let manageFileRequests = true;
|
||||
export let showTerminalDock = true;
|
||||
export let onOpenFile: ((path: string, page?: number | null) => void) | null = null;
|
||||
|
|
@ -368,6 +374,7 @@
|
|||
let showSearch = false;
|
||||
let searchInput: HTMLInputElement;
|
||||
const toggleSearch = async () => {
|
||||
if (onSelectDirectory) return;
|
||||
showSearch = !showSearch;
|
||||
if (!showSearch) searchQuery = '';
|
||||
await tick();
|
||||
|
|
@ -397,7 +404,9 @@
|
|||
normalizePath(name).split('/').filter(Boolean).at(-1) ?? name.replace(/\/+$/, '');
|
||||
|
||||
const normalizeEntries = (items: FileEntry[]) =>
|
||||
items.map((entry) => ({ ...entry, name: cleanEntryName(entry.name) }));
|
||||
items
|
||||
.filter((entry) => !onSelectDirectory || entry.type === 'directory')
|
||||
.map((entry) => ({ ...entry, name: cleanEntryName(entry.name) }));
|
||||
|
||||
const asDirectoryPath = (path: string) => {
|
||||
const normalized = normalizePath(path || '/');
|
||||
|
|
@ -677,6 +686,7 @@
|
|||
let prevTerminalUrl = '';
|
||||
let prevTerminalId = effectiveTerminalId;
|
||||
let prevChatId = chatId;
|
||||
let prevFolderDirectory: string | null = null;
|
||||
let mounted = false;
|
||||
let disposed = false;
|
||||
$: {
|
||||
|
|
@ -687,6 +697,8 @@
|
|||
const chatChanged = chatId !== prevChatId;
|
||||
const oldChatId = prevChatId;
|
||||
if (chatChanged) prevChatId = chatId;
|
||||
const folderChanged = folderDirectory !== prevFolderDirectory;
|
||||
prevFolderDirectory = folderDirectory;
|
||||
|
||||
const terminalChanged =
|
||||
terminal && (terminal.url !== prevTerminalUrl || effectiveTerminalId !== prevTerminalId);
|
||||
|
|
@ -708,9 +720,11 @@
|
|||
}
|
||||
// Chat just got created (null → real ID): persist the current
|
||||
// browsed path as the new session's cwd — don't re-fetch.
|
||||
if (savedPathLoaded) setCwd(terminal.url, terminal.key, savedPath, chatId);
|
||||
} else if (terminalChanged || chatChanged) {
|
||||
++loadGeneration;
|
||||
if (!onSelectDirectory && savedPathLoaded)
|
||||
setCwd(terminal.url, terminal.key, savedPath, chatId);
|
||||
} else if (terminalChanged || chatChanged || folderChanged) {
|
||||
const generation = ++loadGeneration;
|
||||
savedPathLoaded = false;
|
||||
openedFile = null;
|
||||
if (terminalContext) terminalContext = { ...terminalContext, file: null };
|
||||
// Terminal switched, new chat started, or switched between
|
||||
|
|
@ -720,7 +734,10 @@
|
|||
entries = [];
|
||||
resetTreeState();
|
||||
(async () => {
|
||||
savedPath = applyCwd(await getCwd(terminal.url, terminal.key, chatId ?? undefined));
|
||||
const cwd = await getCwd(terminal.url, terminal.key, chatId ?? undefined);
|
||||
if (disposed || generation !== loadGeneration) return;
|
||||
const serverPath = applyCwd(cwd);
|
||||
savedPath = folderDirectory || serverPath;
|
||||
loadDir(savedPath);
|
||||
})();
|
||||
}
|
||||
|
|
@ -1043,7 +1060,8 @@
|
|||
loading = false;
|
||||
|
||||
// Set working directory on the terminal server (fire-and-forget)
|
||||
if (!initialFile) setCwd(terminal.url, terminal.key, directory, chatId ?? undefined);
|
||||
if (!onSelectDirectory && !initialFile)
|
||||
setCwd(terminal.url, terminal.key, directory, chatId ?? undefined);
|
||||
|
||||
if (result === null) {
|
||||
error =
|
||||
|
|
@ -1869,7 +1887,15 @@
|
|||
let handledDisplayFile = false;
|
||||
|
||||
const unsubFileNav = showFileNavPath.subscribe(async (request) => {
|
||||
if (!manageFileRequests || !active || !request || !selectedTerminal || comparison) return;
|
||||
if (
|
||||
onSelectDirectory ||
|
||||
!manageFileRequests ||
|
||||
!active ||
|
||||
!request ||
|
||||
!selectedTerminal ||
|
||||
comparison
|
||||
)
|
||||
return;
|
||||
handledDisplayFile = true;
|
||||
showFileNavPath.set(null);
|
||||
let filePath = typeof request === 'string' ? request : request.path;
|
||||
|
|
@ -1903,7 +1929,13 @@
|
|||
});
|
||||
|
||||
const unsubFileNavDir = showFileNavDir.subscribe(async (filePath) => {
|
||||
if (!filePath || !selectedTerminal || effectiveTerminalId !== $selectedTerminalId) return;
|
||||
if (
|
||||
onSelectDirectory ||
|
||||
!filePath ||
|
||||
!selectedTerminal ||
|
||||
effectiveTerminalId !== $selectedTerminalId
|
||||
)
|
||||
return;
|
||||
showFileNavDir.set(null);
|
||||
filePath = normalizePath(filePath);
|
||||
if (!isInsideFileRoot(filePath)) {
|
||||
|
|
@ -1937,7 +1969,7 @@
|
|||
savedPath =
|
||||
terminalContext && terminalContext.terminalId === effectiveTerminalId
|
||||
? terminalContext.currentDirectory
|
||||
: serverPath;
|
||||
: folderDirectory || serverPath;
|
||||
savedPath = clampToFileRoot(savedPath);
|
||||
if (initialFile) {
|
||||
const path = normalizePath(initialFile.path);
|
||||
|
|
@ -2125,7 +2157,7 @@
|
|||
fileSize={openedFile?.size ?? pendingFile?.size}
|
||||
{loading}
|
||||
{showSearch}
|
||||
onToggleSearch={toggleSearch}
|
||||
onToggleSearch={onSelectDirectory ? null : toggleSearch}
|
||||
writable={currentWritable}
|
||||
canGoBack={!initialFile && canGoBack}
|
||||
canGoForward={!initialFile && canGoForward}
|
||||
|
|
@ -2741,8 +2773,21 @@
|
|||
{/if}
|
||||
</div>
|
||||
|
||||
{#if onSelectDirectory}
|
||||
<div
|
||||
class="flex shrink-0 items-center justify-end border-t border-gray-50 px-2 pt-3 dark:border-gray-850/30"
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
class="flex h-7 items-center rounded-lg bg-gray-900 px-2.5 text-xs text-white hover:bg-black disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-100 dark:text-gray-900 dark:hover:bg-white"
|
||||
disabled={loading || !!error || !savedPathLoaded || !!selectedFile}
|
||||
on:click={() => onSelectDirectory?.(currentPath)}>{$i18n.t('Use this directory')}</button
|
||||
>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<!-- Read-only session output -->
|
||||
{#if showTerminalDock}
|
||||
{#if showTerminalDock && !onSelectDirectory}
|
||||
<div
|
||||
class:hidden={!hasSessions}
|
||||
class="shrink-0 border-t border-gray-50 dark:border-gray-850/30"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
import type { Writable } from 'svelte/store';
|
||||
import type { i18n as I18n } from 'i18next';
|
||||
|
||||
import Collapsible from '$lib/components/common/Collapsible.svelte';
|
||||
import ModelSettingsLabel from '$lib/components/workspace/Models/ModelSettingsLabel.svelte';
|
||||
import Spinner from '$lib/components/common/Spinner.svelte';
|
||||
import Modal from '$lib/components/common/Modal.svelte';
|
||||
import AccessButton from '$lib/components/common/AccessButton.svelte';
|
||||
|
|
@ -14,6 +16,9 @@
|
|||
import { goto } from '$app/navigation';
|
||||
import { user, config, models } from '$lib/stores';
|
||||
import ModelSelector from '$lib/components/chat/ModelSelector/Selector.svelte';
|
||||
import FileNav from '$lib/components/chat/FileNav.svelte';
|
||||
import FolderOpen from '$lib/components/icons/FolderOpen.svelte';
|
||||
import TerminalSelector from '$lib/components/workspace/Models/TerminalSelector.svelte';
|
||||
|
||||
import Textarea from '$lib/components/common/Textarea.svelte';
|
||||
import Knowledge from '$lib/components/workspace/Models/Knowledge.svelte';
|
||||
|
|
@ -35,12 +40,16 @@
|
|||
let data = {
|
||||
description: '',
|
||||
model_ids: [] as string[],
|
||||
terminal_id: '',
|
||||
working_directory: '',
|
||||
system_prompt: '',
|
||||
files: []
|
||||
};
|
||||
|
||||
let loading = false;
|
||||
let showAccessModal = false;
|
||||
let showAdvanced = false;
|
||||
let showDirectoryPicker = false;
|
||||
|
||||
const submitHandler = async () => {
|
||||
loading = true;
|
||||
|
|
@ -68,6 +77,8 @@
|
|||
data: {
|
||||
description: data.description.trim(),
|
||||
model_ids: data.model_ids,
|
||||
terminal_id: data.terminal_id || null,
|
||||
working_directory: data.terminal_id ? data.working_directory.trim() || null : null,
|
||||
system_prompt: data.system_prompt,
|
||||
files: data.files
|
||||
},
|
||||
|
|
@ -95,7 +106,9 @@
|
|||
files: [],
|
||||
...folder.data,
|
||||
description: folder.data?.description ?? '',
|
||||
model_ids: folder.data?.model_ids ?? []
|
||||
model_ids: folder.data?.model_ids ?? [],
|
||||
terminal_id: folder.data?.terminal_id ?? '',
|
||||
working_directory: folder.data?.working_directory ?? ''
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -114,7 +127,11 @@
|
|||
$: if (show) {
|
||||
init();
|
||||
}
|
||||
$: if (!show) showAccessModal = false;
|
||||
$: if (!show) {
|
||||
showAccessModal = false;
|
||||
showAdvanced = false;
|
||||
showDirectoryPicker = false;
|
||||
}
|
||||
|
||||
$: if (!show && !edit) {
|
||||
name = '';
|
||||
|
|
@ -124,6 +141,8 @@
|
|||
data = {
|
||||
description: '',
|
||||
model_ids: [],
|
||||
terminal_id: '',
|
||||
working_directory: '',
|
||||
system_prompt: '',
|
||||
files: []
|
||||
};
|
||||
|
|
@ -258,71 +277,140 @@
|
|||
|
||||
<hr class=" border-gray-50 dark:border-gray-850/30 my-2.5 w-full" />
|
||||
|
||||
<div class="my-1 flex items-center justify-between gap-4">
|
||||
<label
|
||||
for="model-selector-folder-default-button"
|
||||
class="shrink-0 text-xs text-gray-500"
|
||||
>
|
||||
{$i18n.t('Default Model')}
|
||||
</label>
|
||||
<div class="flex min-w-0 max-w-[65%] items-center gap-2">
|
||||
<div class="min-w-0">
|
||||
<ModelSelector
|
||||
id="folder-default"
|
||||
placeholder={$i18n.t('Use default')}
|
||||
items={$models.map((model) => ({
|
||||
value: model.id,
|
||||
label: model.name,
|
||||
model
|
||||
}))}
|
||||
triggerClassName="text-xs"
|
||||
placement="auto"
|
||||
align="end"
|
||||
selectionOnly
|
||||
value={data.model_ids[0] ?? ''}
|
||||
bind:values={data.model_ids}
|
||||
/>
|
||||
</div>
|
||||
{#if data.model_ids.length}
|
||||
<button
|
||||
type="button"
|
||||
aria-label={$i18n.t('Reset')}
|
||||
class="shrink-0 py-1 text-gray-500 hover:text-gray-700 dark:hover:text-gray-200 px-0"
|
||||
on:click={() => (data.model_ids = [])}
|
||||
<Collapsible
|
||||
title={$i18n.t('Advanced')}
|
||||
bind:open={showAdvanced}
|
||||
buttonClassName="w-full py-1 text-xs font-normal text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-100 transition"
|
||||
>
|
||||
<div slot="content" class="space-y-0.5 pt-1">
|
||||
<TerminalSelector
|
||||
bind:terminalId={data.terminal_id}
|
||||
label={$i18n.t('Default terminal')}
|
||||
description={$i18n.t(
|
||||
'Select the terminal used by default for new chats in this folder.'
|
||||
)}
|
||||
onChange={() => (data.working_directory = '')}
|
||||
/>
|
||||
{#if data.terminal_id}
|
||||
<div
|
||||
class="grid grid-cols-[7rem_minmax(0,1fr)] items-start gap-2 px-1 py-1 sm:grid-cols-[8rem_minmax(0,1fr)]"
|
||||
>
|
||||
<XMark className="size-3" />
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{#if $user?.role === 'admin' || ($user?.permissions.chat?.system_prompt ?? true)}
|
||||
<div class="my-1">
|
||||
<div class="mb-2 text-xs text-gray-500">{$i18n.t('System Prompt')}</div>
|
||||
<div>
|
||||
<Textarea
|
||||
className=" text-sm w-full bg-transparent outline-hidden "
|
||||
placeholder={$i18n.t(
|
||||
'Write your model system prompt content here\ne.g.) You are Mario from Super Mario Bros, acting as an assistant.'
|
||||
)}
|
||||
maxSize={200}
|
||||
bind:value={data.system_prompt}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div class="my-2">
|
||||
<Knowledge bind:selectedItems={data.files}>
|
||||
<div slot="label">
|
||||
<div class="flex w-full justify-between">
|
||||
<div class=" text-xs text-gray-500">
|
||||
{$i18n.t('Knowledge')}
|
||||
<label
|
||||
for="folder-working-directory"
|
||||
class="block text-xs font-normal text-gray-600 dark:text-gray-400"
|
||||
>
|
||||
<ModelSettingsLabel
|
||||
label={$i18n.t('Working directory')}
|
||||
description={$i18n.t(
|
||||
'Path on the selected terminal. Applies to new chats only.'
|
||||
)}
|
||||
/>
|
||||
</label>
|
||||
<div class="flex min-w-0 items-center gap-2">
|
||||
<input
|
||||
id="folder-working-directory"
|
||||
class="min-w-0 flex-1 bg-transparent text-xs font-normal text-gray-900 outline-hidden placeholder:text-gray-400 dark:text-gray-100 dark:placeholder:text-gray-600"
|
||||
bind:value={data.working_directory}
|
||||
placeholder={$i18n.t('Use the terminal’s default directory')}
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
aria-label={$i18n.t('Browse directories')}
|
||||
title={$i18n.t('Browse directories')}
|
||||
class="shrink-0 text-gray-500 hover:text-gray-900 dark:hover:text-gray-100"
|
||||
on:click={() => (showDirectoryPicker = true)}
|
||||
><FolderOpen className="size-3.5" /></button
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<div
|
||||
class="grid min-h-7 grid-cols-[7rem_minmax(0,1fr)] items-center gap-2 px-1 sm:grid-cols-[8rem_minmax(0,1fr)]"
|
||||
>
|
||||
<label
|
||||
for="model-selector-folder-default-button"
|
||||
class="shrink-0 text-xs font-normal text-gray-600 dark:text-gray-400"
|
||||
>
|
||||
<ModelSettingsLabel
|
||||
label={$i18n.t('Default Model')}
|
||||
description={$i18n.t(
|
||||
'Select the model used by default for new chats in this folder.'
|
||||
)}
|
||||
/>
|
||||
</label>
|
||||
<div class="flex min-w-0 items-center justify-between gap-2">
|
||||
<div class="min-w-0">
|
||||
<ModelSelector
|
||||
id="folder-default"
|
||||
placeholder={$i18n.t('Use default')}
|
||||
items={$models.map((model) => ({
|
||||
value: model.id,
|
||||
label: model.name,
|
||||
model
|
||||
}))}
|
||||
triggerClassName="text-xs font-normal text-gray-900 dark:text-gray-100"
|
||||
placement="auto"
|
||||
align="start"
|
||||
selectionOnly
|
||||
value={data.model_ids[0] ?? ''}
|
||||
bind:values={data.model_ids}
|
||||
/>
|
||||
</div>
|
||||
{#if data.model_ids.length}
|
||||
<button
|
||||
type="button"
|
||||
aria-label={$i18n.t('Reset')}
|
||||
class="shrink-0 py-1 text-gray-500 hover:text-gray-700 dark:hover:text-gray-200 px-0"
|
||||
on:click={() => (data.model_ids = [])}
|
||||
>
|
||||
<XMark className="size-3" />
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</Knowledge>
|
||||
</div>
|
||||
|
||||
{#if $user?.role === 'admin' || ($user?.permissions.chat?.system_prompt ?? true)}
|
||||
<div
|
||||
class="grid grid-cols-[7rem_minmax(0,1fr)] items-start gap-2 px-1 py-1 sm:grid-cols-[8rem_minmax(0,1fr)]"
|
||||
>
|
||||
<label
|
||||
for="folder-system-prompt"
|
||||
class="block text-xs font-normal text-gray-600 dark:text-gray-400"
|
||||
>
|
||||
<ModelSettingsLabel
|
||||
label={$i18n.t('System Prompt')}
|
||||
description={$i18n.t(
|
||||
'Set instructions that guide how the model behaves in this folder.'
|
||||
)}
|
||||
/>
|
||||
</label>
|
||||
<div>
|
||||
<Textarea
|
||||
id="folder-system-prompt"
|
||||
ariaLabel={$i18n.t('System Prompt')}
|
||||
className="w-full resize-none bg-transparent text-xs font-normal text-gray-900 outline-hidden placeholder:text-gray-400 dark:text-gray-100 dark:placeholder:text-gray-600"
|
||||
placeholder={$i18n.t(
|
||||
'Write your model system prompt content here\ne.g.) You are Mario from Super Mario Bros, acting as an assistant.'
|
||||
)}
|
||||
maxSize={200}
|
||||
bind:value={data.system_prompt}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<Knowledge bind:selectedItems={data.files}>
|
||||
<ModelSettingsLabel
|
||||
slot="label"
|
||||
label={$i18n.t('Knowledge')}
|
||||
description={$i18n.t(
|
||||
'Attach knowledge bases, notes, or files for chats in this folder.'
|
||||
)}
|
||||
/>
|
||||
</Knowledge>
|
||||
</div>
|
||||
</Collapsible>
|
||||
|
||||
<div class="flex justify-end pt-3 text-sm font-normal gap-1.5">
|
||||
<button
|
||||
|
|
@ -348,3 +436,31 @@
|
|||
{#if show && edit && folder && ($user?.role === 'admin' || folder.user_id === $user?.id)}
|
||||
<FolderShareModal bind:show={showAccessModal} {folder} />
|
||||
{/if}
|
||||
|
||||
{#if show && showDirectoryPicker && data.terminal_id}
|
||||
<Modal bind:show={showDirectoryPicker} ariaLabel={$i18n.t('Choose working directory')} size="md">
|
||||
<div class="p-4">
|
||||
<div class="mb-3 flex items-center justify-between text-sm">
|
||||
<span>{$i18n.t('Choose working directory')}</span>
|
||||
<button
|
||||
type="button"
|
||||
aria-label={$i18n.t('Close')}
|
||||
class="text-gray-500 hover:text-gray-900 dark:hover:text-gray-100"
|
||||
on:click={() => (showDirectoryPicker = false)}><XMark className="size-4" /></button
|
||||
>
|
||||
</div>
|
||||
<div class="h-[60dvh] min-h-0">
|
||||
<FileNav
|
||||
terminalId={data.terminal_id}
|
||||
initialDirectory={data.working_directory || null}
|
||||
manageFileRequests={false}
|
||||
showTerminalDock={false}
|
||||
onSelectDirectory={(path) => {
|
||||
data.working_directory = path;
|
||||
showDirectoryPicker = false;
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
{/if}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,17 @@
|
|||
<script lang="ts">
|
||||
import { getContext, onMount } from 'svelte';
|
||||
import Select from '$lib/components/common/Select.svelte';
|
||||
import ChevronDown from '$lib/components/icons/ChevronDown.svelte';
|
||||
import Check from '$lib/components/icons/Check.svelte';
|
||||
import ModelSettingsLabel from './ModelSettingsLabel.svelte';
|
||||
import { getTerminalServers, type TerminalServer } from '$lib/apis/terminal';
|
||||
|
||||
const i18n = getContext<any>('i18n');
|
||||
|
||||
export let terminalId: string = '';
|
||||
export let label = '';
|
||||
export let description = '';
|
||||
export let onChange: () => void = () => {};
|
||||
|
||||
let terminals: TerminalServer[] = [];
|
||||
|
||||
|
|
@ -14,26 +20,41 @@
|
|||
});
|
||||
</script>
|
||||
|
||||
{#if terminals.length > 0}
|
||||
<label
|
||||
class="flex min-h-8 items-center justify-between gap-3 px-1 text-xs font-normal text-gray-600 dark:text-gray-400"
|
||||
{#if terminals.length > 0 || terminalId}
|
||||
<div
|
||||
class="grid min-h-7 grid-cols-[7rem_minmax(0,1fr)] items-center gap-2 px-1 text-xs font-normal text-gray-600 dark:text-gray-400 sm:grid-cols-[8rem_minmax(0,1fr)]"
|
||||
>
|
||||
<ModelSettingsLabel
|
||||
label={$i18n.t('Default terminal')}
|
||||
description={$i18n.t(
|
||||
'Choose the terminal server selected by default for chats with this model.'
|
||||
)}
|
||||
label={label || $i18n.t('Default terminal')}
|
||||
description={description ||
|
||||
$i18n.t('Choose the terminal server selected by default for chats with this model.')}
|
||||
/>
|
||||
<select
|
||||
class="min-w-0 max-w-[60%] cursor-pointer bg-transparent py-0 text-xs font-normal text-gray-900 outline-hidden dark:text-gray-100"
|
||||
<Select
|
||||
bind:value={terminalId}
|
||||
items={[
|
||||
{ value: '', label: $i18n.t('None') },
|
||||
...(terminalId && !terminals.some((terminal) => terminal.id === terminalId)
|
||||
? [{ value: terminalId, label: $i18n.t('Unavailable') }]
|
||||
: []),
|
||||
...terminals.map((terminal) => ({
|
||||
value: terminal.id,
|
||||
label: terminal.name || terminal.id
|
||||
}))
|
||||
]}
|
||||
triggerClass="flex w-fit max-w-full min-w-0 items-center gap-1 bg-transparent px-0.5 text-left text-xs font-normal text-gray-900 dark:text-gray-100"
|
||||
onChange={() => onChange()}
|
||||
>
|
||||
<option value="">{$i18n.t('None')}</option>
|
||||
{#each terminals as terminal (terminal.id)}
|
||||
<option value={terminal.id}>{terminal.name || terminal.id}</option>
|
||||
{/each}
|
||||
</select>
|
||||
</label>
|
||||
<svelte:fragment slot="trigger" let:selectedLabel>
|
||||
<span class="sr-only">{label || $i18n.t('Default terminal')}: </span>
|
||||
<span class="truncate">{selectedLabel}</span>
|
||||
<ChevronDown className="size-3 shrink-0" />
|
||||
</svelte:fragment>
|
||||
<svelte:fragment slot="item" let:item let:selected>
|
||||
<span class="min-w-0 flex-1 truncate text-left">{item.label}</span>
|
||||
{#if selected}<Check className="size-3 shrink-0" />{/if}
|
||||
</svelte:fragment>
|
||||
</Select>
|
||||
</div>
|
||||
{:else}
|
||||
<p class="px-1 py-1 text-xs text-gray-500 dark:text-gray-400">
|
||||
{$i18n.t('No terminal servers available')}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue