@lobehub/chat 1.35.6 → 1.35.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +42 -0
- package/Dockerfile.database +1 -1
- package/README.md +3 -3
- package/README.zh-CN.md +3 -3
- package/changelog/v1.json +14 -0
- package/drizzle.config.ts +2 -2
- package/package.json +2 -1
- package/scripts/migrateServerDB/index.ts +1 -1
- package/src/database/{server/schemas/lobechat → schemas}/agent.ts +1 -1
- package/src/database/{server/schemas/lobechat → schemas}/file.ts +1 -1
- package/src/database/{server/schemas/lobechat → schemas}/message.ts +1 -1
- package/src/database/{server/schemas/lobechat → schemas}/session.ts +1 -1
- package/src/database/{server/schemas/lobechat → schemas}/topic.ts +1 -1
- package/src/database/server/core/db.ts +1 -1
- package/src/database/server/core/dbForTest.ts +2 -2
- package/src/database/server/models/__tests__/_test_template.ts +1 -1
- package/src/database/server/models/__tests__/agent.test.ts +1 -1
- package/src/database/server/models/__tests__/asyncTask.test.ts +1 -1
- package/src/database/server/models/__tests__/chunk.test.ts +1 -1
- package/src/database/server/models/__tests__/file.test.ts +1 -1
- package/src/database/server/models/__tests__/knowledgeBase.test.ts +1 -1
- package/src/database/server/models/__tests__/message.test.ts +1 -1
- package/src/database/server/models/__tests__/nextauth.test.ts +1 -1
- package/src/database/server/models/__tests__/plugin.test.ts +1 -1
- package/src/database/server/models/__tests__/session.test.ts +2 -2
- package/src/database/server/models/__tests__/sessionGroup.test.ts +1 -1
- package/src/database/server/models/__tests__/topic.test.ts +1 -1
- package/src/database/server/models/__tests__/user.test.ts +1 -1
- package/src/database/server/models/_template.ts +1 -1
- package/src/database/server/models/agent.ts +1 -1
- package/src/database/server/models/asyncTask.ts +1 -1
- package/src/database/server/models/chunk.ts +1 -1
- package/src/database/server/models/embedding.ts +1 -1
- package/src/database/server/models/file.ts +1 -1
- package/src/database/server/models/knowledgeBase.ts +1 -1
- package/src/database/server/models/message.ts +2 -2
- package/src/database/server/models/plugin.ts +1 -1
- package/src/database/server/models/ragEval/dataset.ts +1 -1
- package/src/database/server/models/ragEval/datasetRecord.ts +1 -1
- package/src/database/server/models/ragEval/evaluation.ts +1 -1
- package/src/database/server/models/ragEval/evaluationRecord.ts +1 -1
- package/src/database/server/models/session.ts +2 -2
- package/src/database/server/models/sessionGroup.ts +2 -2
- package/src/database/server/models/thread.ts +1 -1
- package/src/database/server/models/topic.ts +2 -2
- package/src/database/server/models/user.ts +1 -1
- package/src/libs/next-auth/adapter/index.ts +1 -1
- package/src/libs/next-auth/adapter/utils.ts +1 -1
- package/src/server/modules/ContentChunk/index.ts +1 -1
- package/src/server/routers/async/file.ts +1 -1
- package/src/server/routers/lambda/_template.ts +1 -1
- package/src/server/routers/lambda/chunk.ts +1 -1
- package/src/server/routers/lambda/knowledgeBase.ts +1 -1
- package/src/server/routers/lambda/message.ts +1 -1
- package/src/server/routers/lambda/session.ts +1 -1
- package/src/server/routers/lambda/sessionGroup.ts +1 -1
- package/src/server/routers/lambda/thread.ts +1 -1
- package/src/server/services/dataImporter/__tests__/index.test.ts +1 -1
- package/src/server/services/dataImporter/index.ts +1 -1
- package/src/server/services/nextAuthUser/index.ts +1 -1
- /package/src/database/{server/migrations → migrations}/0000_init.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0001_add_client_id.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0002_amusing_puma.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0003_naive_echo.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0004_add_next_auth.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0005_pgvector.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0006_add_knowledge_base.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0007_fix_embedding_table.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0008_add_rag_evals.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0009_remove_unused_user_tables.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0010_add_accessed_at_and_clean_tables.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0011_add_topic_history_summary.sql +0 -0
- /package/src/database/{server/migrations → migrations}/0012_add_thread.sql +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0000_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0001_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0002_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0003_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0004_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0005_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0006_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0007_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0008_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0009_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0010_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0011_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/0012_snapshot.json +0 -0
- /package/src/database/{server/migrations → migrations}/meta/_journal.json +0 -0
- /package/src/database/{server/schemas/lobechat → schemas}/_helpers.ts +0 -0
- /package/src/database/{server/schemas/lobechat → schemas}/asyncTask.ts +0 -0
- /package/src/database/{server/schemas/lobechat → schemas}/index.ts +0 -0
- /package/src/database/{server/schemas/lobechat → schemas}/nextauth.ts +0 -0
- /package/src/database/{server/schemas/lobechat → schemas}/rag.ts +0 -0
- /package/src/database/{server/schemas/lobechat → schemas}/ragEvals.ts +0 -0
- /package/src/database/{server/schemas/lobechat → schemas}/relations.ts +0 -0
- /package/src/database/{server/schemas/lobechat → schemas}/user.ts +0 -0
- /package/src/database/{server/utils → utils}/idGenerator.test.ts +0 -0
- /package/src/database/{server/utils → utils}/idGenerator.ts +0 -0
package/CHANGELOG.md
CHANGED
@@ -2,6 +2,48 @@
|
|
2
2
|
|
3
3
|
# Changelog
|
4
4
|
|
5
|
+
### [Version 1.35.8](https://github.com/lobehub/lobe-chat/compare/v1.35.7...v1.35.8)
|
6
|
+
|
7
|
+
<sup>Released on **2024-12-03**</sup>
|
8
|
+
|
9
|
+
#### ♻ Code Refactoring
|
10
|
+
|
11
|
+
- **misc**: Move schema and migration folder.
|
12
|
+
|
13
|
+
<br/>
|
14
|
+
|
15
|
+
<details>
|
16
|
+
<summary><kbd>Improvements and Fixes</kbd></summary>
|
17
|
+
|
18
|
+
#### Code refactoring
|
19
|
+
|
20
|
+
- **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))
|
21
|
+
|
22
|
+
</details>
|
23
|
+
|
24
|
+
<div align="right">
|
25
|
+
|
26
|
+
[](#readme-top)
|
27
|
+
|
28
|
+
</div>
|
29
|
+
|
30
|
+
### [Version 1.35.7](https://github.com/lobehub/lobe-chat/compare/v1.35.6...v1.35.7)
|
31
|
+
|
32
|
+
<sup>Released on **2024-12-03**</sup>
|
33
|
+
|
34
|
+
<br/>
|
35
|
+
|
36
|
+
<details>
|
37
|
+
<summary><kbd>Improvements and Fixes</kbd></summary>
|
38
|
+
|
39
|
+
</details>
|
40
|
+
|
41
|
+
<div align="right">
|
42
|
+
|
43
|
+
[](#readme-top)
|
44
|
+
|
45
|
+
</div>
|
46
|
+
|
5
47
|
### [Version 1.35.6](https://github.com/lobehub/lobe-chat/compare/v1.35.5...v1.35.6)
|
6
48
|
|
7
49
|
<sup>Released on **2024-12-02**</sup>
|
package/Dockerfile.database
CHANGED
@@ -116,7 +116,7 @@ COPY --from=builder /deps/node_modules/pg /app/node_modules/pg
|
|
116
116
|
COPY --from=builder /deps/node_modules/drizzle-orm /app/node_modules/drizzle-orm
|
117
117
|
|
118
118
|
# Copy database migrations
|
119
|
-
COPY --from=builder /app/src/database/
|
119
|
+
COPY --from=builder /app/src/database/migrations /app/migrations
|
120
120
|
COPY --from=builder /app/scripts/migrateServerDB/docker.cjs /app/docker.cjs
|
121
121
|
COPY --from=builder /app/scripts/migrateServerDB/errorHint.js /app/errorHint.js
|
122
122
|
|
package/README.md
CHANGED
@@ -287,12 +287,12 @@ Our marketplace is not just a showcase platform but also a collaborative space.
|
|
287
287
|
|
288
288
|
| Recent Submits | Description |
|
289
289
|
| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
290
|
+
| [Daily Doctor](https://chat-preview.lobehub.com/market?agent=yunchat-docter)<br/><sup>By **[yuyun2000](https://github.com/yuyun2000)** on **2024-11-30**</sup> | Specializes in surgical diagnosis and personalized health management<br/>`general-medicine` `surgery` `health-consultation` `personalized-treatment` `medical-education` |
|
291
|
+
| [Python Artisan](https://chat-preview.lobehub.com/market?agent=yunchat)<br/><sup>By **[yuyun2000](https://github.com/yuyun2000)** on **2024-11-30**</sup> | Expert in Python development and deep learning, skilled in tool selection and code optimization<br/>`python-development` `deep-learning` `code-optimization` `security-review` `project-planning` |
|
290
292
|
| [AI Assistant for Course Content and Teaching Guidelines](https://chat-preview.lobehub.com/market?agent=course-prep-teaching-guide-ai)<br/><sup>By **[HNaga](https://github.com/HNaga)** on **2024-11-29**</sup> | This AI assistant is designed to help educators and instructors prepare comprehensive course content and provide practical teaching guidelines. It leverages advanced NLP capabilities to generate lesson plans, suggest engaging teaching strategies, and offer insights into educational best practices.<br/>`education` `teaching` `course-design` `content-creation` `ai-assistance` `curriculum-development` `instructional-design` |
|
291
293
|
| [Backend Development Assistant](https://chat-preview.lobehub.com/market?agent=backend-assistant)<br/><sup>By **[zeno980](https://github.com/zeno980)** on **2024-11-26**</sup> | Skilled in backend development tasks<br/>`backend-development` `ai-technology` `web-applications` `spring` `sql` |
|
292
|
-
| [Bilingual Dictionary Expert](https://chat-preview.lobehub.com/market?agent=english-chinese-dictionary-expert)<br/><sup>By **[swarfte](https://github.com/swarfte)** on **2024-11-26**</sup> | Expert in bilingual English-Chinese vocabulary translation and analysis<br/>`translation` `language-learning` `vocabulary` `dictionary` |
|
293
|
-
| [SSC Incremental](https://chat-preview.lobehub.com/market?agent=great-for-analysis-coding-and-rubber-ducking)<br/><sup>By **[Base03](https://github.com/Base03)** on **2024-11-26**</sup> | Claude minus the Reddit<br/>`technology` `analysis` `software` `ai` `research` |
|
294
294
|
|
295
|
-
> 📊 Total agents: [<kbd>**
|
295
|
+
> 📊 Total agents: [<kbd>**450**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
|
296
296
|
|
297
297
|
<!-- AGENT LIST -->
|
298
298
|
|
package/README.zh-CN.md
CHANGED
@@ -276,12 +276,12 @@ LobeChat 的插件生态系统是其核心功能的重要扩展,它极大地
|
|
276
276
|
|
277
277
|
| 最近新增 | 助手说明 |
|
278
278
|
| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
279
|
+
| [日常医生](https://chat-preview.lobehub.com/market?agent=yunchat-docter)<br/><sup>By **[yuyun2000](https://github.com/yuyun2000)** on **2024-11-30**</sup> | 擅长外科诊疗与个性化健康管理<br/>`全科医学` `外科` `健康咨询` `个性化治疗` `医学教育` |
|
280
|
+
| [Python 智匠](https://chat-preview.lobehub.com/market?agent=yunchat)<br/><sup>By **[yuyun2000](https://github.com/yuyun2000)** on **2024-11-30**</sup> | 精通 Python 开发与深度学习,擅长工具选择与代码优化<br/>`python开发` `深度学习` `代码优化` `安全审查` `项目规划` |
|
279
281
|
| [课程内容和教学指南的 AI 助手](https://chat-preview.lobehub.com/market?agent=course-prep-teaching-guide-ai)<br/><sup>By **[HNaga](https://github.com/HNaga)** on **2024-11-29**</sup> | 这个 AI 助手旨在帮助教育工作者和讲师准备全面的课程内容并提供实用的教学指南。它利用先进的自然语言处理能力生成课程计划,建议引人入胜的教学策略,并提供教育最佳实践的见解。<br/>`教育` `教学` `课程设计` `内容创作` `人工智能助手` `课程开发` `教学设计` |
|
280
282
|
| [后端开发助手](https://chat-preview.lobehub.com/market?agent=backend-assistant)<br/><sup>By **[zeno980](https://github.com/zeno980)** on **2024-11-26**</sup> | 擅长后端开发任务<br/>`后端开发` `ai技术` `web应用` `spring` `sql` |
|
281
|
-
| [双语词典专家](https://chat-preview.lobehub.com/market?agent=english-chinese-dictionary-expert)<br/><sup>By **[swarfte](https://github.com/swarfte)** on **2024-11-26**</sup> | 双语英语 - 中文词汇翻译和分析专家<br/>`翻译` `语言学习` `词汇` `词典` |
|
282
|
-
| [SSC 增量](https://chat-preview.lobehub.com/market?agent=great-for-analysis-coding-and-rubber-ducking)<br/><sup>By **[Base03](https://github.com/Base03)** on **2024-11-26**</sup> | Claude 减去 Reddit<br/>`技术` `分析` `软件` `人工智能` `研究` |
|
283
283
|
|
284
|
-
> 📊 Total agents: [<kbd>**
|
284
|
+
> 📊 Total agents: [<kbd>**450**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
|
285
285
|
|
286
286
|
<!-- AGENT LIST -->
|
287
287
|
|
package/changelog/v1.json
CHANGED
@@ -1,4 +1,18 @@
|
|
1
1
|
[
|
2
|
+
{
|
3
|
+
"children": {
|
4
|
+
"improvements": [
|
5
|
+
"Move schema and migration folder."
|
6
|
+
]
|
7
|
+
},
|
8
|
+
"date": "2024-12-03",
|
9
|
+
"version": "1.35.8"
|
10
|
+
},
|
11
|
+
{
|
12
|
+
"children": {},
|
13
|
+
"date": "2024-12-03",
|
14
|
+
"version": "1.35.7"
|
15
|
+
},
|
2
16
|
{
|
3
17
|
"children": {
|
4
18
|
"improvements": [
|
package/drizzle.config.ts
CHANGED
@@ -22,8 +22,8 @@ export default {
|
|
22
22
|
url: connectionString,
|
23
23
|
},
|
24
24
|
dialect: 'postgresql',
|
25
|
-
out: './src/database/
|
25
|
+
out: './src/database/migrations',
|
26
26
|
|
27
|
-
schema: './src/database/
|
27
|
+
schema: './src/database/schemas',
|
28
28
|
strict: true,
|
29
29
|
} satisfies Config;
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@lobehub/chat",
|
3
|
-
"version": "1.35.
|
3
|
+
"version": "1.35.8",
|
4
4
|
"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.",
|
5
5
|
"keywords": [
|
6
6
|
"framework",
|
@@ -236,6 +236,7 @@
|
|
236
236
|
"zustand-utils": "^1.3.2"
|
237
237
|
},
|
238
238
|
"devDependencies": {
|
239
|
+
"@browserbasehq/stagehand": "1.3.0",
|
239
240
|
"@commitlint/cli": "^19.5.0",
|
240
241
|
"@edge-runtime/vm": "^4.0.3",
|
241
242
|
"@huggingface/tasks": "^0.12.22",
|
@@ -11,7 +11,7 @@ dotenv.config();
|
|
11
11
|
|
12
12
|
const runMigrations = async () => {
|
13
13
|
await migrator.migrate(serverDB, {
|
14
|
-
migrationsFolder: join(__dirname, '../../src/database/
|
14
|
+
migrationsFolder: join(__dirname, '../../src/database/migrations'),
|
15
15
|
});
|
16
16
|
console.log('✅ database migration pass.');
|
17
17
|
// eslint-disable-next-line unicorn/no-process-exit
|
@@ -4,7 +4,7 @@ import { createInsertSchema } from 'drizzle-zod';
|
|
4
4
|
|
5
5
|
import { LobeAgentChatConfig, LobeAgentTTSConfig } from '@/types/agent';
|
6
6
|
|
7
|
-
import { idGenerator, randomSlug } from '
|
7
|
+
import { idGenerator, randomSlug } from '@/database/utils/idGenerator';
|
8
8
|
import { timestamps } from './_helpers';
|
9
9
|
import { files, knowledgeBases } from './file';
|
10
10
|
import { users } from './user';
|
@@ -11,7 +11,7 @@ import {
|
|
11
11
|
} from 'drizzle-orm/pg-core';
|
12
12
|
import { createInsertSchema } from 'drizzle-zod';
|
13
13
|
|
14
|
-
import { idGenerator } from '
|
14
|
+
import { idGenerator } from '@/database/utils/idGenerator';
|
15
15
|
import { accessedAt, createdAt, timestamps } from './_helpers';
|
16
16
|
import { asyncTasks } from './asyncTask';
|
17
17
|
import { chunks } from './rag';
|
@@ -12,7 +12,7 @@ import {
|
|
12
12
|
} from 'drizzle-orm/pg-core';
|
13
13
|
import { createSelectSchema } from 'drizzle-zod';
|
14
14
|
|
15
|
-
import { idGenerator } from '
|
15
|
+
import { idGenerator } from '@/database/utils/idGenerator';
|
16
16
|
import { timestamps } from './_helpers';
|
17
17
|
import { agents } from './agent';
|
18
18
|
import { files } from './file';
|
@@ -2,7 +2,7 @@
|
|
2
2
|
import { boolean, integer, pgTable, text, unique, uniqueIndex, varchar } from 'drizzle-orm/pg-core';
|
3
3
|
import { createInsertSchema } from 'drizzle-zod';
|
4
4
|
|
5
|
-
import { idGenerator, randomSlug } from '
|
5
|
+
import { idGenerator, randomSlug } from '@/database/utils/idGenerator';
|
6
6
|
import { timestamps } from './_helpers';
|
7
7
|
import { users } from './user';
|
8
8
|
|
@@ -2,7 +2,7 @@
|
|
2
2
|
import { boolean, jsonb, pgTable, text, unique } from 'drizzle-orm/pg-core';
|
3
3
|
import { createInsertSchema } from 'drizzle-zod';
|
4
4
|
|
5
|
-
import { idGenerator } from '
|
5
|
+
import { idGenerator } from '@/database/utils/idGenerator';
|
6
6
|
import { timestamps, timestamptz } from './_helpers';
|
7
7
|
import { sessions } from './session';
|
8
8
|
import { users } from './user';
|
@@ -7,7 +7,7 @@ import ws from 'ws';
|
|
7
7
|
import { serverDBEnv } from '@/config/db';
|
8
8
|
import { isServerMode } from '@/const/version';
|
9
9
|
|
10
|
-
import * as schema from '
|
10
|
+
import * as schema from '../../schemas';
|
11
11
|
|
12
12
|
export const getDBInstance = (): NeonDatabase<typeof schema> => {
|
13
13
|
if (!isServerMode) return {} as any;
|
@@ -9,7 +9,7 @@ import ws from 'ws';
|
|
9
9
|
|
10
10
|
import { serverDBEnv } from '@/config/db';
|
11
11
|
|
12
|
-
import * as schema from '
|
12
|
+
import * as schema from '../../schemas';
|
13
13
|
|
14
14
|
export const getTestDBInstance = async () => {
|
15
15
|
let connectionString = serverDBEnv.DATABASE_TEST_URL;
|
@@ -24,7 +24,7 @@ export const getTestDBInstance = async () => {
|
|
24
24
|
const db = nodeDrizzle(client, { schema });
|
25
25
|
|
26
26
|
await nodeMigrator.migrate(db, {
|
27
|
-
migrationsFolder: join(__dirname, '
|
27
|
+
migrationsFolder: join(__dirname, '../../migrations'),
|
28
28
|
});
|
29
29
|
|
30
30
|
return db;
|
@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
4
4
|
|
5
5
|
import { getTestDBInstance } from '@/database/server/core/dbForTest';
|
6
6
|
|
7
|
-
import { sessionGroups, users } from '
|
7
|
+
import { sessionGroups, users } from '../../../schemas';
|
8
8
|
import { SessionGroupModel } from '../sessionGroup';
|
9
9
|
|
10
10
|
let serverDB = await getTestDBInstance();
|
@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
5
5
|
import { getTestDBInstance } from '@/database/server/core/dbForTest';
|
6
6
|
import { AsyncTaskStatus, AsyncTaskType } from '@/types/asyncTask';
|
7
7
|
|
8
|
-
import { asyncTasks, users } from '
|
8
|
+
import { asyncTasks, users } from '../../../schemas';
|
9
9
|
import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '../asyncTask';
|
10
10
|
|
11
11
|
let serverDB = await getTestDBInstance();
|
@@ -11,7 +11,7 @@ import {
|
|
11
11
|
files,
|
12
12
|
unstructuredChunks,
|
13
13
|
users,
|
14
|
-
} from '
|
14
|
+
} from '../../../schemas';
|
15
15
|
import { ChunkModel } from '../chunk';
|
16
16
|
import { codeEmbedding, designThinkingQuery, designThinkingQuery2 } from './fixtures/embedding';
|
17
17
|
|
@@ -15,7 +15,7 @@ import {
|
|
15
15
|
nextauthSessions,
|
16
16
|
nextauthVerificationTokens,
|
17
17
|
users,
|
18
|
-
} from '@/database/
|
18
|
+
} from '@/database/schemas';
|
19
19
|
import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
|
20
20
|
|
21
21
|
let serverDB = await getTestDBInstance();
|
@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
3
3
|
|
4
4
|
import { getTestDBInstance } from '@/database/server/core/dbForTest';
|
5
5
|
|
6
|
-
import { NewInstalledPlugin, installedPlugins, users } from '
|
6
|
+
import { NewInstalledPlugin, installedPlugins, users } from '../../../schemas';
|
7
7
|
import { PluginModel } from '../plugin';
|
8
8
|
|
9
9
|
let serverDB = await getTestDBInstance();
|
@@ -13,8 +13,8 @@ import {
|
|
13
13
|
sessions,
|
14
14
|
topics,
|
15
15
|
users,
|
16
|
-
} from '
|
17
|
-
import { idGenerator } from '
|
16
|
+
} from '../../../schemas';
|
17
|
+
import { idGenerator } from '@/database/utils/idGenerator';
|
18
18
|
import { SessionModel } from '../session';
|
19
19
|
|
20
20
|
let serverDB = await getTestDBInstance();
|
@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
5
5
|
|
6
6
|
import { getTestDBInstance } from '@/database/server/core/dbForTest';
|
7
7
|
|
8
|
-
import { sessionGroups, users } from '
|
8
|
+
import { sessionGroups, users } from '../../../schemas';
|
9
9
|
import { SessionGroupModel } from '../sessionGroup';
|
10
10
|
|
11
11
|
let serverDB = await getTestDBInstance();
|
@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
3
3
|
|
4
4
|
import { getTestDBInstance } from '@/database/server/core/dbForTest';
|
5
5
|
|
6
|
-
import { messages, sessions, topics, users } from '
|
6
|
+
import { messages, sessions, topics, users } from '../../../schemas';
|
7
7
|
import { CreateTopicParams, TopicModel } from '../topic';
|
8
8
|
|
9
9
|
let serverDB = await getTestDBInstance();
|
@@ -7,7 +7,7 @@ import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
|
|
7
7
|
import { UserGuide, UserPreference } from '@/types/user';
|
8
8
|
import { UserSettings } from '@/types/user/settings';
|
9
9
|
|
10
|
-
import { userSettings, users } from '
|
10
|
+
import { userSettings, users } from '../../../schemas';
|
11
11
|
import { SessionModel } from '../session';
|
12
12
|
import { UserModel } from '../user';
|
13
13
|
|
@@ -3,7 +3,7 @@ import { and, desc } from 'drizzle-orm/expressions';
|
|
3
3
|
|
4
4
|
import { serverDB } from '@/database/server';
|
5
5
|
|
6
|
-
import { NewSessionGroup, SessionGroupItem, sessionGroups } from '
|
6
|
+
import { NewSessionGroup, SessionGroupItem, sessionGroups } from '../../schemas';
|
7
7
|
|
8
8
|
export class TemplateModel {
|
9
9
|
private userId: string;
|
@@ -9,7 +9,7 @@ import {
|
|
9
9
|
AsyncTaskType,
|
10
10
|
} from '@/types/asyncTask';
|
11
11
|
|
12
|
-
import { AsyncTaskSelectItem, NewAsyncTaskItem, asyncTasks } from '
|
12
|
+
import { AsyncTaskSelectItem, NewAsyncTaskItem, asyncTasks } from '../../schemas';
|
13
13
|
|
14
14
|
// set timeout to about 5 minutes, and give 2s padding time
|
15
15
|
export const ASYNC_TASK_TIMEOUT = 298 * 1000;
|
@@ -3,7 +3,7 @@ import { and } from 'drizzle-orm/expressions';
|
|
3
3
|
|
4
4
|
import { serverDB } from '@/database/server';
|
5
5
|
|
6
|
-
import { NewEmbeddingsItem, embeddings } from '
|
6
|
+
import { NewEmbeddingsItem, embeddings } from '../../schemas';
|
7
7
|
|
8
8
|
export class EmbeddingModel {
|
9
9
|
private userId: string;
|
@@ -4,7 +4,7 @@ import { and, desc } from 'drizzle-orm/expressions';
|
|
4
4
|
import { serverDB } from '@/database/server';
|
5
5
|
import { KnowledgeBaseItem } from '@/types/knowledgeBase';
|
6
6
|
|
7
|
-
import { NewKnowledgeBase, knowledgeBaseFiles, knowledgeBases } from '
|
7
|
+
import { NewKnowledgeBase, knowledgeBaseFiles, knowledgeBases } from '../../schemas';
|
8
8
|
|
9
9
|
export class KnowledgeBaseModel {
|
10
10
|
private userId: string;
|
@@ -2,7 +2,7 @@ import { count } from 'drizzle-orm';
|
|
2
2
|
import { and, asc, desc, eq, gte, inArray, isNull, like, lt } from 'drizzle-orm/expressions';
|
3
3
|
|
4
4
|
import { serverDB } from '@/database/server/core/db';
|
5
|
-
import { idGenerator } from '@/database/
|
5
|
+
import { idGenerator } from '@/database/utils/idGenerator';
|
6
6
|
import { getFullFileUrl } from '@/server/utils/files';
|
7
7
|
import {
|
8
8
|
ChatFileItem,
|
@@ -28,7 +28,7 @@ import {
|
|
28
28
|
messageTranslates,
|
29
29
|
messages,
|
30
30
|
messagesFiles,
|
31
|
-
} from '
|
31
|
+
} from '../../schemas';
|
32
32
|
|
33
33
|
export interface QueryMessageParams {
|
34
34
|
current?: number;
|
@@ -2,7 +2,7 @@ import { and, desc, eq } from 'drizzle-orm/expressions';
|
|
2
2
|
|
3
3
|
import { serverDB } from '@/database/server';
|
4
4
|
|
5
|
-
import { InstalledPluginItem, NewInstalledPlugin, installedPlugins } from '
|
5
|
+
import { InstalledPluginItem, NewInstalledPlugin, installedPlugins } from '../../schemas';
|
6
6
|
|
7
7
|
export class PluginModel {
|
8
8
|
private userId: string;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { and, desc, eq } from 'drizzle-orm';
|
2
2
|
|
3
3
|
import { serverDB } from '@/database/server';
|
4
|
-
import { NewEvalDatasetsItem, evalDatasets } from '@/database/
|
4
|
+
import { NewEvalDatasetsItem, evalDatasets } from '@/database/schemas';
|
5
5
|
import { RAGEvalDataSetItem } from '@/types/eval';
|
6
6
|
|
7
7
|
export class EvalDatasetModel {
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { and, eq } from 'drizzle-orm';
|
2
2
|
|
3
3
|
import { serverDB } from '@/database/server';
|
4
|
-
import { NewEvaluationRecordsItem, evaluationRecords } from '@/database/
|
4
|
+
import { NewEvaluationRecordsItem, evaluationRecords } from '@/database/schemas';
|
5
5
|
|
6
6
|
export class EvaluationRecordModel {
|
7
7
|
private userId: string;
|
@@ -18,8 +18,8 @@ import {
|
|
18
18
|
agentsToSessions,
|
19
19
|
sessionGroups,
|
20
20
|
sessions,
|
21
|
-
} from '
|
22
|
-
import { idGenerator } from '
|
21
|
+
} from '../../schemas';
|
22
|
+
import { idGenerator } from '@/database/utils/idGenerator';
|
23
23
|
|
24
24
|
export class SessionModel {
|
25
25
|
private userId: string;
|
@@ -2,9 +2,9 @@ import { eq } from 'drizzle-orm';
|
|
2
2
|
import { and, asc, desc } from 'drizzle-orm/expressions';
|
3
3
|
|
4
4
|
import { serverDB } from '@/database/server';
|
5
|
-
import { idGenerator } from '@/database/
|
5
|
+
import { idGenerator } from '@/database/utils/idGenerator';
|
6
6
|
|
7
|
-
import { SessionGroupItem, sessionGroups } from '
|
7
|
+
import { SessionGroupItem, sessionGroups } from '../../schemas';
|
8
8
|
|
9
9
|
export class SessionGroupModel {
|
10
10
|
private userId: string;
|
@@ -4,7 +4,7 @@ import { and, desc } from 'drizzle-orm/expressions';
|
|
4
4
|
import { serverDB } from '@/database/server';
|
5
5
|
import { CreateThreadParams, ThreadStatus } from '@/types/topic';
|
6
6
|
|
7
|
-
import { ThreadItem, threads } from '
|
7
|
+
import { ThreadItem, threads } from '../../schemas';
|
8
8
|
|
9
9
|
const queryColumns = {
|
10
10
|
createdAt: threads.createdAt,
|
@@ -3,8 +3,8 @@ import { and, desc, eq, exists, isNull, like, or } from 'drizzle-orm/expressions
|
|
3
3
|
|
4
4
|
import { serverDB } from '@/database/server/core/db';
|
5
5
|
|
6
|
-
import { NewMessage, TopicItem, messages, topics } from '
|
7
|
-
import { idGenerator } from '
|
6
|
+
import { NewMessage, TopicItem, messages, topics } from '../../schemas';
|
7
|
+
import { idGenerator } from '@/database/utils/idGenerator';
|
8
8
|
|
9
9
|
export interface CreateTopicParams {
|
10
10
|
favorite?: boolean;
|
@@ -8,7 +8,7 @@ import { UserGuide, UserPreference } from '@/types/user';
|
|
8
8
|
import { UserKeyVaults, UserSettings } from '@/types/user/settings';
|
9
9
|
import { merge } from '@/utils/merge';
|
10
10
|
|
11
|
-
import { NewUser, UserItem, userSettings, users } from '
|
11
|
+
import { NewUser, UserItem, userSettings, users } from '../../schemas';
|
12
12
|
import { SessionModel } from './session';
|
13
13
|
|
14
14
|
export class UserNotFoundError extends TRPCError {
|
@@ -9,7 +9,7 @@ import type { NeonDatabase } from 'drizzle-orm/neon-serverless';
|
|
9
9
|
import { Adapter, AdapterAccount } from 'next-auth/adapters';
|
10
10
|
|
11
11
|
import { UserModel } from '@/database/server/models/user';
|
12
|
-
import * as schema from '@/database/
|
12
|
+
import * as schema from '@/database/schemas';
|
13
13
|
import { merge } from '@/utils/merge';
|
14
14
|
|
15
15
|
import {
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { AdapterAuthenticator, AdapterUser } from 'next-auth/adapters';
|
2
2
|
|
3
|
-
import { NewUser } from '@/database/
|
3
|
+
import { NewUser } from '@/database/schemas';
|
4
4
|
|
5
5
|
export const mapAdapterUserToLobeUser = (adapterUser: AdapterUser): NewUser => {
|
6
6
|
const { id, email, name, image, emailVerified } = adapterUser;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { ChunkingLoader } from 'src/libs/langchain';
|
2
2
|
import { Strategy } from 'unstructured-client/sdk/models/shared';
|
3
3
|
|
4
|
-
import { NewChunkItem, NewUnstructuredChunkItem } from '@/database/
|
4
|
+
import { NewChunkItem, NewUnstructuredChunkItem } from '@/database/schemas';
|
5
5
|
import { ChunkingStrategy, Unstructured } from '@/libs/unstructured';
|
6
6
|
|
7
7
|
export interface ChunkContentParams {
|
@@ -9,7 +9,7 @@ import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '@/database/server/models/asy
|
|
9
9
|
import { ChunkModel } from '@/database/server/models/chunk';
|
10
10
|
import { EmbeddingModel } from '@/database/server/models/embedding';
|
11
11
|
import { FileModel } from '@/database/server/models/file';
|
12
|
-
import { NewChunkItem, NewEmbeddingsItem } from '@/database/
|
12
|
+
import { NewChunkItem, NewEmbeddingsItem } from '@/database/schemas';
|
13
13
|
import { ModelProvider } from '@/libs/agent-runtime';
|
14
14
|
import { asyncAuthedProcedure, asyncRouter as router } from '@/libs/trpc/async';
|
15
15
|
import { initAgentRuntimeWithUserPayload } from '@/server/modules/AgentRuntime';
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { z } from 'zod';
|
2
2
|
|
3
3
|
import { SessionGroupModel } from '@/database/server/models/sessionGroup';
|
4
|
-
import { insertSessionGroupSchema } from '@/database/
|
4
|
+
import { insertSessionGroupSchema } from '@/database/schemas';
|
5
5
|
import { authedProcedure, router } from '@/libs/trpc';
|
6
6
|
import { SessionGroupItem } from '@/types/session';
|
7
7
|
|
@@ -8,7 +8,7 @@ import { ChunkModel } from '@/database/server/models/chunk';
|
|
8
8
|
import { EmbeddingModel } from '@/database/server/models/embedding';
|
9
9
|
import { FileModel } from '@/database/server/models/file';
|
10
10
|
import { MessageModel } from '@/database/server/models/message';
|
11
|
-
import { knowledgeBaseFiles } from '@/database/
|
11
|
+
import { knowledgeBaseFiles } from '@/database/schemas';
|
12
12
|
import { ModelProvider } from '@/libs/agent-runtime';
|
13
13
|
import { authedProcedure, router } from '@/libs/trpc';
|
14
14
|
import { keyVaults } from '@/libs/trpc/middleware/keyVaults';
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { z } from 'zod';
|
2
2
|
|
3
3
|
import { KnowledgeBaseModel } from '@/database/server/models/knowledgeBase';
|
4
|
-
import { insertKnowledgeBasesSchema } from '@/database/
|
4
|
+
import { insertKnowledgeBasesSchema } from '@/database/schemas';
|
5
5
|
import { authedProcedure, router } from '@/libs/trpc';
|
6
6
|
import { KnowledgeBaseItem } from '@/types/knowledgeBase';
|
7
7
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { z } from 'zod';
|
2
2
|
|
3
3
|
import { MessageModel } from '@/database/server/models/message';
|
4
|
-
import { updateMessagePluginSchema } from '@/database/
|
4
|
+
import { updateMessagePluginSchema } from '@/database/schemas';
|
5
5
|
import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
|
6
6
|
import { ChatMessage } from '@/types/message';
|
7
7
|
import { BatchTaskResult } from '@/types/service';
|
@@ -2,7 +2,7 @@ import { z } from 'zod';
|
|
2
2
|
|
3
3
|
import { SessionModel } from '@/database/server/models/session';
|
4
4
|
import { SessionGroupModel } from '@/database/server/models/sessionGroup';
|
5
|
-
import { insertAgentSchema, insertSessionSchema } from '@/database/
|
5
|
+
import { insertAgentSchema, insertSessionSchema } from '@/database/schemas';
|
6
6
|
import { authedProcedure, publicProcedure, router } from '@/libs/trpc';
|
7
7
|
import { AgentChatConfigSchema } from '@/types/agent';
|
8
8
|
import { LobeMetaDataSchema } from '@/types/meta';
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { z } from 'zod';
|
2
2
|
|
3
3
|
import { SessionGroupModel } from '@/database/server/models/sessionGroup';
|
4
|
-
import { insertSessionGroupSchema } from '@/database/
|
4
|
+
import { insertSessionGroupSchema } from '@/database/schemas';
|
5
5
|
import { authedProcedure, router } from '@/libs/trpc';
|
6
6
|
import { SessionGroupItem } from '@/types/session';
|
7
7
|
|
@@ -2,7 +2,7 @@ import { z } from 'zod';
|
|
2
2
|
|
3
3
|
import { MessageModel } from '@/database/server/models/message';
|
4
4
|
import { ThreadModel } from '@/database/server/models/thread';
|
5
|
-
import { insertThreadSchema } from '@/database/
|
5
|
+
import { insertThreadSchema } from '@/database/schemas';
|
6
6
|
import { authedProcedure, router } from '@/libs/trpc';
|
7
7
|
import { ThreadItem, createThreadSchema } from '@/types/topic/thread';
|
8
8
|
|
@@ -11,7 +11,7 @@ import {
|
|
11
11
|
sessions,
|
12
12
|
topics,
|
13
13
|
users,
|
14
|
-
} from '@/database/
|
14
|
+
} from '@/database/schemas';
|
15
15
|
import { CURRENT_CONFIG_VERSION } from '@/migrations';
|
16
16
|
import { ImportResult } from '@/services/config';
|
17
17
|
import { ImporterEntryData } from '@/types/importer';
|
@@ -2,7 +2,7 @@ import { NextResponse } from 'next/server';
|
|
2
2
|
|
3
3
|
import { serverDB } from '@/database/server';
|
4
4
|
import { UserModel } from '@/database/server/models/user';
|
5
|
-
import { UserItem } from '@/database/
|
5
|
+
import { UserItem } from '@/database/schemas';
|
6
6
|
import { pino } from '@/libs/logger';
|
7
7
|
import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
|
8
8
|
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
/package/src/database/{server/migrations → migrations}/0010_add_accessed_at_and_clean_tables.sql
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|