@lobehub/chat 1.103.0 → 1.103.2

package/src/features/ElectronTitlebar/WinControl/index.tsx

@@ -1,95 +1,90 @@
-import { createStyles } from 'antd-style';
-import { Minus, Square, XIcon } from 'lucide-react';
-
-import { electronSystemService } from '@/services/electron/system';
-
-import { TITLE_BAR_HEIGHT } from '../const';
-
-const useStyles = createStyles(({ css, cx, token }) => {
-  const icon = css`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    width: ${TITLE_BAR_HEIGHT * 1.2}px;
-    min-height: ${TITLE_BAR_HEIGHT}px;
-
-    color: ${token.colorTextSecondary};
-
-    transition: all ease-in-out 100ms;
-
-    -webkit-app-region: no-drag;
-
-    &:hover {
-      color: ${token.colorText};
-      background: ${token.colorFillTertiary};
-    }
-
-    &:active {
-      color: ${token.colorText};
-      background: ${token.colorFillSecondary};
-    }
-  `;
-  return {
-    close: cx(
-      icon,
-      css`
-        padding-inline-end: 2px;
-
-        &:hover {
-          color: ${token.colorTextLightSolid};
-
-          /* win11 的色值，亮暗色均不变 */
-          background: #d33328;
-        }
-
-        &:active {
-          color: ${token.colorTextLightSolid};
-
-          /* win11 的色值 */
-          background: #8b2b25;
-        }
-      `,
-    ),
-    container: css`
-      cursor: pointer;
-      display: flex;
-    `,
-    icon,
-  };
-});
+// const useStyles = createStyles(({ css, cx, token }) => {
+//   const icon = css`
+//     display: flex;
+//     align-items: center;
+//     justify-content: center;
+//
+//     width: ${TITLE_BAR_HEIGHT * 1.2}px;
+//     min-height: ${TITLE_BAR_HEIGHT}px;
+//
+//     color: ${token.colorTextSecondary};
+//
+//     transition: all ease-in-out 100ms;
+//
+//     -webkit-app-region: no-drag;
+//
+//     &:hover {
+//       color: ${token.colorText};
+//       background: ${token.colorFillTertiary};
+//     }
+//
+//     &:active {
+//       color: ${token.colorText};
+//       background: ${token.colorFillSecondary};
+//     }
+//   `;
+//   return {
+//     close: cx(
+//       icon,
+//       css`
+//         padding-inline-end: 2px;
+//
+//         &:hover {
+//           color: ${token.colorTextLightSolid};
+//
+//           /* win11 的色值，亮暗色均不变 */
+//           background: #d33328;
+//         }
+//
+//         &:active {
+//           color: ${token.colorTextLightSolid};
+//
+//           /* win11 的色值 */
+//           background: #8b2b25;
+//         }
+//       `,
+//     ),
+//     container: css`
+//       cursor: pointer;
+//       display: flex;
+//     `,
+//     icon,
+//   };
+// });
 
 const WinControl = () => {
-  const { styles } = useStyles();
-
-  return (
-    <div className={styles.container}>
-      <div
-        className={styles.icon}
-        onClick={() => {
-          electronSystemService.minimizeWindow();
-        }}
-      >
-        <Minus absoluteStrokeWidth size={14} strokeWidth={1.2} />
-      </div>
-      <div
-        className={styles.icon}
-        onClick={() => {
-          electronSystemService.maximizeWindow();
-        }}
-      >
-        <Square absoluteStrokeWidth size={10} strokeWidth={1.2} />
-      </div>
-      <div
-        className={styles.close}
-        onClick={() => {
-          electronSystemService.closeWindow();
-        }}
-      >
-        <XIcon absoluteStrokeWidth size={14} strokeWidth={1.2} />
-      </div>
-    </div>
-  );
+  return <div style={{ width: 132 }} />;
+
+  // const { styles } = useStyles();
+  //
+  // return (
+  //   <div className={styles.container}>
+  //     <div
+  //       className={styles.icon}
+  //       onClick={() => {
+  //         electronSystemService.minimizeWindow();
+  //       }}
+  //     >
+  //       <Minus absoluteStrokeWidth size={14} strokeWidth={1.2} />
+  //     </div>
+  //     <div
+  //       className={styles.icon}
+  //       onClick={() => {
+  //         electronSystemService.maximizeWindow();
+  //       }}
+  //     >
+  //       <Square absoluteStrokeWidth size={10} strokeWidth={1.2} />
+  //     </div>
+  //     <div
+  //       className={styles.close}
+  //       onClick={() => {
+  //         electronSystemService.closeWindow();
+  //       }}
+  //     >
+  //       <XIcon absoluteStrokeWidth size={14} strokeWidth={1.2} />
+  //     </div>
+  //   </div>
+  // );
 };
 
 export default WinControl;

