feat(deepresearch): fix conflict

Author: anyin-xyz

spring-ai-alibaba-deepresearch/ui-vue3/src/types/base.ts

@@ -0,0 +1,61 @@
+/**
+ * API 响应基础类型定义
+ * 对应 Java 类：ApiResponse<T>
+ */
+export interface ApiResponse<T = any> {
+  /** 响应状态码 */
+  code: number;
+  /** 响应状态 */
+  status: string;
+  /** 响应消息 */
+  message: string;
+  /** 响应数据 */
+  data: T;
+}
+
+/**
+ * 创建成功响应的工具函数
+ * @param data 响应数据
+ * @returns 成功的 API 响应
+ */
+export function createSuccessResponse<T>(data: T): ApiResponse<T> {
+  return {
+    code: 200,
+    status: 'success',
+    message: '',
+    data
+  };
+}
+
+/**
+ * 创建错误响应的工具函数
+ * @param message 错误消息
+ * @param data 可选的错误数据
+ * @returns 错误的 API 响应
+ */
+export function createErrorResponse<T = null>(message: string, data: T = null as T): ApiResponse<T> {
+  return {
+    code: 500,
+    status: 'error',
+    message,
+    data
+  };
+}
+
+/**
+ * 类型守卫：检查响应是否为成功响应
+ * @param response API 响应
+ * @returns 是否为成功响应
+ */
+export function isSuccessResponse<T>(response: ApiResponse<T>): boolean {
+  return response.code === 200 && response.status === 'success';
+}
+
+/**
+ * 类型守卫：检查响应是否为错误响应
+ * @param response API 响应
+ * @returns 是否为错误响应
+ */
+export function isErrorResponse<T>(response: ApiResponse<T>): boolean {
+  return response.code !== 200 || response.status === 'error';
+}

spring-ai-alibaba-deepresearch/ui-vue3/src/types/node.ts

