@lobehub/chat 1.77.15 → 1.77.17

package/src/server/services/file/impls/s3.ts

@@ -0,0 +1,60 @@
+import urlJoin from 'url-join';
+
+import { fileEnv } from '@/config/file';
+import { S3 } from '@/server/modules/S3';
+
+import { FileServiceImpl } from './type';
+
+/**
+ * 基于S3的文件服务实现
+ */
+export class S3StaticFileImpl implements FileServiceImpl {
+  private readonly s3: S3;
+
+  constructor() {
+    this.s3 = new S3();
+  }
+
+  async deleteFile(key: string) {
+    return this.s3.deleteFile(key);
+  }
+
+  async deleteFiles(keys: string[]) {
+    return this.s3.deleteFiles(keys);
+  }
+
+  async getFileContent(key: string): Promise<string> {
+    return this.s3.getFileContent(key);
+  }
+
+  async getFileByteArray(key: string): Promise<Uint8Array> {
+    return this.s3.getFileByteArray(key);
+  }
+
+  async createPreSignedUrl(key: string): Promise<string> {
+    return this.s3.createPreSignedUrl(key);
+  }
+
+  async createPreSignedUrlForPreview(key: string, expiresIn?: number): Promise<string> {
+    return this.s3.createPreSignedUrlForPreview(key, expiresIn);
+  }
+
+  async uploadContent(path: string, content: string) {
+    return this.s3.uploadContent(path, content);
+  }
+
+  async getFullFileUrl(url?: string | null, expiresIn?: number): Promise<string> {
+    if (!url) return '';
+
+    // If bucket is not set public read, the preview address needs to be regenerated each time
+    if (!fileEnv.S3_SET_ACL) {
+      return await this.createPreSignedUrlForPreview(url, expiresIn);
+    }
+
+    if (fileEnv.S3_ENABLE_PATH_STYLE) {
+      return urlJoin(fileEnv.S3_PUBLIC_DOMAIN!, fileEnv.S3_BUCKET!, url);
+    }
+
+    return urlJoin(fileEnv.S3_PUBLIC_DOMAIN!, url);
+  }
+}

package/src/server/services/file/impls/type.ts

@@ -0,0 +1,44 @@
+/**
+ * S3文件服务实现
+ */
+export interface FileServiceImpl {
+  /**
+   * 创建预签名上传URL
+   */
+  createPreSignedUrl(key: string): Promise<string>;
+
+  /**
+   * 创建预签名预览URL
+   */
+  createPreSignedUrlForPreview(key: string, expiresIn?: number): Promise<string>;
+
+  /**
+   * 删除文件
+   */
+  deleteFile(key: string): Promise<any>;
+
+  /**
+   * 批量删除文件
+   */
+  deleteFiles(keys: string[]): Promise<any>;
+
+  /**
+   * 获取文件字节数组
+   */
+  getFileByteArray(key: string): Promise<Uint8Array>;
+
+  /**
+   * 获取文件内容
+   */
+  getFileContent(key: string): Promise<string>;
+
+  /**
+   * 获取完整文件URL
+   */
+  getFullFileUrl(url?: string | null, expiresIn?: number): Promise<string>;
+
+  /**
+   * 上传内容
+   */
+  uploadContent(path: string, content: string): Promise<any>;
+}

package/src/server/services/file/index.ts

@@ -0,0 +1,65 @@
+import { FileServiceImpl, createFileServiceModule } from './impls';
+
+/**
+ * 文件服务类
+ * 使用模块化实现方式，提供文件操作服务
+ */
+export class FileService {
+  private impl: FileServiceImpl = createFileServiceModule();
+
+  /**
+   * 删除文件
+   */
+  public async deleteFile(key: string) {
+    return this.impl.deleteFile(key);
+  }
+
+  /**
+   * 批量删除文件
+   */
+  public async deleteFiles(keys: string[]) {
+    return this.impl.deleteFiles(keys);
+  }
+
+  /**
+   * 获取文件内容
+   */
+  public async getFileContent(key: string): Promise<string> {
+    return this.impl.getFileContent(key);
+  }
+
+  /**
+   * 获取文件字节数组
+   */
+  public async getFileByteArray(key: string): Promise<Uint8Array> {
+    return this.impl.getFileByteArray(key);
+  }
+
+  /**
+   * 创建预签名上传URL
+   */
+  public async createPreSignedUrl(key: string): Promise<string> {
+    return this.impl.createPreSignedUrl(key);
+  }
+
+  /**
+   * 创建预签名预览URL
+   */
+  public async createPreSignedUrlForPreview(key: string, expiresIn?: number): Promise<string> {
+    return this.impl.createPreSignedUrlForPreview(key, expiresIn);
+  }
+
+  /**
+   * 上传内容
+   */
+  public async uploadContent(path: string, content: string) {
+    return this.impl.uploadContent(path, content);
+  }
+
+  /**
+   * 获取完整文件URL
+   */
+  public async getFullFileUrl(url?: string | null, expiresIn?: number): Promise<string> {
+    return this.impl.getFullFileUrl(url, expiresIn);
+  }
+}

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

