Merge branch 'main' into oidc

This commit is contained in:
Windfarer
2026-03-30 11:31:28 +08:00
committed by GitHub
34 changed files with 1353 additions and 285 deletions
+1
View File
@@ -187,6 +187,7 @@ export interface IMChannel {
enabled: boolean;
mode: 'webhook' | 'websocket';
output_mode: 'stream' | 'full';
session_mode?: 'user' | 'thread';
knowledge_base_id?: string;
credentials: Record<string, any>;
created_at?: string;
@@ -37,6 +37,10 @@
<t-icon name="play-circle" class="meta-icon" />
{{ channel.output_mode === 'stream' ? $t('agentEditor.im.outputStream') : $t('agentEditor.im.outputFull') }}
</span>
<span v-if="channel.session_mode === 'thread'" class="meta-tag">
<t-icon name="chat" class="meta-icon" />
{{ $t('agentEditor.im.sessionModeThread') }}
</span>
</div>
<div v-if="channel.mode === 'webhook'" class="callback-url-row">
<span class="url-label">{{ $t('agentEditor.im.callbackUrl') }}:</span>
@@ -121,6 +125,19 @@
</t-radio-group>
</div>
<!-- Session Mode -->
<div class="form-item">
<label class="form-label">{{ $t('agentEditor.im.sessionMode') }}</label>
<t-radio-group v-model="formData.session_mode">
<t-radio-button value="user">{{ $t('agentEditor.im.sessionModeUser') }}</t-radio-button>
<t-radio-button value="thread"
:disabled="!platformSupportsThread(formData.platform)">
{{ $t('agentEditor.im.sessionModeThread') }}
</t-radio-button>
</t-radio-group>
<p class="form-hint">{{ $t('agentEditor.im.sessionModeHint') }}</p>
</div>
<!-- Knowledge base for file messages -->
<div class="form-item">
<label class="form-label">{{ $t('agentEditor.im.fileKnowledgeBase') }}</label>
@@ -356,6 +373,7 @@ const formData = ref({
name: '',
mode: 'websocket' as 'webhook' | 'websocket',
output_mode: 'stream' as 'stream' | 'full',
session_mode: 'user' as 'user' | 'thread',
knowledge_base_id: '',
credentials: defaultCredentials(),
});
@@ -365,6 +383,10 @@ function platformLabel(platform: string): string {
return t(key);
}
function platformSupportsThread(platform: string): boolean {
return ['slack', 'mattermost', 'feishu', 'telegram'].includes(platform);
}
watch(
() => formData.value.platform,
(p) => {
@@ -374,6 +396,9 @@ watch(
formData.value.credentials.post_to_main = false;
}
}
if (!platformSupportsThread(p)) {
formData.value.session_mode = 'user';
}
},
);
@@ -427,6 +452,7 @@ function editChannel(channel: IMChannel) {
name: channel.name,
mode: channel.mode,
output_mode: channel.output_mode,
session_mode: channel.session_mode || 'user',
knowledge_base_id: channel.knowledge_base_id || '',
credentials: { ...channel.credentials },
};
@@ -440,6 +466,7 @@ function resetForm() {
name: '',
mode: 'websocket',
output_mode: 'stream',
session_mode: 'user',
knowledge_base_id: '',
credentials: defaultCredentials(),
};
@@ -452,6 +479,7 @@ async function handleSave() {
name: formData.value.name,
mode: formData.value.mode,
output_mode: formData.value.output_mode,
session_mode: formData.value.session_mode,
knowledge_base_id: formData.value.knowledge_base_id,
credentials: formData.value.credentials,
});
@@ -462,6 +490,7 @@ async function handleSave() {
name: formData.value.name,
mode: formData.value.mode,
output_mode: formData.value.output_mode,
session_mode: formData.value.session_mode,
knowledge_base_id: formData.value.knowledge_base_id,
credentials: formData.value.credentials,
});
@@ -373,7 +373,7 @@ const fallbackProviderOptions = computed(() => [
value: 'nvidia',
label: t('model.editor.providers.nvidia.label'),
defaultUrls: {
chat: 'https://integrate.api.nvidia.com/v1/chat/completions',
chat: 'https://integrate.api.nvidia.com/v1',
embedding: 'https://integrate.api.nvidia.com/v1',
rerank: 'https://ai.api.nvidia.com/v1/retrieval/nvidia/reranking',
vllm: 'https://integrate.api.nvidia.com/v1',
+4
View File
@@ -3252,6 +3252,10 @@ export default {
fileKnowledgeBase: 'File Storage Knowledge Base',
fileKnowledgeBasePlaceholder: 'Select a knowledge base (optional)',
fileKnowledgeBaseHint: 'When configured, files sent by users will be automatically saved to this knowledge base',
sessionMode: 'Session Mode',
sessionModeUser: 'Per User (default)',
sessionModeThread: 'Per Thread',
sessionModeHint: 'User mode: each person has their own conversation. Use /clear to start fresh. Thread mode: each message thread is a separate conversation. Multiple people can collaborate in the same thread.',
},
mcp: {
label: 'MCP Services',
+4
View File
@@ -3275,6 +3275,10 @@ export default {
fileKnowledgeBase: "파일 저장 지식 베이스",
fileKnowledgeBasePlaceholder: "지식 베이스 선택 (선택 사항)",
fileKnowledgeBaseHint: "설정 시 사용자가 보낸 파일이 자동으로 해당 지식 베이스에 저장됩니다",
sessionMode: "세션 모드",
sessionModeUser: "사용자별 (기본)",
sessionModeThread: "스레드별",
sessionModeHint: "사용자 모드: 각 사용자별 독립 대화. /clear로 새 대화 시작. 스레드 모드: 메시지 스레드별 독립 대화. 같은 스레드에서 여러 명이 함께 대화 가능.",
},
tools: {
thinking: '사고',
+4
View File
@@ -2914,6 +2914,10 @@ export default {
fileKnowledgeBase: 'База знаний для файлов',
fileKnowledgeBasePlaceholder: 'Выберите базу знаний (необязательно)',
fileKnowledgeBaseHint: 'При настройке файлы, отправленные пользователями, автоматически сохраняются в эту базу знаний',
sessionMode: 'Режим сессии',
sessionModeUser: 'По пользователю (по умолчанию)',
sessionModeThread: 'По потоку',
sessionModeHint: 'Режим пользователя: отдельный диалог для каждого пользователя. /clear для нового диалога. Режим потока: отдельный диалог для каждого потока. Несколько человек могут общаться в одном потоке.',
},
mcp: {
label: 'MCP-сервисы',
+4
View File
@@ -3227,6 +3227,10 @@ export default {
fileKnowledgeBase: "文件保存知识库",
fileKnowledgeBasePlaceholder: "选择知识库(可选)",
fileKnowledgeBaseHint: "配置后,用户发送的文件将自动保存到该知识库中",
sessionMode: "会话模式",
sessionModeUser: "按用户(默认)",
sessionModeThread: "按话题",
sessionModeHint: "用户模式:每个用户独立对话,使用 /clear 开始新对话。话题模式:每个消息话题独立对话,同一话题中多人可协作。",
},
tools: {
thinking: "思考",
+43 -56
View File
@@ -1,5 +1,10 @@
import mermaid from 'mermaid';
import type {Tokens} from 'marked';
import {openMermaidFullscreen} from "@/utils/mermaidViewer.ts";
import hljs from "highlight.js";
import "highlight.js/styles/github.css";
hljs.registerAliases("mermaid", { languageName: "plaintext" });
let mermaidInitialized = false;
@@ -37,73 +42,55 @@ export const ensureMermaidInitialized = () => {
mermaidInitialized = true;
};
let mermaidCount = 0;
export const createMermaidCodeRenderer = (idPrefix: string) => {
let mermaidCount = 0;
return ({text, lang}: Tokens.Code) => {
let highlighted = '';
let highlightLang: string = lang || 'Code';
if (highlightLang && hljs.getLanguage(highlightLang)) {
try {
highlighted = hljs.highlight(text, { language: lang }).value;
} catch {
let ret = hljs.highlightAuto(text);
highlighted = ret.value;
highlightLang = ret.language || "Code";
}
} else {
let ret = hljs.highlightAuto(text);
highlighted = ret.value;
highlightLang = ret.language || "Code";
}
if (lang === 'mermaid') {
const id = `${idPrefix}-${++mermaidCount}`;
return `<div class="mermaid" id="${id}">${text}</div>`;
return `<pre id="${id}" data-mermaid="false"><code class="hljs language-${highlightLang}">${highlighted}</code></pre>`;
}
const displayLang = lang || 'Code';
const escapedCode = text
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
return `<pre><code class="language-${displayLang}">${escapedCode}</code></pre>`;
return `<pre><code class="hljs language-${highlightLang}">${highlighted}</code></pre>`;
};
};
export const renderMermaidInContainer = async (
rootElement: HTMLElement | null | undefined,
renderedMermaidIds: Set<string>,
) => {
if (!rootElement) return 0;
const mermaidElements = rootElement.querySelectorAll<HTMLElement>('.mermaid');
const unrenderedElements: HTMLElement[] = [];
mermaidElements.forEach((el) => {
const id = el.id || `mermaid-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
if (!el.id) {
el.id = id;
const mermaidElements = rootElement.querySelectorAll<HTMLElement>('pre[data-mermaid="false"]');
for (const el of mermaidElements) {
try{
const code = el.innerText;
// 验证
await mermaid.parse(code);
// 渲染
let {svg} = await mermaid.render(`${el.id}-svg`, code);
el.classList.add('mermaid')
el.innerHTML = svg;
el.onclick = (event) => {
event.stopPropagation();
openMermaidFullscreen(svg);
};
} catch(e){
console.error("Mermaid rendering error:", e);
}
if (!renderedMermaidIds.has(el.id) && !el.querySelector('svg')) {
renderedMermaidIds.add(el.id);
unrenderedElements.push(el);
}
});
if (unrenderedElements.length === 0) return 0;
await mermaid.run({ nodes: unrenderedElements });
return unrenderedElements.length;
};
export const bindMermaidFullscreenEvents = (
rootElement: HTMLElement | null | undefined,
onOpenFullscreen: (svgOuterHTML: string) => void,
) => {
if (!rootElement) return;
const mermaidDivs = rootElement.querySelectorAll<HTMLElement>('.mermaid');
mermaidDivs.forEach((div) => {
div.style.cursor = 'pointer';
const oldHandler = (div as any).__mermaidClickHandler as EventListener | undefined;
if (oldHandler) {
div.removeEventListener('click', oldHandler);
}
const handler: EventListener = (e: Event) => {
e.stopPropagation();
const target = e.currentTarget as HTMLElement;
const svg = target.querySelector('svg');
if (svg) {
onOpenFullscreen(svg.outerHTML);
}
};
(div as any).__mermaidClickHandler = handler;
div.addEventListener('click', handler);
});
};
// 标记为已渲染
el.setAttribute('data-mermaid', 'true');
}
};
@@ -349,7 +349,6 @@ import { MessagePlugin } from 'tdesign-vue-next';
import { useUIStore } from '@/stores/ui';
import { useI18n } from 'vue-i18n';
import i18n from '@/i18n';
import { openMermaidFullscreen } from '@/utils/mermaidViewer';
import { hydrateProtectedFileImages } from '@/utils/security';
import {
buildManualMarkdown,
@@ -358,7 +357,6 @@ import {
replaceIncompleteImageWithPlaceholder,
} from '@/utils/chatMessageShared';
import {
bindMermaidFullscreenEvents,
createMermaidCodeRenderer,
ensureMermaidInitialized,
renderMermaidInContainer,
@@ -1466,28 +1464,9 @@ const protectProviderImageSrcInHTML = (html: string): string => {
);
};
// 已渲染的 mermaid 元素 ID 集合
const renderedMermaidIds = new Set<string>();
// 渲染 Mermaid 图表的函数
const renderMermaidDiagrams = async () => {
try {
const renderedCount = await renderMermaidInContainer(rootElement.value, renderedMermaidIds);
if (renderedCount > 0) {
nextTick(() => {
bindMermaidClickEvents();
});
}
} catch (error) {
console.error('Mermaid rendering error:', error);
}
};
// 为 Mermaid 容器绑定点击全屏事件(绑定在 div 上,不是 SVG 上)
const bindMermaidClickEvents = () => {
bindMermaidFullscreenEvents(rootElement.value, (svgOuterHTML: string) => {
openMermaidFullscreen(svgOuterHTML);
});
await renderMermaidInContainer(rootElement.value);
};
// Tool summary - extract key info to display externally
+5 -26
View File
@@ -60,14 +60,13 @@
</div>
</template>
<script setup>
import { onMounted, onBeforeUnmount, watch, computed, ref, reactive, defineProps, nextTick } from 'vue';
import { onMounted, onBeforeUnmount, watch, computed, ref, reactive, defineProps, nextTick, onUpdated } from 'vue';
import { marked } from 'marked';
import docInfo from './docInfo.vue';
import deepThink from './deepThink.vue';
import AgentStreamDisplay from './AgentStreamDisplay.vue';
import picturePreview from '@/components/picture-preview.vue';
import { sanitizeHTML, safeMarkdownToHTML, createSafeImage, isValidImageURL, hydrateProtectedFileImages } from '@/utils/security';
import { openMermaidFullscreen } from '@/utils/mermaidViewer';
import { useI18n } from 'vue-i18n';
import { MessagePlugin } from 'tdesign-vue-next';
import { useUIStore } from '@/stores/ui';
@@ -78,7 +77,6 @@ import {
replaceIncompleteImageWithPlaceholder
} from '@/utils/chatMessageShared';
import {
bindMermaidFullscreenEvents,
createMermaidCodeRenderer,
ensureMermaidInitialized,
renderMermaidInContainer
@@ -228,7 +226,7 @@ const handleAddToKnowledge = () => {
const question = (props.userQuery || '').trim();
const manualContent = buildManualMarkdown(question, content);
const manualTitle = formatManualTitle(question);
``
uiStore.openManualEditor({
mode: 'create',
title: manualTitle,
@@ -254,30 +252,11 @@ const handleMarkdownImageClick = (e) => {
// 渲染 Mermaid 图表的函数
const renderMermaidDiagrams = async () => {
try {
const renderedCount = await renderMermaidInContainer(parentMd.value, renderedMermaidIds);
if (renderedCount > 0) {
nextTick(() => {
bindMermaidClickEvents();
});
}
} catch (error) {
console.error('Mermaid rendering error:', error);
}
};
// 已渲染的 mermaid 元素 ID 集合
const renderedMermaidIds = new Set();
// 为 Mermaid 容器绑定点击全屏事件(绑定在 div 上,不是 SVG 上)
const bindMermaidClickEvents = () => {
bindMermaidFullscreenEvents(parentMd.value, (svgOuterHTML) => {
openMermaidFullscreen(svgOuterHTML);
});
await renderMermaidInContainer(parentMd.value);
};
// 监听内容变化并渲染 Mermaid - 只在会话完成后渲染
watch(() => [props.content, props.session?.content, props.session?.is_completed], () => {
onUpdated(() => {
nextTick(async () => {
await hydrateProtectedFileImages(parentMd.value);
// 只在会话完成后渲染 mermaid
@@ -285,7 +264,7 @@ watch(() => [props.content, props.session?.content, props.session?.is_completed]
renderMermaidDiagrams();
}
});
}, { immediate: true });
});
onMounted(async () => {
// 为 markdown-content 中的图片添加点击事件