package/src/features/ElectronTitlebar/hooks/useWatchThemeUpdate.ts

@@ -7,10 +7,14 @@ import { useElectronStore } from '@/store/electron';
 import { useGlobalStore } from '@/store/global';
 
 export const useWatchThemeUpdate = () => {
-  const [systemAppearance, updateElectronAppState] = useElectronStore((s) => [
-    s.appState.systemAppearance,
-    s.updateElectronAppState,
-  ]);
+  const [isAppStateInit, systemAppearance, updateElectronAppState, isMac] = useElectronStore(
+    (s) => [
+      s.isAppStateInit,
+      s.appState.systemAppearance,
+      s.updateElectronAppState,
+      s.appState.isMac,
+    ],
+  );
   const switchThemeMode = useGlobalStore((s) => s.switchThemeMode);
 
   const theme = useTheme();
@@ -24,11 +28,12 @@ export const useWatchThemeUpdate = () => {
   });
 
   useEffect(() => {
+    if (!isAppStateInit || !isMac) return;
     document.documentElement.style.background = 'none';
 
     // https://x.com/alanblogsooo/status/1939208908993896684
     const isNotSameTheme = !systemAppearance ? true : theme.appearance !== systemAppearance;
 
     document.body.style.background = rgba(theme.colorBgLayout, isNotSameTheme ? 0.95 : 0.66);
-  }, [theme, systemAppearance]);
+  }, [theme, systemAppearance, isAppStateInit, isMac]);
 };

package/src/features/ImageTopicPanel/index.tsx

@@ -67,7 +67,6 @@ const ImageTopicPanel = memo<PropsWithChildren>(({ children }) => {
           flex: 'none',
           height: '100%',
           minWidth: 80,
-          padding: 16,
         }}
       >
         {children}

package/src/features/PluginDevModal/index.tsx

@@ -7,6 +7,8 @@ import { Trans, useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { WIKI_PLUGIN_GUIDE } from '@/const/url';
+import { isDesktop } from '@/const/version';
+import { TITLE_BAR_HEIGHT } from '@/features/ElectronTitlebar';
 import { LobeToolCustomPlugin } from '@/types/tool/plugin';
 
 import MCPManifestForm from './MCPManifestForm';
@@ -112,7 +114,7 @@ const DevModal = memo<DevModalProps>(
           containerMaxWidth={'auto'}
           destroyOnHidden
           footer={footer}
-          height={'100vh'}
+          height={isDesktop ? `calc(100vh - ${TITLE_BAR_HEIGHT}px)` : '100vh'}
           onClose={(e) => {
             e.stopPropagation();
             onOpenChange(false);

package/src/features/User/__tests__/UserAvatar.test.tsx

@@ -1,6 +1,7 @@
 import { act, render, screen } from '@testing-library/react';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
+import { BRANDING_NAME } from '@/const/branding';
 import { DEFAULT_USER_AVATAR_URL } from '@/const/meta';
 import { useUserStore } from '@/store/user';
 
@@ -63,8 +64,8 @@ describe('UserAvatar', () => {
       });
 
       render(<UserAvatar />);
-      expect(screen.getByAltText('LobeChat')).toBeInTheDocument();
-      expect(screen.getByAltText('LobeChat')).toHaveAttribute('src', DEFAULT_USER_AVATAR_URL);
+      expect(screen.getByAltText(BRANDING_NAME)).toBeInTheDocument();
+      expect(screen.getByAltText(BRANDING_NAME)).toHaveAttribute('src', DEFAULT_USER_AVATAR_URL);
     });
   });
 
