@lobehub/lobehub 2.0.0-next.196 → 2.0.0-next.197

package/packages/database/src/repositories/dataImporter/__tests__/index.test.ts

@@ -2,7 +2,7 @@ import type { ImportPgDataStructure } from '@lobechat/types';
 import { eq, inArray } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { getTestDB } from '../../../models/__tests__/_util';
+import { getTestDB } from '../../../core/getTestDB';
 import * as Schema from '../../../schemas';
 import { DataImporterRepos } from '../index';
 import agentsData from './fixtures/agents.json';

package/packages/database/src/repositories/dataImporter/deprecated/__tests__/index.test.ts

@@ -3,7 +3,7 @@ import type { ImporterEntryData } from '@lobechat/types';
 import { eq, inArray } from 'drizzle-orm';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { getTestDBInstance } from '@/database/core/dbForTest';
+import { getTestDB } from '../../../../core/getTestDB';
 import {
   agents,
   agentsToSessions,
@@ -19,7 +19,7 @@ import mockImportData from './fixtures/messages.json';
 
 const CURRENT_CONFIG_VERSION = 7;
 
-const serverDB = await getTestDBInstance();
+const serverDB = await getTestDB();
 
 const userId = 'test-user-id';
 let importer: DataImporterRepos;

package/packages/database/src/repositories/home/__tests__/index.test.ts

@@ -1,7 +1,7 @@
 import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDB } from '../../../models/__tests__/_util';
+import { getTestDB } from '../../../core/getTestDB';
 import * as Schema from '../../../schemas';
 import { HomeRepository } from '../index';
 

package/packages/database/src/repositories/home/index.test.ts

@@ -1,7 +1,7 @@
 // @vitest-environment node
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDB } from '../../models/__tests__/_util';
+import { getTestDB } from '../../core/getTestDB';
 import { NewAgent, agents } from '../../schemas/agent';
 import { NewChatGroup, chatGroups } from '../../schemas/chatGroup';
 import { agentsToSessions } from '../../schemas/relations';

package/packages/database/src/repositories/knowledge/index.test.ts

@@ -2,7 +2,7 @@
 import { FilesTabs } from '@lobechat/types';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDB } from '../../models/__tests__/_util';
+import { getTestDB } from '../../core/getTestDB';
 import { NewDocument, documents } from '../../schemas/file';
 import { NewFile, files } from '../../schemas/file';
 import { users } from '../../schemas/user';

package/packages/database/src/repositories/search/index.test.ts

@@ -1,7 +1,7 @@
 // @vitest-environment node
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDB } from '../../models/__tests__/_util';
+import { getTestDB } from '../../core/getTestDB';
 import { NewAgent, agents } from '../../schemas/agent';
 import { NewFile, files } from '../../schemas/file';
 import { messages } from '../../schemas/message';

package/packages/database/src/repositories/topicImporter/__tests__/importTopic.test.ts

@@ -4,7 +4,7 @@ import { readFileSync } from 'node:fs';
 import path from 'node:path';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDB } from '../../../models/__tests__/_util';
+import { getTestDB } from '../../../core/getTestDB';
 import { agents, messagePlugins, messages, topics, users } from '../../../schemas';
 import { LobeChatDatabase } from '../../../type';
 import { TopicImporterRepo } from '../index';

package/packages/database/src/repositories/userMemory/__tests__/UserMemoryTopicRepository.test.ts

@@ -1,7 +1,7 @@
 // @vitest-environment node
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDB } from '../../../models/__tests__/_util';
+import { getTestDB } from '../../../core/getTestDB';
 import { messages } from '../../../schemas/message';
 import { topics } from '../../../schemas/topic';
 import { users } from '../../../schemas/user';

package/packages/database/src/server/models/__tests__/adapter.test.ts

@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { DrizzleAdapter } from '@/libs/oidc-provider/adapter';
 