@@ -0,0 +1,21 @@
+import { Mock, describe, expect, it, vi } from 'vitest';
+
+import { ModelsService } from '../models';
+
+vi.stubGlobal('fetch', vi.fn());
+
+// 创建一个测试用的 ModelsService 实例
+
+const modelsService = new ModelsService();
+
+describe('ModelsService', () => {
+  describe('getModels', () => {
+    it('should call the appropriate endpoint for a generic provider', async () => {
+      (fetch as Mock).mockResolvedValueOnce(new Response(JSON.stringify({ models: [] })));
+
+      await modelsService.getModels('openai');
+
+      expect(fetch).toHaveBeenCalled();
+    });
+  });
+});

package/src/services/_url.ts

@@ -32,7 +32,10 @@ export const API_ENDPOINTS = mapWithBasePath({
 
   // chat
   chat: (provider: string) => withBasePath(`/webapi/chat/${provider}`),
-  chatModels: (provider: string) => withBasePath(`/webapi/chat/models/${provider}`),
+
+  // models
+  models: (provider: string) => withBasePath(`/webapi/models/${provider}`),
+  modelPull: (provider: string) => withBasePath(`/webapi/models/${provider}/pull`),
 
   // image
   images: (provider: string) => `/webapi/text-to-image/${provider}`,

package/src/services/chat.ts

@@ -133,7 +133,7 @@ interface CreateAssistantMessageStream extends FetchSSEOptions {
  *
  * **Note**: if you try to fetch directly, use `fetchOnClient` instead.
  */
-export function initializeWithClientStore(provider: string, payload: any) {
+export function initializeWithClientStore(provider: string, payload?: any) {
   /**
    * Since #5267, we map parameters for client-fetch in function `getProviderAuthPayload`
    * which called by `createPayloadWithKeyVaults` below.

package/src/services/electron/__tests__/devtools.test.ts

@@ -0,0 +1,34 @@
+import { dispatch } from '@lobechat/electron-client-ipc';
+import { describe, expect, it, vi } from 'vitest';
+
+import { electronDevtoolsService } from '../devtools';
+
+vi.mock('@lobechat/electron-client-ipc', () => ({
+  dispatch: vi.fn(),
+}));
+
+describe('DevtoolsService', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe('openDevtools', () => {
+    it('should call dispatch with openDevtools', async () => {
+      await electronDevtoolsService.openDevtools();
+      expect(dispatch).toHaveBeenCalledWith('openDevtools');
+    });
+
+    it('should return void when dispatch succeeds', async () => {
+      vi.mocked(dispatch).mockResolvedValueOnce();
+      const result = await electronDevtoolsService.openDevtools();
+      expect(result).toBeUndefined();
+    });
+
+    it('should throw error when dispatch fails', async () => {
+      const error = new Error('Failed to open devtools');
+      vi.mocked(dispatch).mockRejectedValueOnce(error);
+
+      await expect(electronDevtoolsService.openDevtools()).rejects.toThrow(error);
+    });
+  });
+});

package/src/services/models.ts

@@ -1,13 +1,42 @@
+import { isDeprecatedEdition } from '@/const/version';
 import { createHeaderWithAuth } from '@/services/_auth';
+import { aiProviderSelectors, getAiInfraStoreState } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { modelConfigSelectors } from '@/store/user/selectors';
 import { ChatModelCard } from '@/types/llm';
+import { getMessageError } from '@/utils/fetch';
 
 import { API_ENDPOINTS } from './_url';
 import { initializeWithClientStore } from './chat';
 
-class ModelsService {
-  getChatModels = async (provider: string): Promise<ChatModelCard[] | undefined> => {
+const isEnableFetchOnClient = (provider: string) => {
+  // TODO: remove this condition in V2.0
+  if (isDeprecatedEdition) {
+    return modelConfigSelectors.isProviderFetchOnClient(provider)(useUserStore.getState());
+  } else {
+    return aiProviderSelectors.isProviderFetchOnClient(provider)(getAiInfraStoreState());
+  }
+};
+
+// 进度信息接口
+export interface ModelProgressInfo {
+  completed?: number;
+  digest?: string;
+  model?: string;
+  status?: string;
+  total?: number;
+}
+
+// 进度回调函数类型
+export type ProgressCallback = (progress: ModelProgressInfo) => void;
+export type ErrorCallback = (error: { message: string }) => void;
+
+export class ModelsService {
+  // 用于中断下载的控制器
+  private _abortController: AbortController | null = null;
+
+  // 获取模型列表
+  getModels = async (provider: string): Promise<ChatModelCard[] | undefined> => {
     const headers = await createHeaderWithAuth({
       headers: { 'Content-Type': 'application/json' },
       provider,
@@ -16,15 +45,13 @@ class ModelsService {
       /**
        * Use browser agent runtime
        */
-      const enableFetchOnClient = modelConfigSelectors.isProviderFetchOnClient(provider)(
-        useUserStore.getState(),
-      );
+      const enableFetchOnClient = isEnableFetchOnClient(provider);
       if (enableFetchOnClient) {
-        const agentRuntime = await initializeWithClientStore(provider, {});
+        const agentRuntime = await initializeWithClientStore(provider);
         return agentRuntime.models();
       }
 
-      const res = await fetch(API_ENDPOINTS.chatModels(provider), { headers });
+      const res = await fetch(API_ENDPOINTS.models(provider), { headers });
       if (!res.ok) return;
 
       return res.json();
@@ -32,6 +59,125 @@ class ModelsService {
       return;
     }
   };
+
+  /**
+   * 下载模型并通过回调函数返回进度信息
+   */
+  downloadModel = async (
+    { model, provider }: { model: string; provider: string },
+    { onProgress }: { onError?: ErrorCallback; onProgress?: ProgressCallback } = {},
+  ): Promise<void> => {
+    try {
+      // 创建一个新的 AbortController
+      this._abortController = new AbortController();
+      const signal = this._abortController.signal;
+
+      const headers = await createHeaderWithAuth({
+        headers: { 'Content-Type': 'application/json' },
+        provider,
+      });
+
+      const enableFetchOnClient = isEnableFetchOnClient(provider);
+
+      console.log('enableFetchOnClient：', enableFetchOnClient);
+      let res: Response;
+      if (enableFetchOnClient) {
+        const agentRuntime = await initializeWithClientStore(provider);
+        res = (await agentRuntime.pullModel({ model }, { signal }))!;
+      } else {
+        res = await fetch(API_ENDPOINTS.modelPull(provider), {
+          body: JSON.stringify({ model }),
+          headers,
+          method: 'POST',
+          signal,
+        });
+      }
+
+      if (!res.ok) {
+        throw await getMessageError(res);
+      }
+
+      // 处理响应流
+      if (res.body) {
+        await this.processModelPullStream(res, { onProgress });
+      }
+    } catch (error) {
+      // 如果是取消操作，不需要继续抛出错误
+      if (error instanceof DOMException && error.name === 'AbortError') {
+        return;
+      }
+
+      console.error('download model error:', error);
+      throw error;
+    } finally {
+      // 清理 AbortController
+      this._abortController = null;
+    }
+  };
+
+  // 中断模型下载
+  abortPull = () => {
+    // 使用 AbortController 中断下载
+    if (this._abortController) {
+      this._abortController.abort();
+      this._abortController = null;
+    }
+  };
+
+  /**
+   * 处理模型下载流，解析进度信息并通过回调函数返回
+   * @param response 响应对象
+   * @param onProgress 进度回调函数
+   * @returns Promise<void>
+   */
+  private processModelPullStream = async (
+    response: Response,
+    { onProgress, onError }: { onError?: ErrorCallback; onProgress?: ProgressCallback },
+  ): Promise<void> => {
+    // 处理响应流
+    const reader = response.body?.getReader();
+    if (!reader) return;
+
+    // 读取和处理流数据
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+
+      // 解析进度数据
+      const progressText = new TextDecoder().decode(value);
+      // 一行可能包含多个进度更新
+      const progressUpdates = progressText.trim().split('\n');
+
+      for (const update of progressUpdates) {
+        let progress;
+        try {
+          progress = JSON.parse(update);
+        } catch (e) {
+          console.error('Error parsing progress update:', e);
+          console.error('raw data', update);
+        }
+
+        if (progress.status === 'canceled') {
+          console.log('progress：', progress);
+          // const abortError = new Error('abort');
+          // abortError.name = 'AbortError';
+          //
+          // throw abortError;
+        }
+
+        if (progress.status === 'error') {
+          onError?.({ message: progress.error });
+          throw new Error(progress.error);
+        }
+
+        // 调用进度回调
+        if (progress.completed !== undefined || progress.status) {
+          onProgress?.(progress);
+        }
+      }
+    }
+  };
 }
 
 export const modelsService = new ModelsService();

package/src/store/aiInfra/slices/aiModel/action.ts

@@ -71,7 +71,7 @@ export const createAiModelSlice: StateCreator<
   fetchRemoteModelList: async (providerId) => {
     const { modelsService } = await import('@/services/models');
 
-    const data = await modelsService.getChatModels(providerId);
+    const data = await modelsService.getModels(providerId);
     if (data) {
       await get().batchUpdateAiModels(
         data.map((model) => ({

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

@@ -3,7 +3,7 @@ import { SWRResponse, mutate } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
 import { DEFAULT_MODEL_PROVIDER_LIST } from '@/config/modelProviders';
-import { isDeprecatedEdition } from '@/const/version';
+import { isDeprecatedEdition, isDesktop, isUsePgliteDB } from '@/const/version';
 import { useClientDataSWR } from '@/libs/swr';
 import { aiProviderService } from '@/services/aiProvider';
 import { AiInfraStore } from '@/store/aiInfra/store';
@@ -184,6 +184,7 @@ export const createAiProviderSlice: StateCreator<
         };
       },
       {
+        focusThrottleInterval: isDesktop || isUsePgliteDB ? 100 : undefined,
         onSuccess: async (data) => {
           if (!data) return;
 

package/src/store/user/slices/modelList/action.test.ts

@@ -328,7 +328,7 @@ describe('LLMSettingsSliceAction', () => {
 
       const spyOn = vi.spyOn(result.current, 'refreshDefaultModelProviderList');
 
-      vi.spyOn(modelsService, 'getChatModels').mockResolvedValueOnce([]);
+      vi.spyOn(modelsService, 'getModels').mockResolvedValueOnce([]);
 
       renderHook(() => result.current.useFetchProviderModelList(provider, enabledAutoFetch));
 
@@ -347,7 +347,7 @@ describe('LLMSettingsSliceAction', () => {
 
       const spyOn = vi.spyOn(result.current, 'refreshDefaultModelProviderList');
 
-      vi.spyOn(modelsService, 'getChatModels').mockResolvedValueOnce([]);
+      vi.spyOn(modelsService, 'getModels').mockResolvedValueOnce([]);
 
       renderHook(() => result.current.useFetchProviderModelList(provider, enabledAutoFetch));
 

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

@@ -202,7 +202,7 @@ export const createModelListSlice: StateCreator<
       async ([p]) => {
         const { modelsService } = await import('@/services/models');
 
-        return modelsService.getChatModels(p);
+        return modelsService.getModels(p);
       },
       {
         onSuccess: async (data) => {

package/src/app/[variants]/(main)/settings/llm/ProviderList/Ollama/Checker.tsx

@@ -1,73 +0,0 @@
-import { CheckCircleFilled } from '@ant-design/icons';
-import { Alert, Highlighter } from '@lobehub/ui';
-import { Button } from 'antd';
-import { useTheme } from 'antd-style';
-import { ListResponse } from 'ollama/browser';
-import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Flexbox } from 'react-layout-kit';
-import useSWR from 'swr';
-
-import { useIsMobile } from '@/hooks/useIsMobile';
-import { ollamaService } from '@/services/ollama';
-
-const OllamaChecker = memo(() => {
-  const { t } = useTranslation('setting');
-
-  const theme = useTheme();
-
-  const { data, error, isLoading, mutate } = useSWR<ListResponse>(
-    'ollama.list',
-    ollamaService.getModels,
-    {
-      revalidateOnFocus: false,
-      revalidateOnMount: false,
-      revalidateOnReconnect: false,
-    },
-  );
-
-  const checkConnection = () => {
-    mutate().catch();
-  };
-
-  const isMobile = useIsMobile();
-
-  return (
-    <Flexbox align={isMobile ? 'flex-start' : 'flex-end'} gap={8}>
-      <Flexbox align={'center'} direction={isMobile ? 'horizontal-reverse' : 'horizontal'} gap={12}>
-        {!error && data?.models && (
-          <Flexbox gap={4} horizontal>
-            <CheckCircleFilled
-              style={{
-                color: theme.colorSuccess,
-              }}
-            />
-            {t('llm.checker.pass')}
-          </Flexbox>
-        )}
-        <Button loading={isLoading} onClick={checkConnection}>
-          {t('llm.checker.button')}
-        </Button>
-      </Flexbox>
-      {error && (
-        <Flexbox gap={8} style={{ maxWidth: '600px', width: '100%' }}>
-          <Alert
-            banner
-            extra={
-              <Flexbox>
-                <Highlighter copyButtonSize={'small'} language={'json'} type={'pure'}>
-                  {JSON.stringify(error.body || error, null, 2)}
-                </Highlighter>
-              </Flexbox>
-            }
-            message={t(`response.${error.type}` as any, { ns: 'error' })}
-            showIcon
-            type={'error'}
-          />
-        </Flexbox>
-      )}
-    </Flexbox>
-  );
-});
-
-export default OllamaChecker;