🐛 fix: fix client config

weijihailanzhou · Sep 11, 2023 · d62f1b3 · d62f1b3
1 parent 554dd8a
commit d62f1b3
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 23 deletions.
diff --git a/next.config.mjs b/next.config.mjs
@@ -14,9 +14,6 @@ const nextConfig = {
   reactStrictMode: true,
   pageExtensions: ['page.tsx', 'api.ts'],
   transpilePackages: ['@lobehub/ui'],
-  env: {
-    USE_AZURE_OPENAI: process.env.USE_AZURE_OPENAI === '1',
-  },
   webpack(config) {
     config.experiments = {
       asyncWebAssembly: true,

diff --git a/src/config/client.ts b/src/config/client.ts
diff --git a/src/config/server.ts b/src/config/server.ts
@@ -7,6 +7,7 @@ declare global {
       AZURE_API_VERSION?: string;
       OPENAI_API_KEY?: string;
       OPENAI_PROXY_URL?: string;
+      USE_AZURE_OPENAI?: string;
     }
   }
 }
@@ -25,5 +26,6 @@ export const getServerConfig = () => {
 
     OPENAI_API_KEY: process.env.OPENAI_API_KEY,
     OPENAI_PROXY_URL: process.env.OPENAI_PROXY_URL,
+    USE_AZURE_OPENAI: process.env.USE_AZURE_OPENAI === '1',
   };
 };
diff --git a/src/const/settings.ts b/src/const/settings.ts
@@ -1,4 +1,3 @@
-import { getClientConfig } from '@/config/client';
 import { DEFAULT_OPENAI_MODEL_LIST } from '@/const/llm';
 import { DEFAULT_AGENT_META } from '@/const/meta';
 import { LanguageModel } from '@/types/llm';
@@ -38,7 +37,6 @@ export const DEFAULT_LLM_CONFIG: GlobalLLMConfig = {
   openAI: {
     OPENAI_API_KEY: '',
     models: DEFAULT_OPENAI_MODEL_LIST,
-    useAzure: getClientConfig().USE_AZURE_OPENAI,
   },
 };
 

diff --git a/src/pages/api/openai/chat.api.ts b/src/pages/api/openai/chat.api.ts
@@ -1,6 +1,6 @@
 import OpenAI from 'openai';
 
-import { getClientConfig } from '@/config/client';
+import { getServerConfig } from '@/config/server';
 import { getOpenAIAuthFromRequest } from '@/const/fetch';
 import { ErrorType } from '@/types/fetch';
 import { OpenAIStreamPayload } from '@/types/openai';
@@ -26,7 +26,7 @@ export default async function handler(req: Request) {
 
   let openai: OpenAI;
 
-  const { USE_AZURE_OPENAI } = getClientConfig();
+  const { USE_AZURE_OPENAI } = getServerConfig();
   const useAzureOpenAI = useAzure || USE_AZURE_OPENAI;
 
   if (useAzureOpenAI) {

diff --git a/src/pages/settings/features/Settings/LLM/index.tsx b/src/pages/settings/features/Settings/LLM/index.tsx
@@ -8,7 +8,6 @@ import { memo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { getClientConfig } from '@/config/client';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { globalSelectors, useEffectAfterGlobalHydrated, useGlobalStore } from '@/store/global';
 
@@ -83,7 +82,7 @@ const LLM = memo(() => {
       },
       {
         children: (
-          <Switch disabled={getClientConfig().USE_AZURE_OPENAI} />
+          <Switch />
           //   <Flexbox gap={4}>
           //   <div>
           //