[pull] main from lobehub:main

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.35.8](https://github.com/lobehub/lobe-chat/compare/v1.35.7...v1.35.8)
+
+<sup>Released on **2024-12-03**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Move schema and migration folder.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Move schema and migration folder, closes [#4874](https://github.com/lobehub/lobe-chat/issues/4874) ([9aa16d4](https://github.com/lobehub/lobe-chat/commit/9aa16d4))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.35.7](https://github.com/lobehub/lobe-chat/compare/v1.35.6...v1.35.7)
 
 <sup>Released on **2024-12-03**</sup>

Dockerfile.database

@@ -116,7 +116,7 @@ COPY --from=builder /deps/node_modules/pg /app/node_modules/pg
 COPY --from=builder /deps/node_modules/drizzle-orm /app/node_modules/drizzle-orm
 
 # Copy database migrations
-COPY --from=builder /app/src/database/server/migrations /app/migrations
+COPY --from=builder /app/src/database/migrations /app/migrations
 COPY --from=builder /app/scripts/migrateServerDB/docker.cjs /app/docker.cjs
 COPY --from=builder /app/scripts/migrateServerDB/errorHint.js /app/errorHint.js
 

changelog/v1.json

@@ -1,4 +1,11 @@
 [
+  {
+    "children": {
+      "improvements": ["Move schema and migration folder."]
+    },
+    "date": "2024-12-03",
+    "version": "1.35.8"
+  },
   {
     "children": {},
     "date": "2024-12-03",

drizzle.config.ts

@@ -22,8 +22,8 @@ export default {
     url: connectionString,
   },
   dialect: 'postgresql',
-  out: './src/database/server/migrations',
+  out: './src/database/migrations',
 
-  schema: './src/database/server/schemas/lobechat',
+  schema: './src/database/schemas',
   strict: true,
 } satisfies Config;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.35.7",
+  "version": "1.35.8",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

scripts/migrateServerDB/index.ts

@@ -11,7 +11,7 @@ dotenv.config();
 
 const runMigrations = async () => {
   await migrator.migrate(serverDB, {
-    migrationsFolder: join(__dirname, '../../src/database/server/migrations'),
+    migrationsFolder: join(__dirname, '../../src/database/migrations'),
   });
   console.log('✅ database migration pass.');
   // eslint-disable-next-line unicorn/no-process-exit

src/database/server/schemas/lobechat/agent.ts → src/database/schemas/agent.ts

@@ -4,7 +4,7 @@ import { createInsertSchema } from 'drizzle-zod';
 
 import { LobeAgentChatConfig, LobeAgentTTSConfig } from '@/types/agent';
 
-import { idGenerator, randomSlug } from '../../utils/idGenerator';
+import { idGenerator, randomSlug } from '@/database/utils/idGenerator';
 import { timestamps } from './_helpers';
 import { files, knowledgeBases } from './file';
 import { users } from './user';

src/database/server/schemas/lobechat/file.ts → src/database/schemas/file.ts

@@ -11,7 +11,7 @@ import {
 } from 'drizzle-orm/pg-core';
 import { createInsertSchema } from 'drizzle-zod';
 
-import { idGenerator } from '../../utils/idGenerator';
+import { idGenerator } from '@/database/utils/idGenerator';
 import { accessedAt, createdAt, timestamps } from './_helpers';
 import { asyncTasks } from './asyncTask';
 import { chunks } from './rag';

src/database/server/schemas/lobechat/message.ts → src/database/schemas/message.ts

@@ -12,7 +12,7 @@ import {
 } from 'drizzle-orm/pg-core';
 import { createSelectSchema } from 'drizzle-zod';
 
-import { idGenerator } from '../../utils/idGenerator';
+import { idGenerator } from '@/database/utils/idGenerator';
 import { timestamps } from './_helpers';
 import { agents } from './agent';
 import { files } from './file';

src/database/server/schemas/lobechat/session.ts → src/database/schemas/session.ts

@@ -2,7 +2,7 @@
 import { boolean, integer, pgTable, text, unique, uniqueIndex, varchar } from 'drizzle-orm/pg-core';
 import { createInsertSchema } from 'drizzle-zod';
 
-import { idGenerator, randomSlug } from '../../utils/idGenerator';
+import { idGenerator, randomSlug } from '@/database/utils/idGenerator';
 import { timestamps } from './_helpers';
 import { users } from './user';
 

src/database/server/schemas/lobechat/topic.ts → src/database/schemas/topic.ts

@@ -2,7 +2,7 @@
 import { boolean, jsonb, pgTable, text, unique } from 'drizzle-orm/pg-core';
 import { createInsertSchema } from 'drizzle-zod';
 
-import { idGenerator } from '../../utils/idGenerator';
+import { idGenerator } from '@/database/utils/idGenerator';
 import { timestamps, timestamptz } from './_helpers';
 import { sessions } from './session';
 import { users } from './user';

src/database/server/core/db.ts

@@ -7,7 +7,7 @@ import ws from 'ws';
 import { serverDBEnv } from '@/config/db';
 import { isServerMode } from '@/const/version';
 
-import * as schema from '../schemas/lobechat';
+import * as schema from '../../schemas';
 
 export const getDBInstance = (): NeonDatabase<typeof schema> => {
   if (!isServerMode) return {} as any;

src/database/server/core/dbForTest.ts

@@ -9,7 +9,7 @@ import ws from 'ws';
 
 import { serverDBEnv } from '@/config/db';
 
-import * as schema from '../schemas/lobechat';
+import * as schema from '../../schemas';
 
 export const getTestDBInstance = async () => {
   let connectionString = serverDBEnv.DATABASE_TEST_URL;
@@ -24,7 +24,7 @@ export const getTestDBInstance = async () => {
     const db = nodeDrizzle(client, { schema });
 
     await nodeMigrator.migrate(db, {
-      migrationsFolder: join(__dirname, '../migrations'),
+      migrationsFolder: join(__dirname, '../../migrations'),
     });
 
     return db;

src/database/server/models/__tests__/_test_template.ts

@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';
 
-import { sessionGroups, users } from '../../schemas/lobechat';
+import { sessionGroups, users } from '../../../schemas';
 import { SessionGroupModel } from '../sessionGroup';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/agent.test.ts

@@ -13,7 +13,7 @@ import {
   knowledgeBases,
   sessions,
   users,
-} from '../../schemas/lobechat';
+} from '../../../schemas';
 import { AgentModel } from '../agent';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/asyncTask.test.ts

@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { getTestDBInstance } from '@/database/server/core/dbForTest';
 import { AsyncTaskStatus, AsyncTaskType } from '@/types/asyncTask';
 
-import { asyncTasks, users } from '../../schemas/lobechat';
+import { asyncTasks, users } from '../../../schemas';
 import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '../asyncTask';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/chunk.test.ts

@@ -11,7 +11,7 @@ import {
   files,
   unstructuredChunks,
   users,
-} from '../../schemas/lobechat';
+} from '../../../schemas';
 import { ChunkModel } from '../chunk';
 import { codeEmbedding, designThinkingQuery, designThinkingQuery2 } from './fixtures/embedding';
 

src/database/server/models/__tests__/file.test.ts

@@ -12,7 +12,7 @@ import {
   knowledgeBaseFiles,
   knowledgeBases,
   users,
-} from '../../schemas/lobechat';
+} from '../../../schemas';
 import { FileModel } from '../file';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/knowledgeBase.test.ts

@@ -12,7 +12,7 @@ import {
   knowledgeBaseFiles,
   knowledgeBases,
   users,
-} from '../../schemas/lobechat';
+} from '../../../schemas';
 import { KnowledgeBaseModel } from '../knowledgeBase';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/message.test.ts

@@ -13,7 +13,7 @@ import {
   sessions,
   topics,
   users,
-} from '../../schemas/lobechat';
+} from '../../../schemas';
 import { MessageModel } from '../message';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/nextauth.test.ts

@@ -15,7 +15,7 @@ import {
   nextauthSessions,
   nextauthVerificationTokens,
   users,
-} from '@/database/server/schemas/lobechat';
+} from '@/database/schemas';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/plugin.test.ts

@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';
 
-import { NewInstalledPlugin, installedPlugins, users } from '../../schemas/lobechat';
+import { NewInstalledPlugin, installedPlugins, users } from '../../../schemas';
 import { PluginModel } from '../plugin';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/session.test.ts

@@ -13,8 +13,8 @@ import {
   sessions,
   topics,
   users,
-} from '../../schemas/lobechat';
-import { idGenerator } from '../../utils/idGenerator';
+} from '../../../schemas';
+import { idGenerator } from '@/database/utils/idGenerator';
 import { SessionModel } from '../session';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/sessionGroup.test.ts

