@lobehub/lobehub 2.0.0-next.2 → 2.0.0-next.21

package/src/store/user/slices/modelList/selectors/modelConfig.test.ts

@@ -1,219 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { UserStore } from '@/store/user';
-import { merge } from '@/utils/merge';
-
-import { UserState } from '../../../initialState';
-import { UserSettingsState, initialSettingsState } from '../../settings/initialState';
-import { modelConfigSelectors } from './modelConfig';
-
-describe('modelConfigSelectors', () => {
-  describe('isProviderEnabled', () => {
-    it('should return true if provider is enabled', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            ollama: { enabled: true },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-
-      expect(modelConfigSelectors.isProviderEnabled('ollama')(s)).toBe(true);
-    });
-
-    it('should return false if provider is not enabled', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            perplexity: { enabled: false },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-
-      expect(modelConfigSelectors.isProviderEnabled('perplexity')(s)).toBe(false);
-    });
-
-    it('should follow the user settings if provider is in the whitelist', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            ollama: { enabled: false },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-
-      expect(modelConfigSelectors.isProviderEnabled('ollama')(s)).toBe(false);
-    });
-
-    it('ollama should be enabled by default', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {},
-        },
-      } as UserSettingsState) as unknown as UserStore;
-      expect(modelConfigSelectors.isProviderEnabled('ollama')(s)).toBe(true);
-    });
-  });
-
-  describe('isProviderFetchOnClient', () => {
-    // The next 4 case are base on the rules on https://github.com/lobehub/lobe-chat/pull/2753
-    it('client fetch should disabled on default', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          keyVaults: {
-            azure: {
-              endpoint: 'endpoint',
-              apiKey: 'apikey',
-            },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-      expect(modelConfigSelectors.isProviderFetchOnClient('azure')(s)).toBe(false);
-    });
-
-    it('client fetch should disabled if no apikey or endpoint provided even user set it enabled', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            azure: { fetchOnClient: true },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-      expect(modelConfigSelectors.isProviderFetchOnClient('azure')(s)).toBe(false);
-    });
-
-    it('client fetch should enable if only endpoint provided', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            azure: { fetchOnClient: false },
-          },
-          keyVaults: {
-            azure: { endpoint: 'https://example.com' },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-      expect(modelConfigSelectors.isProviderFetchOnClient('azure')(s)).toBe(true);
-    });
-
-    it('client fetch should control by user when a apikey or endpoint provided', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            azure: { fetchOnClient: true },
-          },
-          keyVaults: {
-            azure: { apiKey: 'some-key' },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-      expect(modelConfigSelectors.isProviderFetchOnClient('azure')(s)).toBe(true);
-    });
-
-    // Qwen provider not work in browser request. Please skip this case if it work in future.
-    // Issue: https://github.com/lobehub/lobe-chat/issues/3108
-    // PR: https://github.com/lobehub/lobe-chat/pull/3133
-    it('client fecth should be disabled if provider is disable browser request', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            qwen: { fetchOnClient: true },
-          },
-          keyVaults: {
-            qwen: {
-              apiKey: 'apikey',
-            },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-      expect(modelConfigSelectors.isAutoFetchModelsEnabled('qwen')(s)).toBe(false);
-    });
-  });
-
-  describe('getCustomModelCardById', () => {
-    it('should return the custom model card with the given id and provider', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            perplexity: {
-              customModelCards: [
-                { id: 'custom-model-1', displayName: 'Custom Model 1' },
-                { id: 'custom-model-2', displayName: 'Custom Model 2' },
-              ],
-            },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-
-      const customModelCard = modelConfigSelectors.getCustomModelCard({
-        id: 'custom-model-2',
-        provider: 'perplexity',
-      })(s);
-
-      expect(customModelCard).toEqual({ id: 'custom-model-2', displayName: 'Custom Model 2' });
-    });
-
-    it('should return undefined if no custom model card is found with the given id and provider', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            perplexity: {
-              customModelCards: [{ id: 'custom-model-1', displayName: 'Custom Model 1' }],
-            },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-
-      const customModelCard = modelConfigSelectors.getCustomModelCard({
-        id: 'nonexistent-model',
-        provider: 'perplexity',
-      })(s);
-
-      expect(customModelCard).toBeUndefined();
-    });
-  });
-
-  describe('currentEditingCustomModelCard', () => {
-    it('should return the custom model card that is currently being edited', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            perplexity: {
-              customModelCards: [
-                { id: 'custom-model-1', displayName: 'Custom Model 1' },
-                { id: 'custom-model-2', displayName: 'Custom Model 2' },
-              ],
-            },
-          },
-        },
-        editingCustomCardModel: {
-          id: 'custom-model-2',
-          provider: 'perplexity',
-        },
-      } as UserState) as unknown as UserStore;
-
-      const currentEditingModelCard = modelConfigSelectors.currentEditingCustomModelCard(s);
-
-      expect(currentEditingModelCard).toEqual({
-        id: 'custom-model-2',
-        displayName: 'Custom Model 2',
-      });
-    });
-
-    it('should return undefined if no custom model card is currently being edited', () => {
-      const s = merge(initialSettingsState, {
-        settings: {
-          languageModel: {
-            perplexity: {
-              customModelCards: [{ id: 'custom-model-1', displayName: 'Custom Model 1' }],
-            },
-          },
-        },
-      } as UserSettingsState) as unknown as UserStore;
-
-      const currentEditingModelCard = modelConfigSelectors.currentEditingCustomModelCard(s);
-
-      expect(currentEditingModelCard).toBeUndefined();
-    });
-  });
-});

