@lobehub/chat 1.76.0 → 1.77.0

package/src/services/import/client.ts

@@ -23,7 +23,36 @@ export class ClientService extends BaseClientService implements IImportService {
       const duration = Date.now() - time;
 
       callbacks?.onStageChange?.(ImportStage.Success);
-      callbacks?.onSuccess?.(result, duration);
+      callbacks?.onSuccess?.(result.results, duration);
+    } catch (e) {
+      console.error(e);
+      callbacks?.onStageChange?.(ImportStage.Error);
+      const error = e as Error;
+
+      callbacks?.onError?.({ code: 'ImportError', httpStatus: 0, message: error.message });
+    }
+  };
+
+  importPgData: IImportService['importPgData'] = async (
+    data,
+    { callbacks, overwriteExisting } = {},
+  ) => {
+    callbacks?.onStageChange?.(ImportStage.Importing);
+    const time = Date.now();
+    try {
+      const result = await this.dataImporter.importPgData(
+        data,
+        overwriteExisting ? 'override' : 'skip',
+      );
+
+      const duration = Date.now() - time;
+
+      callbacks?.onStageChange?.(ImportStage.Success);
+      if (result.success) {
+        callbacks?.onSuccess?.(result.results, duration);
+      } else {
+        callbacks?.onError?.({ code: 'ImportError', httpStatus: 0, message: result.error.message });
+      }
     } catch (e) {
       console.error(e);
       callbacks?.onStageChange?.(ImportStage.Error);

package/src/services/import/server.ts

@@ -2,6 +2,7 @@ import { DefaultErrorShape } from '@trpc/server/unstable-core-do-not-import';
 
 import { edgeClient, lambdaClient } from '@/libs/trpc/client';
 import { useUserStore } from '@/store/user';
+import { ImportPgDataStructure } from '@/types/export';
 import { ImportStage, OnImportCallbacks } from '@/types/importer';
 import { uuid } from '@/utils/uuid';
 
@@ -39,7 +40,7 @@ export class ServerService implements IImportService {
         const duration = Date.now() - time;
 
         callbacks?.onStageChange?.(ImportStage.Success);
-        callbacks?.onSuccess?.(result, duration);
+        callbacks?.onSuccess?.(result.results, duration);
       } catch (e) {
         handleError(e);
       }
@@ -67,7 +68,74 @@ export class ServerService implements IImportService {
       const result = await lambdaClient.importer.importByFile.mutate({ pathname });
       const duration = Date.now() - time;
       callbacks?.onStageChange?.(ImportStage.Success);
-      callbacks?.onSuccess?.(result, duration);
+      callbacks?.onSuccess?.(result.results, duration);
+    } catch (e) {
+      handleError(e);
+    }
+  };
+
+  importPgData: IImportService['importPgData'] = async (
+    data: ImportPgDataStructure,
+    {
+      callbacks,
+    }: {
+      callbacks?: OnImportCallbacks;
+      overwriteExisting?: boolean;
+    } = {},
+  ): Promise<void> => {
+    const handleError = (e: unknown) => {
+      callbacks?.onStageChange?.(ImportStage.Error);
+      const error = e as DefaultErrorShape;
+
+      callbacks?.onError?.({
+        code: error.data.code,
+        httpStatus: error.data.httpStatus,
+        message: error.message,
+        path: error.data.path,
+      });
+    };
+
+    const totalLength = Object.values(data.data)
+      .map((d) => d.length)
+      .reduce((a, b) => a + b, 0);
+
+    if (totalLength < 500) {
+      callbacks?.onStageChange?.(ImportStage.Importing);
+      const time = Date.now();
+      try {
+        const result = await lambdaClient.importer.importPgByPost.mutate(data);
+        const duration = Date.now() - time;
+
+        callbacks?.onStageChange?.(ImportStage.Success);
+        callbacks?.onSuccess?.(result.results, duration);
+      } catch (e) {
+        handleError(e);
+      }
+
+      return;
+    }
+
+    // if the data is too large, upload it to S3 and upload by file
+    const filename = `${uuid()}.json`;
+
+    const pathname = `import_config/${filename}`;
+
+    const url = await edgeClient.upload.createS3PreSignedUrl.mutate({ pathname });
+
+    try {
+      callbacks?.onStageChange?.(ImportStage.Uploading);
+      await this.uploadWithProgress(url, data, callbacks?.onFileUploading);
+    } catch {
+      throw new Error('Upload Error');
+    }
+
+    callbacks?.onStageChange?.(ImportStage.Importing);
+    const time = Date.now();
+    try {
+      const result = await lambdaClient.importer.importByFile.mutate({ pathname });
+      const duration = Date.now() - time;
+      callbacks?.onStageChange?.(ImportStage.Success);
+      callbacks?.onSuccess?.(result.results, duration);
     } catch (e) {
       handleError(e);
     }

package/src/services/import/type.ts

@@ -1,7 +1,17 @@
+import { ImportPgDataStructure } from '@/types/export';
 import { ImporterEntryData, OnImportCallbacks } from '@/types/importer';
 import { UserSettings } from '@/types/user/settings';
 
 export interface IImportService {
   importData(data: ImporterEntryData, callbacks?: OnImportCallbacks): Promise<void>;
+
+  importPgData(
+    data: ImportPgDataStructure,
+    options?: {
+      callbacks?: OnImportCallbacks;
+      overwriteExisting?: boolean;
+    },
+  ): Promise<void>;
+
   importSettings(settings: UserSettings): Promise<void>;
 }

package/src/store/global/initialState.ts

@@ -30,6 +30,7 @@ export enum SettingsTabs {
   Hotkey = 'hotkey',
   LLM = 'llm',
   Provider = 'provider',
+  Storage = 'storage',
   Sync = 'sync',
   SystemAgent = 'system-agent',
   TTS = 'tts',

package/src/types/export.ts

@@ -0,0 +1,11 @@
+export interface ExportDatabaseData {
+  data: Record<string, object[]>;
+  schemaHash?: string;
+  url?: string;
+}
+
+export interface ImportPgDataStructure {
+  data: Record<string, object[]>;
+  mode: 'pglite' | 'postgres';
+  schemaHash: string;
+}

package/src/types/exportConfig.ts

@@ -3,6 +3,8 @@ import { LobeSessions, SessionGroupItem } from '@/types/session';
 import { ChatTopic } from '@/types/topic';
 import { UserSettings } from '@/types/user/settings';
 
+// ---------- TODO: this file need to be deleted in V2 ---------- //
+
 /**
  * 导出方式
  * @enum ['agents', 'sessions', 'singleSession', 'settings', 'all']

package/src/types/importer.ts

@@ -146,3 +146,18 @@ export interface OnImportCallbacks {
    */
   onSuccess?: (results: ImportResults, duration: number) => void;
 }
+
+// ------
+
+export type ImportResultData = ImportSuccessResult | ImportErrorResult;
+
+export interface ImportSuccessResult {
+  results: Record<string, any>;
+  success: true;
+}
+
+export interface ImportErrorResult {
+  error: { details?: string; message: string };
+  results: Record<string, any>;
+  success: false;
+}

package/src/types/user/settings/tts.ts

@@ -3,7 +3,7 @@ export type STTServer = 'openai' | 'browser';
 export interface UserTTSConfig {
   openAI: {
     sttModel: 'whisper-1';
-    ttsModel: 'tts-1' | 'tts-1-hd';
+    ttsModel: 'gpt-4o-mini-tts' | 'tts-1' | 'tts-1-hd';
   };
   sttAutoStop: boolean;
   sttServer: STTServer;

package/src/utils/client/exportFile.ts

@@ -18,3 +18,24 @@ export const exportFile = (content: string, filename?: string) => {
   URL.revokeObjectURL(url);
   a.remove();
 };
+
+export const exportJSONFile = (data: object, fileName: string) => {
+  // 创建一个 Blob 对象
+  const blob = new Blob([JSON.stringify(data)], { type: 'application/json' });
+
+  // 创建一个 URL 对象，用于下载
+  const url = URL.createObjectURL(blob);
+
+  // 创建一个 <a> 元素，设置下载链接和文件名
+  const a = document.createElement('a');
+  a.href = url;
+  a.download = fileName;
+
+  // 触发 <a> 元素的点击事件，开始下载
+  document.body.append(a);
+  a.click();
+
+  // 下载完成后，清除 URL 对象
+  URL.revokeObjectURL(url);
+  a.remove();
+};

package/vitest.config.ts

@@ -31,7 +31,7 @@ export default defineConfig({
       '**/dist/**',
       '**/build/**',
       'src/database/server/**/**',
-      'src/database/repositories/dataImporter/**/**',
+      'src/database/repositories/dataImporter/deprecated/**/**',
     ],
     globals: true,
     server: {

package/src/utils/config.ts

@@ -1,109 +0,0 @@
-import { notification } from '@/components/AntdStaticMethods';
-import { BRANDING_NAME } from '@/const/branding';
-import { CURRENT_CONFIG_VERSION, Migration } from '@/migrations';
-import {
-  ConfigFile,
-  ConfigFileAgents,
-  ConfigFileAll,
-  ConfigFileSessions,
-  ConfigFileSettings,
-  ConfigFileSingleSession,
-  ConfigModelMap,
-  ExportType,
-} from '@/types/exportConfig';
-
-export const exportConfigFile = (config: object, fileName?: string) => {
-  const file = `${BRANDING_NAME}-${fileName || '-config'}-v${CURRENT_CONFIG_VERSION}.json`;
-
-  // 创建一个 Blob 对象
-  const blob = new Blob([JSON.stringify(config)], { type: 'application/json' });
-
-  // 创建一个 URL 对象，用于下载
-  const url = URL.createObjectURL(blob);
-
-  // 创建一个 <a> 元素，设置下载链接和文件名
-  const a = document.createElement('a');
-  a.href = url;
-  a.download = file;
-
-  // 触发 <a> 元素的点击事件，开始下载
-  document.body.append(a);
-  a.click();
-
-  // 下载完成后，清除 URL 对象
-  URL.revokeObjectURL(url);
-  a.remove();
-};
-
-export const importConfigFile = async (
-  file: File,
-  onConfigImport: (config: ConfigFile) => Promise<void>,
-) => {
-  const text = await file.text();
-
-  try {
-    const config = JSON.parse(text);
-    const { state, version } = Migration.migrate(config);
-
-    await onConfigImport({ ...config, state, version });
-  } catch (error) {
-    console.error(error);
-    notification.error({
-      description: `出错原因: ${(error as Error).message}`,
-      message: '导入失败',
-    });
-  }
-};
-
-type CreateConfigFileState<T extends ExportType> = ConfigModelMap[T]['state'];
-
-type CreateConfigFile<T extends ExportType> = ConfigModelMap[T]['file'];
-
-export const createConfigFile = <T extends ExportType>(
-  type: T,
-  state: CreateConfigFileState<T>,
-): CreateConfigFile<T> => {
-  switch (type) {
-    case 'agents': {
-      return {
-        exportType: 'agents',
-        state,
-        version: Migration.targetVersion,
-      } as ConfigFileAgents;
-    }
-
-    case 'sessions': {
-      return {
-        exportType: 'sessions',
-        state,
-        version: Migration.targetVersion,
-      } as ConfigFileSessions;
-    }
-
-    case 'settings': {
-      return {
-        exportType: 'settings',
-        state,
-        version: Migration.targetVersion,
-      } as ConfigFileSettings;
-    }
-
-    case 'singleSession': {
-      return {
-        exportType: 'sessions',
-        state,
-        version: Migration.targetVersion,
-      } as ConfigFileSingleSession;
-    }
-
-    case 'all': {
-      return {
-        exportType: 'all',
-        state,
-        version: Migration.targetVersion,
-      } as ConfigFileAll;
-    }
-  }
-
-  throw new Error('缺少正确的导出类型，请检查实现...');
-};