@@ -25,7 +25,7 @@ export interface NormalNode {
   /** 节点名称 */
   nodeName: string
   /** 节点内容 */
-  content: string | object ,
+  content: string | any ,
   graphId: GraphId
   displayTitle: string,
   siteInformation: SiteInformation[]

spring-ai-alibaba-deepresearch/ui-vue3/src/utils/request.ts

@@ -22,7 +22,9 @@ import type {
   InternalAxiosRequestConfig,
 } from 'axios'
 import axios from 'axios'
-import { message } from 'ant-design-vue';
+import { message } from 'ant-design-vue'
+import type { ApiResponse } from '@/types/base'
+import { isSuccessResponse } from '@/types/base'
 
 const service: AxiosInstance = axios.create({
   baseURL: import.meta.env.VITE_BASE_URL || '',
@@ -53,23 +55,112 @@ request.use(
   }
 )
 
+/**
+ * 响应拦截器封装
+ * 处理 ApiResponse 类型的响应数据
+ */
 response.use(
-  response => {
-    if (
-      response.status === 200 &&
-      (response.data.code === 200 || response.data.status === 'success')
-    ) {
-      return Promise.resolve(response.data)
+  (response: AxiosResponse<ApiResponse>) => {
+    const apiResponse: ApiResponse = response.data
+
+    // 使用类型守卫检查响应是否成功
+    if (response.status === 200 && isSuccessResponse(apiResponse)) {
+      // 返回原始响应对象，保持 axios 响应结构
+      return response
+    }
+
+    // 显示错误消息
+    if (apiResponse.message) {
+      message.error(apiResponse.message)
     }
-    message.error(response.data.message)
-    return Promise.reject(response.data)
+    return Promise.reject(apiResponse)
   },
   error => {
-    if (error) {
-      console.error('error', error)
+    console.error('Request error:', error)
+
+    // 处理网络错误或其他错误
+    if (error.response?.data) {
+      const errorResponse: ApiResponse = error.response.data
+      if (errorResponse.message) {
+        message.error(errorResponse.message)
+      }
+      return Promise.reject(errorResponse)
     }
-    message.error(error.response.data.message)
-    return Promise.reject(error.response.data)
+
+    // 处理网络错误等情况
+    const networkError: ApiResponse = {
+      code: 500,
+      status: 'error',
+      message: error.message || '网络请求失败',
+      data: null
+    }
+    message.error(networkError.message)
+    return Promise.reject(networkError)
   }
 )
+/**
+ * 封装的请求函数，返回 ApiResponse 数据部分
+ * @param config axios 请求配置
+ * @returns Promise<T> 直接返回 ApiResponse.data 的类型
+ */
+export async function apiRequest<T = any>(config: Partial<InternalAxiosRequestConfig>): Promise<T> {
+  try {
+    const response = await service(config as InternalAxiosRequestConfig)
+    const apiResponse: ApiResponse<T> = response.data
+
+    if (isSuccessResponse(apiResponse)) {
+      return apiResponse.data
+    }
+
+    throw apiResponse
+  } catch (error: any) {
+    throw error
+  }
+}
+
+/**
+ * GET 请求封装
+ */
+export function get<T = any>(url: string, params?: any): Promise<T> {
+  return apiRequest<T>({
+    method: 'GET',
+    url,
+    params
+  })
+}
+
+/**
+ * POST 请求封装
+ */
+export function post<T = any>(url: string, data?: any): Promise<T> {
+  return apiRequest<T>({
+    method: 'POST',
+    url,
+    data
+  })
+}
+
+/**
+ * PUT 请求封装
+ */
+export function put<T = any>(url: string, data?: any): Promise<T> {
+  return apiRequest<T>({
+    method: 'PUT',
+    url,
+    data
+  })
+}
+
+/**
+ * DELETE 请求封装
+ */
+export function del<T = any>(url: string, params?: any): Promise<T> {
+  return apiRequest<T>({
+    method: 'DELETE',
+    url,
+    params
+  })
+}
+
+// 导出原始 axios 实例，用于特殊需求
 export default service

spring-ai-alibaba-deepresearch/ui-vue3/src/views/chat/index.vue

@@ -32,7 +32,7 @@
           <div class="welcome">
             <span class="gradient-text">{{ $t('welcome') }}, {{ username }}</span>
           </div>
-        </Flex>  
+        </Flex>
         <div class="sender-wrapper">
           <sender
             class-name="sender"
@@ -71,7 +71,7 @@
                     v-if="senderLoading"
                     type="default"
                     style="display: block"
-                    :disabled="true"
+                    @click="stopHandle"
                   >
                     <template #icon>
                       <Spin size="small" />
@@ -137,9 +137,8 @@ import { useRoute, useRouter } from 'vue-router'
 import { useConfigStore } from '@/store/ConfigStore'
 import { parseJsonTextStrict } from '@/utils/jsonParser';
 import type { NormalNode, SiteInformation } from '@/types/node';
-import type { UploadFile } from '@/types/upload';
 import type { MessageState } from '@/types/message';
-import service from '@/utils/request'
+import service, { post } from '@/utils/request'
 
 const router = useRouter()
 const route = useRoute()
@@ -150,7 +149,6 @@ if (!convId) {
   const { key } = conversationStore.newOne()
   router.push(`/chat/${key}`) 
 }
-const uploadFileList = ref<UploadFile[]>([])
 const { useToken } = theme
 const { token } = useToken()
 const username = useAuthStore().token
@@ -308,6 +306,17 @@ const submitHandle = (nextContent: any) => {
   conversationStore.updateTitle(convId, nextContent)
 }
 
+const stopHandle = async () => {
+  // 发送上传请求
+    await post<string>('/chat/stop', {
+      session_id: convId,
+      thread_id: current.threadId,
+    })
+
+    message.success('停止成功')
+
+}
+
 // 开始研究
 function startDeepResearch() {
   messageStore.nextAIType()
@@ -538,24 +547,32 @@ function parseLoadingMessage(msg: string): any{
 
   return buildPendingNodeThoughtChain(jsonArray)
 }
-
+function findNode(jsonArray: NormalNode[], nodeName: string): NormalNode | undefined {
+  return jsonArray.filter((item) => item.nodeName === nodeName)[0]
+}
 // 解析 status = success 的消息
 function parseSuccessMessage(msg: string) {
     // 解析完整数据
     const jsonArray: NormalNode[] = parseJsonTextStrict(msg)
     // 闲聊模式
-    if(jsonArray.filter((item) => item.nodeName === 'coordinator').length > 0) {
-      const coordinatorNode = jsonArray.filter((item) => item.nodeName === 'coordinator')[0];
-      if(coordinatorNode && !coordinatorNode.content) {
-        return (jsonArray.filter((item) => item.nodeName === '__END__')[0].content as any).output
+    const coordinatorNode = findNode(jsonArray, 'coordinator')
+    if(coordinatorNode && !coordinatorNode.content) {
+      const endNode = findNode(jsonArray, '__END__')
+      return endNode?.content.output
       }
+    // 用户终止
+    const endNode = findNode(jsonArray, '__END__')
+    if(endNode && endNode.content.reason === '用户终止') {
+      current.deepResearchDetail = false
+      return endNode.content.reason
     }
-    // 人类中断模式
-    if(jsonArray.filter((item) => item.nodeName === '__END__').length === 0) {
+    // 需要用用户反馈
+    if(!endNode) {
       return buildStartDSThoughtChain(jsonArray)
     }
     // 人类恢复模式 或者 直接 end 模式
-    if(jsonArray.filter((item) => item.nodeName === 'human_feedback').length > 0 || jsonArray.filter((item) => item.nodeName === '__END__').length) {
+    const humanFeedbackNode = findNode(jsonArray, 'human_feedback')
+    if(humanFeedbackNode || endNode) {
       return buildEndDSThoughtChain(jsonArray)
     }
 }
@@ -649,21 +666,21 @@ function beforeUpload(file: File) {
     message.error('只支持 PDF、TXT、DOC、DOCX、MD 格式的文件')
     return false
   }
-  
+
   // 检查文件大小（限制为 10MB）
   const maxSize = 10 * 1024 * 1024
   if (file.size > maxSize) {
     message.error('文件大小不能超过 10MB')
     return false
   }
-  
+
   return true
 }
 
 // 处理文件上传
 async function handleFileUpload(options: any) {
   const file = options.file as File
-  
+
   try {
     // 构建表单数据
     const formData = new FormData()
@@ -696,7 +713,7 @@ async function handleFileUpload(options: any) {
 const headerNode = computed(() => {
   const filesList = messageStore.uploadedFiles?.[convId] || []
   return (
-  
+
     <Sender.Header title="上传文件" open={headerOpen.value} onOpenChange={v => headerOpen.value = v}>
       <Attachments items={filesList} overflow="scrollX" onChange={handleFileChange} beforeUpload={beforeUpload} customRequest={handleFileUpload} placeholder={(type) => type === 'drop'
               ? {
@@ -708,7 +725,7 @@ const headerNode = computed(() => {
                 description: '支持上传PDF、TXT、DOC、DOCX、MD等文件',
               }}/>
     </Sender.Header>
-  
+
 )});
 
 const scrollContainer = ref<Element | any>(null)