From c1c91db9d28c31b9ebee8851377785f80f0f4118 Mon Sep 17 00:00:00 2001
From: icarus <eurfelux@gmail.com>
Date: Fri, 29 Aug 2025 22:51:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(api):=20=E4=BF=AE=E5=A4=8DAPI=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=92=8C=E5=8F=96=E6=B6=88=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加对API检查过程中错误的处理，并支持通过abortController取消请求
避免空系统提示词导致的报错，优化检查流程的健壮性
---
 src/renderer/src/services/ApiService.ts | 44 ++++++++++++++++---------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index 211774b6b9..d9a79ee978 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -15,13 +15,15 @@ import { Assistant, MCPServer, MCPTool, Model, Provider } from '@renderer/types'
 import { type Chunk, ChunkType } from '@renderer/types/chunk'
 import { Message } from '@renderer/types/newMessage'
 import { SdkModel } from '@renderer/types/sdk'
-import { removeSpecialCharactersForTopicName } from '@renderer/utils'
+import { removeSpecialCharactersForTopicName, uuid } from '@renderer/utils'
+import { abortCompletion, readyToAbort } from '@renderer/utils/abortController'
+import { isAbortError } from '@renderer/utils/error'
 import { isPromptToolUse, isSupportedToolUse } from '@renderer/utils/mcp-tools'
 import { findFileBlocks, getMainTextContent } from '@renderer/utils/messageUtils/find'
 import { containsSupportedVariables, replacePromptVariables } from '@renderer/utils/prompt'
 import { isEmpty, takeRight } from 'lodash'
 
-import AiProviderNew from '../aiCore/index_new'
+import AiProviderNew, { ModernAiProviderConfig } from '../aiCore/index_new'
 import {
   // getAssistantProvider,
   // getAssistantSettings,
@@ -418,6 +420,7 @@ export async function checkApi(provider: Provider, model: Model, timeout = 15000
 
   const assistant = getDefaultAssistant()
   assistant.model = model
+  assistant.prompt = 'test' // 避免部分 provider 空系统提示词会报错
   try {
     if (isEmbeddingModel(model)) {
       // race 超时 15s
@@ -425,32 +428,41 @@ export async function checkApi(provider: Provider, model: Model, timeout = 15000
       const timerPromise = new Promise((_, reject) => setTimeout(() => reject('Timeout'), timeout))
       await Promise.race([ai.getEmbeddingDimensions(model), timerPromise])
     } else {
+      const abortId = uuid()
+      const signal = readyToAbort(abortId)
+      let chunkError
       const params: StreamTextParams = {
         system: assistant.prompt,
-        prompt: 'hi'
+        prompt: 'hi',
+        abortSignal: signal
       }
-      const middlewareConfig: AiSdkMiddlewareConfig = {
-        streamOutput: false,
+      const config: ModernAiProviderConfig = {
+        streamOutput: true,
         enableReasoning: false,
         isSupportedToolUse: false,
         isImageGenerationEndpoint: false,
         enableWebSearch: false,
         enableGenerateImage: false,
-        isPromptToolUse: false
+        isPromptToolUse: false,
+        assistant,
+        callType: 'check',
+        onChunk: (chunk: Chunk) => {
+          if (chunk.type === ChunkType.ERROR) {
+            chunkError = chunk.error
+          } else {
+            abortCompletion(abortId)
+          }
+        }
       }
 
       // Try streaming check first
-      const result = await ai.completions(model.id, params, {
-        ...middlewareConfig,
-        assistant,
-        callType: 'check'
-      })
-      if (!result.getText()) {
-        throw new Error('No response received')
+      try {
+        await ai.completions(model.id, params, config)
+      } catch (e) {
+        if (!isAbortError(e) && !isAbortError(chunkError)) {
+          throw e
+        }
       }
-      // if (streamError) {
-      //   throw streamError
-      // }
     }
   } catch (error: any) {
     // 失败回退legacy