-import { getTestDBInstance } from '../../../core/dbForTest';
+import { getTestDB } from '../../../core/getTestDB';
 import { users } from '../../../schemas';
 import {
   oidcAccessTokens,
@@ -14,7 +14,7 @@ import {
   oidcSessions,
 } from '../../../schemas/oidc';
 
-let serverDB = await getTestDBInstance();
+let serverDB = await getTestDB();
 
 // Test data
 const testModelName = 'Session';

package/packages/database/src/server/models/__tests__/user.test.ts

@@ -7,12 +7,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 
-import { getTestDBInstance } from '../../../core/dbForTest';
+import { getTestDB } from '../../../core/getTestDB';
 import { SessionModel } from '../../../models/session';
 import { UserModel, UserNotFoundError } from '../../../models/user';
 import { UserSettingsItem, nextauthAccounts, userSettings, users } from '../../../schemas';
 
-let serverDB = await getTestDBInstance();
+let serverDB = await getTestDB();
 
 const userId = 'user-db';
 const userEmail = 'user@example.com';

package/packages/database/tests/test-utils.ts

@@ -1 +1 @@
-export * from '../src/models/__tests__/_util';
+export * from '../src/core/getTestDB';

package/packages/types/src/export.ts

@@ -1,6 +1,6 @@
 export interface ExportDatabaseData {
   data: Record<string, object[]>;
-  schemaHash?: string;
+  schemaHash: string;
   url?: string;
 }
 

package/packages/types/src/index.ts

@@ -29,7 +29,6 @@ export * from './serverConfig';
 export * from './service';
 export * from './session';
 export * from './stepContext';
-export * from './tableViewer';
 export * from './tool';
 export * from './topic';
 export * from './user';

package/src/features/ChatInput/ActionBar/Token/TokenTag.tsx

@@ -52,6 +52,7 @@ const Token = memo<TokenTagProps>(({ total: messageString }) => {
     chatConfigByIdSelectors.getEnableHistoryCountById(agentId)(s),
     // need to re-render by search mode
     chatConfigByIdSelectors.isEnableSearchById(agentId)(s),
+    chatConfigByIdSelectors.getUseModelBuiltinSearchById(agentId)(s),
   ]);
 
   const maxTokens = useModelContextWindowTokens(model, provider);

package/src/features/LibraryModal/AssignKnowledgeBase/List.tsx

@@ -114,19 +114,18 @@ export const List = memo(() => {
           totalCount={data!.length}
         />
       ) : (
-        <div style={{ flex: 1, overflow: 'hidden' }}>
-          <div style={{ height: '100%', overflowY: 'auto' }}>
-            <div style={{ paddingInline: 16 }}>
-              <VirtuosoMasonry
-                ItemContent={MasonryItemWrapper}
-                columnCount={columnCount}
-                context={masonryContext}
-                data={data || []}
-                style={{
-                  gap: '16px',
-                }}
-              />
-            </div>
+        <div style={{ height: '100%', position: 'relative' }}>
+          <div style={{ inset: 0, position: 'absolute' }}>
+            <VirtuosoMasonry
+              ItemContent={MasonryItemWrapper}
+              columnCount={columnCount}
+              context={masonryContext}
+              data={data || []}
+              style={{
+                gap: '16px',
+                height: '100%',
+              }}
+            />
           </div>
         </div>
       )}

package/src/features/ResourceManager/components/Explorer/MasonryView/index.tsx

@@ -87,6 +87,7 @@ const MasonryView = memo<MasonryViewProps>(
             data={data || []}
             style={{
               gap: '16px',
+              overflow: 'hidden',
             }}
           />
           {isLoadingMore && (

package/src/server/routers/lambda/__tests__/file.test.ts

@@ -245,7 +245,35 @@ describe('fileRouter', () => {
       );
     });
 
-    it('should handle getFileMetadata errors', async () => {
+    it('should fallback to input size when getFileMetadata fails', async () => {
+      mockFileModelCheckHash.mockResolvedValue({ isExist: false });
+      mockFileModelCreate.mockResolvedValue({ id: 'new-file-id' });
+      mockFileServiceGetFileMetadata.mockRejectedValue(new Error('File not found in S3'));
+
+      const result = await caller.createFile({
+        hash: 'test-hash',
+        fileType: 'text',
+        name: 'test.txt',
+        size: 100,
+        url: 'files/non-existent.txt',
+        metadata: {},
+      });
+
+      expect(result).toEqual({
+        id: 'new-file-id',
+        url: 'https://lobehub.com/f/new-file-id',
+      });
+
+      // Verify create was called with input size as fallback
+      expect(mockFileModelCreate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          size: 100,
+        }),
+        true,
+      );
+    });
+
+    it('should throw error when getFileMetadata fails and input size is less than 1', async () => {
       mockFileModelCheckHash.mockResolvedValue({ isExist: false });
       mockFileServiceGetFileMetadata.mockRejectedValue(new Error('File not found in S3'));
 
@@ -254,11 +282,56 @@ describe('fileRouter', () => {
           hash: 'test-hash',
           fileType: 'text',
           name: 'test.txt',
-          size: 100,
+          size: 0,
           url: 'files/non-existent.txt',
           metadata: {},
         }),
-      ).rejects.toThrow('File not found in S3');
+      ).rejects.toThrow('File size must be at least 1 byte');
+    });
+
+    it('should use input size when getFileMetadata returns contentLength less than 1', async () => {
+      mockFileModelCheckHash.mockResolvedValue({ isExist: false });
+      mockFileModelCreate.mockResolvedValue({ id: 'new-file-id' });
+      mockFileServiceGetFileMetadata.mockResolvedValue({
+        contentLength: 0,
+        contentType: 'text/plain',
+      });
+
+      await caller.createFile({
+        hash: 'test-hash',
+        fileType: 'text',
+        name: 'test.txt',
+        size: 100,
+        url: 'files/test.txt',
+        metadata: {},
+      });
+
+      // Verify create was called with input size since contentLength < 1
+      expect(mockFileModelCreate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          size: 100,
+        }),
+        true,
+      );
+    });
+
+    it('should throw error when both getFileMetadata contentLength and input size are less than 1', async () => {
+      mockFileModelCheckHash.mockResolvedValue({ isExist: false });
+      mockFileServiceGetFileMetadata.mockResolvedValue({
+        contentLength: 0,
+        contentType: 'text/plain',
+      });
+
+      await expect(
+        caller.createFile({
+          hash: 'test-hash',
+          fileType: 'text',
+          name: 'test.txt',
+          size: 0,
+          url: 'files/test.txt',
+          metadata: {},
+        }),
+      ).rejects.toThrow('File size must be at least 1 byte');
     });
   });
 

