feat: Enhance Robot plugin AI model configuration and refine API endpoint paths.

hexqi · hexqi · commit 81711b54285a · 2025-12-08T20:05:51.000+08:00
diff --git a/packages/plugins/materials/src/composable/useMaterial.ts b/packages/plugins/materials/src/composable/useMaterial.ts
@@ -509,7 +509,7 @@ const getComponentDetail = (name) => {
   if (!data) return null
 
   const props = data.schema.properties
-    .map((item) => {
+    ?.map((item) => {
       return item.content.map((content) => {
         return {
           property: content.property,
diff --git a/packages/plugins/robot/src/Main.vue b/packages/plugins/robot/src/Main.vue
@@ -79,7 +79,7 @@
 <script setup lang="ts">
 import { computed, h, onMounted, ref, watch } from 'vue'
 import { ToolbarBase } from '@opentiny/tiny-engine-common'
-import { META_APP, useLayout, useNotify } from '@opentiny/tiny-engine-meta-register'
+import { META_APP, META_SERVICE, getMetaApi, useLayout, useNotify } from '@opentiny/tiny-engine-meta-register'
 import { type PopupConfig, type PromptProps, TrIconButton } from '@opentiny/tiny-robot'
 import { IconThink, IconNewSession } from '@opentiny/tiny-robot-svgs'
 import RobotChat from './components/chat/RobotChat.vue'
@@ -189,7 +189,7 @@ const isToolsModel = computed(() => {
     robotSettingState.defaultModel.serviceId,
     robotSettingState.defaultModel.modelName
   )
-  return modelCapabilities?.toolCalling !== false
+  return modelCapabilities?.toolCalling || false
 })
 
 const handleChatModeChange = (type: string) => {
@@ -248,6 +248,8 @@ const bubbleRenderers = { 'agent-content': AgentRenderer, 'agent-loading': Agent
 
 const handleFileSelected = async (formData: FormData, updateAttachment: (resourceUrl: string) => void) => {
   try {
+    const appId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
+    formData.append('appId', appId)
     const { resourceUrl } = await apiService.uploadFile(formData)
     updateAttachment(resourceUrl)
     if (!inputMessage.value) {
diff --git a/packages/plugins/robot/src/composables/modes/useAgentMode.ts b/packages/plugins/robot/src/composables/modes/useAgentMode.ts
@@ -61,7 +61,7 @@ export default function useAgentMode(): ModeHooks {
   const { getSelectedModelInfo } = useModelConfig()
 
   // ========== 配置方法 ==========
-  const getApiUrl = () => '/app-center/api/ai/chat'
+  const getApiUrl = () => 'app-center/api/ai/chat'
 
   const getContentType = () => 'agent-content'
 
@@ -112,11 +112,6 @@ export default function useAgentMode(): ModeHooks {
 
     const { baseUrl, model, config, capabilities } = getSelectedModelInfo()
 
-    // Agent 模式默认使用 JSON 对象格式
-    if (!config?.enableThinking) {
-      Object.assign(requestParams, { response_format: { type: 'json_object' } })
-    }
-
     requestParams.baseUrl = baseUrl
     requestParams.model = model
 
@@ -129,6 +124,11 @@ export default function useAgentMode(): ModeHooks {
       }
     }
 
+    // Agent 模式默认使用 JSON 对象格式
+    if (capabilities?.jsonOutput?.extraBody?.enable) {
+      Object.assign(requestParams, capabilities.jsonOutput.extraBody.enable)
+    }
+
     return requestParams
   }
 
@@ -204,14 +204,16 @@ export default function useAgentMode(): ModeHooks {
           if (capabilities?.reasoning?.extraBody?.disable) {
             Object.assign(requestParams, capabilities.reasoning.extraBody.disable)
           }
+          if (capabilities?.jsonOutput?.extraBody?.enable) {
+            Object.assign(requestParams, capabilities.jsonOutput.extraBody.enable)
+          }
           Object.assign(requestParams, {
-            response_format: { type: 'json_object' },
             model,
             baseUrl
           })
           return requestParams
         }
-        const apiUrl = '/app-center/api/chat/completions'
+        const apiUrl = 'app-center/api/chat/completions'
         lastMessage.renderContent.at(-1).status = 'fix'
         const fixedResponse = await client.chat({
           messages: [{ role: 'user', content: getJsonFixPrompt(content, jsonValidResult.error) }],
diff --git a/packages/plugins/robot/src/composables/modes/useChatMode.ts b/packages/plugins/robot/src/composables/modes/useChatMode.ts
@@ -54,7 +54,7 @@ export default function useChatMode(): ModeHooks {
   const { getSelectedModelInfo } = useModelConfig()
 
   // ========== 配置方法 ==========
-  const getApiUrl = () => '/app-center/api/chat/completions'
+  const getApiUrl = () => 'app-center/api/chat/completions'
 
   const getContentType = () => 'markdown'
 
diff --git a/packages/plugins/robot/src/composables/useChat.ts b/packages/plugins/robot/src/composables/useChat.ts
@@ -97,7 +97,14 @@ const handleFinishRequest = async (
   delete abortControllerMap.main
   await onRequestEnd(finishReason, lastMessage.content, messages) // 本次请求结束
 
-  if (finishReason === 'tool_calls' && lastMessage.tool_calls?.length) {
+  // 部分模型返回格式不太标准，例如finishReason没有返回tool_calls而是stop，这里做下兼容
+  if (['tool_calls', 'stop'].includes(finishReason) && lastMessage.tool_calls?.length) {
+    lastMessage!.tool_calls.forEach((toolCall) => {
+      if (toolCall.type !== 'function') {
+        // 修复，兼容部分场景返回格式不标准，流式中多次返回type字段
+        toolCall.type = 'function'
+      }
+    })
     await handleToolCall(lastMessage.tool_calls, messages, contextMessages) // eslint-disable-line
   }
 
diff --git a/packages/plugins/robot/src/constants/model-config.ts b/packages/plugins/robot/src/constants/model-config.ts
@@ -8,6 +8,23 @@ const reasoningExtraBody = {
   }
 }
 
+const jsonOutputExtraBody = {
+  extraBody: {
+    enable: { response_format: { type: 'json_object' } },
+    disable: null
+  }
+}
+
+const bailianJsonOutputExtraBody = {
+  extraBody: {
+    enable: {
+      response_format: { type: 'json_object' },
+      enable_thinking: false // 千问模型不支持思考模式下输出json
+    },
+    disable: null
+  }
+}
+
 export const DEFAULT_LLM_MODELS = [
   {
     provider: 'bailian',
@@ -21,7 +38,8 @@ export const DEFAULT_LLM_MODELS = [
         name: 'qwen-plus',
         capabilities: {
           toolCalling: true,
-          reasoning: reasoningExtraBody
+          reasoning: reasoningExtraBody,
+          jsonOutput: bailianJsonOutputExtraBody
         }
       },
       // 备注：千问多模态模型不支持工具调用；
@@ -30,23 +48,26 @@ export const DEFAULT_LLM_MODELS = [
         name: 'qwen3-vl-plus',
         capabilities: {
           vision: true,
-          reasoning: reasoningExtraBody
+          reasoning: reasoningExtraBody,
+          jsonOutput: bailianJsonOutputExtraBody
         }
       },
       {
         label: 'Qwen Coder编程模型（PLUS）',
         name: 'qwen3-coder-plus',
         capabilities: {
           toolCalling: true,
-          reasoning: reasoningExtraBody
+          reasoning: reasoningExtraBody,
+          jsonOutput: bailianJsonOutputExtraBody
         }
       },
       {
         label: 'DeepSeek（v3.2）',
         name: 'deepseek-v3.2-exp',
         capabilities: {
           toolCalling: true,
-          reasoning: reasoningExtraBody
+          reasoning: reasoningExtraBody,
+          jsonOutput: bailianJsonOutputExtraBody
         }
       },
       // 小参数模型
@@ -55,19 +76,29 @@ export const DEFAULT_LLM_MODELS = [
         name: 'qwen-flash',
         capabilities: {
           toolCalling: true,
-          compact: true
+          compact: true,
+          jsonOutput: bailianJsonOutputExtraBody
         }
       },
       {
         label: 'Qwen Coder编程模型（Flash）',
         name: 'qwen3-coder-flash',
         capabilities: {
           toolCalling: true,
-          compact: true
+          compact: true,
+          jsonOutput: bailianJsonOutputExtraBody
         }
       },
-      { label: 'Qwen3（14b）', name: 'qwen3-14b', capabilities: { compact: true, toolCalling: true } },
-      { label: 'Qwen3（8b）', name: 'qwen3-8b', capabilities: { compact: true, toolCalling: true } }
+      {
+        label: 'Qwen3（14b）',
+        name: 'qwen3-14b',
+        capabilities: { compact: true, toolCalling: true, jsonOutput: bailianJsonOutputExtraBody }
+      },
+      {
+        label: 'Qwen3（8b）',
+        name: 'qwen3-8b',
+        capabilities: { compact: true, toolCalling: true, jsonOutput: bailianJsonOutputExtraBody }
+      }
     ]
   },
   {
@@ -86,7 +117,8 @@ export const DEFAULT_LLM_MODELS = [
               enable: { model: 'deepseek-reasoner' },
               disable: { model: 'deepseek-chat' }
             }
-          }
+          },
+          jsonOutput: jsonOutputExtraBody
         }
       }
     ]
diff --git a/packages/plugins/robot/src/constants/prompts/index.ts b/packages/plugins/robot/src/constants/prompts/index.ts
@@ -88,7 +88,7 @@ export const formatComponents = (snippets: any[], getComponent: (name: string) =
     .filter((item: any) => !ignoreGroups.includes(item.group))
     .map((group) => group.children)
     .flat()
-    .filter((item: any) => !ignoreComponents.includes(item.snippetName))
+    .filter((item: any) => item.snippetName && !ignoreComponents.includes(item.snippetName))
     .map((child) => {
       const component: ComponentMaterial = getComponent(toPascalCase(child.snippetName))
       const schema: any = {}
diff --git a/packages/plugins/robot/src/services/OpenAICompatibleProvider.ts b/packages/plugins/robot/src/services/OpenAICompatibleProvider.ts
@@ -163,7 +163,9 @@ export class OpenAICompatibleProvider extends BaseModelProvider {
       // 构建完整URL
       let url = config.url
       if (!url.startsWith('http') && config.baseURL) {
-        url = new URL(url, config.baseURL).href
+        const baseURL =
+          config.baseURL.startsWith('http') && !config.baseURL.endsWith('/') ? `${config.baseURL}/` : config.baseURL
+        url = new URL(url, baseURL).href
       }
 
       try {
diff --git a/packages/plugins/robot/src/services/api.ts b/packages/plugins/robot/src/services/api.ts
@@ -23,7 +23,7 @@ export const aiChatApi = {
    * @param options 请求选项
    */
   chatCompletions: (body: LLMRequestBody, options: RequestOptions = {}) => {
-    return getMetaApi(META_SERVICE.Http).post(options?.url || '/app-center/api/chat/completions', body, {
+    return getMetaApi(META_SERVICE.Http).post(options?.url || 'app-center/api/chat/completions', body, {
       headers: {
         'Content-Type': 'application/json',
         ...options?.headers
@@ -37,7 +37,7 @@ export const aiChatApi = {
    * @param options 请求选项
    */
   agentChat: (body: LLMRequestBody, options: RequestOptions = {}) => {
-    return getMetaApi(META_SERVICE.Http).post('/app-center/api/ai/chat', body, {
+    return getMetaApi(META_SERVICE.Http).post('app-center/api/ai/chat', body, {
       headers: {
         'Content-Type': 'application/json',
         ...options?.headers
@@ -50,7 +50,7 @@ export const aiChatApi = {
    * @param content 搜索内容
    */
   aiSearch: (content: string): Promise<Array<{ score: number; content: string; doc_name: string }>> => {
-    return getMetaApi(META_SERVICE.Http).post('/app-center/api/ai/search', { content })
+    return getMetaApi(META_SERVICE.Http).post('app-center/api/ai/search', { content })
   }
 }
 
@@ -82,7 +82,7 @@ export const resourceApi = {
    * @param formData 文件表单数据
    */
   uploadFile: (formData: FormData): Promise<Resource> => {
-    return getMetaApi(META_SERVICE.Http).post('/material-center/api/resource/upload', formData, {
+    return getMetaApi(META_SERVICE.Http).post('material-center/api/resource/upload', formData, {
       headers: {
         'Content-Type': 'multipart/form-data'
       }
@@ -94,15 +94,15 @@ export const resourceApi = {
    * @param appId 应用ID
    */
   getResourceList: (appId: string): Promise<ResourceGroupList> => {
-    return getMetaApi(META_SERVICE.Http).get(`/material-center/api/resource-group/${appId}`)
+    return getMetaApi(META_SERVICE.Http).get(`material-center/api/resource-group/${appId}`)
   },
 
   /**
    * 获取资源列表
    * @param groupId 组ID
    */
   getResourceListByGroup: (groupId: string): Promise<ResourceGroup> => {
-    return getMetaApi(META_SERVICE.Http).get(`/material-center/api/resource/find/${groupId}`)
+    return getMetaApi(META_SERVICE.Http).get(`material-center/api/resource/find/${groupId}`)
   }
 }
 
@@ -120,7 +120,7 @@ export const httpApi = {
 
 export const encryptApi = {
   encryptKey: (apiKey: string): Promise<{ token: string }> =>
-    getMetaApi(META_SERVICE.Http).post('/app-center/api/encrypt-key', { apiKey })
+    getMetaApi(META_SERVICE.Http).post('app-center/api/encrypt-key', { apiKey })
 }
 
 export const apiService = {
diff --git a/packages/plugins/robot/src/types/setting.types.ts b/packages/plugins/robot/src/types/setting.types.ts
@@ -13,14 +13,24 @@
 /**
  * 模型配置接口
  */
+
+export interface Capability {
+  extraBody: {
+    enable: any
+    disable: any
+  }
+  [key: string]: any
+}
+
 export interface ModelConfig {
   name: string
   label: string
   capabilities?: {
     toolCalling?: boolean
     vision?: boolean
-    reasoning?: boolean | object
+    reasoning?: boolean | Capability
     compact?: boolean
+    jsonOutput?: boolean | Capability
   }
 }
 
