@lobehub/chat 1.43.6 → 1.44.1

package/src/store/aiInfra/slices/aiProvider/selectors.ts

@@ -0,0 +1,99 @@
+import { isProviderDisableBroswerRequest } from '@/config/modelProviders';
+import { AIProviderStoreState } from '@/store/aiInfra/initialState';
+import { AiProviderRuntimeConfig } from '@/types/aiProvider';
+import { GlobalLLMProviderKey } from '@/types/user/settings';
+
+// List
+const enabledAiProviderList = (s: AIProviderStoreState) =>
+  s.aiProviderList.filter((item) => item.enabled).sort((a, b) => a.sort! - b.sort!);
+
+const disabledAiProviderList = (s: AIProviderStoreState) =>
+  s.aiProviderList.filter((item) => !item.enabled);
+
+const isProviderEnabled = (id: string) => (s: AIProviderStoreState) =>
+  enabledAiProviderList(s).some((i) => i.id === id);
+
+const isProviderLoading = (id: string) => (s: AIProviderStoreState) =>
+  s.aiProviderLoadingIds.includes(id);
+
+const activeProviderConfig = (s: AIProviderStoreState) => s.aiProviderDetail;
+
+// Detail
+
+const isAiProviderConfigLoading = (id: string) => (s: AIProviderStoreState) =>
+  s.activeAiProvider !== id;
+
+const providerWhitelist = new Set(['ollama']);
+
+const activeProviderKeyVaults = (s: AIProviderStoreState) => activeProviderConfig(s)?.keyVaults;
+
+const isActiveProviderEndpointNotEmpty = (s: AIProviderStoreState) => {
+  const vault = activeProviderKeyVaults(s);
+  return !!vault?.baseURL || !!vault?.endpoint;
+};
+
+const isActiveProviderApiKeyNotEmpty = (s: AIProviderStoreState) => {
+  const vault = activeProviderKeyVaults(s);
+  return !!vault?.apiKey || !!vault?.accessKeyId || !!vault?.secretAccessKey;
+};
+
+/**
+ * @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: AIProviderStoreState) => {
+    const config = activeProviderConfig(s);
+
+    // If the provider already disable broswer request in model config, force on Server.
+    if (isProviderDisableBroswerRequest(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 = isActiveProviderEndpointNotEmpty(s);
+    const isProviderApiKeyNotEmpty = isActiveProviderApiKeyNotEmpty(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 providerKeyVaults = (provider: string | undefined) => (s: AIProviderStoreState) => {
+  if (!provider) return undefined;
+
+  return s.aiProviderRuntimeConfig?.[provider]?.keyVaults;
+};
+
+const providerConfigById =
+  (id: string) =>
+  (s: AIProviderStoreState): AiProviderRuntimeConfig | undefined => {
+    if (!id) return undefined;
+
+    return s.aiProviderRuntimeConfig?.[id];
+  };
+
+export const aiProviderSelectors = {
+  activeProviderConfig,
+  disabledAiProviderList,
+  enabledAiProviderList,
+  isActiveProviderApiKeyNotEmpty,
+  isActiveProviderEndpointNotEmpty,
+  isAiProviderConfigLoading,
+  isProviderEnabled,
+  isProviderFetchOnClient,
+  isProviderLoading,
+  providerConfigById,
+  providerKeyVaults,
+};

package/src/store/aiInfra/store.ts

@@ -0,0 +1,25 @@
+import { shallow } from 'zustand/shallow';
+import { createWithEqualityFn } from 'zustand/traditional';
+import { StateCreator } from 'zustand/vanilla';
+
+import { createDevtools } from '../middleware/createDevtools';
+import { AIProviderStoreState, initialState } from './initialState';
+import { AiModelAction, createAiModelSlice } from './slices/aiModel';
+import { AiProviderAction, createAiProviderSlice } from './slices/aiProvider';
+
+//  ===============  聚合 createStoreFn ============ //
+
+export interface AiInfraStore extends AIProviderStoreState, AiProviderAction, AiModelAction {
+  /* empty */
+}
+
+const createStore: StateCreator<AiInfraStore, [['zustand/devtools', never]]> = (...parameters) => ({
+  ...initialState,
+  ...createAiModelSlice(...parameters),
+  ...createAiProviderSlice(...parameters),
+});
+
+//  ===============  实装 useStore ============ //
+const devtools = createDevtools('aiInfra');
+
+export const useAiInfraStore = createWithEqualityFn<AiInfraStore>()(devtools(createStore), shallow);