package/src/store/user/slices/modelList/selectors/modelConfig.ts

@@ -1,95 +0,0 @@
-import { isProviderDisableBrowserRequest } from '@/config/modelProviders';
-import { isDesktop } from '@/const/version';
-import { UserStore } from '@/store/user';
-import { GlobalLLMProviderKey } from '@/types/user/settings';
-
-import { currentLLMSettings, getProviderConfigById } from '../../settings/selectors/settings';
-import { keyVaultsConfigSelectors } from './keyVaults';
-
-const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: UserStore) =>
-  getProviderConfigById(provider)(s)?.enabled || false;
-
-const providerWhitelist = new Set(['ollama', 'lmstudio']);
-/**
- * @description The conditions to enable client fetch
- * 1. If no baseUrl and apikey input, force on Server.
- * 2. If only contains baseUrl, force on Client
- * 3. Follow the user settings.
- * 4. On Server, by default.
- */
-const isProviderFetchOnClient = (provider: GlobalLLMProviderKey | string) => (s: UserStore) => {
-  const config = getProviderConfigById(provider)(s);
-
-  // if is desktop, force on Server.
-  if (isDesktop) return false;
-
-  // If the provider already disable browser request in model config, force on Server.
-  if (isProviderDisableBrowserRequest(provider)) return false;
-
-  // If the provider in the whitelist, follow the user settings
-  if (providerWhitelist.has(provider) && typeof config?.fetchOnClient !== 'undefined')
-    return config?.fetchOnClient;
-
-  // 1. If no baseUrl and apikey input, force on Server.
-  const isProviderEndpointNotEmpty =
-    keyVaultsConfigSelectors.isProviderEndpointNotEmpty(provider)(s);
-  const isProviderApiKeyNotEmpty = keyVaultsConfigSelectors.isProviderApiKeyNotEmpty(provider)(s);
-  if (!isProviderEndpointNotEmpty && !isProviderApiKeyNotEmpty) return false;
-
-  // 2. If only contains baseUrl, force on Client
-  if (isProviderEndpointNotEmpty && !isProviderApiKeyNotEmpty) return true;
-
-  // 3. Follow the user settings.
-  if (typeof config?.fetchOnClient !== 'undefined') return config?.fetchOnClient;
-
-  // 4. On Server, by default.
-  return false;
-};
-
-const getCustomModelCard =
-  ({ id, provider }: { id?: string; provider?: string }) =>
-  (s: UserStore) => {
-    if (!provider) return;
-
-    const config = getProviderConfigById(provider)(s);
-
-    return config?.customModelCards?.find((m) => m.id === id);
-  };
-
-const currentEditingCustomModelCard = (s: UserStore) => {
-  if (!s.editingCustomCardModel) return;
-  const { id, provider } = s.editingCustomCardModel;
-
-  return getCustomModelCard({ id, provider })(s);
-};
-
-const isAutoFetchModelsEnabled =
-  (provider: GlobalLLMProviderKey) =>
-  (s: UserStore): boolean => {
-    return getProviderConfigById(provider)(s)?.autoFetchModelLists || false;
-  };
-
-const openAIConfig = (s: UserStore) => currentLLMSettings(s).openai;
-const bedrockConfig = (s: UserStore) => currentLLMSettings(s).bedrock;
-const ollamaConfig = (s: UserStore) => currentLLMSettings(s).ollama;
-const azureConfig = (s: UserStore) => currentLLMSettings(s).azure;
-const cloudflareConfig = (s: UserStore) => currentLLMSettings(s).cloudflare;
-
-const isAzureEnabled = (s: UserStore) => currentLLMSettings(s).azure.enabled;
-
-export const modelConfigSelectors = {
-  azureConfig,
-  bedrockConfig,
-  cloudflareConfig,
-
-  currentEditingCustomModelCard,
-  getCustomModelCard,
-
-  isAutoFetchModelsEnabled,
-  isAzureEnabled,
-  isProviderEnabled,
-  isProviderFetchOnClient,
-
-  ollamaConfig,
-  openAIConfig,
-};

