@lobehub/chat 0.147.1 → 0.147.2

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.147.2](https://github.com/lobehub/lobe-chat/compare/v0.147.1...v0.147.2)
+
+<sup>Released on **2024-04-11**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix custom model not display correctly.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix custom model not display correctly, closes [#1972](https://github.com/lobehub/lobe-chat/issues/1972) ([5d7cae9](https://github.com/lobehub/lobe-chat/commit/5d7cae9))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.147.1](https://github.com/lobehub/lobe-chat/compare/v0.147.0...v0.147.1)
 
 <sup>Released on **2024-04-11**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.147.1",
+  "version": "0.147.2",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/settings/llm/Azure/index.tsx

@@ -34,7 +34,7 @@ const AzureOpenAIProvider = memo(() => {
 
   // Get the first model card's deployment name as the check model
   const checkModel = useGlobalStore((s) => {
-    const chatModelCards = modelConfigSelectors.providerModelCards(providerKey)(s);
+    const chatModelCards = modelConfigSelectors.getModelCardsByProviderId(providerKey)(s);
 
     if (chatModelCards.length > 0) {
       return chatModelCards[0].deploymentName;

package/src/app/settings/llm/components/ProviderConfig/index.tsx

@@ -54,7 +54,7 @@ const ProviderConfig = memo<ProviderConfigProps>(
     const [toggleProviderEnabled, setSettings, enabled] = useGlobalStore((s) => [
       s.toggleProviderEnabled,
       s.setSettings,
-      modelConfigSelectors.providerEnabled(provider)(s),
+      modelConfigSelectors.isProviderEnabled(provider)(s),
     ]);
 
     useSyncSettings(form);

package/src/app/settings/llm/components/ProviderModelList/CustomModelOption.tsx

@@ -29,7 +29,7 @@ const CustomModelOption = memo<CustomModelOptionProps>(({ id, provider }) => {
       s.removeEnabledModels,
     ]);
   const modelCard = useGlobalStore(
-    modelConfigSelectors.getCustomModelCardById({ id, provider }),
+    modelConfigSelectors.getCustomModelCard({ id, provider }),
     isEqual,
   );
 

package/src/app/settings/llm/components/ProviderModelList/ModelConfigModal.tsx

@@ -27,7 +27,7 @@ const ModelConfigModal = memo<ModelConfigModalProps>(({ showAzureDeployName, pro
     ]);
 
   const modelCard = useGlobalStore(
-    modelConfigSelectors.getCustomModelCardById({ id, provider: editingProvider }),
+    modelConfigSelectors.getCustomModelCard({ id, provider: editingProvider }),
     isEqual,
   );
 

package/src/app/settings/llm/components/ProviderModelList/ModelFetcher.tsx

@@ -36,12 +36,12 @@ const ModelFetcher = memo<ModelFetcherProps>(({ provider }) => {
     s.useFetchProviderModelList,
     s.setModelProviderConfig,
   ]);
-  const enabledAutoFetch = useGlobalStore(modelConfigSelectors.enabledAutoFetchModels(provider));
+  const enabledAutoFetch = useGlobalStore(modelConfigSelectors.isAutoFetchModelsEnabled(provider));
   const latestFetchTime = useGlobalStore(
-    (s) => modelConfigSelectors.providerConfig(provider)(s)?.latestFetchTime,
+    (s) => modelConfigSelectors.getConfigByProviderId(provider)(s)?.latestFetchTime,
   );
   const totalModels = useGlobalStore(
-    (s) => modelConfigSelectors.providerModelCards(provider)(s).length,
+    (s) => modelConfigSelectors.getModelCardsByProviderId(provider)(s).length,
   );
 
   const { mutate, isValidating } = useFetchProviderModelList(provider, enabledAutoFetch);

package/src/app/settings/llm/components/ProviderModelList/index.tsx

@@ -51,7 +51,7 @@ const ProviderModelListSelect = memo<CustomModelSelectProps>(
     ]);
 
     const chatModelCards = useGlobalStore(
-      modelConfigSelectors.providerModelCards(provider),
+      modelConfigSelectors.getModelCardsByProviderId(provider),
       isEqual,
     );
 
@@ -60,7 +60,7 @@ const ProviderModelListSelect = memo<CustomModelSelectProps>(
       isEqual,
     );
     const enabledModels = useGlobalStore(
-      modelConfigSelectors.providerEnableModels(provider),
+      modelConfigSelectors.getEnableModelsByProviderId(provider),
       isEqual,
     );
 

package/src/features/AgentSetting/AgentConfig/ModelSelect.tsx

@@ -25,7 +25,7 @@ interface ModelOption {
 
 const ModelSelect = memo(() => {
   const [model, updateConfig] = useStore((s) => [s.config.model, s.setAgentConfig]);
-  const enabledList = useGlobalStore(modelConfigSelectors.enabledModelProviderList, isEqual);
+  const enabledList = useGlobalStore(modelConfigSelectors.providerListForModelSelect, isEqual);
   const { styles } = useStyles();
 
   const options = useMemo<SelectProps['options']>(() => {

package/src/features/Conversation/Error/APIKeyForm/ProviderApiKeyForm.tsx

@@ -24,8 +24,8 @@ const ProviderApiKeyForm = memo<ProviderApiKeyFormProps>(
     const [showProxy, setShow] = useState(false);
 
     const [apiKey, proxyUrl, setConfig] = useGlobalStore((s) => [
-      modelConfigSelectors.providerConfig(provider)(s)?.apiKey,
-      modelConfigSelectors.providerConfig(provider)(s)?.endpoint,
+      modelConfigSelectors.getConfigByProviderId(provider)(s)?.apiKey,
+      modelConfigSelectors.getConfigByProviderId(provider)(s)?.endpoint,
       s.setModelProviderConfig,
     ]);
 

package/src/features/ModelSwitchPanel/index.tsx

@@ -44,7 +44,7 @@ const ModelSwitchPanel = memo<PropsWithChildren>(({ children }) => {
   const updateAgentConfig = useSessionStore((s) => s.updateAgentConfig);
 
   const router = useRouter();
-  const enabledList = useGlobalStore(modelConfigSelectors.enabledModelProviderList, isEqual);
+  const enabledList = useGlobalStore(modelConfigSelectors.providerListForModelSelect, isEqual);
 
   const items = useMemo(() => {
     const getModelItems = (provider: ModelProviderCard) => {

package/src/services/_auth.ts

@@ -29,13 +29,15 @@ export const getProviderAuthPayload = (provider: string) => {
     }
 
     case ModelProvider.Ollama: {
-      const endpoint = modelConfigSelectors.ollamaProxyUrl(useGlobalStore.getState());
+      const config = modelConfigSelectors.ollamaConfig(useGlobalStore.getState());
 
-      return { endpoint };
+      return { endpoint: config?.endpoint };
     }
 
     default: {
-      const config = modelConfigSelectors.providerConfig(provider)(useGlobalStore.getState());
+      const config = modelConfigSelectors.getConfigByProviderId(provider)(
+        useGlobalStore.getState(),
+      );
 
       return { apiKey: config?.apiKey, endpoint: config?.endpoint };
     }

package/src/services/_header.ts

@@ -8,14 +8,13 @@ import { modelConfigSelectors, settingsSelectors } from '@/store/global/selector
  */
 // eslint-disable-next-line no-undef
 export const createHeaderWithOpenAI = (header?: HeadersInit): HeadersInit => {
-  const apiKey = modelConfigSelectors.openAIAPIKey(useGlobalStore.getState()) || '';
-  const endpoint = modelConfigSelectors.openAIProxyUrl(useGlobalStore.getState()) || '';
+  const openAIConfig = modelConfigSelectors.openAIConfig(useGlobalStore.getState());
 
   // eslint-disable-next-line no-undef
   return {
     ...header,
     [LOBE_CHAT_ACCESS_CODE]: settingsSelectors.password(useGlobalStore.getState()),
-    [OPENAI_API_KEY_HEADER_KEY]: apiKey,
-    [OPENAI_END_POINT]: endpoint,
+    [OPENAI_API_KEY_HEADER_KEY]: openAIConfig.apiKey || '',
+    [OPENAI_END_POINT]: openAIConfig.endpoint || '',
   };
 };

package/src/services/chat.ts

@@ -137,7 +137,7 @@ class ChatService {
 
     // if the provider is Azure, get the deployment name as the request model
     if (provider === ModelProvider.Azure) {
-      const chatModelCards = modelConfigSelectors.providerModelCards(provider)(
+      const chatModelCards = modelConfigSelectors.getModelCardsByProviderId(provider)(
         useGlobalStore.getState(),
       );
 

package/src/services/ollama.ts

@@ -11,8 +11,9 @@ const DEFAULT_BASE_URL = 'http://127.0.0.1:11434/v1';
 
 class OllamaService {
   getHost = (): string => {
-    const endpoint = modelConfigSelectors.ollamaProxyUrl(useGlobalStore.getState());
-    const url = new URL(endpoint || DEFAULT_BASE_URL);
+    const config = modelConfigSelectors.ollamaConfig(useGlobalStore.getState());
+
+    const url = new URL(config.endpoint || DEFAULT_BASE_URL);
     return url.host;
   };
 

package/src/store/global/slices/settings/actions/llm.test.ts

@@ -46,7 +46,7 @@ describe('LLMSettingsSliceAction', () => {
       const payload: CustomModelCardDispatch = { type: 'add', modelCard: { id: 'test-id' } };
 
       // Mock the selector to return undefined
-      vi.spyOn(modelConfigSelectors, 'providerConfig').mockReturnValue(() => undefined);
+      vi.spyOn(modelConfigSelectors, 'getConfigByProviderId').mockReturnValue(() => undefined);
       vi.spyOn(result.current, 'setModelProviderConfig');
 
       await act(async () => {

package/src/store/global/slices/settings/actions/llm.ts

@@ -37,7 +37,7 @@ export const llmSettingsSlice: StateCreator<
   LLMSettingsAction
 > = (set, get) => ({
   dispatchCustomModelCards: async (provider, payload) => {
-    const prevState = modelConfigSelectors.providerConfig(provider)(get());
+    const prevState = modelConfigSelectors.getConfigByProviderId(provider)(get());
 
     if (!prevState) return;
 
@@ -47,7 +47,7 @@ export const llmSettingsSlice: StateCreator<
   },
 
   removeEnabledModels: async (provider, model) => {
-    const config = modelConfigSelectors.providerConfig(provider)(get());
+    const config = modelConfigSelectors.getConfigByProviderId(provider)(get());
 
     await get().setModelProviderConfig(provider, {
       enabledModels: config?.enabledModels?.filter((s) => s !== model).filter(Boolean),

package/src/store/global/slices/settings/selectors/modelConfig.test.ts

@@ -1,8 +1,5 @@
 import { describe, expect, it } from 'vitest';
 
-import { DEFAULT_SETTINGS } from '@/const/settings';
-import { modelProviderSelectors } from '@/store/global/slices/settings/selectors/modelProvider';
-import { agentSelectors } from '@/store/session/slices/agent';
 import { merge } from '@/utils/merge';
 
 import { GlobalStore, useGlobalStore } from '../../../store';
@@ -10,7 +7,7 @@ import { GlobalSettingsState, initialSettingsState } from '../initialState';
 import { modelConfigSelectors } from './modelConfig';
 
 describe('modelConfigSelectors', () => {
-  describe('modelSelectList', () => {
+  describe('providerListWithConfig', () => {
     it('visible', () => {
       const s = merge(initialSettingsState, {
         settings: {
@@ -22,7 +19,9 @@ describe('modelConfigSelectors', () => {
         },
       } as GlobalSettingsState) as unknown as GlobalStore;
 
-      const ollamaList = modelConfigSelectors.modelSelectList(s).find((r) => r.id === 'ollama');
+      const ollamaList = modelConfigSelectors
+        .providerListWithConfig(s)
+        .find((r) => r.id === 'ollama');
 
       expect(ollamaList?.chatModels.find((c) => c.id === 'llava')).toEqual({
         displayName: 'LLaVA 7B',
@@ -33,9 +32,31 @@ describe('modelConfigSelectors', () => {
         vision: true,
       });
     });
+    it('with user custom models', () => {
+      const s = merge(initialSettingsState, {
+        settings: {
+          languageModel: {
+            perplexity: {
+              customModelCards: [{ id: 'sonar-online', displayName: 'Sonar Online' }],
+            },
+          },
+        },
+      } as GlobalSettingsState) as unknown as GlobalStore;
+
+      const providerList = modelConfigSelectors
+        .providerListWithConfig(s)
+        .find((r) => r.id === 'perplexity');
+
+      expect(providerList?.chatModels.find((c) => c.id === 'sonar-online')).toEqual({
+        id: 'sonar-online',
+        displayName: 'Sonar Online',
+        enabled: false,
+        isCustom: true,
+      });
+    });
   });
 
-  describe('providerEnabled', () => {
+  describe('isProviderEnabled', () => {
     it('should return true if provider is enabled', () => {
       const s = merge(initialSettingsState, {
         settings: {
@@ -45,7 +66,7 @@ describe('modelConfigSelectors', () => {
         },
       } as GlobalSettingsState) as unknown as GlobalStore;
 
-      expect(modelConfigSelectors.providerEnabled('ollama')(s)).toBe(true);
+      expect(modelConfigSelectors.isProviderEnabled('ollama')(s)).toBe(true);
     });
 
     it('should return false if provider is not enabled', () => {
@@ -57,11 +78,11 @@ describe('modelConfigSelectors', () => {
         },
       } as GlobalSettingsState) as unknown as GlobalStore;
 
-      expect(modelConfigSelectors.providerEnabled('perplexity')(s)).toBe(false);
+      expect(modelConfigSelectors.isProviderEnabled('perplexity')(s)).toBe(false);
     });
   });
 
-  describe('providerModelCards', () => {
+  describe('getModelCardsByProviderId', () => {
     it('should return model cards including custom model cards', () => {
       const s = merge(initialSettingsState, {
         settings: {
@@ -73,7 +94,7 @@ describe('modelConfigSelectors', () => {
         },
       } as GlobalSettingsState) as unknown as GlobalStore;
 
-      const modelCards = modelConfigSelectors.providerModelCards('perplexity')(s);
+      const modelCards = modelConfigSelectors.getModelCardsByProviderId('perplexity')(s);
 
       expect(modelCards).toContainEqual({
         id: 'custom-model',
@@ -83,7 +104,7 @@ describe('modelConfigSelectors', () => {
     });
   });
 
-  describe('enabledModelProviderList', () => {
+  describe('providerListForModelSelect', () => {
     it('should return only enabled providers', () => {
       const s = merge(initialSettingsState, {
         settings: {
@@ -94,7 +115,7 @@ describe('modelConfigSelectors', () => {
         },
       } as GlobalSettingsState) as unknown as GlobalStore;
 
-      const enabledProviders = modelConfigSelectors.enabledModelProviderList(s);
+      const enabledProviders = modelConfigSelectors.providerListForModelSelect(s);
       expect(enabledProviders).toHaveLength(2);
       expect(enabledProviders[1].id).toBe('perplexity');
     });
@@ -115,7 +136,7 @@ describe('modelConfigSelectors', () => {
         },
       } as GlobalSettingsState) as unknown as GlobalStore;
 
-      const customModelCard = modelConfigSelectors.getCustomModelCardById({
+      const customModelCard = modelConfigSelectors.getCustomModelCard({
         id: 'custom-model-2',
         provider: 'perplexity',
       })(s);
@@ -134,7 +155,7 @@ describe('modelConfigSelectors', () => {
         },
       } as GlobalSettingsState) as unknown as GlobalStore;
 
-      const customModelCard = modelConfigSelectors.getCustomModelCardById({
+      const customModelCard = modelConfigSelectors.getCustomModelCard({
         id: 'nonexistent-model',
         provider: 'perplexity',
       })(s);

package/src/store/global/slices/settings/selectors/modelConfig.ts

@@ -7,60 +7,51 @@ import { GlobalStore } from '../../../store';
 import { modelProviderSelectors } from './modelProvider';
 import { currentSettings } from './settings';
 
-const modelProvider = (s: GlobalStore) => currentSettings(s).languageModel;
-
-const providerConfig = (provider: string) => (s: GlobalStore) =>
+const getConfigByProviderId = (provider: string) => (s: GlobalStore) =>
   currentSettings(s).languageModel[provider as GlobalLLMProviderKey] as
     | GeneralModelProviderConfig
     | undefined;
 
-const providerEnabled = (provider: GlobalLLMProviderKey) => (s: GlobalStore) =>
+const getModeProviderById = (provider: string) => (s: GlobalStore) =>
+  modelProviderSelectors.providerModelList(s).find((s) => s.id === provider);
+
+const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: GlobalStore) =>
   currentSettings(s).languageModel[provider]?.enabled || false;
 
-const providerEnableModels = (provider: string) => (s: GlobalStore) => {
-  if (!providerConfig(provider)(s)?.enabledModels) return;
+const getEnableModelsByProviderId = (provider: string) => (s: GlobalStore) => {
+  if (!getConfigByProviderId(provider)(s)?.enabledModels) return;
 
-  return providerConfig(provider)(s)?.enabledModels?.filter(Boolean);
+  return getConfigByProviderId(provider)(s)?.enabledModels?.filter(Boolean);
 };
 
-const openAIConfig = (s: GlobalStore) => modelProvider(s).openai;
-
-const openAIAPIKey = (s: GlobalStore) => modelProvider(s).openai.apiKey;
-const openAIProxyUrl = (s: GlobalStore) => modelProvider(s).openai.endpoint;
-
-const zhipuAPIKey = (s: GlobalStore) => modelProvider(s).zhipu.apiKey;
-
-const bedrockConfig = (s: GlobalStore) => modelProvider(s).bedrock;
-
-const googleAPIKey = (s: GlobalStore) => modelProvider(s).google.apiKey;
-
-const enableAzure = (s: GlobalStore) => modelProvider(s).azure.enabled;
-const azureConfig = (s: GlobalStore) => modelProvider(s).azure;
-
-const mistralAPIKey = (s: GlobalStore) => modelProvider(s).mistral.apiKey;
-
-const moonshotAPIKey = (s: GlobalStore) => modelProvider(s).moonshot.apiKey;
-
-const ollamaProxyUrl = (s: GlobalStore) => modelProvider(s).ollama.endpoint;
-
-const perplexityAPIKey = (s: GlobalStore) => modelProvider(s).perplexity.apiKey;
+const getModelCardsByProviderId =
+  (provider: string) =>
+  (s: GlobalStore): ChatModelCard[] => {
+    const builtinCards = getModeProviderById(provider)(s)?.chatModels || [];
 
-const anthropicAPIKey = (s: GlobalStore) => modelProvider(s).anthropic.apiKey;
-const anthropicProxyUrl = (s: GlobalStore) => modelProvider(s).anthropic.endpoint;
+    const userCards = (getConfigByProviderId(provider)(s)?.customModelCards || []).map((model) => ({
+      ...model,
+      isCustom: true,
+    }));
 
-const groqAPIKey = (s: GlobalStore) => modelProvider(s).groq.apiKey;
+    return uniqBy([...userCards, ...builtinCards], 'id');
+  };
 
-const openrouterAPIKey = (s: GlobalStore) => modelProvider(s).openrouter.apiKey;
+const getCustomModelCard =
+  ({ id, provider }: { id?: string; provider?: string }) =>
+  (s: GlobalStore) => {
+    if (!provider) return;
 
-const togetheraiAPIKey = (s: GlobalStore) => modelProvider(s).togetherai.apiKey;
+    const config = getConfigByProviderId(provider)(s);
 
-const zerooneAPIKey = (s: GlobalStore) => modelProvider(s).zeroone.apiKey;
+    return config?.customModelCards?.find((m) => m.id === id);
+  };
 
-const modelSelectList = (s: GlobalStore): ModelProviderCard[] => {
-  return modelProviderSelectors.providerModelList(s).map((list) => ({
+const providerListWithConfig = (s: GlobalStore): ModelProviderCard[] =>
+  modelProviderSelectors.providerModelList(s).map((list) => ({
     ...list,
-    chatModels: list.chatModels.map((model) => {
-      const models = providerEnableModels(list.id)(s);
+    chatModels: getModelCardsByProviderId(list.id)(s)?.map((model) => {
+      const models = getEnableModelsByProviderId(list.id)(s);
 
       if (!models) return model;
 
@@ -69,111 +60,57 @@ const modelSelectList = (s: GlobalStore): ModelProviderCard[] => {
         enabled: models?.some((m) => m === model.id),
       };
     }),
-    enabled: providerEnabled(list.id as any)(s),
+    enabled: isProviderEnabled(list.id as any)(s),
   }));
-};
 
-const enabledModelProviderList = (s: GlobalStore): ModelProviderCard[] =>
-  modelSelectList(s)
+const providerListForModelSelect = (s: GlobalStore): ModelProviderCard[] =>
+  providerListWithConfig(s)
     .filter((s) => s.enabled)
     .map((provider) => ({
       ...provider,
       chatModels: provider.chatModels.filter((model) => model.enabled),
     }));
 
-const providerCard = (provider: string) => (s: GlobalStore) =>
-  modelProviderSelectors.providerModelList(s).find((s) => s.id === provider);
-
-const providerModelCards =
-  (provider: string) =>
-  (s: GlobalStore): ChatModelCard[] => {
-    const builtinCards = providerCard(provider)(s)?.chatModels || [];
-
-    const userCards = (providerConfig(provider)(s)?.customModelCards || []).map((model) => ({
-      ...model,
-      isCustom: true,
-    }));
-
-    return uniqBy([...userCards, ...builtinCards], 'id');
-  };
-
-const getCustomModelCardById =
-  ({ id, provider }: { id?: string; provider?: string }) =>
-  (s: GlobalStore) => {
-    if (!provider) return;
-
-    const config = providerConfig(provider)(s);
-
-    return config?.customModelCards?.find((m) => m.id === id);
-  };
-
 const currentEditingCustomModelCard = (s: GlobalStore) => {
   if (!s.editingCustomCardModel) return;
   const { id, provider } = s.editingCustomCardModel;
 
-  return getCustomModelCardById({ id, provider })(s);
+  return getCustomModelCard({ id, provider })(s);
 };
 
-const enabledAutoFetchModels =
+const isAutoFetchModelsEnabled =
   (provider: GlobalLLMProviderKey) =>
   (s: GlobalStore): boolean => {
-    return providerConfig(provider)(s)?.autoFetchModelLists || false;
+    return getConfigByProviderId(provider)(s)?.autoFetchModelLists || false;
   };
 
+const llmSettings = (s: GlobalStore) => currentSettings(s).languageModel;
+
+const openAIConfig = (s: GlobalStore) => llmSettings(s).openai;
+const bedrockConfig = (s: GlobalStore) => llmSettings(s).bedrock;
+const ollamaConfig = (s: GlobalStore) => llmSettings(s).ollama;
+const azureConfig = (s: GlobalStore) => llmSettings(s).azure;
+
+const isAzureEnabled = (s: GlobalStore) => llmSettings(s).azure.enabled;
+
 /* eslint-disable sort-keys-fix/sort-keys-fix,  */
 export const modelConfigSelectors = {
-  providerEnabled,
-  providerEnableModels,
-  providerConfig,
-  providerModelCards,
+  isAutoFetchModelsEnabled,
+  isProviderEnabled,
   currentEditingCustomModelCard,
-  getCustomModelCardById,
 
-  modelSelectList,
-  enabledModelProviderList,
-  enabledAutoFetchModels,
+  getConfigByProviderId,
+  getEnableModelsByProviderId,
+  getModelCardsByProviderId,
+  getCustomModelCard,
 
-  // OpenAI
-  openAIConfig,
-  openAIAPIKey,
-  openAIProxyUrl,
+  providerListWithConfig,
+  providerListForModelSelect,
 
-  // Azure OpenAI
-  enableAzure,
+  openAIConfig,
   azureConfig,
-  // Zhipu
-  zhipuAPIKey,
-  // Google
-  googleAPIKey,
-
-  // Bedrock
   bedrockConfig,
+  ollamaConfig,
 
-  // Moonshot
-  moonshotAPIKey,
-
-  // Ollama
-  ollamaProxyUrl,
-
-  // Perplexity
-  perplexityAPIKey,
-
-  // Anthropic
-  anthropicAPIKey,
-  anthropicProxyUrl,
-
-  // Mistral
-  mistralAPIKey,
-
-  // Groq
-  groqAPIKey,
-
-  // OpenRouter
-  openrouterAPIKey,
-
-  // ZeroOne 零一万物
-  zerooneAPIKey,
-
-  // TogetherAI
-  togetheraiAPIKey,
+  isAzureEnabled,
 };