@@ -76,8 +77,8 @@ describe('UserAvatar', () => {
       });
 
       render(<UserAvatar />);
-      expect(screen.getByAltText('LobeChat')).toBeInTheDocument();
-      expect(screen.getByAltText('LobeChat')).toHaveAttribute('src', DEFAULT_USER_AVATAR_URL);
+      expect(screen.getByAltText(BRANDING_NAME)).toBeInTheDocument();
+      expect(screen.getByAltText(BRANDING_NAME)).toHaveAttribute('src', DEFAULT_USER_AVATAR_URL);
     });
   });
 });

package/src/libs/model-runtime/fal/index.ts

@@ -3,7 +3,7 @@ import debug from 'debug';
 import { pick } from 'lodash-es';
 import { ClientOptions } from 'openai';
 
-import { RuntimeImageGenParamsValue } from '@/libs/standard-parameters/meta-schema';
+import { RuntimeImageGenParamsValue } from '@/libs/standard-parameters/index';
 
 import { LobeRuntimeAI } from '../BaseAI';
 import { AgentRuntimeErrorType } from '../error';

package/src/libs/model-runtime/types/image.ts

@@ -1,4 +1,4 @@
-import { RuntimeImageGenParams } from '@/libs/standard-parameters/meta-schema';
+import { RuntimeImageGenParams } from '@/libs/standard-parameters/index';
 
 export type CreateImagePayload = {
   model: string;

package/src/libs/model-runtime/utils/openaiCompatibleFactory/index.ts

@@ -5,7 +5,7 @@ import OpenAI, { ClientOptions } from 'openai';
 import { Stream } from 'openai/streaming';
 
 import { LOBE_DEFAULT_MODEL_LIST } from '@/config/aiModels';
-import { RuntimeImageGenParamsValue } from '@/libs/standard-parameters/meta-schema';
+import { RuntimeImageGenParamsValue } from '@/libs/standard-parameters/index';
 import type { ChatModelCard } from '@/types/llm';
 import { getModelPropertyWithFallback } from '@/utils/getFallbackModelProperty';
 

package/src/libs/model-runtime/utils/response.ts

@@ -6,6 +6,8 @@ export const StreamingResponse = (
     headers: {
       'Cache-Control': 'no-cache',
       'Content-Type': 'text/event-stream',
+      // for Nginx: disable chunk buffering
+      'X-Accel-Buffering': 'no',
       ...options?.headers,
     },
   });

package/src/libs/model-runtime/utils/streams/google-ai.test.ts

@@ -186,6 +186,52 @@ describe('GoogleGenerativeAIStream', () => {
     ]);
   });
 
