@@ -91,8 +91,9 @@ const Settings = memo(() => {
{`${pkg.version}`}
- {tab === Tabs.common &&
}
- {tab === Tabs.agent &&
}
+ {tab === 'common' &&
}
+ {tab === 'llm' &&
}
+ {tab === 'agent' &&
}
);
});
diff --git a/src/services/_header.ts b/src/services/_header.ts
new file mode 100644
index 000000000000..82d79a4f587b
--- /dev/null
+++ b/src/services/_header.ts
@@ -0,0 +1,33 @@
+import {
+ AZURE_OPENAI_API_VERSION,
+ LOBE_CHAT_ACCESS_CODE,
+ OPENAI_API_KEY_HEADER_KEY,
+ OPENAI_END_POINT,
+ USE_AZURE_OPENAI,
+} from '@/const/fetch';
+import { useGlobalStore } from '@/store/global';
+
+// eslint-disable-next-line no-undef
+export const createHeaderWithOpenAI = (header?: HeadersInit): HeadersInit => {
+ const openai = useGlobalStore.getState().settings.languageModel.openAI;
+
+ const apiKey = openai.OPENAI_API_KEY || useGlobalStore.getState().settings.OPENAI_API_KEY || '';
+ const endpoint = openai.endpoint || useGlobalStore.getState().settings.endpoint || '';
+
+ // eslint-disable-next-line no-undef
+ const result: HeadersInit = {
+ ...header,
+ [LOBE_CHAT_ACCESS_CODE]: useGlobalStore.getState().settings.password || '',
+ [OPENAI_API_KEY_HEADER_KEY]: apiKey,
+ [OPENAI_END_POINT]: endpoint,
+ };
+
+ if (openai.useAzure) {
+ Object.assign(result, {
+ [AZURE_OPENAI_API_VERSION]: openai.azureApiVersion,
+ [USE_AZURE_OPENAI]: '1',
+ });
+ }
+
+ return result;
+};
diff --git a/src/services/_url.ts b/src/services/_url.ts
new file mode 100644
index 000000000000..6b49a94acb98
--- /dev/null
+++ b/src/services/_url.ts
@@ -0,0 +1,17 @@
+const isDev = process.env.NODE_ENV === 'development';
+
+const prefix = isDev ? '-dev' : '';
+
+export const URLS = {
+ plugins: '/api/plugins' + prefix,
+};
+
+export const OPENAI_URLS = {
+ chat: '/api/openai/chat' + prefix,
+ models: '/api/openai/models' + prefix,
+};
+
+export const AZURE_OPENAI_URLS = {
+ chat: '/api/azure-openai/chat' + prefix,
+ models: '/api/azure-openai/models' + prefix,
+};
diff --git a/src/services/chatModel.ts b/src/services/chatModel.ts
index e371aea71fe5..9df970e336fa 100644
--- a/src/services/chatModel.ts
+++ b/src/services/chatModel.ts
@@ -1,12 +1,11 @@
import { merge } from 'lodash-es';
-import { LOBE_CHAT_ACCESS_CODE, OPENAI_API_KEY_HEADER_KEY, OPENAI_END_POINT } from '@/const/fetch';
-import { useGlobalStore } from '@/store/global';
import { pluginSelectors, usePluginStore } from '@/store/plugin';
import { initialLobeAgentConfig } from '@/store/session/initialState';
import type { ChatCompletionFunctions, OpenAIStreamPayload } from '@/types/openai';
-import { URLS } from './url';
+import { createHeaderWithOpenAI } from './_header';
+import { OPENAI_URLS } from './_url';
interface FetchChatModelOptions {
signal?: AbortSignal | undefined;
@@ -35,14 +34,9 @@ export const fetchChatModel = (
const functions = filterFunctions.length === 0 ? undefined : filterFunctions;
- return fetch(URLS.openai, {
+ return fetch(OPENAI_URLS.chat, {
body: JSON.stringify({ ...payload, functions }),
- headers: {
- 'Content-Type': 'application/json',
- [LOBE_CHAT_ACCESS_CODE]: useGlobalStore.getState().settings.password || '',
- [OPENAI_API_KEY_HEADER_KEY]: useGlobalStore.getState().settings.OPENAI_API_KEY || '',
- [OPENAI_END_POINT]: useGlobalStore.getState().settings.endpoint || '',
- },
+ headers: createHeaderWithOpenAI({ 'Content-Type': 'application/json' }),
method: 'POST',
signal: options?.signal,
});
diff --git a/src/services/modelList.ts b/src/services/modelList.ts
new file mode 100644
index 000000000000..b91a0d9934c8
--- /dev/null
+++ b/src/services/modelList.ts
@@ -0,0 +1,15 @@
+import { LanguageModelWhiteList } from '@/const/llm';
+
+import { createHeaderWithOpenAI } from './_header';
+import { OPENAI_URLS } from './_url';
+
+export const fetchModelList = async (): Promise
=> {
+ const res = await fetch(OPENAI_URLS.models, {
+ headers: createHeaderWithOpenAI(),
+ method: 'POST',
+ });
+
+ const modelList: string[] = await res.json();
+
+ return LanguageModelWhiteList.filter((i) => modelList.includes(i));
+};
diff --git a/src/services/plugin.ts b/src/services/plugin.ts
index f0c0054943b7..8e01d2f44eff 100644
--- a/src/services/plugin.ts
+++ b/src/services/plugin.ts
@@ -3,7 +3,7 @@ import { PluginRequestPayload, createHeadersWithPluginSettings } from '@lobehub/
import { pluginSelectors, usePluginStore } from '@/store/plugin';
import { getMessageError } from '@/utils/fetch';
-import { URLS } from './url';
+import { URLS } from './_url';
interface FetchChatModelOptions {
signal?: AbortSignal | undefined;
diff --git a/src/services/pluginMarket.ts b/src/services/pluginMarket.ts
index 9f992845fd87..e93f130e026d 100644
--- a/src/services/pluginMarket.ts
+++ b/src/services/pluginMarket.ts
@@ -2,7 +2,7 @@ import { getPluginIndexJSON } from '@/const/url';
import { useGlobalStore } from '@/store/global';
/**
- * 请求插件列表
+ * fetch Plugin Market List
*/
export const getPluginList = async () => {
const url = getPluginIndexJSON(useGlobalStore.getState().settings.language);
diff --git a/src/services/url.ts b/src/services/url.ts
deleted file mode 100644
index f18b774bd92c..000000000000
--- a/src/services/url.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-const isDev = process.env.NODE_ENV === 'development';
-
-const prefix = isDev ? '-dev' : '';
-
-export const URLS = {
- openai: '/api/openai' + prefix,
- plugins: '/api/plugins' + prefix,
-};
diff --git a/src/store/global/hooks/index.ts b/src/store/global/hooks/index.ts
index 818f44eefc5f..8d8dc9d9ae44 100644
--- a/src/store/global/hooks/index.ts
+++ b/src/store/global/hooks/index.ts
@@ -1,3 +1,4 @@
+export * from './useEffectAfterHydrated';
export * from './useHydrated';
export * from './useOnFinishHydrationGlobal';
export * from './useSwitchSideBarOnInit';
diff --git a/src/store/global/hooks/useEffectAfterHydrated.ts b/src/store/global/hooks/useEffectAfterHydrated.ts
new file mode 100644
index 000000000000..8cb9caefb4d0
--- /dev/null
+++ b/src/store/global/hooks/useEffectAfterHydrated.ts
@@ -0,0 +1,22 @@
+import { useEffect } from 'react';
+
+import { useGlobalStore } from '../store';
+
+export const useEffectAfterGlobalHydrated = (
+ fn: (store: typeof useGlobalStore) => void,
+ deps: any[] = [],
+) => {
+ useEffect(() => {
+ const hasRehydrated = useGlobalStore.persist.hasHydrated();
+
+ if (hasRehydrated) {
+ // 等价 useEffect 多次触发
+ fn(useGlobalStore);
+ } else {
+ // 等价于 useEffect 第一次触发
+ useGlobalStore.persist.onFinishHydration(() => {
+ fn(useGlobalStore);
+ });
+ }
+ }, deps);
+};
diff --git a/src/store/global/initialState.ts b/src/store/global/initialState.ts
index 896fd165fb27..42d0c1239b03 100644
--- a/src/store/global/initialState.ts
+++ b/src/store/global/initialState.ts
@@ -3,6 +3,8 @@ import type { GlobalSettings } from '@/types/settings';
export type SidebarTabKey = 'chat' | 'market' | 'settings';
+export type SettingsTabs = 'agent' | 'common' | 'llm';
+
export interface Guide {
// Topic 引导
topic?: boolean;
@@ -19,6 +21,7 @@ export interface GlobalState {
* 用户设置
*/
settings: GlobalSettings;
+ settingsTab: SettingsTabs;
sidebarKey: SidebarTabKey;
}
@@ -41,5 +44,6 @@ export const initialState: GlobalState = {
showSessionPanel: true,
},
settings: DEFAULT_SETTINGS,
+ settingsTab: 'common',
sidebarKey: 'chat',
};
diff --git a/src/store/global/selectors.test.ts b/src/store/global/selectors.test.ts
new file mode 100644
index 000000000000..4979b981ec38
--- /dev/null
+++ b/src/store/global/selectors.test.ts
@@ -0,0 +1,264 @@
+import { LanguageModel } from '@/types/llm';
+
+import { globalSelectors } from './selectors';
+import { GlobalStore } from './store';
+
+describe('globalSelectors', () => {
+ describe('currentSettings', () => {
+ it('should merge DEFAULT_SETTINGS and s.settings correctly', () => {
+ const s = {
+ settings: {
+ avatar: 'avatar.jpg',
+ fontSize: 14,
+ language: 'en-US',
+ neutralColor: 'sand',
+ password: 'password123',
+ primaryColor: 'blue',
+ themeMode: 'light',
+ defaultAgent: {
+ config: {
+ systemRole: '',
+ model: LanguageModel.GPT3_5,
+ params: {},
+ },
+ meta: {
+ avatar: 'Default Agent',
+ description: 'Default agent for testing',
+ },
+ },
+ languageModel: {
+ openAI: {
+ OPENAI_API_KEY: 'openai-api-key',
+ endpoint: 'https://openai-endpoint.com',
+ models: ['gpt-3.5-turbo'],
+ },
+ },
+ },
+ } as unknown as GlobalStore;
+
+ const result = globalSelectors.currentSettings(s);
+
+ expect(result).toEqual({
+ avatar: 'avatar.jpg',
+ fontSize: 14,
+ language: 'en-US',
+ neutralColor: 'sand',
+ password: 'password123',
+ primaryColor: 'blue',
+ themeMode: 'light',
+ defaultAgent: {
+ config: {
+ displayMode: 'chat',
+ historyCount: 1,
+ systemRole: '',
+ model: LanguageModel.GPT3_5,
+ params: {
+ frequency_penalty: 0,
+ presence_penalty: 0,
+ temperature: 0.6,
+ top_p: 1,
+ },
+ plugins: [],
+ },
+ meta: {
+ avatar: 'Default Agent',
+ description: 'Default agent for testing',
+ },
+ },
+ languageModel: {
+ openAI: {
+ OPENAI_API_KEY: 'openai-api-key',
+ azureApiVersion: '2023-08-01-preview',
+ endpoint: 'https://openai-endpoint.com',
+ models: ['gpt-3.5-turbo'],
+ },
+ },
+ });
+ });
+ });
+ //
+ // describe('defaultAgent', () => {
+ // it('should merge DEFAULT_AGENT and s.settings.defaultAgent correctly', () => {
+ // const s: GlobalStore = {
+ // settings: {
+ // defaultAgent: {
+ // config: {
+ // model: 'gpt-3.5-turbo',
+ // maxTokens: 100,
+ // },
+ // meta: {
+ // name: 'Default Agent',
+ // description: 'Default agent for testing',
+ // },
+ // },
+ // },
+ // };
+ //
+ // const result = globalSelectors.defaultAgent(s);
+ //
+ //
+ //
+ // expect(result).toEqual(expected);
+ // });
+ // });
+ //
+ // describe('defaultAgentConfig', () => {
+ // it('should merge DEFAULT_AGENT_CONFIG and defaultAgent(s).config correctly', () => {
+ // const s: GlobalStore = {
+ // settings: {
+ // defaultAgent: {
+ // config: {
+ // model: 'gpt-3.5-turbo',
+ // maxTokens: 100,
+ // },
+ // },
+ // },
+ // };
+ //
+ // const result = globalSelectors.defaultAgentConfig(s);
+ //
+ // const defaultAgent = globalSelectors.defaultAgent(s);
+ // const expected = merge({}, DEFAULT_AGENT_CONFIG, defaultAgent.config);
+ //
+ // expect(result).toEqual(expected);
+ // });
+ // });
+ //
+ // describe('defaultAgentMeta', () => {
+ // it('should merge DEFAULT_AGENT_META and defaultAgent(s).meta correctly', () => {
+ // const s: GlobalStore = {
+ // settings: {
+ // defaultAgent: {
+ // meta: {
+ // name: 'Default Agent',
+ // description: 'Default agent for testing',
+ // },
+ // },
+ // },
+ // };
+ //
+ // const result = globalSelectors.defaultAgentMeta(s);
+ //
+ // const defaultAgent = globalSelectors.defaultAgent(s);
+ // const expected = merge({}, DEFAULT_AGENT_META, defaultAgent.meta);
+ //
+ // expect(result).toEqual(expected);
+ // });
+ // });
+ //
+ // describe('exportSettings', () => {
+ // it('should remove OPENAI_API_KEY and password fields from s.settings', () => {
+ // const s: GlobalStore = {
+ // settings: {
+ // OPENAI_API_KEY: 'openai-api-key',
+ // password: 'password123',
+ // avatar: 'avatar.jpg',
+ // fontSize: 14,
+ // language: 'en',
+ // neutralColor: 'white',
+ // primaryColor: 'blue',
+ // themeMode: 'light',
+ // defaultAgent: {
+ // config: {
+ // model: 'gpt-3.5-turbo',
+ // maxTokens: 100,
+ // },
+ // meta: {
+ // name: 'Default Agent',
+ // description: 'Default agent for testing',
+ // },
+ // },
+ // languageModel: {
+ // azureOpenAI: {
+ // AZURE_API_KEY: 'azure-api-key',
+ // apiVersion: 'v1',
+ // endpoint: 'https://azure-openai-endpoint.com',
+ // models: ['gpt-3.5-turbo'],
+ // },
+ // openAI: {
+ // OPENAI_API_KEY: 'openai-api-key',
+ // endpoint: 'https://openai-endpoint.com',
+ // models: ['gpt-3.5-turbo'],
+ // },
+ // },
+ // },
+ // };
+ //
+ // const result = globalSelectors.exportSettings(s);
+ //
+ // const expected = {
+ // avatar: 'avatar.jpg',
+ // fontSize: 14,
+ // language: 'en',
+ // neutralColor: 'white',
+ // primaryColor: 'blue',
+ // themeMode: 'light',
+ // defaultAgent: {
+ // config: {
+ // model: 'gpt-3.5-turbo',
+ // maxTokens: 100,
+ // },
+ // meta: {
+ // name: 'Default Agent',
+ // description: 'Default agent for testing',
+ // },
+ // },
+ // languageModel: {
+ // azureOpenAI: {
+ // AZURE_API_KEY: 'azure-api-key',
+ // apiVersion: 'v1',
+ // endpoint: 'https://azure-openai-endpoint.com',
+ // models: ['gpt-3.5-turbo'],
+ // },
+ // openAI: {
+ // endpoint: 'https://openai-endpoint.com',
+ // models: ['gpt-3.5-turbo'],
+ // },
+ // },
+ // };
+ //
+ // expect(result).toEqual(expected);
+ // });
+ //
+ // it('should return the result as GlobalSettings type', () => {
+ // const s: GlobalStore = {
+ // settings: {
+ // avatar: 'avatar.jpg',
+ // fontSize: 14,
+ // language: 'en',
+ // neutralColor: 'white',
+ // password: 'password123',
+ // primaryColor: 'blue',
+ // themeMode: 'light',
+ // defaultAgent: {
+ // config: {
+ // model: 'gpt-3.5-turbo',
+ // maxTokens: 100,
+ // },
+ // meta: {
+ // name: 'Default Agent',
+ // description: 'Default agent for testing',
+ // },
+ // },
+ // languageModel: {
+ // azureOpenAI: {
+ // AZURE_API_KEY: 'azure-api-key',
+ // apiVersion: 'v1',
+ // endpoint: 'https://azure-openai-endpoint.com',
+ // models: ['gpt-3.5-turbo'],
+ // },
+ // openAI: {
+ // OPENAI_API_KEY: 'openai-api-key',
+ // endpoint: 'https://openai-endpoint.com',
+ // models: ['gpt-3.5-turbo'],
+ // },
+ // },
+ // },
+ // };
+ //
+ // const result = globalSelectors.exportSettings(s);
+ //
+ // expect(result).toBeInstanceOf(GlobalSettings);
+ // });
+ // });
+});
diff --git a/src/store/global/selectors.ts b/src/store/global/selectors.ts
index fe61110d9681..bff03853efce 100644
--- a/src/store/global/selectors.ts
+++ b/src/store/global/selectors.ts
@@ -5,14 +5,13 @@ import { merge } from '@/utils/merge';
import { GlobalStore } from './store';
-const currentSettings = (s: GlobalStore) => merge({}, DEFAULT_SETTINGS, s.settings);
+const currentSettings = (s: GlobalStore) => merge(DEFAULT_SETTINGS, s.settings);
-const defaultAgent = (s: GlobalStore) => merge({}, DEFAULT_AGENT, s.settings.defaultAgent);
+const defaultAgent = (s: GlobalStore) => merge(DEFAULT_AGENT, s.settings.defaultAgent);
-const defaultAgentConfig = (s: GlobalStore) =>
- merge({}, DEFAULT_AGENT_CONFIG, defaultAgent(s).config);
+const defaultAgentConfig = (s: GlobalStore) => merge(DEFAULT_AGENT_CONFIG, defaultAgent(s).config);
-const defaultAgentMeta = (s: GlobalStore) => merge({}, DEFAULT_AGENT_META, defaultAgent(s).meta);
+const defaultAgentMeta = (s: GlobalStore) => merge(DEFAULT_AGENT_META, defaultAgent(s).meta);
export const exportSettings = (s: GlobalStore) => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/src/store/global/slices/settings.ts b/src/store/global/slices/settings.ts
index 6ee674b6ca61..c39e6977b50b 100644
--- a/src/store/global/slices/settings.ts
+++ b/src/store/global/slices/settings.ts
@@ -1,10 +1,13 @@
import { ThemeMode } from 'antd-style';
+import isEqual from 'fast-deep-equal';
import { produce } from 'immer';
-import { merge } from 'lodash-es';
+import { DeepPartial } from 'utility-types';
import type { StateCreator } from 'zustand/vanilla';
import { DEFAULT_AGENT, DEFAULT_SETTINGS } from '@/const/settings';
+import { SettingsTabs } from '@/store/global/initialState';
import type { GlobalSettings } from '@/types/settings';
+import { merge } from '@/utils/merge';
import { setNamespace } from '@/utils/storeDebug';
import type { GlobalStore } from '../store';
@@ -24,7 +27,8 @@ export interface SettingsAction {
* 设置部分配置设置
* @param settings - 部分配置设置
*/
- setSettings: (settings: Partial) => void;
+ setSettings: (settings: DeepPartial) => void;
+ switchSettingTabs: (tab: SettingsTabs) => void;
/**
* 设置主题模式
* @param themeMode - 主题模式
@@ -58,11 +62,19 @@ export const createSettingsSlice: StateCreator<
resetSettings: () => {
set({ settings: DEFAULT_SETTINGS }, false, t('resetSettings'));
},
-
setSettings: (settings) => {
const oldSetting = get().settings;
- set({ settings: merge({}, oldSetting, settings) }, false, t('setSettings', settings));
+ const nextSettings = merge(oldSetting, settings);
+
+ if (isEqual(oldSetting, nextSettings)) return;
+
+ set({ settings: merge(oldSetting, settings) }, false, t('setSettings', settings));
},
+
+ switchSettingTabs: (tab) => {
+ set({ settingsTab: tab });
+ },
+
switchThemeMode: (themeMode) => {
get().setSettings({ themeMode });
},
diff --git a/src/store/global/store.ts b/src/store/global/store.ts
index df536c9f06a1..99fdd498ffa5 100644
--- a/src/store/global/store.ts
+++ b/src/store/global/store.ts
@@ -4,9 +4,10 @@ import { shallow } from 'zustand/shallow';
import { createWithEqualityFn } from 'zustand/traditional';
import { StateCreator } from 'zustand/vanilla';
-import { DEFAULT_AGENT } from '@/const/settings';
+import { DEFAULT_AGENT, DEFAULT_LLM_CONFIG } from '@/const/settings';
import { isDev } from '@/utils/env';
+import { createHyperStorage } from '../middleware/createHyperStorage';
import { type GlobalState, initialState } from './initialState';
import { type AgentAction, createAgentSlice } from './slices/agent';
import { type CommonAction, createCommonSlice } from './slices/common';
@@ -29,6 +30,7 @@ type GlobalPersist = Pick;
const persistOptions: PersistOptions = {
merge: (persistedState, currentState) => {
const state = persistedState as GlobalPersist;
+
return {
...currentState,
...state,
@@ -36,15 +38,42 @@ const persistOptions: PersistOptions = {
if (!draft.defaultAgent) {
draft.defaultAgent = DEFAULT_AGENT;
}
+ delete draft.enableMaxTokens;
+ delete draft.enableHistoryCount;
+ delete draft.historyCount;
+ delete draft.enableCompressThreshold;
+ delete draft.compressThreshold;
+
+ // migration to new data model
+ if (!draft.languageModel) {
+ draft.languageModel = {
+ openAI: {
+ ...DEFAULT_LLM_CONFIG.openAI,
+ OPENAI_API_KEY: draft.OPENAI_API_KEY || DEFAULT_LLM_CONFIG.openAI.OPENAI_API_KEY,
+ endpoint: draft.endpoint || DEFAULT_LLM_CONFIG.openAI.OPENAI_API_KEY,
+ },
+ };
+
+ delete draft.OPENAI_API_KEY;
+ delete draft.endpoint;
+ }
}),
};
},
name: 'LOBE_SETTINGS',
- partialize: (s) => ({
- preference: s.preference,
- settings: s.settings,
- }),
+
skipHydration: true,
+
+ storage: createHyperStorage({
+ localStorage: {
+ dbName: 'LobeHub',
+ selectors: ['preference', 'settings'],
+ },
+ url: {
+ mode: 'hash',
+ selectors: [{ settingsTab: 'tab' }],
+ },
+ }),
};
// =============== 实装 useStore ============ //
diff --git a/src/types/settings.ts b/src/types/settings.ts
index dc935ec445c6..0570d13ad67a 100644
--- a/src/types/settings.ts
+++ b/src/types/settings.ts
@@ -5,15 +5,37 @@ import type { Locales } from '@/locales/resources';
import type { LobeAgentSession } from '@/types/session';
export interface GlobalBaseSettings {
- OPENAI_API_KEY: string;
+ /**
+ * @deprecated
+ */
+ OPENAI_API_KEY?: string;
+
avatar: string;
- compressThreshold: number;
- enableCompressThreshold: boolean;
- enableHistoryCount: boolean;
- enableMaxTokens: boolean;
- endpoint: string;
+ /**
+ * @deprecated
+ */
+ compressThreshold?: number;
+ /**
+ * @deprecated
+ */
+ enableCompressThreshold?: boolean;
+ /**
+ * @deprecated
+ */
+ enableHistoryCount?: boolean;
+ /**
+ * @deprecated
+ */
+ enableMaxTokens?: boolean;
+ /**
+ * @deprecated
+ */
+ endpoint?: string;
fontSize: number;
- historyCount: number;
+ /**
+ * @deprecated
+ */
+ historyCount?: number;
language: Locales;
neutralColor: NeutralColors | '';
password: string;
@@ -21,13 +43,28 @@ export interface GlobalBaseSettings {
themeMode: ThemeMode;
}
-export type GlobalDefaultAgent = Partial;
+export type GlobalDefaultAgent = Pick;
+
+interface OpenAIConfig {
+ OPENAI_API_KEY: string;
+ azureApiVersion?: string;
+ endpoint?: string;
+ models?: string[];
+ useAzure?: boolean;
+}
+
+export type GlobalLLMConfig = {
+ openAI: OpenAIConfig;
+};
+
+export type LLMBrand = keyof GlobalLLMConfig;
/**
* 配置设置
*/
export interface GlobalSettings extends GlobalBaseSettings {
defaultAgent: GlobalDefaultAgent;
+ languageModel: GlobalLLMConfig;
}
export type ConfigKeys = keyof GlobalSettings;
diff --git a/src/utils/fetch.ts b/src/utils/fetch.ts
index f65def52d055..02121183596c 100644
--- a/src/utils/fetch.ts
+++ b/src/utils/fetch.ts
@@ -74,7 +74,7 @@ interface FetchAITaskResultParams {
/**
* 错误处理函数
*/
- onError?: (e: Error) => void;
+ onError?: (e: Error, rawError?: any) => void;
/**
* 加载状态变化处理函数
* @param loading - 是否处于加载状态
@@ -101,27 +101,19 @@ export const fetchAIFactory =
onLoadingChange,
abortController,
}: FetchAITaskResultParams) => {
- const errorHandle = (error: Error) => {
+ const errorHandle = (error: Error, errorContent?: any) => {
onLoadingChange?.(false);
if (abortController?.signal.aborted) {
- // notification.primaryInfo({
- // message: '已中断当前节点的执行任务',
- // });
return;
}
-
- // notification?.error({
- // message: `请求失败(${error.message})`,
- // placement: 'bottomRight',
- // });
- onError?.(error);
+ onError?.(error, errorContent);
};
onLoadingChange?.(true);
const data = await fetchSSE(() => fetcher(params, { signal: abortController?.signal }), {
onErrorHandle: (error) => {
- errorHandle(new Error(error.message));
+ errorHandle(new Error(error.message), error);
},
onMessageHandle,
}).catch(errorHandle);