package/src/store/user/slices/modelList/selectors/modelProvider.test.ts

@@ -1,138 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { merge } from '@/utils/merge';
-
-import { UserState, initialState } from '../../../initialState';
-import { UserStore, useUserStore } from '../../../store';
-import { getDefaultModeProviderById, modelProviderSelectors } from './modelProvider';
-
-describe('modelProviderSelectors', () => {
-  describe('getDefaultModeProviderById', () => {
-    it('should return the correct ModelProviderCard when provider ID matches', () => {
-      const s = merge(initialState, {}) as unknown as UserStore;
-
-      const result = getDefaultModeProviderById('openai')(s);
-      expect(result).not.toBeUndefined();
-    });
-
-    it('should return undefined when provider ID does not exist', () => {
-      const s = merge(initialState, {}) as unknown as UserStore;
-      const result = getDefaultModeProviderById('nonExistingProvider')(s);
-      expect(result).toBeUndefined();
-    });
-  });
-
-  describe('getModelCardsById', () => {
-    it('should return model cards including custom model cards', () => {
-      const s = merge(initialState, {
-        settings: {
-          languageModel: {
-            perplexity: {
-              customModelCards: [{ id: 'custom-model', displayName: 'Custom Model' }],
-            },
-          },
-        },
-      } as UserState) as unknown as UserStore;
-
-      const modelCards = modelProviderSelectors.getModelCardsById('perplexity')(s);
-
-      expect(modelCards).toContainEqual({
-        id: 'custom-model',
-        displayName: 'Custom Model',
-        isCustom: true,
-      });
-    });
-  });
-
-  describe('defaultEnabledProviderModels', () => {
-    it('should return undefined for a non-existing provider', () => {
-      const s = merge(initialState, {}) as unknown as UserStore;
-
-      const result = modelProviderSelectors.getDefaultEnabledModelsById('nonExistingProvider')(s);
-      expect(result).toBeUndefined();
-    });
-  });
-  describe('modelEnabledVision', () => {
-    it('should return true if the model has vision ability', () => {
-      const hasAbility = modelProviderSelectors.isModelEnabledVision('gpt-4-vision-preview')(
-        useUserStore.getState(),
-      );
-      expect(hasAbility).toBeTruthy();
-    });
-
-    it('should return false if the model does not have vision ability', () => {
-      const hasAbility = modelProviderSelectors.isModelEnabledVision('some-other-model')(
-        useUserStore.getState(),
-      );
-
-      expect(hasAbility).toBeFalsy();
-    });
-
-    it('should return false if the model include vision in id', () => {
-      const hasAbility = modelProviderSelectors.isModelEnabledVision('some-other-model-vision')(
-        useUserStore.getState(),
-      );
-
-      expect(hasAbility).toBeTruthy();
-    });
-  });
-
-  describe('modelEnabledFiles', () => {
-    it('should return false if the model does not have file ability', () => {
-      const enabledFiles = modelProviderSelectors.isModelEnabledFiles('gpt-4-vision-preview')(
-        useUserStore.getState(),
-      );
-      expect(enabledFiles).toBeFalsy();
-    });
-
-    it.skip('should return true if the model has file ability', () => {
-      const enabledFiles = modelProviderSelectors.isModelEnabledFiles('gpt-4-all')(
-        useUserStore.getState(),
-      );
-      expect(enabledFiles).toBeTruthy();
-    });
-  });
-
-  describe('modelHasMaxToken', () => {
-    it('should return true if the model is in the list of models that show tokens', () => {
-      const show = modelProviderSelectors.isModelHasMaxToken('gpt-3.5-turbo')(
-        useUserStore.getState(),
-      );
-      expect(show).toBeTruthy();
-    });
-
-    it('should return false if the model is not in the list of models that show tokens', () => {
-      const show = modelProviderSelectors.isModelHasMaxToken('some-other-model')(
-        useUserStore.getState(),
-      );
-      expect(show).toBe(false);
-    });
-  });
-
-  describe('modelMaxToken', () => {
-    it('should return the correct token count for a model with specified tokens', () => {
-      const model1Tokens = modelProviderSelectors.modelMaxToken('gpt-3.5-turbo')(
-        useUserStore.getState(),
-      );
-
-      expect(model1Tokens).toEqual(16385);
-    });
-
-    it('should return 0 for a model without a specified token count', () => {
-      // 测试未指定tokens属性的模型的tokens值，期望为0
-      const tokens = modelProviderSelectors.modelMaxToken('chat-bison-001')(
-        useUserStore.getState(),
-      );
-      expect(tokens).toEqual(0);
-    });
-
-    it('should return 0 for a non-existing model', () => {
-      // 测试一个不存在的模型的tokens值，期望为0
-      const tokens = modelProviderSelectors.modelMaxToken('nonExistingModel')(
-        useUserStore.getState(),
-      );
-
-      expect(tokens).toEqual(0);
-    });
-  });
-});

