@lobehub/chat 1.77.1 → 1.77.3

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.77.3](https://github.com/lobehub/lobe-chat/compare/v1.77.2...v1.77.3)
+
+<sup>Released on **2025-03-29**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Move general db models to database folder.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Move general db models to database folder, closes [#7222](https://github.com/lobehub/lobe-chat/issues/7222) ([f831d86](https://github.com/lobehub/lobe-chat/commit/f831d86))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.77.2](https://github.com/lobehub/lobe-chat/compare/v1.77.1...v1.77.2)
+
+<sup>Released on **2025-03-29**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix decrypt error with imported pg data.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix decrypt error with imported pg data, closes [#7220](https://github.com/lobehub/lobe-chat/issues/7220) ([f8a0aa0](https://github.com/lobehub/lobe-chat/commit/f8a0aa0))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.77.1](https://github.com/lobehub/lobe-chat/compare/v1.77.0...v1.77.1)
 
 <sup>Released on **2025-03-29**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Move general db models to database folder."
+      ]
+    },
+    "date": "2025-03-29",
+    "version": "1.77.3"
+  },
+  {
+    "children": {
+      "fixes": [
+        "Fix decrypt error with imported pg data."
+      ]
+    },
+    "date": "2025-03-29",
+    "version": "1.77.2"
+  },
   {
     "children": {
       "fixes": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.77.1",
+  "version": "1.77.3",
   "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",

package/src/app/[variants]/(main)/repos/[id]/@menu/default.tsx

@@ -1,8 +1,8 @@
 import { notFound } from 'next/navigation';
 import { Flexbox } from 'react-layout-kit';
 
+import { KnowledgeBaseModel } from '@/database/models/knowledgeBase';
 import { serverDB } from '@/database/server';
-import { KnowledgeBaseModel } from '@/database/server/models/knowledgeBase';
 
 import Head from './Head';
 import Menu from './Menu';

package/src/app/[variants]/(main)/repos/[id]/page.tsx

@@ -1,7 +1,7 @@
 import { redirect } from 'next/navigation';
 
+import { KnowledgeBaseModel } from '@/database/models/knowledgeBase';
 import { serverDB } from '@/database/server';
-import { KnowledgeBaseModel } from '@/database/server/models/knowledgeBase';
 import FileManager from '@/features/FileManager';
 import { PagePropsWithId } from '@/types/next';
 

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

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

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

@@ -14,7 +14,7 @@ import {
   sessions,
   users,
 } from '../../schemas';
-import { AgentModel } from '../../server/models/agent';
+import { AgentModel } from '../agent';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

package/src/database/models/__tests__/aiModel.test.ts

@@ -6,7 +6,7 @@ import { LobeChatDatabase } from '@/database/type';
 import { AiProviderModelListItem } from '@/types/aiModel';
 
 import { AiModelSelectItem, NewAiModelItem, aiModels, users } from '../../schemas';
-import { AiModelModel } from '../../server/models/aiModel';
+import { AiModelModel } from '../aiModel';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

package/src/database/models/__tests__/aiProvider.test.ts

@@ -6,7 +6,7 @@ import { LobeChatDatabase } from '@/database/type';
 import { ModelProvider } from '@/libs/agent-runtime';
 
 import { aiProviders, users } from '../../schemas';
-import { AiProviderModel } from '../../server/models/aiProvider';
+import { AiProviderModel } from '../aiProvider';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

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

@@ -6,7 +6,7 @@ import { LobeChatDatabase } from '@/database/type';
 import { AsyncTaskStatus, AsyncTaskType } from '@/types/asyncTask';
 
 import { asyncTasks, users } from '../../schemas';
-import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '../../server/models/asyncTask';
+import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '../asyncTask';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

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

@@ -6,7 +6,7 @@ import { LobeChatDatabase } from '@/database/type';
 import { uuid } from '@/utils/uuid';
 
 import { chunks, embeddings, fileChunks, files, unstructuredChunks, users } from '../../schemas';
-import { ChunkModel } from '../../server/models/chunk';
+import { ChunkModel } from '../chunk';
 import { getTestDB } from './_util';
 import { codeEmbedding, designThinkingQuery, designThinkingQuery2 } from './fixtures/embedding';
 

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

@@ -6,7 +6,7 @@ import { LobeChatDatabase } from '@/database/type';
 import { FilesTabs, SortType } from '@/types/files';
 
 import { files, globalFiles, knowledgeBaseFiles, knowledgeBases, users } from '../../schemas';
-import { FileModel } from '../../server/models/file';
+import { FileModel } from '../file';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

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

@@ -13,7 +13,7 @@ import {
   knowledgeBases,
   users,
 } from '../../schemas';
-import { KnowledgeBaseModel } from '../../server/models/knowledgeBase';
+import { KnowledgeBaseModel } from '../knowledgeBase';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

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

@@ -23,7 +23,7 @@ import {
   topics,
   users,
 } from '../../schemas';
-import { MessageModel } from '../../server/models/message';
+import { MessageModel } from '../message';
 import { codeEmbedding } from './fixtures/embedding';
 
 const serverDB: LobeChatDatabase = await getTestDB();

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

@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { LobeChatDatabase } from '@/database/type';
 
 import { NewInstalledPlugin, userInstalledPlugins, users } from '../../schemas';
-import { PluginModel } from '../../server/models/plugin';
+import { PluginModel } from '../plugin';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

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

@@ -17,7 +17,7 @@ import {
   topics,
   users,
 } from '../../schemas';
-import { SessionModel } from '../../server/models/session';
+import { SessionModel } from '../session';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

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

@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { LobeChatDatabase } from '@/database/type';
 
 import { sessionGroups, users } from '../../schemas';
-import { SessionGroupModel } from '../../server/models/sessionGroup';
+import { SessionGroupModel } from '../sessionGroup';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

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

@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { LobeChatDatabase } from '@/database/type';
 
 import { messages, sessions, topics, users } from '../../schemas';
-import { CreateTopicParams, TopicModel } from '../../server/models/topic';
+import { CreateTopicParams, TopicModel } from '../topic';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

package/src/database/{server/models → models}/_template.ts

@@ -2,7 +2,7 @@ import { and, desc, eq } from 'drizzle-orm/expressions';
 
 import { LobeChatDatabase } from '@/database/type';
 
-import { NewSessionGroup, SessionGroupItem, sessionGroups } from '../../schemas';
+import { NewSessionGroup, SessionGroupItem, sessionGroups } from '../schemas';
 
 export class TemplateModel {
   private userId: string;

package/src/database/{server/models → models}/aiModel.ts

@@ -9,7 +9,7 @@ import {
   ToggleAiModelEnableParams,
 } from '@/types/aiModel';
 
-import { AiModelSelectItem, NewAiModelItem, aiModels } from '../../schemas';
+import { AiModelSelectItem, NewAiModelItem, aiModels } from '../schemas';
 
 export class AiModelModel {
   private userId: string;

package/src/database/{server/models → models}/aiProvider.ts

@@ -13,7 +13,7 @@ import {
 } from '@/types/aiProvider';
 import { merge } from '@/utils/merge';
 
-import { AiProviderSelectItem, aiModels, aiProviders } from '../../schemas';
+import { AiProviderSelectItem, aiModels, aiProviders } from '../schemas';
 
 type DecryptUserKeyVaults = (encryptKeyVaultsStr: string | null) => Promise<any>;
 
@@ -215,7 +215,15 @@ export class AiProviderModel {
 
     const decrypt = decryptor ?? JSON.parse;
 
-    const keyVaults = !!result.keyVaults ? await decrypt(result.keyVaults) : {};
+    let keyVaults = {};
+
+    if (!!result.keyVaults) {
+      try {
+        keyVaults = await decrypt(result.keyVaults);
+      } catch {
+        /* empty */
+      }
+    }
 
     return {
       ...result,

package/src/database/{server/models → models}/asyncTask.ts

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

package/src/database/{server/models → models}/chunk.ts

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

package/src/database/{server/models → models}/embedding.ts

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

package/src/database/{server/models → models}/file.ts

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

package/src/database/{server/models → models}/knowledgeBase.ts

@@ -3,7 +3,7 @@ import { and, desc, eq, inArray } from 'drizzle-orm/expressions';
 import { LobeChatDatabase } from '@/database/type';
 import { KnowledgeBaseItem } from '@/types/knowledgeBase';
 
-import { NewKnowledgeBase, knowledgeBaseFiles, knowledgeBases } from '../../schemas';
+import { NewKnowledgeBase, knowledgeBaseFiles, knowledgeBases } from '../schemas';
 
 export class KnowledgeBaseModel {
   private userId: string;

package/src/database/{server/models → models}/message.ts

@@ -40,7 +40,7 @@ import {
   messageTranslates,
   messages,
   messagesFiles,
-} from '../../schemas';
+} from '../schemas';
 
 export interface QueryMessageParams {
   current?: number;

package/src/database/{server/models → models}/plugin.ts

@@ -2,7 +2,7 @@ import { and, desc, eq } from 'drizzle-orm/expressions';
 
 import { LobeChatDatabase } from '@/database/type';
 
-import { InstalledPluginItem, NewInstalledPlugin, userInstalledPlugins } from '../../schemas';
+import { InstalledPluginItem, NewInstalledPlugin, userInstalledPlugins } from '../schemas';
 
 export class PluginModel {
   private userId: string;
@@ -31,7 +31,9 @@ export class PluginModel {
   delete = async (id: string) => {
     return this.db
       .delete(userInstalledPlugins)
-      .where(and(eq(userInstalledPlugins.identifier, id), eq(userInstalledPlugins.userId, this.userId)));
+      .where(
+        and(eq(userInstalledPlugins.identifier, id), eq(userInstalledPlugins.userId, this.userId)),
+      );
   };
 
   deleteAll = async () => {
@@ -56,7 +58,10 @@ export class PluginModel {
 
   findById = async (id: string) => {
     return this.db.query.userInstalledPlugins.findFirst({
-      where: and(eq(userInstalledPlugins.identifier, id), eq(userInstalledPlugins.userId, this.userId)),
+      where: and(
+        eq(userInstalledPlugins.identifier, id),
+        eq(userInstalledPlugins.userId, this.userId),
+      ),
     });
   };
 
@@ -64,6 +69,8 @@ export class PluginModel {
     return this.db
       .update(userInstalledPlugins)
       .set({ ...value, updatedAt: new Date() })
-      .where(and(eq(userInstalledPlugins.identifier, id), eq(userInstalledPlugins.userId, this.userId)));
+      .where(
+        and(eq(userInstalledPlugins.identifier, id), eq(userInstalledPlugins.userId, this.userId)),
+      );
   };
 }

package/src/database/{server/models → models}/session.ts

@@ -27,7 +27,7 @@ import {
   sessionGroups,
   sessions,
   topics,
-} from '../../schemas';
+} from '../schemas';
 
 export class SessionModel {
   private userId: string;

package/src/database/{server/models → models}/sessionGroup.ts

@@ -3,7 +3,7 @@ import { and, asc, desc, eq } from 'drizzle-orm/expressions';
 import { LobeChatDatabase } from '@/database/type';
 import { idGenerator } from '@/database/utils/idGenerator';
 
-import { SessionGroupItem, sessionGroups } from '../../schemas';
+import { SessionGroupItem, sessionGroups } from '../schemas';
 
 export class SessionGroupModel {
   private userId: string;

package/src/database/{server/models → models}/thread.ts

@@ -3,7 +3,7 @@ import { and, desc, eq } from 'drizzle-orm/expressions';
 import { LobeChatDatabase } from '@/database/type';
 import { CreateThreadParams, ThreadStatus } from '@/types/topic';
 
-import { ThreadItem, threads } from '../../schemas';
+import { ThreadItem, threads } from '../schemas';
 
 const queryColumns = {
   createdAt: threads.createdAt,

package/src/database/{server/models → models}/topic.ts

@@ -12,7 +12,7 @@ import { idGenerator } from '@/database/utils/idGenerator';
 import { MessageItem } from '@/types/message';
 import { TopicRankItem } from '@/types/topic';
 
-import { TopicItem, messages, topics } from '../../schemas';
+import { TopicItem, messages, topics } from '../schemas';
 
 export interface CreateTopicParams {
   favorite?: boolean;

package/src/database/{server/models → models}/user.ts

@@ -17,7 +17,7 @@ import {
   nextauthAccounts,
   userSettings,
   users,
-} from '../../schemas';
+} from '../schemas';
 
 type DecryptUserKeyVaults = (
   encryptKeyVaultsStr: string | null,

package/src/database/repositories/aiInfra/index.ts

@@ -2,8 +2,8 @@ import { isEmpty } from 'lodash-es';
 import pMap from 'p-map';
 
 import { DEFAULT_MODEL_PROVIDER_LIST } from '@/config/modelProviders';
-import { AiModelModel } from '@/database/server/models/aiModel';
-import { AiProviderModel } from '@/database/server/models/aiProvider';
+import { AiModelModel } from '@/database/models/aiModel';
+import { AiProviderModel } from '@/database/models/aiProvider';
 import { LobeChatDatabase } from '@/database/type';
 import {
   AIChatModelCard,

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

@@ -9,9 +9,9 @@ import { LobeChatDatabase } from '@/database/type';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserGuide, UserPreference } from '@/types/user';
 
+import { SessionModel } from '../../../models/session';
+import { UserModel, UserNotFoundError } from '../../../models/user';
 import { UserSettingsItem, userSettings, users } from '../../../schemas';
-import { SessionModel } from '../session';
-import { UserModel, UserNotFoundError } from '../user';
 
 let serverDB = await getTestDBInstance();
 

package/src/libs/next-auth/adapter/index.ts

@@ -8,8 +8,8 @@ import { and, eq } from 'drizzle-orm/expressions';
 import type { NeonDatabase } from 'drizzle-orm/neon-serverless';
 import { Adapter, AdapterAccount } from 'next-auth/adapters';
 
+import { UserModel } from '@/database/models/user';
 import * as schema from '@/database/schemas';
-import { UserModel } from '@/database/server/models/user';
 import { AgentService } from '@/server/services/agent';
 import { merge } from '@/utils/merge';
 

package/src/libs/trpc/async/asyncAuth.ts

@@ -1,8 +1,8 @@
 import { TRPCError } from '@trpc/server';
 
 import { serverDBEnv } from '@/config/db';
+import { UserModel } from '@/database/models/user';
 import { serverDB } from '@/database/server';
-import { UserModel } from '@/database/server/models/user';
 
 import { asyncTrpc } from './init';
 

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

@@ -6,12 +6,12 @@ import { z } from 'zod';
 import { serverDBEnv } from '@/config/db';
 import { fileEnv } from '@/config/file';
 import { DEFAULT_FILE_EMBEDDING_MODEL_ITEM } from '@/const/settings/knowledge';
+import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '@/database/models/asyncTask';
+import { ChunkModel } from '@/database/models/chunk';
+import { EmbeddingModel } from '@/database/models/embedding';
+import { FileModel } from '@/database/models/file';
 import { NewChunkItem, NewEmbeddingsItem } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '@/database/server/models/asyncTask';
-import { ChunkModel } from '@/database/server/models/chunk';
-import { EmbeddingModel } from '@/database/server/models/embedding';
-import { FileModel } from '@/database/server/models/file';
 import { asyncAuthedProcedure, asyncRouter as router } from '@/libs/trpc/async';
 import { getServerDefaultFilesConfig } from '@/server/globalConfig';
 import { initAgentRuntimeWithUserPayload } from '@/server/modules/AgentRuntime';

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

@@ -4,10 +4,10 @@ import { z } from 'zod';
 
 import { chainAnswerWithContext } from '@/chains/answerWithContext';
 import { DEFAULT_EMBEDDING_MODEL, DEFAULT_MODEL } from '@/const/settings';
+import { ChunkModel } from '@/database/models/chunk';
+import { EmbeddingModel } from '@/database/models/embedding';
+import { FileModel } from '@/database/models/file';
 import { serverDB } from '@/database/server';
-import { ChunkModel } from '@/database/server/models/chunk';
-import { EmbeddingModel } from '@/database/server/models/embedding';
-import { FileModel } from '@/database/server/models/file';
 import {
   EvalDatasetRecordModel,
   EvalEvaluationModel,

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

@@ -1,8 +1,8 @@
 import { z } from 'zod';
 
+import { SessionGroupModel } from '@/database/models/sessionGroup';
 import { insertSessionGroupSchema } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { SessionGroupModel } from '@/database/server/models/sessionGroup';
 import { authedProcedure, router } from '@/libs/trpc';
 import { SessionGroupItem } from '@/types/session';
 

package/src/server/routers/lambda/agent.test.ts

@@ -3,36 +3,36 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
+import { AgentModel } from '@/database/models/agent';
+import { FileModel } from '@/database/models/file';
+import { KnowledgeBaseModel } from '@/database/models/knowledgeBase';
+import { SessionModel } from '@/database/models/session';
+import { UserModel } from '@/database/models/user';
 import { serverDB } from '@/database/server';
-import { AgentModel } from '@/database/server/models/agent';
-import { FileModel } from '@/database/server/models/file';
-import { KnowledgeBaseModel } from '@/database/server/models/knowledgeBase';
-import { SessionModel } from '@/database/server/models/session';
-import { UserModel } from '@/database/server/models/user';
 import { AgentService } from '@/server/services/agent';
 import { KnowledgeType } from '@/types/knowledgeBase';
 
 import { agentRouter } from './agent';
 
-vi.mock('@/database/server/models/user', () => ({
+vi.mock('@/database/models/user', () => ({
   UserModel: {
     findById: vi.fn(),
   },
 }));
 
-vi.mock('@/database/server/models/agent', () => ({
+vi.mock('@/database/models/agent', () => ({
   AgentModel: vi.fn(),
 }));
 
-vi.mock('@/database/server/models/session', () => ({
+vi.mock('@/database/models/session', () => ({
   SessionModel: vi.fn(),
 }));
 
-vi.mock('@/database/server/models/file', () => ({
+vi.mock('@/database/models/file', () => ({
   FileModel: vi.fn(),
 }));
 
-vi.mock('@/database/server/models/knowledgeBase', () => ({
+vi.mock('@/database/models/knowledgeBase', () => ({
   KnowledgeBaseModel: vi.fn(),
 }));
 

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

@@ -2,12 +2,12 @@ import { z } from 'zod';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
+import { AgentModel } from '@/database/models/agent';
+import { FileModel } from '@/database/models/file';
+import { KnowledgeBaseModel } from '@/database/models/knowledgeBase';
+import { SessionModel } from '@/database/models/session';
+import { UserModel } from '@/database/models/user';
 import { serverDB } from '@/database/server';
-import { AgentModel } from '@/database/server/models/agent';
-import { FileModel } from '@/database/server/models/file';
-import { KnowledgeBaseModel } from '@/database/server/models/knowledgeBase';
-import { SessionModel } from '@/database/server/models/session';
-import { UserModel } from '@/database/server/models/user';
 import { pino } from '@/libs/logger';
 import { authedProcedure, router } from '@/libs/trpc';
 import { AgentService } from '@/server/services/agent';

package/src/server/routers/lambda/aiModel.test.ts

@@ -1,13 +1,13 @@
 import { describe, expect, it, vi } from 'vitest';
 
+import { AiModelModel } from '@/database/models/aiModel';
+import { UserModel } from '@/database/models/user';
 import { AiInfraRepos } from '@/database/repositories/aiInfra';
-import { AiModelModel } from '@/database/server/models/aiModel';
-import { UserModel } from '@/database/server/models/user';
 
 import { aiModelRouter } from './aiModel';
 
-vi.mock('@/database/server/models/aiModel');
-vi.mock('@/database/server/models/user');
+vi.mock('@/database/models/aiModel');
+vi.mock('@/database/models/user');
 vi.mock('@/database/repositories/aiInfra');
 vi.mock('@/server/globalConfig', () => ({
   getServerGlobalConfig: vi.fn().mockReturnValue({

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

@@ -1,9 +1,9 @@
 import { z } from 'zod';
 
+import { AiModelModel } from '@/database/models/aiModel';
+import { UserModel } from '@/database/models/user';
 import { AiInfraRepos } from '@/database/repositories/aiInfra';
 import { serverDB } from '@/database/server';
-import { AiModelModel } from '@/database/server/models/aiModel';
-import { UserModel } from '@/database/server/models/user';
 import { authedProcedure, router } from '@/libs/trpc';
 import { getServerGlobalConfig } from '@/server/globalConfig';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';

package/src/server/routers/lambda/aiProvider.test.ts

@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { AiProviderModel } from '@/database/models/aiProvider';
+import { UserModel } from '@/database/models/user';
 import { AiInfraRepos } from '@/database/repositories/aiInfra';
 import { serverDB } from '@/database/server';
-import { AiProviderModel } from '@/database/server/models/aiProvider';
-import { UserModel } from '@/database/server/models/user';
 import { getServerGlobalConfig } from '@/server/globalConfig';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { AiProviderDetailItem, AiProviderRuntimeState } from '@/types/aiProvider';
@@ -13,8 +13,8 @@ import { aiProviderRouter } from './aiProvider';
 vi.mock('@/server/globalConfig');
 vi.mock('@/server/modules/KeyVaultsEncrypt');
 vi.mock('@/database/repositories/aiInfra');
-vi.mock('@/database/server/models/aiProvider');
-vi.mock('@/database/server/models/user');
+vi.mock('@/database/models/aiProvider');
+vi.mock('@/database/models/user');
 
 describe('aiProviderRouter', () => {
   const mockUserId = 'test-user-id';

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

@@ -1,9 +1,9 @@
 import { z } from 'zod';
 
+import { AiProviderModel } from '@/database/models/aiProvider';
+import { UserModel } from '@/database/models/user';
 import { AiInfraRepos } from '@/database/repositories/aiInfra';
 import { serverDB } from '@/database/server';
-import { AiProviderModel } from '@/database/server/models/aiProvider';
-import { UserModel } from '@/database/server/models/user';
 import { authedProcedure, router } from '@/libs/trpc';
 import { getServerGlobalConfig } from '@/server/globalConfig';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';

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

@@ -3,13 +3,13 @@ import { inArray } from 'drizzle-orm/expressions';
 import { z } from 'zod';
 
 import { DEFAULT_FILE_EMBEDDING_MODEL_ITEM } from '@/const/settings/knowledge';
+import { AsyncTaskModel } from '@/database/models/asyncTask';
+import { ChunkModel } from '@/database/models/chunk';
+import { EmbeddingModel } from '@/database/models/embedding';
+import { FileModel } from '@/database/models/file';
+import { MessageModel } from '@/database/models/message';
 import { knowledgeBaseFiles } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { AsyncTaskModel } from '@/database/server/models/asyncTask';
-import { ChunkModel } from '@/database/server/models/chunk';
-import { EmbeddingModel } from '@/database/server/models/embedding';
-import { FileModel } from '@/database/server/models/file';
-import { MessageModel } from '@/database/server/models/message';
 import { authedProcedure, router } from '@/libs/trpc';
 import { keyVaults } from '@/libs/trpc/middleware/keyVaults';
 import { getServerDefaultFilesConfig } from '@/server/globalConfig';

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

@@ -2,10 +2,10 @@ import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
 import { serverDBEnv } from '@/config/db';
+import { AsyncTaskModel } from '@/database/models/asyncTask';
+import { ChunkModel } from '@/database/models/chunk';
+import { FileModel } from '@/database/models/file';
 import { serverDB } from '@/database/server';
-import { AsyncTaskModel } from '@/database/server/models/asyncTask';
-import { ChunkModel } from '@/database/server/models/chunk';
-import { FileModel } from '@/database/server/models/file';
 import { authedProcedure, router } from '@/libs/trpc';
 import { S3 } from '@/server/modules/S3';
 import { getFullFileUrl } from '@/server/utils/files';

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

@@ -1,8 +1,8 @@
 import { z } from 'zod';
 
+import { KnowledgeBaseModel } from '@/database/models/knowledgeBase';
 import { insertKnowledgeBasesSchema } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { KnowledgeBaseModel } from '@/database/server/models/knowledgeBase';
 import { authedProcedure, router } from '@/libs/trpc';
 import { KnowledgeBaseItem } from '@/types/knowledgeBase';
 

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

@@ -1,8 +1,8 @@
 import { z } from 'zod';
 
+import { MessageModel } from '@/database/models/message';
 import { updateMessagePluginSchema } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { MessageModel } from '@/database/server/models/message';
 import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
 import { getFullFileUrl } from '@/server/utils/files';
 import { ChatMessage } from '@/types/message';

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

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
+import { PluginModel } from '@/database/models/plugin';
 import { serverDB } from '@/database/server';
-import { PluginModel } from '@/database/server/models/plugin';
 import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
 import { LobeTool } from '@/types/tool';
 

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

@@ -6,8 +6,8 @@ import pMap from 'p-map';
 import { z } from 'zod';
 
 import { DEFAULT_EMBEDDING_MODEL, DEFAULT_MODEL } from '@/const/settings';
+import { FileModel } from '@/database/models/file';
 import { serverDB } from '@/database/server';
-import { FileModel } from '@/database/server/models/file';
 import {
   EvalDatasetModel,
   EvalDatasetRecordModel,

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

@@ -1,9 +1,9 @@
 import { z } from 'zod';
 
+import { SessionModel } from '@/database/models/session';
+import { SessionGroupModel } from '@/database/models/sessionGroup';
 import { insertAgentSchema, insertSessionSchema } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { SessionModel } from '@/database/server/models/session';
-import { SessionGroupModel } from '@/database/server/models/sessionGroup';
 import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
 import { AgentChatConfigSchema } from '@/types/agent';
 import { LobeMetaDataSchema } from '@/types/meta';

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

@@ -1,8 +1,8 @@
 import { z } from 'zod';
 
+import { SessionGroupModel } from '@/database/models/sessionGroup';
 import { insertSessionGroupSchema } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { SessionGroupModel } from '@/database/server/models/sessionGroup';
 import { authedProcedure, router } from '@/libs/trpc';
 import { SessionGroupItem } from '@/types/session';
 

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

@@ -1,9 +1,9 @@
 import { z } from 'zod';
 
+import { MessageModel } from '@/database/models/message';
+import { ThreadModel } from '@/database/models/thread';
 import { insertThreadSchema } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { MessageModel } from '@/database/server/models/message';
-import { ThreadModel } from '@/database/server/models/thread';
 import { authedProcedure, router } from '@/libs/trpc';
 import { ThreadItem, createThreadSchema } from '@/types/topic/thread';
 

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

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
+import { TopicModel } from '@/database/models/topic';
 import { serverDB } from '@/database/server';
-import { TopicModel } from '@/database/server/models/topic';
 import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
 import { BatchTaskResult } from '@/types/service';
 

package/src/server/routers/lambda/user.test.ts

@@ -2,10 +2,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { enableClerk } from '@/const/auth';
+import { MessageModel } from '@/database/models/message';
+import { SessionModel } from '@/database/models/session';
+import { UserModel, UserNotFoundError } from '@/database/models/user';
 import { serverDB } from '@/database/server';
-import { MessageModel } from '@/database/server/models/message';
-import { SessionModel } from '@/database/server/models/session';
-import { UserModel, UserNotFoundError } from '@/database/server/models/user';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserService } from '@/server/services/user';
@@ -21,9 +21,9 @@ vi.mock('@/database/server', () => ({
   serverDB: {},
 }));
 
-vi.mock('@/database/server/models/message');
-vi.mock('@/database/server/models/session');
-vi.mock('@/database/server/models/user');
+vi.mock('@/database/models/message');
+vi.mock('@/database/models/session');
+vi.mock('@/database/models/user');
 vi.mock('@/libs/next-auth/adapter');
 vi.mock('@/server/modules/KeyVaultsEncrypt');
 vi.mock('@/server/services/user');

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

@@ -2,10 +2,10 @@ import { UserJSON } from '@clerk/backend';
 import { z } from 'zod';
 
 import { enableClerk } from '@/const/auth';
+import { MessageModel } from '@/database/models/message';
+import { SessionModel } from '@/database/models/session';
+import { UserModel, UserNotFoundError } from '@/database/models/user';
 import { serverDB } from '@/database/server';
-import { MessageModel } from '@/database/server/models/message';
-import { SessionModel } from '@/database/server/models/session';
-import { UserModel, UserNotFoundError } from '@/database/server/models/user';
 import { ClerkAuth } from '@/libs/clerk-auth';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 import { authedProcedure, router } from '@/libs/trpc';

package/src/server/services/agent/index.test.ts

@@ -1,7 +1,7 @@
 // @vitest-environment node
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { SessionModel } from '@/database/server/models/session';
+import { SessionModel } from '@/database/models/session';
 import { parseAgentConfig } from '@/server/globalConfig/parseDefaultAgent';
 
 import { AgentService } from './index';
@@ -16,7 +16,7 @@ vi.mock('@/server/globalConfig/parseDefaultAgent', () => ({
   parseAgentConfig: vi.fn(),
 }));
 
-vi.mock('@/database/server/models/session', () => ({
+vi.mock('@/database/models/session', () => ({
   SessionModel: vi.fn(),
 }));
 

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

@@ -1,5 +1,5 @@
 import { appEnv } from '@/config/app';
-import { SessionModel } from '@/database/server/models/session';
+import { SessionModel } from '@/database/models/session';
 import { LobeChatDatabase } from '@/database/type';
 import { parseAgentConfig } from '@/server/globalConfig/parseDefaultAgent';
 

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

@@ -1,7 +1,7 @@
 import { JWTPayload } from '@/const/auth';
+import { AsyncTaskModel } from '@/database/models/asyncTask';
+import { FileModel } from '@/database/models/file';
 import { serverDB } from '@/database/server';
-import { AsyncTaskModel } from '@/database/server/models/asyncTask';
-import { FileModel } from '@/database/server/models/file';
 import { ChunkContentParams, ContentChunk } from '@/server/modules/ContentChunk';
 import { createAsyncServerClient } from '@/server/routers/async';
 import {

package/src/server/services/nextAuthUser/index.test.ts

@@ -2,9 +2,9 @@
 import { NextResponse } from 'next/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { UserModel } from '@/database/models/user';
 import { UserItem } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { UserModel } from '@/database/server/models/user';
 import { pino } from '@/libs/logger';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 
@@ -17,7 +17,7 @@ vi.mock('@/libs/logger', () => ({
   },
 }));
 
-vi.mock('@/database/server/models/user');
+vi.mock('@/database/models/user');
 vi.mock('@/database/server');
 
 describe('NextAuthUserService', () => {

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

@@ -1,8 +1,8 @@
 import { NextResponse } from 'next/server';
 
+import { UserModel } from '@/database/models/user';
 import { UserItem } from '@/database/schemas';
 import { serverDB } from '@/database/server';
-import { UserModel } from '@/database/server/models/user';
 import { pino } from '@/libs/logger';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 

package/src/server/services/user/index.test.ts

@@ -1,15 +1,15 @@
 import { UserJSON } from '@clerk/backend';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { UserModel } from '@/database/models/user';
 import { UserItem } from '@/database/schemas';
-import { UserModel } from '@/database/server/models/user';
 import { pino } from '@/libs/logger';
 import { AgentService } from '@/server/services/agent';
 
 import { UserService } from './index';
 
 // Mock dependencies
-vi.mock('@/database/server/models/user', () => {
+vi.mock('@/database/models/user', () => {
   const MockUserModel = vi.fn();
   // @ts-ignore
   MockUserModel.findById = vi.fn();

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

@@ -1,7 +1,7 @@
 import { UserJSON } from '@clerk/backend';
 
+import { UserModel } from '@/database/models/user';
 import { serverDB } from '@/database/server';
-import { UserModel } from '@/database/server/models/user';
 import { pino } from '@/libs/logger';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { AgentService } from '@/server/services/agent';

package/src/services/aiModel/client.ts

@@ -1,6 +1,6 @@
 import { clientDB } from '@/database/client/db';
+import { AiModelModel } from '@/database/models/aiModel';
 import { AiInfraRepos } from '@/database/repositories/aiInfra';
-import { AiModelModel } from '@/database/server/models/aiModel';
 import { BaseClientService } from '@/services/baseClientService';
 
 import { IAiModelService } from './type';

package/src/services/aiProvider/client.ts

@@ -1,6 +1,6 @@
 import { clientDB } from '@/database/client/db';
+import { AiProviderModel } from '@/database/models/aiProvider';
 import { AiInfraRepos } from '@/database/repositories/aiInfra';
-import { AiProviderModel } from '@/database/server/models/aiProvider';
 import { BaseClientService } from '@/services/baseClientService';
 
 import { IAiProviderService } from './type';

package/src/services/file/client.ts

@@ -1,5 +1,5 @@
 import { clientDB } from '@/database/client/db';
-import { FileModel } from '@/database/server/models/file';
+import { FileModel } from '@/database/models/file';
 import { BaseClientService } from '@/services/baseClientService';
 import { clientS3Storage } from '@/services/file/ClientS3';
 

package/src/services/message/client.ts

@@ -1,6 +1,6 @@
 import { INBOX_SESSION_ID } from '@/const/session';
 import { clientDB } from '@/database/client/db';
-import { MessageModel } from '@/database/server/models/message';
+import { MessageModel } from '@/database/models/message';
 import { BaseClientService } from '@/services/baseClientService';
 import { clientS3Storage } from '@/services/file/ClientS3';
 import { ChatMessage } from '@/types/message';

package/src/services/plugin/client.ts

@@ -1,5 +1,5 @@
 import { clientDB } from '@/database/client/db';
-import { PluginModel } from '@/database/server/models/plugin';
+import { PluginModel } from '@/database/models/plugin';
 import { BaseClientService } from '@/services/baseClientService';
 import { LobeTool } from '@/types/tool';
 

package/src/services/session/client.ts

@@ -1,8 +1,8 @@
 import { INBOX_SESSION_ID } from '@/const/session';
 import { clientDB } from '@/database/client/db';
+import { SessionModel } from '@/database/models/session';
+import { SessionGroupModel } from '@/database/models/sessionGroup';
 import { AgentItem } from '@/database/schemas';
-import { SessionModel } from '@/database/server/models/session';
-import { SessionGroupModel } from '@/database/server/models/sessionGroup';
 import { BaseClientService } from '@/services/baseClientService';
 import { LobeAgentConfig } from '@/types/agent';
 

package/src/services/thread/client.ts

@@ -1,7 +1,7 @@
 import { INBOX_SESSION_ID } from '@/const/session';
 import { clientDB } from '@/database/client/db';
-import { MessageModel } from '@/database/server/models/message';
-import { ThreadModel } from '@/database/server/models/thread';
+import { MessageModel } from '@/database/models/message';
+import { ThreadModel } from '@/database/models/thread';
 import { BaseClientService } from '@/services/baseClientService';
 
 import { IThreadService } from './type';

package/src/services/topic/client.ts

@@ -1,6 +1,6 @@
 import { INBOX_SESSION_ID } from '@/const/session';
 import { clientDB } from '@/database/client/db';
-import { TopicModel } from '@/database/server/models/topic';
+import { TopicModel } from '@/database/models/topic';
 import { BaseClientService } from '@/services/baseClientService';
 import { ChatTopic } from '@/types/topic';
 

package/src/services/user/client.ts

@@ -1,8 +1,8 @@
 import { clientDB } from '@/database/client/db';
+import { MessageModel } from '@/database/models/message';
+import { SessionModel } from '@/database/models/session';
+import { UserModel } from '@/database/models/user';
 import { users } from '@/database/schemas';
-import { MessageModel } from '@/database/server/models/message';
-import { SessionModel } from '@/database/server/models/session';
-import { UserModel } from '@/database/server/models/user';
 import { BaseClientService } from '@/services/baseClientService';
 import { UserPreference } from '@/types/user';
 import { AsyncLocalStorage } from '@/utils/localStorage';