+  it('should handle token count with cached token count', async () => {
+    vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1');
+
+    const data = {
+      candidates: [{ content: { role: 'model' }, finishReason: 'STOP', index: 0 }],
+      usageMetadata: {
+        promptTokenCount: 15725,
+        candidatesTokenCount: 1053,
+        totalTokenCount: 16778,
+        cachedContentTokenCount: 14286,
+        promptTokensDetails: [{ modality: 'TEXT', tokenCount: 15725 }],
+        cacheTokensDetails: [{ modality: 'TEXT', tokenCount: 14286 }],
+      },
+      modelVersion: 'gemini-2.0-flash-exp',
+    };
+
+    const mockGoogleStream = new ReadableStream({
+      start(controller) {
+        controller.enqueue(data);
+
+        controller.close();
+      },
+    });
+
+    const protocolStream = GoogleGenerativeAIStream(mockGoogleStream);
+
+    const decoder = new TextDecoder();
+    const chunks = [];
+
+    // @ts-ignore
+    for await (const chunk of protocolStream) {
+      chunks.push(decoder.decode(chunk, { stream: true }));
+    }
+
+    expect(chunks).toEqual([
+      // stop
+      'id: chat_1\n',
+      'event: stop\n',
+      `data: "STOP"\n\n`,
+      // usage
+      'id: chat_1\n',
+      'event: usage\n',
+      `data: {"inputCachedTokens":14286,"inputTextTokens":15725,"outputTextTokens":1053,"totalInputTokens":15725,"totalOutputTokens":1053,"totalTokens":16778}\n\n`,
+    ]);
+  });
+
   it('should handle stop with content', async () => {
     vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1');
 

package/src/libs/model-runtime/utils/streams/google-ai.ts

@@ -33,10 +33,10 @@ const transformGoogleGenerativeAIStream = (
       { data: candidate.finishReason, id: context?.id, type: 'stop' },
       {
         data: {
-          // TODO: Google SDK 0.24.0 don't have promptTokensDetails types
-          inputImageTokens: usage.promptTokensDetails?.find((i: any) => i.modality === 'IMAGE')
+          inputCachedTokens: usage.cachedContentTokenCount,
+          inputImageTokens: usage.promptTokensDetails?.find((i) => i.modality === 'IMAGE')
             ?.tokenCount,
-          inputTextTokens: usage.promptTokensDetails?.find((i: any) => i.modality === 'TEXT')
+          inputTextTokens: usage.promptTokensDetails?.find((i) => i.modality === 'TEXT')
             ?.tokenCount,
           outputReasoningTokens: reasoningTokens,
           outputTextTokens,
@@ -79,7 +79,7 @@ const transformGoogleGenerativeAIStream = (
     // 首先检查是否为 reasoning 内容 (thought: true)
     if (Array.isArray(candidate.content?.parts) && candidate.content.parts.length > 0) {
       for (const part of candidate.content.parts) {
-        if (part && part.text && (part as any).thought === true) {
+        if (part && part.text && part.thought === true) {
           return { data: part.text, id: context.id, type: 'reasoning' };
         }
       }

package/src/libs/model-runtime/utils/streams/vertex-ai.ts

@@ -31,13 +31,11 @@ const transformVertexAIStream = (
       { data: candidate.finishReason, id: context?.id, type: 'stop' },
       {
         data: {
-          // TODO: Google SDK 0.24.0 don't have promptTokensDetails types
-          inputImageTokens: (usage as any).promptTokensDetails?.find(
-            (i: any) => i.modality === 'IMAGE',
-          )?.tokenCount,
-          inputTextTokens: (usage as any).promptTokensDetails?.find(
-            (i: any) => i.modality === 'TEXT',
-          )?.tokenCount,
+          inputCachedTokens: usage.cachedContentTokenCount,
+          inputImageTokens: usage.promptTokensDetails?.find((i) => i.modality === 'IMAGE')
+            ?.tokenCount,
+          inputTextTokens: usage.promptTokensDetails?.find((i) => i.modality === 'TEXT')
+            ?.tokenCount,
           outputReasoningTokens,
           outputTextTokens,
           totalInputTokens: usage.promptTokenCount,
@@ -56,7 +54,7 @@ const transformVertexAIStream = (
     candidate.content.parts.length > 0
   ) {
     for (const part of candidate.content.parts) {
-      if (part && part.text && (part as any).thought === true) {
+      if (part && part.text && part.thought === true) {
         return { data: part.text, id: context.id, type: 'reasoning' };
       }
     }

package/src/libs/standard-parameters/{meta-schema.test.ts → index.test.ts}

@@ -6,7 +6,7 @@ import {
   type RuntimeImageGenParams,
   extractDefaultValues,
   validateModelParamsSchema,
-} from './meta-schema';
+} from './index';
 
 describe('meta-schema', () => {
   describe('ModelParamsMetaSchema', () => {

package/src/libs/standard-parameters/index.ts

@@ -1 +1,152 @@
-export * from './meta-schema';
+import type { Simplify } from 'type-fest';
+import { z } from 'zod';
+
+export const MAX_SEED = 2 ** 31 - 1;
+
+// 定义顶层的元规范 - 平铺结构
+export const ModelParamsMetaSchema = z.object({
+  aspectRatio: z
+    .object({
+      default: z.string(),
+      description: z.string().optional(),
+      enum: z.array(z.string()),
+      type: z.literal('string').optional(),
+    })
+    .optional(),
+
+  cfg: z
+    .object({
+      default: z.number(),
+      description: z.string().optional(),
+      max: z.number(),
+      min: z.number(),
+      step: z.number(),
+      type: z.literal('number').optional(),
+    })
+    .optional(),
+
+  height: z
+    .object({
+      default: z.number(),
+      description: z.string().optional(),
+      max: z.number(),
+      min: z.number(),
+      step: z.number().optional().default(1),
+      type: z.literal('number').optional(),
+    })
+    .optional(),
+
+  imageUrl: z
+    .object({
+      default: z.string().nullable().optional(),
+      description: z.string().optional(),
+      type: z.tuple([z.literal('string'), z.literal('null')]).optional(),
+    })
+    .optional(),
+
+  imageUrls: z
+    .object({
+      default: z.array(z.string()),
+      description: z.string().optional(),
+      type: z.literal('array').optional(),
+    })
+    .optional(),
+
+  /**
+   * Prompt 是唯一一个每个模型都有的参数
+   */
+  prompt: z.object({
+    default: z.string().optional().default(''),
+    description: z.string().optional(),
+    type: z.literal('string').optional(),
+  }),
+
+  seed: z
+    .object({
+      default: z.number().nullable().default(null),
+      description: z.string().optional(),
+      max: z.number().optional().default(MAX_SEED),
+      min: z.number().optional().default(0),
+      type: z.tuple([z.literal('number'), z.literal('null')]).optional(),
+    })
+    .optional(),
+
+  size: z
+    .object({
+      default: z.string(),
+      description: z.string().optional(),
+      enum: z.array(z.string()),
+      type: z.literal('string').optional(),
+    })
+    .optional(),
+
+  steps: z
+    .object({
+      default: z.number(),
+      description: z.string().optional(),
+      max: z.number(),
+      min: z.number(),
+      step: z.number().optional().default(1),
+      type: z.literal('number').optional(),
+    })
+    .optional(),
+
+  width: z
+    .object({
+      default: z.number(),
+      description: z.string().optional(),
+      max: z.number(),
+      min: z.number(),
+      step: z.number().optional().default(1),
+      type: z.literal('number').optional(),
+    })
+    .optional(),
+});
+// 导出推断出的类型，供定义对象使用
+export type ModelParamsSchema = z.input<typeof ModelParamsMetaSchema>;
+export type ModelParamsOutputSchema = z.output<typeof ModelParamsMetaSchema>;
+export type ModelParamsKeys = Simplify<keyof ModelParamsOutputSchema>;
+
+type TypeMapping<T> = T extends 'string'
+  ? string
+  : T extends 'number'
+    ? number
+    : T extends ['number', 'null']
+      ? number | null
+      : T extends ['string', 'null']
+        ? string | null
+        : T extends 'string'
+          ? string
+          : T extends 'boolean'
+            ? boolean
+            : never;
+type TypeType<K extends ModelParamsKeys> = NonNullable<ModelParamsOutputSchema[K]>['type'];
+type DefaultType<K extends ModelParamsKeys> = NonNullable<ModelParamsOutputSchema[K]>['default'];
+type _StandardImageGenerationParameters<P extends ModelParamsKeys = ModelParamsKeys> = {
+  [key in P]: NonNullable<TypeType<key>> extends 'array'
+    ? DefaultType<key>
+    : TypeMapping<TypeType<key>>;
+};
+
+export type RuntimeImageGenParams = Pick<_StandardImageGenerationParameters, 'prompt'> &
+  Partial<Omit<_StandardImageGenerationParameters, 'prompt'>>;
+export type RuntimeImageGenParamsKeys = keyof RuntimeImageGenParams;
+export type RuntimeImageGenParamsValue = RuntimeImageGenParams[RuntimeImageGenParamsKeys];
+
+// 验证函数
+export function validateModelParamsSchema(paramsSchema: unknown): ModelParamsOutputSchema {
+  return ModelParamsMetaSchema.parse(paramsSchema);
+}
+
+/**
+ * 从参数定义对象提取默认值
+ */
+export function extractDefaultValues(paramsSchema: ModelParamsSchema) {
+  // 部分默认值从 ModelParamsMetaSchema 中获取
+  const schemaWithDefault = ModelParamsMetaSchema.parse(paramsSchema);
+  return Object.fromEntries(
+    Object.entries(schemaWithDefault).map(([key, value]) => {
+      return [key, value.default];
+    }),
+  ) as RuntimeImageGenParams;
+}

package/src/server/ld.test.ts

@@ -1,6 +1,7 @@
 // @vitest-environment node
 import { describe, expect, it } from 'vitest';
 
+import { BRANDING_NAME } from '@/const/branding';
 import { DEFAULT_LANG } from '@/const/locale';
 
 import { AUTHOR_LIST, Ld } from './ld';
@@ -57,7 +58,7 @@ describe('Ld', () => {
       });
 
       expect(webpage['@type']).toBe('WebPage');
-      expect(webpage.name).toBe('Test Page · LobeChat');
+      expect(webpage.name).toBe(`Test Page · ${BRANDING_NAME}`);
       expect(webpage.description).toBe('Test Description');
     });
   });
@@ -79,7 +80,7 @@ describe('Ld', () => {
       const website = ld.genWebSite();
 
       expect(website['@type']).toBe('WebSite');
-      expect(website.name).toBe('LobeChat');
+      expect(website.name).toBe(BRANDING_NAME);
     });
   });
 
@@ -95,7 +96,7 @@ describe('Ld', () => {
       });
 
       expect(article['@type']).toBe('Article');
-      expect(article.headline).toBe('Test Article · LobeChat');
+      expect(article.headline).toBe(`Test Article · ${BRANDING_NAME}`);
       expect(article.author['@type']).toBe('Person');
     });
   });

package/src/server/routers/async/image.ts

@@ -5,7 +5,7 @@ import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '@/database/models/asyncTask'
 import { FileModel } from '@/database/models/file';
 import { GenerationModel } from '@/database/models/generation';
 import { AgentRuntimeErrorType } from '@/libs/model-runtime/error';
-import { RuntimeImageGenParams } from '@/libs/standard-parameters/meta-schema';
+import { RuntimeImageGenParams } from '@/libs/standard-parameters/index';
 import { asyncAuthedProcedure, asyncRouter as router } from '@/libs/trpc/async';
 import { initAgentRuntimeWithUserPayload } from '@/server/modules/AgentRuntime';
 import { GenerationService } from '@/server/services/generation';

package/src/services/__tests__/chat.test.ts

@@ -4,6 +4,7 @@ import { merge } from 'lodash-es';
 import OpenAI from 'openai';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { DEFAULT_USER_AVATAR } from '@/const/meta';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import {
   LobeAnthropicAI,
@@ -31,8 +32,6 @@ import { aiModelSelectors } from '@/store/aiInfra';
 import { useToolStore } from '@/store/tool';
 import { toolSelectors } from '@/store/tool/selectors';
 import { UserStore } from '@/store/user';
-import { useUserStore } from '@/store/user';
-import { modelConfigSelectors } from '@/store/user/selectors';
 import { UserSettingsState, initialSettingsState } from '@/store/user/slices/settings/initialState';
 import { DalleManifest } from '@/tools/dalle';
 import { WebBrowsingManifest } from '@/tools/web-browsing';
@@ -671,7 +670,7 @@ describe('ChatService', () => {
             updatedAt: 1702723964330,
             extra: {},
             meta: {
-              avatar: '😀',
+              avatar: DEFAULT_USER_AVATAR,
             },
           },
         ] as ChatMessage[];
@@ -913,7 +912,7 @@ describe('ChatService', () => {
             updatedAt: 1702723964330,
             extra: {},
             meta: {
-              avatar: '😀',
+              avatar: DEFAULT_USER_AVATAR,
             },
           },
         ] as ChatMessage[];