package/src/store/user/slices/modelList/selectors/modelProvider.ts

@@ -1,170 +0,0 @@
-import type {
-  ChatModelCard,
-  EnabledProviderWithModels,
-  GlobalLLMProviderKey,
-  ModelProviderCard,
-} from '@lobechat/types';
-import { ServerModelProviderConfig } from '@lobechat/types';
-import { uniqBy } from 'lodash-es';
-
-import { filterEnabledModels } from '@/config/modelProviders';
-import type { UserStore } from '@/store/user';
-
-import { currentSettings, getProviderConfigById } from '../../settings/selectors/settings';
-
-/**
- * get the server side model cards
- */
-const serverProviderModelCards =
-  (provider: GlobalLLMProviderKey) =>
-  (s: UserStore): ChatModelCard[] | undefined => {
-    const config = s.serverLanguageModel?.[provider] as ServerModelProviderConfig | undefined;
-
-    if (!config) return;
-
-    return config.serverModelCards;
-  };
-
-const remoteProviderModelCards =
-  (provider: GlobalLLMProviderKey) =>
-  (s: UserStore): ChatModelCard[] | undefined => {
-    const cards = currentSettings(s).languageModel?.[provider]?.remoteModelCards as
-      | ChatModelCard[]
-      | undefined;
-
-    if (!cards) return;
-
-    return cards;
-  };
-
-const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: UserStore) =>
-  getProviderConfigById(provider)(s)?.enabled || false;
-
-// Default Model Provider List
-
-/**
- * define all the model list of providers
- */
-const defaultModelProviderList = (s: UserStore): ModelProviderCard[] => s.defaultModelProviderList;
-
-export const getDefaultModeProviderById = (provider: string) => (s: UserStore) =>
-  defaultModelProviderList(s).find((s) => s.id === provider);
-
-/**
- * get the default enabled models for a provider
- * it's a default enabled model list by Lobe Chat
- * e.g. openai is ['gpt-4o-mini','gpt-4o','gpt-4-turbo']
- */
-const getDefaultEnabledModelsById = (provider: string) => (s: UserStore) => {
-  const modelProvider = getDefaultModeProviderById(provider)(s);
-
-  if (modelProvider) return filterEnabledModels(modelProvider);
-
-  return undefined;
-};
-
-const getDefaultModelCardById = (id: string) => (s: UserStore) => {
-  const list = defaultModelProviderList(s);
-
-  return list.flatMap((i) => i.chatModels).find((m) => m.id === id);
-};
-
-// Model Provider List
-
-const getModelCardsById =
-  (provider: string) =>
-  (s: UserStore): ChatModelCard[] => {
-    const builtinCards = getDefaultModeProviderById(provider)(s)?.chatModels || [];
-
-    const userCards = (getProviderConfigById(provider)(s)?.customModelCards || []).map((model) => ({
-      ...model,
-      isCustom: true,
-    }));
-
-    return uniqBy([...userCards, ...builtinCards], 'id');
-  };
-
-const getEnableModelsById = (provider: string) => (s: UserStore) => {
-  if (!getProviderConfigById(provider)(s)?.enabledModels) return;
-
-  return getProviderConfigById(provider)(s)?.enabledModels?.filter(Boolean);
-};
-
-const modelProviderList = (s: UserStore): ModelProviderCard[] => s.modelProviderList;
-
-const modelProviderListForModelSelect = (s: UserStore): EnabledProviderWithModels[] =>
-  modelProviderList(s)
-    .filter((s) => s.enabled)
-    .map((provider) => ({
-      ...provider,
-      children: provider.chatModels
-        .filter((model) => model.enabled)
-        .map((m) => ({
-          abilities: {
-            functionCall: m.functionCall,
-            vision: m.vision,
-          },
-          contextWindowTokens: m.contextWindowTokens,
-          displayName: m.displayName,
-          id: m.id,
-        })),
-      source: 'builtin',
-    }));
-
-const getModelCardById = (id: string, provider?: GlobalLLMProviderKey) => (s: UserStore) => {
-  const list = modelProviderList(s);
-
-  return list
-    .filter((i) => !provider || i.id === provider)
-    .flatMap((i) => i.chatModels)
-    .find((m) => m.id === id);
-};
-
-const isModelEnabledFunctionCall = (id: string) => (s: UserStore) =>
-  getModelCardById(id)(s)?.functionCall || false;
-
-// vision model white list, these models will change the content from string to array
-// refs: https://github.com/lobehub/lobe-chat/issues/790
-const isModelEnabledVision = (id: string) => (s: UserStore) =>
-  getModelCardById(id)(s)?.vision || id.includes('vision');
-
-const isModelEnabledReasoning = (id: string) => (s: UserStore) =>
-  getModelCardById(id)(s)?.reasoning || false;
-
-const isModelEnabledFiles = (id: string) => (s: UserStore) => getModelCardById(id)(s)?.files;
-
-const isModelEnabledUpload = (id: string) => (s: UserStore) =>
-  isModelEnabledVision(id)(s) || isModelEnabledFiles(id)(s);
-
-const isModelHasMaxToken = (id: string) => (s: UserStore) =>
-  typeof getModelCardById(id)(s)?.contextWindowTokens !== 'undefined';
-
-const modelMaxToken = (id: string) => (s: UserStore) =>
-  getModelCardById(id)(s)?.contextWindowTokens || 0;
-
-export const modelProviderSelectors = {
-  defaultModelProviderList,
-  getDefaultEnabledModelsById,
-  getDefaultModelCardById,
-
-  getEnableModelsById,
-  getModelCardById,
-
-  getModelCardsById,
-  isModelEnabledFiles,
-  isModelEnabledFunctionCall,
-  isModelEnabledReasoning,
-  isModelEnabledUpload,
-  isModelEnabledVision,
-  isModelHasMaxToken,
-
-  isProviderEnabled,
-
-  modelMaxToken,
-  modelProviderList,
-
-  modelProviderListForModelSelect,
-
-  remoteProviderModelCards,
-  serverProviderModelCards,
-};

