From 1c4f95cff12bc7472bcd75704e50541964255c98 Mon Sep 17 00:00:00 2001 From: askyLYZ <30401729+askyLYZ@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:24:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0openai=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=8A=A8=E6=80=81=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新openai接口类型的动态调用 --- src/services/api/openai/client.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/services/api/openai/client.ts b/src/services/api/openai/client.ts index 62a37dfbc..2d7f1ff8c 100644 --- a/src/services/api/openai/client.ts +++ b/src/services/api/openai/client.ts @@ -1,6 +1,5 @@ -import OpenAI from 'openai' +import type OpenAI from 'openai import { getProxyFetchOptions } from 'src/utils/proxy.js' -import { isEnvTruthy } from 'src/utils/envUtils.js' /** * Environment variables: @@ -13,13 +12,14 @@ import { isEnvTruthy } from 'src/utils/envUtils.js' let cachedClient: OpenAI | null = null -export function getOpenAIClient(options?: { +export async function getOpenAIClient(options?: { maxRetries?: number fetchOverride?: typeof fetch source?: string -}): OpenAI { +}): Promise { if (cachedClient) return cachedClient - + + const { default: OpenAI } = await import('openai') const apiKey = process.env.OPENAI_API_KEY || '' const baseURL = process.env.OPENAI_BASE_URL From 9dd521a533712da2005f777b5945534c9d371f10 Mon Sep 17 00:00:00 2001 From: askyLYZ <30401729+askyLYZ@users.noreply.github.com> Date: Mon, 20 Apr 2026 15:25:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dopenai=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复openai类型接口第一次调用失败的bug --- src/services/api/openai/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/api/openai/index.ts b/src/services/api/openai/index.ts index 0db002225..8f0f115d3 100644 --- a/src/services/api/openai/index.ts +++ b/src/services/api/openai/index.ts @@ -217,7 +217,7 @@ export async function* queryModelOpenAI( const maxTokens = resolveOpenAIMaxTokens(upperLimit, options.maxOutputTokensOverride) // 11. Get client - const client = getOpenAIClient({ + const client = await getOpenAIClient({ maxRetries: 0, fetchOverride: options.fetchOverride as unknown as typeof fetch, source: options.querySource, From d3ac5fee3fca2ec0b92925eff85a2c7c83f69b60 Mon Sep 17 00:00:00 2001 From: askyLYZ <30401729+askyLYZ@users.noreply.github.com> Date: Mon, 20 Apr 2026 16:08:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dopenai=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84GLM-5=E7=9A=84=E9=80=82=E9=85=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复openai兼容接口的GLM-5的适配bug --- .../@ant/model-provider/src/shared/openaiConvertMessages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@ant/model-provider/src/shared/openaiConvertMessages.ts b/packages/@ant/model-provider/src/shared/openaiConvertMessages.ts index 4d2553653..40b136a7a 100644 --- a/packages/@ant/model-provider/src/shared/openaiConvertMessages.ts +++ b/packages/@ant/model-provider/src/shared/openaiConvertMessages.ts @@ -260,7 +260,7 @@ function convertInternalAssistantMessage( const result: ChatCompletionAssistantMessageParam = { role: 'assistant', - content: textParts.length > 0 ? textParts.join('\n') : null, + content: textParts.length > 0 ? textParts.join('\n') : "", ...(toolCalls.length > 0 && { tool_calls: toolCalls }), ...(reasoningParts.length > 0 && { reasoning_content: reasoningParts.join('\n') }), }