package/src/server/routers/lambda/file.ts

@@ -64,7 +64,19 @@ export const fileRouter = router({
         }
       }
 
-      const { contentLength: actualSize } = await ctx.fileService.getFileMetadata(input.url);
+      let actualSize = input.size;
+      try {
+        const { contentLength } = await ctx.fileService.getFileMetadata(input.url);
+        if (contentLength >= 1) {
+          actualSize = contentLength;
+        }
+      } catch {
+        // If metadata fetch fails, use original size from input
+      }
+
+      if (actualSize < 1) {
+        throw new TRPCError({ code: 'BAD_REQUEST', message: 'File size must be at least 1 byte' });
+      }
 
       const { id } = await ctx.fileModel.create(
         {

package/src/services/config.ts

@@ -8,7 +8,7 @@ import { exportService } from './export';
 
 class ConfigService {
   exportAll = async () => {
-    const { data, url } = await exportService.exportData();
+    const { data, url, schemaHash } = await exportService.exportData();
     const filename = `${dayjs().format('YYYY-MM-DD-hh-mm')}_${BRANDING_NAME}-data.json`;
 
     // if url exists, means export data from server and upload the data to S3
@@ -18,24 +18,10 @@ class ConfigService {
       return;
     }
 
-    // or export to file with the data
-    const result = await this.createDataStructure(data, 'postgres');
+    const result: ImportPgDataStructure = { data, mode: 'postgres', schemaHash };
 
     exportJSONFile(result, filename);
   };
-
-  private createDataStructure = async (
-    data: any,
-    mode: 'pglite' | 'postgres',
-  ): Promise<ImportPgDataStructure> => {
-    const { default: json } = await import('@/database/core/migrations.json');
-    const latestHash = json.at(-1)?.hash;
-    if (!latestHash) {
-      throw new Error('Not find database sql hash');
-    }
-
-    return { data, mode, schemaHash: latestHash };
-  };
 }
 
 export const configService = new ConfigService();

package/packages/database/src/core/dbForTest.ts

@@ -1,43 +0,0 @@
-import { Pool as NeonPool, neonConfig } from '@neondatabase/serverless';
-import { drizzle as neonDrizzle } from 'drizzle-orm/neon-serverless';
-import * as migrator from 'drizzle-orm/neon-serverless/migrator';
-import { drizzle as nodeDrizzle } from 'drizzle-orm/node-postgres';
-import * as nodeMigrator from 'drizzle-orm/node-postgres/migrator';
-import { join } from 'node:path';
-import { Pool as NodePool } from 'pg';
-import ws from 'ws';
-
-import { serverDBEnv } from '@/config/db';
-
-import * as schema from '../schemas';
-
-const migrationsFolder = join(__dirname, '../../migrations');
-
-export const getTestDBInstance = async () => {
-  let connectionString = serverDBEnv.DATABASE_TEST_URL;
-
-  if (!connectionString) {
-    throw new Error(`You are try to use database, but "DATABASE_TEST_URL" is not set correctly`);
-  }
-
-  if (serverDBEnv.DATABASE_DRIVER === 'node') {
-    const client = new NodePool({ connectionString });
-
-    const db = nodeDrizzle(client, { schema });
-
-    await nodeMigrator.migrate(db, { migrationsFolder });
-
-    return db;
-  }
-
-  // https://github.com/neondatabase/serverless/blob/main/CONFIG.md#websocketconstructor-typeof-websocket--undefined
-  neonConfig.webSocketConstructor = ws;
-
-  const client = new NeonPool({ connectionString });
-
-  const db = neonDrizzle(client, { schema });
-
-  await migrator.migrate(db, { migrationsFolder });
-
-  return db;
-};