@lobehub/chat 1.136.13 → 1.137.0

package/src/server/globalConfig/index.ts

@@ -3,10 +3,12 @@ import { isDesktop } from '@/const/version';
 import { appEnv, getAppConfig } from '@/envs/app';
 import { authEnv } from '@/envs/auth';
 import { fileEnv } from '@/envs/file';
+import { imageEnv } from '@/envs/image';
 import { knowledgeEnv } from '@/envs/knowledge';
 import { langfuseEnv } from '@/envs/langfuse';
 import { parseSystemAgent } from '@/server/globalConfig/parseSystemAgent';
 import { GlobalServerConfig } from '@/types/serverConfig';
+import { cleanObject } from '@/utils/object';
 
 import { genServerLLMConfig } from './_deprecated';
 import { genServerAiProvidersConfig } from './genServerAiProviderConfig';
@@ -61,6 +63,9 @@ export const getServerGlobalConfig = async () => {
     enabledAccessCode: ACCESS_CODES?.length > 0,
 
     enabledOAuthSSO: enableNextAuth,
+    image: cleanObject({
+      defaultImageNum: imageEnv.AI_IMAGE_DEFAULT_IMAGE_NUM,
+    }),
     /**
      * @deprecated
      */

package/src/store/global/initialState.ts

@@ -30,6 +30,7 @@ export enum SettingsTabs {
   Agent = 'agent',
   Common = 'common',
   Hotkey = 'hotkey',
+  Image = 'image',
   LLM = 'llm',
   Provider = 'provider',
   Proxy = 'proxy',

package/src/store/image/slices/generationConfig/action.test.ts

@@ -6,6 +6,18 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { useImageStore } from '@/store/image';
 
+const { currentImageSettingsMock } = vi.hoisted(() => ({
+  currentImageSettingsMock: vi.fn(() => ({
+    defaultImageNum: 4,
+  })),
+}));
+
+vi.mock('@/store/user/slices/settings/selectors', () => ({
+  settingsSelectors: {
+    currentImageSettings: currentImageSettingsMock,
+  },
+}));
+
 // Test fixtures
 const customModelSchema: ModelParamsSchema = {
   prompt: { default: '' },
@@ -74,6 +86,7 @@ const initialTestState = {
 
 beforeEach(() => {
   vi.clearAllMocks();
+  currentImageSettingsMock.mockReturnValue({ defaultImageNum: 4 });
   useImageStore.setState(initialTestState);
 });
 
@@ -483,6 +496,7 @@ describe('GenerationConfigAction', () => {
     });
 
     it('should initialize with remembered model when user is logged in', () => {
+      currentImageSettingsMock.mockReturnValueOnce({ defaultImageNum: 6 });
       const { result } = renderHook(() => useImageStore());
 
       useImageStore.setState({
@@ -499,6 +513,7 @@ describe('GenerationConfigAction', () => {
       expect(result.current.provider).toBe('fal');
       expect(result.current.parameters).toEqual(fluxSchnellDefaultValues);
       expect(result.current.isInit).toBe(true);
+      expect(result.current.imageNum).toBe(6);
     });
 
     it('should handle initialization without remembered preferences', () => {
@@ -511,6 +526,7 @@ describe('GenerationConfigAction', () => {
       });
 
       expect(result.current.isInit).toBe(true);
+      expect(result.current.imageNum).toBe(4);
     });
 
     it('should handle initialization errors gracefully', () => {
@@ -523,6 +539,7 @@ describe('GenerationConfigAction', () => {
       });
 
       expect(result.current.isInit).toBe(true);
+      expect(result.current.imageNum).toBe(4);
     });
   });
 });

package/src/store/image/slices/generationConfig/action.ts

@@ -12,6 +12,7 @@ import { aiProviderSelectors, getAiInfraStoreState } from '@/store/aiInfra';
 import { useGlobalStore } from '@/store/global';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
+import { settingsSelectors } from '@/store/user/slices/settings/selectors';
 
 import type { ImageStore } from '../../store';
 import { calculateInitialAspectRatio } from '../../utils/aspectRatio';
@@ -40,6 +41,7 @@ export interface GenerationConfigAction {
   setAspectRatio(aspectRatio: string): void;
 
   // 初始化相关方法
+  _initializeDefaultImageConfig(): void;
   initializeImageConfig(
     isLogin?: boolean,
     lastSelectedImageModel?: string,
@@ -327,46 +329,41 @@ export const createGenerationConfigSlice: StateCreator<
     set((state) => ({ parameters: { ...state.parameters, seed } }), false, `reuseSeed/${seed}`);
   },
 
+  _initializeDefaultImageConfig: () => {
+    const { defaultImageNum } = settingsSelectors.currentImageSettings(useUserStore.getState());
+    set({ imageNum: defaultImageNum, isInit: true }, false, 'initializeImageConfig/default');
+  },
+
   initializeImageConfig: (isLogin, lastSelectedImageModel, lastSelectedImageProvider) => {
-    // If no parameters are passed, get from store (backward compatibility)
-    let actualIsLogin = isLogin;
-    let actualLastSelectedImageModel = lastSelectedImageModel;
-    let actualLastSelectedImageProvider = lastSelectedImageProvider;
-
-    if (typeof isLogin === 'undefined') {
-      const globalStatus = useGlobalStore.getState().status;
-      actualIsLogin = authSelectors.isLogin(useUserStore.getState());
-      actualLastSelectedImageModel = globalStatus.lastSelectedImageModel;
-      actualLastSelectedImageProvider = globalStatus.lastSelectedImageProvider;
-    }
+    const { _initializeDefaultImageConfig } = get();
+    const { defaultImageNum } = settingsSelectors.currentImageSettings(useUserStore.getState());
 
-    if (actualIsLogin && actualLastSelectedImageModel && actualLastSelectedImageProvider) {
+    if (isLogin && lastSelectedImageModel && lastSelectedImageProvider) {
       try {
         const { defaultValues, parametersSchema, initialActiveRatio } = prepareModelConfigState(
-          actualLastSelectedImageModel,
-          actualLastSelectedImageProvider,
+          lastSelectedImageModel,
+          lastSelectedImageProvider,
         );
 
         set(
           {
-            model: actualLastSelectedImageModel,
-            provider: actualLastSelectedImageProvider,
+            model: lastSelectedImageModel,
+            provider: lastSelectedImageProvider,
             parameters: defaultValues,
             parametersSchema,
             isAspectRatioLocked: false,
             activeAspectRatio: initialActiveRatio,
+            imageNum: defaultImageNum,
             isInit: true,
           },
           false,
-          `initializeImageConfig/${actualLastSelectedImageModel}/${actualLastSelectedImageProvider}`,
+          `initializeImageConfig/${lastSelectedImageModel}/${lastSelectedImageProvider}`,
         );
       } catch {
-        // If restoration fails, simply mark as initialized to use default configuration
-        set({ isInit: true }, false, 'initializeImageConfig/fallback');
+        _initializeDefaultImageConfig();
       }
     } else {
-      // No remembered model, directly mark as initialized (use default values)
-      set({ isInit: true }, false, 'initializeImageConfig/default');
+      _initializeDefaultImageConfig();
     }
   },
 });

package/src/store/image/slices/generationConfig/initialState.ts

@@ -7,9 +7,10 @@ import {
   gptImage1ParamsSchema,
 } from 'model-bank';
 
+import { DEFAULT_IMAGE_CONFIG } from '@/const/settings';
+
 export const DEFAULT_AI_IMAGE_PROVIDER = ModelProvider.OpenAI;
 export const DEFAULT_AI_IMAGE_MODEL = 'gpt-image-1';
-export const DEFAULT_IMAGE_NUM = 4;
 
 export interface GenerationConfigState {
   parameters: RuntimeImageGenParams;
@@ -34,7 +35,7 @@ export const DEFAULT_IMAGE_GENERATION_PARAMETERS: RuntimeImageGenParams =
 export const initialGenerationConfigState: GenerationConfigState = {
   model: DEFAULT_AI_IMAGE_MODEL,
   provider: DEFAULT_AI_IMAGE_PROVIDER,
-  imageNum: DEFAULT_IMAGE_NUM,
+  imageNum: DEFAULT_IMAGE_CONFIG.defaultImageNum,
   parameters: DEFAULT_IMAGE_GENERATION_PARAMETERS,
   parametersSchema: gptImage1ParamsSchema,
   isAspectRatioLocked: false,

package/src/store/user/slices/common/action.ts

@@ -78,6 +78,7 @@ export const createCommonSlice: StateCreator<
             // merge settings
             const serverSettings: PartialDeep<UserSettings> = {
               defaultAgent: serverConfig.defaultAgent,
+              image: serverConfig.image,
               languageModel: serverConfig.languageModel,
               systemAgent: serverConfig.systemAgent,
             };

package/src/store/user/slices/settings/selectors/settings.ts

@@ -25,6 +25,8 @@ export const currentLLMSettings = (s: UserStore): UserModelProviderConfig =>
 export const getProviderConfigById = (provider: string) => (s: UserStore) =>
   currentLLMSettings(s)[provider as GlobalLLMProviderKey] as ProviderConfig | undefined;
 
+const currentImageSettings = (s: UserStore) => currentSettings(s).image;
+
 const currentTTS = (s: UserStore) => merge(DEFAULT_TTS_CONFIG, currentSettings(s).tts);
 
 const defaultAgent = (s: UserStore) => merge(DEFAULT_AGENT, currentSettings(s).defaultAgent);
@@ -44,6 +46,7 @@ const getHotkeyById = (id: HotkeyId) => (s: UserStore) =>
   merge(DEFAULT_HOTKEY_CONFIG, currentSettings(s).hotkey)[id];
 
 export const settingsSelectors = {
+  currentImageSettings,
   currentSettings,
   currentSystemAgent,
   currentTTS,