From 1ff9e2d14693aed2ecbd852a11d4b93d4b24db7c Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Thu, 7 Mar 2024 13:41:16 +0800 Subject: [PATCH] openapi config --- packages/global/common/system/types/index.d.ts | 2 ++ packages/service/core/ai/config.ts | 4 ++-- pnpm-lock.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/global/common/system/types/index.d.ts b/packages/global/common/system/types/index.d.ts index fda136277a..94abbd74ac 100644 --- a/packages/global/common/system/types/index.d.ts +++ b/packages/global/common/system/types/index.d.ts @@ -63,6 +63,8 @@ export type SystemEnvType = { vectorMaxProcess: number; qaMaxProcess: number; pgHNSWEfSearch: number; + oneapiUrl?: string; + chatApiKey?: string; }; // declare global { diff --git a/packages/service/core/ai/config.ts b/packages/service/core/ai/config.ts index 17aff89aa1..3662b1fa3e 100644 --- a/packages/service/core/ai/config.ts +++ b/packages/service/core/ai/config.ts @@ -2,9 +2,9 @@ import type { UserModelSchema } from '@fastgpt/global/support/user/type'; import OpenAI from '@fastgpt/global/core/ai'; export const openaiBaseUrl = process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1'; -export const baseUrl = process.env.ONEAPI_URL || openaiBaseUrl; +export const baseUrl = global?.systemEnv?.oneapiUrl || process.env.ONEAPI_URL || openaiBaseUrl; -export const systemAIChatKey = process.env.CHAT_API_KEY || ''; +export const systemAIChatKey = global?.systemEnv?.chatApiKey || process.env.CHAT_API_KEY || ''; export const getAIApi = (props?: { userKey?: UserModelSchema['openaiAccount']; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ee0c8750ce..3e7caaf7d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.0' +lockfileVersion: '6.1' settings: autoInstallPeers: true