@lobehub/chat 1.96.9 → 1.96.10
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 +25 -0
- package/changelog/v1.json +9 -0
- package/package.json +1 -1
- package/src/app/[variants]/layout.tsx +0 -7
- package/src/server/routers/async/caller.ts +78 -0
- package/src/server/routers/async/index.ts +2 -1
- package/src/server/routers/lambda/ragEval.ts +7 -4
- package/src/server/services/chunk/index.ts +14 -16
package/CHANGELOG.md
CHANGED
@@ -2,6 +2,31 @@
|
|
2
2
|
|
3
3
|
# Changelog
|
4
4
|
|
5
|
+
### [Version 1.96.10](https://github.com/lobehub/lobe-chat/compare/v1.96.9...v1.96.10)
|
6
|
+
|
7
|
+
<sup>Released on **2025-06-28**</sup>
|
8
|
+
|
9
|
+
#### 🐛 Bug Fixes
|
10
|
+
|
11
|
+
- **misc**: Fix desktop chunk issue.
|
12
|
+
|
13
|
+
<br/>
|
14
|
+
|
15
|
+
<details>
|
16
|
+
<summary><kbd>Improvements and Fixes</kbd></summary>
|
17
|
+
|
18
|
+
#### What's fixed
|
19
|
+
|
20
|
+
- **misc**: Fix desktop chunk issue, closes [#8280](https://github.com/lobehub/lobe-chat/issues/8280) ([c193e65](https://github.com/lobehub/lobe-chat/commit/c193e65))
|
21
|
+
|
22
|
+
</details>
|
23
|
+
|
24
|
+
<div align="right">
|
25
|
+
|
26
|
+
[](#readme-top)
|
27
|
+
|
28
|
+
</div>
|
29
|
+
|
5
30
|
### [Version 1.96.9](https://github.com/lobehub/lobe-chat/compare/v1.96.8...v1.96.9)
|
6
31
|
|
7
32
|
<sup>Released on **2025-06-23**</sup>
|
package/changelog/v1.json
CHANGED
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@lobehub/chat",
|
3
|
-
"version": "1.96.
|
3
|
+
"version": "1.96.10",
|
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",
|
@@ -78,13 +78,6 @@ export const generateViewport = async (props: DynamicLayoutProps): ResolvingView
|
|
78
78
|
};
|
79
79
|
|
80
80
|
export const generateStaticParams = () => {
|
81
|
-
// if in dev mode or in vercel preview mode, use ISR to speed up
|
82
|
-
const isVercelPreview = process.env.VERCEL === '1' && process.env.VERCEL_ENV !== 'production';
|
83
|
-
|
84
|
-
if (process.env.NODE_ENV !== 'production' || isVercelPreview) {
|
85
|
-
return [];
|
86
|
-
}
|
87
|
-
|
88
81
|
const themes: ThemeAppearance[] = ['dark', 'light'];
|
89
82
|
const mobileOptions = isDesktop ? [false] : [true, false];
|
90
83
|
// only static for serveral page, other go to dynamtic
|
@@ -4,9 +4,13 @@ import urlJoin from 'url-join';
|
|
4
4
|
|
5
5
|
import { serverDBEnv } from '@/config/db';
|
6
6
|
import { JWTPayload, LOBE_CHAT_AUTH_HEADER } from '@/const/auth';
|
7
|
+
import { isDesktop } from '@/const/version';
|
7
8
|
import { appEnv } from '@/envs/app';
|
9
|
+
import { createAsyncCallerFactory } from '@/libs/trpc/async';
|
10
|
+
import { createAsyncContextInner } from '@/libs/trpc/async/context';
|
8
11
|
import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
|
9
12
|
|
13
|
+
import { asyncRouter } from './index';
|
10
14
|
import type { AsyncRouter } from './index';
|
11
15
|
|
12
16
|
export const createAsyncServerClient = async (userId: string, payload: JWTPayload) => {
|
@@ -30,3 +34,77 @@ export const createAsyncServerClient = async (userId: string, payload: JWTPayloa
|
|
30
34
|
],
|
31
35
|
});
|
32
36
|
};
|
37
|
+
|
38
|
+
/**
|
39
|
+
* 用来推断 caller 类型辅助方法,但不实际调用 createAsyncCallerFactory,调用会报错:asyncRouter 没有初始化
|
40
|
+
*/
|
41
|
+
const helperFunc = () => {
|
42
|
+
const dummyCreateCaller = createAsyncCallerFactory(asyncRouter);
|
43
|
+
return {} as unknown as ReturnType<typeof dummyCreateCaller>;
|
44
|
+
};
|
45
|
+
|
46
|
+
export type UnifiedAsyncCaller = ReturnType<typeof helperFunc>;
|
47
|
+
|
48
|
+
interface CreateCallerOptions {
|
49
|
+
jwtPayload: any;
|
50
|
+
userId: string;
|
51
|
+
}
|
52
|
+
|
53
|
+
/**
|
54
|
+
* 创建 caller 的工厂方法,兼容 desktop server 和 remote server 环境
|
55
|
+
* 使用方式统一成 caller.a.b() 的调用方式
|
56
|
+
*/
|
57
|
+
export const createAsyncCaller = async (
|
58
|
+
options: CreateCallerOptions,
|
59
|
+
): Promise<UnifiedAsyncCaller> => {
|
60
|
+
const { userId, jwtPayload } = options;
|
61
|
+
|
62
|
+
if (isDesktop) {
|
63
|
+
// Desktop 环境:使用 caller 直接同线程调用方法
|
64
|
+
const asyncContext = await createAsyncContextInner({
|
65
|
+
jwtPayload,
|
66
|
+
// 参考 src/libs/trpc/async/asyncAuth.ts
|
67
|
+
secret: serverDBEnv.KEY_VAULTS_SECRET,
|
68
|
+
userId,
|
69
|
+
});
|
70
|
+
|
71
|
+
const createCaller = createAsyncCallerFactory(asyncRouter);
|
72
|
+
const caller = createCaller(asyncContext);
|
73
|
+
|
74
|
+
return caller;
|
75
|
+
}
|
76
|
+
// 非 Desktop 环境:使用 HTTP Client
|
77
|
+
// http client 调用方式是 client.a.b.mutate(), 我希望统一成 caller.a.b() 的调用方式
|
78
|
+
else {
|
79
|
+
const httpClient = await createAsyncServerClient(userId, jwtPayload);
|
80
|
+
const createRecursiveProxy = (client: any, path: string[]): any => {
|
81
|
+
// The target is a dummy function, so that 'apply' can be triggered.
|
82
|
+
return new Proxy(() => {}, {
|
83
|
+
apply: (target, thisArg, args) => {
|
84
|
+
// 'apply' is triggered by the function call `(...)`.
|
85
|
+
// The `path` at this point is the full path to the procedure.
|
86
|
+
|
87
|
+
// Traverse the original httpClient to get the actual procedure object.
|
88
|
+
const procedure = path.reduce((obj, key) => (obj ? obj[key] : undefined), client);
|
89
|
+
|
90
|
+
if (procedure && typeof procedure.mutate === 'function') {
|
91
|
+
// If we found a valid procedure, call its mutate method.
|
92
|
+
return procedure.mutate(...args);
|
93
|
+
} else {
|
94
|
+
// This should not happen if the call path is correct.
|
95
|
+
const message = `Procedure not found or not valid at path: ${path.join('.')}`;
|
96
|
+
throw new Error(message);
|
97
|
+
}
|
98
|
+
},
|
99
|
+
get: (_, property: string) => {
|
100
|
+
// When a property is accessed, we just extend the path and return a new proxy.
|
101
|
+
// This handles `caller.file.parseFileToChunks`
|
102
|
+
if (property === 'then') return undefined; // Prevent async/await issues
|
103
|
+
return createRecursiveProxy(client, [...path, property as string]);
|
104
|
+
},
|
105
|
+
});
|
106
|
+
};
|
107
|
+
|
108
|
+
return createRecursiveProxy(httpClient, []);
|
109
|
+
}
|
110
|
+
};
|
@@ -15,7 +15,7 @@ import {
|
|
15
15
|
} from '@/database/server/models/ragEval';
|
16
16
|
import { authedProcedure, router } from '@/libs/trpc/lambda';
|
17
17
|
import { keyVaults, serverDatabase } from '@/libs/trpc/lambda/middleware';
|
18
|
-
import {
|
18
|
+
import { createAsyncCaller } from '@/server/routers/async';
|
19
19
|
import { FileService } from '@/server/services/file';
|
20
20
|
import {
|
21
21
|
EvalDatasetRecord,
|
@@ -201,15 +201,18 @@ export const ragEvalRouter = router({
|
|
201
201
|
})),
|
202
202
|
);
|
203
203
|
|
204
|
-
const asyncCaller = await
|
204
|
+
const asyncCaller = await createAsyncCaller({
|
205
|
+
userId: ctx.userId,
|
206
|
+
jwtPayload: ctx.jwtPayload,
|
207
|
+
});
|
205
208
|
|
206
209
|
await ctx.evaluationModel.update(input.id, { status: EvalEvaluationStatus.Processing });
|
207
210
|
try {
|
208
211
|
await pMap(
|
209
212
|
evalRecords,
|
210
213
|
async (record) => {
|
211
|
-
asyncCaller.ragEval
|
212
|
-
.
|
214
|
+
asyncCaller.ragEval
|
215
|
+
.runRecordEvaluation({ evalRecordId: record.id })
|
213
216
|
.catch(async (e) => {
|
214
217
|
await ctx.evaluationModel.update(input.id, { status: EvalEvaluationStatus.Error });
|
215
218
|
|
@@ -3,7 +3,7 @@ import { AsyncTaskModel } from '@/database/models/asyncTask';
|
|
3
3
|
import { FileModel } from '@/database/models/file';
|
4
4
|
import { serverDB } from '@/database/server';
|
5
5
|
import { ChunkContentParams, ContentChunk } from '@/server/modules/ContentChunk';
|
6
|
-
import {
|
6
|
+
import { createAsyncCaller } from '@/server/routers/async';
|
7
7
|
import {
|
8
8
|
AsyncTaskError,
|
9
9
|
AsyncTaskErrorType,
|
@@ -43,11 +43,11 @@ export class ChunkService {
|
|
43
43
|
|
44
44
|
await this.fileModel.update(fileId, { embeddingTaskId: asyncTaskId });
|
45
45
|
|
46
|
-
const asyncCaller = await
|
46
|
+
const asyncCaller = await createAsyncCaller({ jwtPayload: payload, userId: this.userId });
|
47
47
|
|
48
48
|
// trigger embedding task asynchronously
|
49
49
|
try {
|
50
|
-
await asyncCaller.file.embeddingChunks
|
50
|
+
await asyncCaller.file.embeddingChunks({ fileId, taskId: asyncTaskId });
|
51
51
|
} catch (e) {
|
52
52
|
console.error('[embeddingFileChunks] error:', e);
|
53
53
|
|
@@ -82,22 +82,20 @@ export class ChunkService {
|
|
82
82
|
|
83
83
|
await this.fileModel.update(fileId, { chunkTaskId: asyncTaskId });
|
84
84
|
|
85
|
-
const asyncCaller = await
|
85
|
+
const asyncCaller = await createAsyncCaller({ jwtPayload: payload, userId: this.userId });
|
86
86
|
|
87
87
|
// trigger parse file task asynchronously
|
88
|
-
asyncCaller.file.parseFileToChunks
|
89
|
-
.
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
error
|
95
|
-
|
96
|
-
|
97
|
-
),
|
98
|
-
status: AsyncTaskStatus.Error,
|
99
|
-
});
|
88
|
+
asyncCaller.file.parseFileToChunks({ fileId: fileId, taskId: asyncTaskId }).catch(async (e) => {
|
89
|
+
console.error('[ParseFileToChunks] error:', e);
|
90
|
+
|
91
|
+
await this.asyncTaskModel.update(asyncTaskId, {
|
92
|
+
error: new AsyncTaskError(
|
93
|
+
AsyncTaskErrorType.TaskTriggerError,
|
94
|
+
'trigger chunk embedding async task error. Please make sure the APP_URL is available from your server. You can check the proxy config or WAF blocking',
|
95
|
+
),
|
96
|
+
status: AsyncTaskStatus.Error,
|
100
97
|
});
|
98
|
+
});
|
101
99
|
|
102
100
|
return asyncTaskId;
|
103
101
|
}
|