@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';
 
-import { sessionGroups, users } from '../../schemas/lobechat';
+import { sessionGroups, users } from '../../../schemas';
 import { SessionGroupModel } from '../sessionGroup';
 
 let serverDB = await getTestDBInstance();

src/database/server/models/__tests__/topic.test.ts

@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';
 
-import { messages, sessions, topics, users } from '../../schemas/lobechat';
+import { messages, sessions, topics, users } from '../../../schemas';
 import { CreateTopicParams, TopicModel } from '../topic';
 
 let serverDB = await getTestDBInstance();

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

@@ -7,7 +7,7 @@ import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserGuide, UserPreference } from '@/types/user';
 import { UserSettings } from '@/types/user/settings';
 
-import { userSettings, users } from '../../schemas/lobechat';
+import { userSettings, users } from '../../../schemas';
 import { SessionModel } from '../session';
 import { UserModel } from '../user';
 

src/database/server/models/_template.ts

@@ -3,7 +3,7 @@ import { and, desc } from 'drizzle-orm/expressions';
 
 import { serverDB } from '@/database/server';
 
-import { NewSessionGroup, SessionGroupItem, sessionGroups } from '../schemas/lobechat';
+import { NewSessionGroup, SessionGroupItem, sessionGroups } from '../../schemas';
 
 export class TemplateModel {
   private userId: string;

src/database/server/models/agent.ts

@@ -9,7 +9,7 @@ import {
   agentsToSessions,
   files,
   knowledgeBases,
-} from '@/database/server/schemas/lobechat';
+} from '@/database/schemas';
 
 export class AgentModel {
   private userId: string;

src/database/server/models/asyncTask.ts

@@ -9,7 +9,7 @@ import {
   AsyncTaskType,
 } from '@/types/asyncTask';
 
-import { AsyncTaskSelectItem, NewAsyncTaskItem, asyncTasks } from '../schemas/lobechat';
+import { AsyncTaskSelectItem, NewAsyncTaskItem, asyncTasks } from '../../schemas';
 
 // set timeout to about 5 minutes, and give 2s padding time
 export const ASYNC_TASK_TIMEOUT = 298 * 1000;

src/database/server/models/chunk.ts

@@ -13,7 +13,7 @@ import {
   fileChunks,
   files,
   unstructuredChunks,
-} from '../schemas/lobechat';
+} from '../../schemas';
 
 export class ChunkModel {
   private userId: string;

src/database/server/models/embedding.ts

@@ -3,7 +3,7 @@ import { and } from 'drizzle-orm/expressions';
 
 import { serverDB } from '@/database/server';
 
-import { NewEmbeddingsItem, embeddings } from '../schemas/lobechat';
+import { NewEmbeddingsItem, embeddings } from '../../schemas';
 
 export class EmbeddingModel {
   private userId: string;

src/database/server/models/file.ts

@@ -16,7 +16,7 @@ import {
   files,
   globalFiles,
   knowledgeBaseFiles,
-} from '../schemas/lobechat';
+} from '../../schemas';
 
 export class FileModel {
   private readonly userId: string;

src/database/server/models/knowledgeBase.ts

@@ -4,7 +4,7 @@ import { and, desc } from 'drizzle-orm/expressions';
 import { serverDB } from '@/database/server';
 import { KnowledgeBaseItem } from '@/types/knowledgeBase';
 
-import { NewKnowledgeBase, knowledgeBaseFiles, knowledgeBases } from '../schemas/lobechat';
+import { NewKnowledgeBase, knowledgeBaseFiles, knowledgeBases } from '../../schemas';
 
 export class KnowledgeBaseModel {
   private userId: string;

src/database/server/models/message.ts

@@ -2,7 +2,7 @@ import { count } from 'drizzle-orm';
 import { and, asc, desc, eq, gte, inArray, isNull, like, lt } from 'drizzle-orm/expressions';
 
 import { serverDB } from '@/database/server/core/db';
-import { idGenerator } from '@/database/server/utils/idGenerator';
+import { idGenerator } from '@/database/utils/idGenerator';
 import { getFullFileUrl } from '@/server/utils/files';
 import {
   ChatFileItem,
@@ -28,7 +28,7 @@ import {
   messageTranslates,
   messages,
   messagesFiles,
-} from '../schemas/lobechat';
+} from '../../schemas';
 
 export interface QueryMessageParams {
   current?: number;

src/database/server/models/plugin.ts

@@ -2,7 +2,7 @@ import { and, desc, eq } from 'drizzle-orm/expressions';
 
 import { serverDB } from '@/database/server';
 
-import { InstalledPluginItem, NewInstalledPlugin, installedPlugins } from '../schemas/lobechat';
+import { InstalledPluginItem, NewInstalledPlugin, installedPlugins } from '../../schemas';
 
 export class PluginModel {
   private userId: string;

src/database/server/models/ragEval/dataset.ts

@@ -1,7 +1,7 @@
 import { and, desc, eq } from 'drizzle-orm';
 
 import { serverDB } from '@/database/server';
-import { NewEvalDatasetsItem, evalDatasets } from '@/database/server/schemas/lobechat';
+import { NewEvalDatasetsItem, evalDatasets } from '@/database/schemas';
 import { RAGEvalDataSetItem } from '@/types/eval';
 
 export class EvalDatasetModel {

src/database/server/models/ragEval/datasetRecord.ts

@@ -5,7 +5,7 @@ import {
   NewEvalDatasetRecordsItem,
   evalDatasetRecords,
   files,
-} from '@/database/server/schemas/lobechat';
+} from '@/database/schemas';
 import { EvalDatasetRecordRefFile } from '@/types/eval';
 
 export class EvalDatasetRecordModel {

src/database/server/models/ragEval/evaluation.ts

@@ -6,7 +6,7 @@ import {
   evalDatasets,
   evalEvaluation,
   evaluationRecords,
-} from '@/database/server/schemas/lobechat';
+} from '@/database/schemas';
 import { EvalEvaluationStatus, RAGEvalEvaluationItem } from '@/types/eval';
 
 export class EvalEvaluationModel {

src/database/server/models/ragEval/evaluationRecord.ts

@@ -1,7 +1,7 @@
 import { and, eq } from 'drizzle-orm';
 
 import { serverDB } from '@/database/server';
-import { NewEvaluationRecordsItem, evaluationRecords } from '@/database/server/schemas/lobechat';
+import { NewEvaluationRecordsItem, evaluationRecords } from '@/database/schemas';
 
 export class EvaluationRecordModel {
   private userId: string;