package/src/store/global/initialState.ts

@@ -26,6 +26,7 @@ export enum SettingsTabs {
   Agent = 'agent',
   Common = 'common',
   LLM = 'llm',
+  Provider = 'provider',
   Sync = 'sync',
   SystemAgent = 'system-agent',
   TTS = 'tts',

package/src/store/serverConfig/selectors.test.ts

@@ -34,6 +34,7 @@ describe('featureFlagsSelectors', () => {
       enableCheckUpdates: true,
       showWelcomeSuggest: true,
       enableClerkSignUp: true,
+      showProvider: true,
       showMarket: true,
       showPinList: false,
       enableSTT: true,

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

@@ -105,6 +105,7 @@ const modelProviderListForModelSelect = (s: UserStore): EnabledProviderWithModel
           displayName: m.displayName,
           id: m.id,
         })),
+      source: 'builtin',
     }));
 
 const getModelCardById = (id: string) => (s: UserStore) => {

package/src/styles/global.ts

@@ -36,9 +36,9 @@ export default ({ token }: { prefixCls: string; token: Theme }) => css`
     }
 
     :hover::-webkit-scrollbar-thumb {
+      border: 3px solid transparent;
       background-color: ${token.colorText};
       background-clip: content-box;
-      border: 3px solid transparent;
     }
 
     ::-webkit-scrollbar-track {

package/src/types/aiModel.ts

@@ -1,5 +1,7 @@
 import { z } from 'zod';
 
+import { AiProviderSourceType } from '@/types/aiProvider';
+
 export type ModelPriceCurrency = 'CNY' | 'USD';
 
 export const AiModelSourceEnum = {
@@ -16,7 +18,8 @@ export type AiModelType =
   | 'stt'
   | 'image'
   | 'text2video'
-  | 'text2music';
+  | 'text2music'
+  | 'realtime';
 
 export interface ModelAbilities {
   /**
@@ -91,7 +94,7 @@ export interface ChatModelPricing extends BasicModelPricing {
   writeCacheInput?: number;
 }
 
-interface AIBaseModelCard {
+export interface AIBaseModelCard {
   /**
    * the context window (or input + output tokens limit)
    */
@@ -115,6 +118,13 @@ interface AIBaseModelCard {
   releasedAt?: string;
 }
 
+export interface AiModelConfig {
+  /**
+   * used in azure and doubao
+   */
+  deploymentName?: string;
+}
+
 export interface AIChatModelCard extends AIBaseModelCard {
   abilities?: {
     /**
@@ -130,10 +140,7 @@ export interface AIChatModelCard extends AIBaseModelCard {
      */
     vision?: boolean;
   };
-  /**
-   * used in azure and doubao
-   */
-  deploymentName?: string;
+  config?: AiModelConfig;
   maxOutput?: number;
   pricing?: ChatModelPricing;
   type: 'chat';
@@ -221,6 +228,21 @@ export interface AIRealtimeModelCard extends AIBaseModelCard {
   type: 'realtime';
 }
 
+export interface AiFullModelCard extends AIBaseModelCard {
+  abilities?: ModelAbilities;
+  contextWindowTokens?: number;
+  displayName?: string;
+  id: string;
+  maxDimension?: number;
+  pricing?: ChatModelPricing;
+  type: AiModelType;
+}
+
+export interface LobeDefaultAiModelListItem extends AiFullModelCard {
+  abilities: ModelAbilities;
+  providerId: string;
+}
+
 // create
 export const CreateAiModelSchema = z.object({
   abilities: AiModelAbilitiesSchema.optional(),
@@ -241,6 +263,7 @@ export type CreateAiModelParams = z.infer<typeof CreateAiModelSchema>;
 
 export interface AiProviderModelListItem {
   abilities?: ModelAbilities;
+  config?: AiModelConfig;
   contextWindowTokens?: number;
   displayName?: string;
   enabled: boolean;
@@ -254,6 +277,11 @@ export interface AiProviderModelListItem {
 // Update
 export const UpdateAiModelSchema = z.object({
   abilities: AiModelAbilitiesSchema.optional(),
+  config: z
+    .object({
+      deploymentName: z.string().optional(),
+    })
+    .optional(),
   contextWindowTokens: z.number().optional(),
   displayName: z.string().optional(),
 });
@@ -286,5 +314,7 @@ interface AiModelForSelect {
 export interface EnabledProviderWithModels {
   children: AiModelForSelect[];
   id: string;
+  logo?: string;
   name: string;
+  source: AiProviderSourceType;
 }

package/src/types/aiProvider.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import { AiModelSourceType, AiModelType, ModelAbilities } from '@/types/aiModel';
+import { AiModelConfig, AiModelType, ModelAbilities } from '@/types/aiModel';
 import { SmoothingParams } from '@/types/llm';
 
 export const AiProviderSourceEnum = {
@@ -167,7 +167,7 @@ export type UpdateAiProviderParams = z.infer<typeof UpdateAiProviderSchema>;
 
 export const UpdateAiProviderConfigSchema = z.object({
   checkModel: z.string().optional(),
-  fetchOnClient: z.boolean().optional(),
+  fetchOnClient: z.boolean().nullable().optional(),
   keyVaults: z.object({}).passthrough().optional(),
 });
 
@@ -182,21 +182,30 @@ export interface AiProviderSortMap {
 
 export interface EnabledProvider {
   id: string;
+  logo?: string;
   name?: string;
-  source: AiModelSourceType;
+  source: AiProviderSourceType;
 }
 
 export interface EnabledAiModel {
   abilities: ModelAbilities;
+  config?: AiModelConfig;
   contextWindowTokens?: number;
   displayName?: string;
   id: string;
   providerId: string;
+  sort?: number;
   type: AiModelType;
 }
 
-export interface AiProviderInitState {
+export interface AiProviderRuntimeConfig {
+  fetchOnClient?: boolean;
+  keyVaults: Record<string, object>;
+  settings: AiProviderSettings;
+}
+
+export interface AiProviderRuntimeState {
   enabledAiModels: EnabledAiModel[];
   enabledAiProviders: EnabledProvider[];
-  keyVaults: Record<string, object>;
+  runtimeConfig: Record<string, AiProviderRuntimeConfig>;
 }

package/src/utils/fetch/fetchSSE.ts

@@ -1,3 +1,5 @@
+import { isObject } from 'lodash-es';
+
 import { MESSAGE_CANCEL_FLAT } from '@/const/message';
 import { LOBE_CHAT_OBSERVATION_ID, LOBE_CHAT_TRACE_ID } from '@/const/trace';
 import { ChatErrorType } from '@/types/fetch';
@@ -243,7 +245,7 @@ export const fetchSSE = async (url: string, options: RequestInit & FetchSSEOptio
   const textSmoothing = typeof smoothing === 'boolean' ? smoothing : smoothing?.text;
   const toolsCallingSmoothing =
     typeof smoothing === 'boolean' ? smoothing : (smoothing?.toolsCalling ?? true);
-  const smoothingSpeed = typeof smoothing === 'object' ? smoothing.speed : undefined;
+  const smoothingSpeed = isObject(smoothing) ? smoothing.speed : undefined;
 
   const textController = createSmoothMessage({
     onTextUpdate: (delta, text) => {