Merge branch 'main' into feat_oss

This commit is contained in:
peterchan2020
2026-04-14 00:41:29 +08:00
committed by GitHub
44 changed files with 3183 additions and 115 deletions
+42
View File
@@ -126,3 +126,45 @@ export function deleteModel(id: string): Promise<void> {
});
}
export interface InitializeWeKnoraCloudRequest {
app_id: string
app_secret: string
}
export interface InitializeWeKnoraCloudResult {
models: Array<{
name: string
type: string
action: 'created' | 'updated'
}>
}
export function initializeWeKnoraCloud(data: InitializeWeKnoraCloudRequest): Promise<InitializeWeKnoraCloudResult> {
return post('/api/v1/models/weknoracloud/initialize', data) as Promise<InitializeWeKnoraCloudResult>
}
export interface WeKnoraCloudStatusResult {
has_models: boolean
needs_reinit: boolean
reason?: string
}
export function getWeKnoraCloudStatus(): Promise<WeKnoraCloudStatusResult> {
return new Promise((resolve, reject) => {
get('/api/v1/models/weknoracloud/status')
.then((response: any) => {
// status 接口直接返回对象,不包在 success/data 中
if (response && typeof response.has_models === 'boolean') {
resolve(response)
} else if (response?.success && response?.data) {
resolve(response.data)
} else {
resolve({ has_models: false, needs_reinit: false })
}
})
.catch(() => {
resolve({ has_models: false, needs_reinit: false })
})
})
}
@@ -174,6 +174,11 @@
<label class="form-label">Bot Secret</label>
<t-input v-model="formData.credentials.bot_secret" type="password" placeholder="Bot Secret" />
</div>
<div class="form-item">
<label class="form-label">WebSocket Endpoint</label>
<t-input v-model="formData.credentials.ws_endpoint" placeholder="wss://openws.work.weixin.qq.com" />
<p class="form-hint">{{ $t('agentEditor.im.wecomWSEndpointHint') }}</p>
</div>
</template>
<template v-else>
<div class="form-item">
@@ -196,6 +201,11 @@
<label class="form-label">Corp Agent ID</label>
<t-input-number v-model="formData.credentials.corp_agent_id" placeholder="Corp Agent ID" style="width: 100%;" />
</div>
<div class="form-item">
<label class="form-label">API Base URL</label>
<t-input v-model="formData.credentials.api_base_url" placeholder="https://qyapi.weixin.qq.com" />
<p class="form-hint">{{ $t('agentEditor.im.wecomAPIBaseURLHint') }}</p>
</div>
</template>
</template>
+2
View File
@@ -3357,6 +3357,8 @@ export default {
'When on, bot replies are new top-level posts in the channel. When off (default), they stay in the thread and the main view only shows “N replies”.',
modeHint: 'WebSocket is recommended for easier setup',
consoleTip: 'to get credentials',
wecomWSEndpointHint: 'Optional. For private WeCom deployments, enter a custom WebSocket address. Leave empty to use the default public cloud endpoint. For internal network addresses, add the hostname to the SSRF_WHITELIST env var.',
wecomAPIBaseURLHint: 'Optional. For private WeCom deployments, enter a custom API base URL. Leave empty to use the default public cloud endpoint. For internal network addresses, add the hostname to the SSRF_WHITELIST env var.',
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',
+2
View File
@@ -3384,6 +3384,8 @@ export default {
"켜면 봇 답변이 채널의 새 최상위 게시물로 올라갑니다. 끄면(기본) 스레드 답변이며 메인 화면에는 「N개 답변」만 보입니다.",
modeHint: "WebSocket 방식이 설정이 더 간편하여 권장됩니다",
consoleTip: "자격 증명 정보를 가져오세요",
wecomWSEndpointHint: "선택 사항. 프라이빗 WeCom 배포 시 사용자 정의 WebSocket 주소를 입력하세요. 비워두면 기본 퍼블릭 클라우드 주소를 사용합니다. 내부 네트워크 주소의 경우 SSRF_WHITELIST 환경 변수에 호스트명을 추가하세요.",
wecomAPIBaseURLHint: "선택 사항. 프라이빗 WeCom 배포 시 사용자 정의 API 기본 URL을 입력하세요. 비워두면 기본 퍼블릭 클라우드 주소를 사용합니다. 내부 네트워크 주소의 경우 SSRF_WHITELIST 환경 변수에 호스트명을 추가하세요.",
fileKnowledgeBase: "파일 저장 지식 베이스",
fileKnowledgeBasePlaceholder: "지식 베이스 선택 (선택 사항)",
fileKnowledgeBaseHint: "설정 시 사용자가 보낸 파일이 자동으로 해당 지식 베이스에 저장됩니다",
+2
View File
@@ -3022,6 +3022,8 @@ export default {
'Включено — ответы бота как новые сообщения в канале. Выключено (по умолчанию) — ответы в ветке, в основном окне только «N ответов».',
modeHint: 'Рекомендуется WebSocket — проще настроить',
consoleTip: 'для получения учётных данных',
wecomWSEndpointHint: 'Необязательно. Для приватного развёртывания WeCom укажите пользовательский адрес WebSocket. Оставьте пустым для публичного облака. Для адресов внутренней сети добавьте имя хоста в переменную SSRF_WHITELIST.',
wecomAPIBaseURLHint: 'Необязательно. Для приватного развёртывания WeCom укажите пользовательский базовый URL API. Оставьте пустым для публичного облака. Для адресов внутренней сети добавьте имя хоста в переменную SSRF_WHITELIST.',
fileKnowledgeBase: 'База знаний для файлов',
fileKnowledgeBasePlaceholder: 'Выберите базу знаний (необязательно)',
fileKnowledgeBaseHint: 'При настройке файлы, отправленные пользователями, автоматически сохраняются в эту базу знаний',
+2
View File
@@ -3332,6 +3332,8 @@ export default {
"开启后 Bot 回复作为频道内新帖子;关闭(默认)则作为原消息的线程回复,主窗口仅显示「N 条回复」。",
modeHint: "推荐使用 WebSocket 方式接入,配置更简单",
consoleTip: "前往获取凭证信息",
wecomWSEndpointHint: "可选,私有化部署时填写自定义 WebSocket 地址,留空则使用默认公有云地址。内网地址需将域名加入 SSRF_WHITELIST 环境变量",
wecomAPIBaseURLHint: "可选,私有化部署时填写自定义 API 地址,留空则使用默认公有云地址。内网地址需将域名加入 SSRF_WHITELIST 环境变量",
fileKnowledgeBase: "文件保存知识库",
fileKnowledgeBasePlaceholder: "选择知识库(可选)",
fileKnowledgeBaseHint: "配置后,用户发送的文件将自动保存到该知识库中",
+77 -1
View File
@@ -18,6 +18,46 @@
</div>
</div>
<!-- WeKnoraCloud 厂商配置 -->
<div class="weknoracloud-config-section" style="margin-bottom: 24px;">
<div class="category-header" style="margin-bottom: 12px;">
<h3 style="margin: 0; font-size: 16px; font-weight: 600;">WeKnoraCloud 厂商配置</h3>
</div>
<!-- 凭证失效警告 -->
<div v-if="weKnoraCloudNeedsReinit" style="margin-bottom: 12px; background: #fff7ed; border: 1px solid #fed7aa; border-left: 3px solid #f97316; border-radius: 6px; padding: 12px 16px; display: flex; align-items: flex-start; gap: 10px;">
<t-icon name="error-circle" style="font-size: 16px; color: #f97316; flex-shrink: 0; margin-top: 1px;" />
<div style="font-size: 13px; color: #9a3412; line-height: 1.5;">
<strong>WeKnoraCloud 凭证已失效</strong><br />
{{ weKnoraCloudReinitReason || '服务重启后加密密钥已变更,已保存的凭证无法解密。' }}
</div>
</div>
<div class="weknoracloud-config-card" style="background: var(--td-bg-color-container); border: 1px solid var(--td-component-stroke); border-radius: 8px; padding: 20px;">
<div style="display: flex; align-items: flex-end; gap: 16px; flex-wrap: wrap;">
<t-form-item label="APPID" style="margin-bottom: 0;">
<t-input v-model="weKnoraCloudForm.appId" placeholder="请输入 APPID" style="width: 240px;" />
</t-form-item>
<t-form-item label="APPSECRET" style="margin-bottom: 0;">
<t-input
v-model="weKnoraCloudForm.appSecret"
type="password"
placeholder="请输入 APPSECRET"
style="width: 240px;"
/>
</t-form-item>
<t-button
theme="primary"
:loading="weKnoraCloudLoading"
@click="handleWeKnoraCloudInit"
>
保存并初始化
</t-button>
</div>
<p style="color: var(--td-text-color-secondary); font-size: 12px; margin-top: 12px; margin-bottom: 0;">
提交后将自动创建或更新三个模型(Chat / Embedding / Rerank)并设为各类型默认
</p>
</div>
</div>
<!-- 对话模型 -->
<div class="settings-group model-type-group" data-model-type="chat">
<div class="section-subheader">
@@ -295,7 +335,7 @@ import { MessagePlugin } from 'tdesign-vue-next'
import { AddIcon } from 'tdesign-icons-vue-next'
import { useI18n } from 'vue-i18n'
import ModelEditorDialog from '@/components/ModelEditorDialog.vue'
import { listModels, createModel, updateModel as updateModelAPI, deleteModel as deleteModelAPI, type ModelConfig } from '@/api/model'
import { listModels, createModel, updateModel as updateModelAPI, deleteModel as deleteModelAPI, initializeWeKnoraCloud, getWeKnoraCloudStatus, type ModelConfig } from '@/api/model'
const { t } = useI18n()
@@ -304,6 +344,38 @@ const currentModelType = ref<'chat' | 'embedding' | 'rerank' | 'vllm' | 'asr'>('
const editingModel = ref<any>(null)
const loading = ref(true)
// WeKnoraCloud 配置
const weKnoraCloudForm = ref({ appId: '', appSecret: '' })
const weKnoraCloudLoading = ref(false)
const weKnoraCloudNeedsReinit = ref(false)
const weKnoraCloudReinitReason = ref('')
const handleWeKnoraCloudInit = async () => {
if (!weKnoraCloudForm.value.appId || !weKnoraCloudForm.value.appSecret) {
MessagePlugin.warning('请填写 APPID 和 APPSECRET')
return
}
weKnoraCloudLoading.value = true
try {
const result = await initializeWeKnoraCloud({
app_id: weKnoraCloudForm.value.appId,
app_secret: weKnoraCloudForm.value.appSecret,
})
const updatedCount = result.models.filter((m: any) => m.action === 'updated').length
const createdCount = result.models.filter((m: any) => m.action === 'created').length
MessagePlugin.success(`初始化成功:新建 ${createdCount} 个,更新 ${updatedCount} 个模型`)
weKnoraCloudForm.value.appId = ''
weKnoraCloudForm.value.appSecret = ''
weKnoraCloudNeedsReinit.value = false
weKnoraCloudReinitReason.value = ''
await loadModels()
} catch (err: any) {
MessagePlugin.error(err?.message || 'WeKnoraCloud 初始化失败')
} finally {
weKnoraCloudLoading.value = false
}
}
// 模型列表数据
const allModels = ref<ModelConfig[]>([])
@@ -361,6 +433,10 @@ const loadModels = async () => {
// 直接获取所有模型,不分类型
const models = await listModels()
allModels.value = models
// 检查 WeKnoraCloud 凭证状态
const status = await getWeKnoraCloudStatus()
weKnoraCloudNeedsReinit.value = status.needs_reinit
weKnoraCloudReinitReason.value = status.reason || ''
} catch (error: any) {
console.error('加载模型列表失败:', error)
MessagePlugin.error(error.message)