package/src/tools/dalle/Render/GalleyGrid.tsx

@@ -1,60 +0,0 @@
-import { useResponsive } from 'antd-style';
-import { ReactNode, memo, useMemo } from 'react';
-import { Flexbox } from 'react-layout-kit';
-
-import Grid from '@/components/GalleyGrid/Grid';
-
-const MAX_SIZE_DESKTOP = 640;
-const MAX_SIZE_MOBILE = 280;
-
-interface GalleyGridProps<T = any> {
-  items: T[];
-  renderItem: (props: T) => ReactNode;
-}
-
-const GalleyGrid = memo<GalleyGridProps>(({ items, renderItem: Render }) => {
-  const { mobile } = useResponsive();
-
-  const { firstRow, lastRow } = useMemo(() => {
-    if (items.length === 4) {
-      return {
-        firstRow: items.slice(0, 2),
-        lastRow: items.slice(2, 4),
-      };
-    }
-
-    const firstCol = items.length % 3 === 0 ? 3 : items.length % 3;
-
-    return {
-      firstRow: items.slice(0, firstCol),
-      lastRow: items.slice(firstCol, items.length),
-    };
-  }, [items]);
-
-  const { gap, max } = useMemo(
-    () => ({
-      gap: mobile ? 4 : 6,
-      max: (mobile ? MAX_SIZE_MOBILE : MAX_SIZE_DESKTOP) * firstRow.length,
-    }),
-    [mobile],
-  );
-
-  return (
-    <Flexbox gap={gap}>
-      <Grid col={firstRow.length} gap={gap} max={max}>
-        {firstRow.map((i, index) => (
-          <Render {...i} index={index} key={index} />
-        ))}
-      </Grid>
-      {lastRow.length > 0 && (
-        <Grid col={lastRow.length > 2 ? 3 : lastRow.length} gap={gap} max={max}>
-          {lastRow.map((i, index) => (
-            <Render {...i} index={index} key={index} />
-          ))}
-        </Grid>
-      )}
-    </Flexbox>
-  );
-});
-
-export default GalleyGrid;