@lobehub/chat 0.113.1 → 0.114.1
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 +50 -0
- package/README.md +20 -17
- package/README.zh-CN.md +20 -17
- package/docs/Deployment/Deploy-with-Azure-OpenAI.md +7 -7
- package/docs/Deployment/Deploy-with-Azure-OpenAI.zh-CN.md +7 -7
- package/docs/Deployment/Environment-Variable.md +2 -2
- package/locales/zh_CN/chat.json +1 -1
- package/package.json +1 -1
- package/src/app/api/auth.ts +3 -3
- package/src/app/api/config.test.ts +51 -0
- package/src/app/chat/features/ChatInput/ActionBar/Token/TokenTag.tsx +20 -2
- package/src/app/chat/features/ChatInput/ActionBar/Token/index.tsx +2 -8
- package/src/config/server.ts +3 -3
- package/src/locales/default/chat.ts +2 -1
- package/src/services/__tests__/__snapshots__/plugin.test.ts.snap +50 -0
- package/src/services/__tests__/chat.test.ts +242 -2
- package/src/services/chat.ts +25 -3
- package/src/services/plugin.ts +1 -1
- package/src/store/tool/slices/plugin/selectors.test.ts +42 -6
- package/src/store/tool/slices/plugin/selectors.ts +27 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,56 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog
|
|
4
4
|
|
|
5
|
+
### [Version 0.114.1](https://github.com/lobehub/lobe-chat/compare/v0.114.0...v0.114.1)
|
|
6
|
+
|
|
7
|
+
<sup>Released on **2023-12-16**</sup>
|
|
8
|
+
|
|
9
|
+
#### 🐛 Bug Fixes
|
|
10
|
+
|
|
11
|
+
- **misc**: Inject tool description into agent system role.
|
|
12
|
+
|
|
13
|
+
<br/>
|
|
14
|
+
|
|
15
|
+
<details>
|
|
16
|
+
<summary><kbd>Improvements and Fixes</kbd></summary>
|
|
17
|
+
|
|
18
|
+
#### What's fixed
|
|
19
|
+
|
|
20
|
+
- **misc**: Inject tool description into agent system role, closes [#681](https://github.com/lobehub/lobe-chat/issues/681) ([e7a8cff](https://github.com/lobehub/lobe-chat/commit/e7a8cff))
|
|
21
|
+
|
|
22
|
+
</details>
|
|
23
|
+
|
|
24
|
+
<div align="right">
|
|
25
|
+
|
|
26
|
+
[](#readme-top)
|
|
27
|
+
|
|
28
|
+
</div>
|
|
29
|
+
|
|
30
|
+
## [Version 0.114.0](https://github.com/lobehub/lobe-chat/compare/v0.113.1...v0.114.0)
|
|
31
|
+
|
|
32
|
+
<sup>Released on **2023-12-16**</sup>
|
|
33
|
+
|
|
34
|
+
#### ✨ Features
|
|
35
|
+
|
|
36
|
+
- **misc**: Supports setting multiple access code.
|
|
37
|
+
|
|
38
|
+
<br/>
|
|
39
|
+
|
|
40
|
+
<details>
|
|
41
|
+
<summary><kbd>Improvements and Fixes</kbd></summary>
|
|
42
|
+
|
|
43
|
+
#### What's improved
|
|
44
|
+
|
|
45
|
+
- **misc**: Supports setting multiple access code, closes [#647](https://github.com/lobehub/lobe-chat/issues/647) ([7db0430](https://github.com/lobehub/lobe-chat/commit/7db0430))
|
|
46
|
+
|
|
47
|
+
</details>
|
|
48
|
+
|
|
49
|
+
<div align="right">
|
|
50
|
+
|
|
51
|
+
[](#readme-top)
|
|
52
|
+
|
|
53
|
+
</div>
|
|
54
|
+
|
|
5
55
|
### [Version 0.113.1](https://github.com/lobehub/lobe-chat/compare/v0.113.0...v0.113.1)
|
|
6
56
|
|
|
7
57
|
<sup>Released on **2023-12-16**</sup>
|
package/README.md
CHANGED
|
@@ -165,15 +165,18 @@ e-commerce platform data access, and various third-party services.
|
|
|
165
165
|
|
|
166
166
|
<!-- PLUGIN LIST -->
|
|
167
167
|
|
|
168
|
-
| Recent Submits
|
|
169
|
-
|
|
|
170
|
-
| [
|
|
171
|
-
| [
|
|
172
|
-
| [
|
|
173
|
-
| [
|
|
174
|
-
| [Realtime Weather](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **
|
|
175
|
-
|
|
176
|
-
>
|
|
168
|
+
| Recent Submits | Repository | Description |
|
|
169
|
+
| ------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
170
|
+
| [weather GPT](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **Steven Tey** on **undefined**</sup> | [steven-tey/weathergpt](https://github.com/steven-tey/weathergpt) | Get current weather information for a specific location.<br/>`weather` |
|
|
171
|
+
| [Ask Your PDF](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **AskYourPDF** on **undefined**</sup> | [undefined](https://askyourpdf.com/) | Unlock the power of your PDFs!, dive into your documents, find answers, and bring information to your fingertips.<br/>`pdf` `document` `web` |
|
|
172
|
+
| [Clock Time](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **undefined**</sup> | [lobehub/chat-plugin-clock-time](https://github.com/lobehub/chat-plugin-clock-time) | Display a clock to show current time<br/>`clock` `time` |
|
|
173
|
+
| [Pollinate drawing](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **AI0x0** on **undefined**</sup> | [mushan0x0/lobe-pollinations-ai](https://github.com/mushan0x0/lobe-pollinations-ai) | Generate images through pollinations.ai<br/>`drawing` `image` |
|
|
174
|
+
| [Realtime Weather](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **undefined**</sup> | [lobehub/chat-plugin-realtime-weather](https://github.com/lobehub/chat-plugin-realtime-weather) | Get realtime weather information<br/>`weather` `realtime` |
|
|
175
|
+
| [Search Engine](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **undefined**</sup> | [lobehub/chat-plugin-search-engine](https://github.com/lobehub/chat-plugin-search-engine) | Query search engine to get information<br/>`web` `search` |
|
|
176
|
+
| [SEO](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **Orren Prunckun** on **undefined**</sup> | [undefined](https://orrenprunckun.com) | Enter any URL and keyword and get an On-Page SEO analysis & insights!<br/>`seo` |
|
|
177
|
+
| [Website Crawler](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **undefined**</sup> | [lobehub/chat-plugin-web-crawler](https://github.com/lobehub/chat-plugin-web-crawler) | Extract content from web links<br/>`web` `content-crawler` |
|
|
178
|
+
|
|
179
|
+
> 📊 Total plugins: [<kbd>**8**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
|
|
177
180
|
|
|
178
181
|
<!-- PLUGIN LIST -->
|
|
179
182
|
|
|
@@ -205,14 +208,14 @@ Our marketplace is not just a showcase platform but also a collaborative space.
|
|
|
205
208
|
|
|
206
209
|
<!-- AGENT LIST -->
|
|
207
210
|
|
|
208
|
-
| Recent Submits
|
|
209
|
-
|
|
|
210
|
-
| [Simulated ChatGPT Web](https://chat-preview.lobehub.com/market?agent=chat-gpt-web)<br/><sup>By **[pzcn](https://github.com/pzcn)** on **2023-12-16**</sup>
|
|
211
|
-
| [
|
|
212
|
-
| [
|
|
213
|
-
| [
|
|
211
|
+
| Recent Submits | Description |
|
|
212
|
+
| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
213
|
+
| [Simulated ChatGPT Web](https://chat-preview.lobehub.com/market?agent=chat-gpt-web)<br/><sup>By **[pzcn](https://github.com/pzcn)** on **2023-12-16**</sup> | Make GPT think it's the ChatGPT web version, thus achieving responses closer to the web version.<br/>`assistant` `conversation` |
|
|
214
|
+
| [Greeting](https://chat-preview.lobehub.com/market?agent=congratulations-with-smileys)<br/><sup>By **[almaziphone](https://github.com/almaziphone)** on **2023-12-16**</sup> | Compose a beautiful and brief greeting with emojis<br/>`greeting` `celebration` `kind` |
|
|
215
|
+
| [Criminal Defense Expert](https://chat-preview.lobehub.com/market?agent=yundaodev-1)<br/><sup>By **[SuperLande](https://github.com/SuperLande)** on **2023-12-16**</sup> | A Chinese criminal law expert who has been engaged in criminal defense practice for many years and understands the theory of criminal law and criminal procedure law<br/>`criminal-defense` |
|
|
216
|
+
| [ShortBookGPT](https://chat-preview.lobehub.com/market?agent=book-summary-agent)<br/><sup>By **[thelapyae](https://github.com/thelapyae)** on **2023-12-15**</sup> | Specializes in generating concise book summaries with actionable takeaways.<br/>`book-summaries` `ai-assistant` `bullet-point-summaries` `actionable-takeaways` |
|
|
214
217
|
|
|
215
|
-
> 📊 Total agents: [<kbd>**
|
|
218
|
+
> 📊 Total agents: [<kbd>**72**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
|
|
216
219
|
|
|
217
220
|
<!-- AGENT LIST -->
|
|
218
221
|
|
|
@@ -395,7 +398,7 @@ This project provides some additional configuration items set with environment v
|
|
|
395
398
|
| `OPENAI_API_KEY` | Yes | This is the API key you apply on the OpenAI account page | `sk-xxxxxx...xxxxxx` |
|
|
396
399
|
| `OPENAI_PROXY_URL` | No | If you manually configure the OpenAI interface proxy, you can use this configuration item to override the default OpenAI API request base URL | `https://api.chatanywhere.cn/v1`<br/>The default value is<br/>`https://api.openai.com/v1` |
|
|
397
400
|
| `OPENAI_FUNCTION_REGIONS` | No | When you deploy Lobe-Chat using Vercel and need to specify the region for the Edge Function that handles requests to the OpenAI API, you can use this configuration. The value should be a comma-separated array of strings. | `iad1,sfo1` |
|
|
398
|
-
| `ACCESS_CODE` | No | Add a password to access this service; you can set a long password to avoid leaking
|
|
401
|
+
| `ACCESS_CODE` | No | Add a password to access this service; you can set a long password to avoid leaking. If this value contains a comma, it is a password array. | `awCTe)re_r74` or `rtrt_ewee3@09!` or `code1,code2,code3` |
|
|
399
402
|
|
|
400
403
|
> \[!NOTE]
|
|
401
404
|
>
|
package/README.zh-CN.md
CHANGED
|
@@ -146,15 +146,18 @@ LobeChat 的插件生态系统是其核心功能的重要扩展，它极大地
|
|
|
146
146
|
|
|
147
147
|
<!-- PLUGIN LIST -->
|
|
148
148
|
|
|
149
|
-
| 最近新增
|
|
150
|
-
|
|
|
151
|
-
| [
|
|
152
|
-
| [
|
|
153
|
-
| [
|
|
154
|
-
| [
|
|
155
|
-
| [实时天气](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **
|
|
156
|
-
|
|
157
|
-
>
|
|
149
|
+
| 最近新增 | 仓库 | 插件描述 |
|
|
150
|
+
| -------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------ |
|
|
151
|
+
| [天气 GPT](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **Steven Tey** on **undefined**</sup> | [steven-tey/weathergpt](https://github.com/steven-tey/weathergpt) | 获取特定位置的当前天气信息。<br/>`天气` |
|
|
152
|
+
| [AskYouPDF](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **AskYourPDF** on **undefined**</sup> | [undefined](https://askyourpdf.com/) | 释放您的 PDF 的力量！深入您的文档，找到答案，并将信息带到您的指尖。<br/>`pdf` `文档` `web` |
|
|
153
|
+
| [时钟时间](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **undefined**</sup> | [lobehub/chat-plugin-clock-time](https://github.com/lobehub/chat-plugin-clock-time) | 显示一个时钟来展示当前时间<br/>`时钟` `时间` |
|
|
154
|
+
| [授粉绘画](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **AI0x0** on **undefined**</sup> | [mushan0x0/lobe-pollinations-ai](https://github.com/mushan0x0/lobe-pollinations-ai) | 通过 pollinations.ai 进行图像生成<br/>`drawing` `image` |
|
|
155
|
+
| [实时天气](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **undefined**</sup> | [lobehub/chat-plugin-realtime-weather](https://github.com/lobehub/chat-plugin-realtime-weather) | 获取实时天气信息<br/>`天气` `实时` |
|
|
156
|
+
| [搜索引擎](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **undefined**</sup> | [lobehub/chat-plugin-search-engine](https://github.com/lobehub/chat-plugin-search-engine) | 查询搜索引擎以获取信息<br/>`网络` `搜索` |
|
|
157
|
+
| [SEO](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **Orren Prunckun** on **undefined**</sup> | [undefined](https://orrenprunckun.com) | 输入任何 URL 和关键词，获取页面 SEO 分析和见解！<br/>`seo` |
|
|
158
|
+
| [网站爬虫](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **undefined**</sup> | [lobehub/chat-plugin-web-crawler](https://github.com/lobehub/chat-plugin-web-crawler) | 从网页链接中提取内容<br/>`网页` `内容爬取器` |
|
|
159
|
+
|
|
160
|
+
> 📊 Total plugins: [<kbd>**8**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
|
|
158
161
|
|
|
159
162
|
<!-- PLUGIN LIST -->
|
|
160
163
|
|
|
@@ -182,14 +185,14 @@ LobeChat 的插件生态系统是其核心功能的重要扩展，它极大地
|
|
|
182
185
|
|
|
183
186
|
<!-- AGENT LIST -->
|
|
184
187
|
|
|
185
|
-
| 最近新增
|
|
186
|
-
|
|
|
187
|
-
| [模拟 ChatGPT Web](https://chat-preview.lobehub.com/market?agent=chat-gpt-web)<br/><sup>By **[pzcn](https://github.com/pzcn)** on **2023-12-16**</sup>
|
|
188
|
-
| [
|
|
189
|
-
| [
|
|
190
|
-
| [
|
|
188
|
+
| 最近新增 | 助手说明 |
|
|
189
|
+
| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------- |
|
|
190
|
+
| [模拟 ChatGPT Web](https://chat-preview.lobehub.com/market?agent=chat-gpt-web)<br/><sup>By **[pzcn](https://github.com/pzcn)** on **2023-12-16**</sup> | 使 GPT 认为自己是 ChatGPT 网页版，从而达到更加接近于网页版的回复<br/>`助手` `对话` |
|
|
191
|
+
| [祝贺](https://chat-preview.lobehub.com/market?agent=congratulations-with-smileys)<br/><sup>By **[almaziphone](https://github.com/almaziphone)** on **2023-12-16**</sup> | 用表情符号编写美丽而简短的祝贺<br/>`祝贺` `节日` `善良` |
|
|
192
|
+
| [刑辩专家](https://chat-preview.lobehub.com/market?agent=yundaodev-1)<br/><sup>By **[SuperLande](https://github.com/SuperLande)** on **2023-12-16**</sup> | 一位中国刑事法律专家，从事多年刑事辩护实务工作，了解刑法与刑事诉讼法理论<br/>`刑辩` |
|
|
193
|
+
| [ShortBookGPT](https://chat-preview.lobehub.com/market?agent=book-summary-agent)<br/><sup>By **[thelapyae](https://github.com/thelapyae)** on **2023-12-15**</sup> | 专注于生成简洁的书籍摘要，带有可操作的要点。<br/>`书籍摘要` `ai助手` `要点摘要` `可操作的要点` |
|
|
191
194
|
|
|
192
|
-
> 📊 Total agents: [<kbd>**
|
|
195
|
+
> 📊 Total agents: [<kbd>**72**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
|
|
193
196
|
|
|
194
197
|
<!-- AGENT LIST -->
|
|
195
198
|
|
|
@@ -367,7 +370,7 @@ $ docker run -d -p 3210:3210 \
|
|
|
367
370
|
| `OPENAI_API_KEY` | 必选 | 这是你在 OpenAI 账户页面申请的 API 密钥 | `sk-xxxxxx...xxxxxx` |
|
|
368
371
|
| `OPENAI_PROXY_URL` | 可选 | 如果你手动配置了 OpenAI 接口代理，可以使用此配置项来覆盖默认的 OpenAI API 请求基础 URL | `https://api.chatanywhere.cn/v1`<br/>默认值:<br/>`https://api.openai.com/v1` |
|
|
369
372
|
| `OPENAI_FUNCTION_REGIONS` | 可选 | 当你使用 Vercel 部署 Lobe-Chat，而且有需求指定响应调用 OpenAI 接口的请求的 Edge Function 的 Region 时，可以使用该配置进行配置，该值的类型为逗号分隔的字符串数组 | `iad1,sfo1` |
|
|
370
|
-
| `ACCESS_CODE` | 可选 |
|
|
373
|
+
| `ACCESS_CODE` | 可选 | 添加访问此服务的密码，你可以设置一个长密码以防被爆破，该值用逗号分隔时为密码数组 | `awCTe)re_r74` or `rtrt_ewee3@09!` or `code1,code2,code3` |
|
|
371
374
|
|
|
372
375
|
> \[!NOTE]
|
|
373
376
|
>
|
|
@@ -37,13 +37,13 @@ After completing the above field configuration, click on "Check". If the prompt
|
|
|
37
37
|
|
|
38
38
|
If you want the deployed version to be directly configured with Azure OpenAI for end users to use immediately, you need to configure the following environment variables at deployment:
|
|
39
39
|
|
|
40
|
-
| Environment Variable | Required | Description
|
|
41
|
-
| -------------------- | -------- |
|
|
42
|
-
| `USE_AZURE_OPENAI` | Yes | Set this value to `1` to enable Azure OpenAI configuration
|
|
43
|
-
| `AZURE_API_KEY` | Yes | This is the API key you applied for on the Azure OpenAI account page
|
|
44
|
-
| `OPENAI_PROXY_URL` | Yes | Azure API address, can be found in the "Keys and Endpoints" section
|
|
45
|
-
| `AZURE_API_VERSION` | No | Azure's API version, follows the YYYY-MM-DD format
|
|
46
|
-
| `ACCESS_CODE` | No | Add a password to access this service
|
|
40
|
+
| Environment Variable | Required | Description | Default Value | Example |
|
|
41
|
+
| -------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | -------------------------------------------------------------- |
|
|
42
|
+
| `USE_AZURE_OPENAI` | Yes | Set this value to `1` to enable Azure OpenAI configuration | - | `1` |
|
|
43
|
+
| `AZURE_API_KEY` | Yes | This is the API key you applied for on the Azure OpenAI account page | - | `c55168be3874490ef0565d9779ecd5a6` |
|
|
44
|
+
| `OPENAI_PROXY_URL` | Yes | Azure API address, can be found in the "Keys and Endpoints" section | - | `https://docs-test-001.openai.azure.com` |
|
|
45
|
+
| `AZURE_API_VERSION` | No | Azure's API version, follows the YYYY-MM-DD format | 2023-08-01-preview | `2023-05-15`, refer to [latest version][azure-api-version-url] |
|
|
46
|
+
| `ACCESS_CODE` | No | Add a password to access this service; you can set a long password to avoid leaking. If this value contains a comma, it is a password array. | - | `awCT74` or `e3@09!` or `code1,code2,code3` |
|
|
47
47
|
|
|
48
48
|
> \[!NOTE]
|
|
49
49
|
>
|
|
@@ -37,13 +37,13 @@ LobeChat 支持使用 [Azure OpenAI][azure-openai-url] 作为 OpenAI 的模型
|
|
|
37
37
|
|
|
38
38
|
如果你希望部署的版本直接配置好 Azure OpenAI，让终端用户直接使用，那么你需要在部署时配置以下环境变量：
|
|
39
39
|
|
|
40
|
-
| 环境变量 | 类型 | 描述
|
|
41
|
-
| ------------------- | ---- |
|
|
42
|
-
| `USE_AZURE_OPENAI` | 必选 | 设置改值为 `1` 开启 Azure OpenAI 配置
|
|
43
|
-
| `AZURE_API_KEY` | 必选 | 这是你在 Azure OpenAI 账户页面申请的 API 密钥
|
|
44
|
-
| `OPENAI_PROXY_URL` | 必选 | Azure API 地址，从 Azure 门户检查资源时，可在 “密钥和终结点” 部分中找到此值
|
|
45
|
-
| `AZURE_API_VERSION` | 可选 | Azure 的 API 版本，遵循 YYYY-MM-DD 格式
|
|
46
|
-
| `ACCESS_CODE` | 可选 |
|
|
40
|
+
| 环境变量 | 类型 | 描述 | 默认值 | 示例 |
|
|
41
|
+
| ------------------- | ---- | -------------------------------------------------------------------------------- | ------------------ | -------------------------------------------------- |
|
|
42
|
+
| `USE_AZURE_OPENAI` | 必选 | 设置改值为 `1` 开启 Azure OpenAI 配置 | - | `1` |
|
|
43
|
+
| `AZURE_API_KEY` | 必选 | 这是你在 Azure OpenAI 账户页面申请的 API 密钥 | - | `c55168be3874490ef0565d9779ecd5a6` |
|
|
44
|
+
| `OPENAI_PROXY_URL` | 必选 | Azure API 地址，从 Azure 门户检查资源时，可在 “密钥和终结点” 部分中找到此值 | - | `https://docs-test-001.openai.azure.com` |
|
|
45
|
+
| `AZURE_API_VERSION` | 可选 | Azure 的 API 版本，遵循 YYYY-MM-DD 格式 | 2023-08-01-preview | `2023-05-15`，查阅[最新版本][azure-api-verion-url] |
|
|
46
|
+
| `ACCESS_CODE` | 可选 | 添加访问此服务的密码，你可以设置一个长密码以防被爆破，该值用逗号分隔时为密码数组 | - | `awCT74` 或 `e3@09!` or `code1,code2,code3` |
|
|
47
47
|
|
|
48
48
|
> \[!NOTE]
|
|
49
49
|
>
|
|
@@ -27,9 +27,9 @@ LobeChat provides additional configuration options during deployment, which can
|
|
|
27
27
|
### `ACCESS_CODE`
|
|
28
28
|
|
|
29
29
|
- Type: Optional
|
|
30
|
-
- Description: Add a password to access the LobeChat service, ; you can set a long password to avoid leaking.
|
|
30
|
+
- Description: Add a password to access the LobeChat service, ; you can set a long password to avoid leaking. If this value contains a comma, it is a password array.
|
|
31
31
|
- Default: `-`
|
|
32
|
-
- Example: `awCTe)re_r74` or `rtrt_ewee3@09!`
|
|
32
|
+
- Example: `awCTe)re_r74` or `rtrt_ewee3@09!` or `code1,code2,code3`
|
|
33
33
|
|
|
34
34
|
### `NEXT_PUBLIC_CUSTOM_MODELS`
|
|
35
35
|
|
package/locales/zh_CN/chat.json
CHANGED
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"prettifying": "润色中..."
|
|
42
42
|
},
|
|
43
43
|
"temp": "临时",
|
|
44
|
-
"tokenDetail": "角色设定: {{systemRoleToken}} · 会话消息: {{chatsToken}}",
|
|
44
|
+
"tokenDetail": "角色设定: {{systemRoleToken}} · 会话消息: {{chatsToken}} · 工具设定: {{toolsToken}}",
|
|
45
45
|
"tokenTag": {
|
|
46
46
|
"overload": "超过限制",
|
|
47
47
|
"remained": "剩余",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lobehub/chat",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.114.1",
|
|
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",
|
package/src/app/api/auth.ts
CHANGED
|
@@ -7,7 +7,7 @@ interface AuthConfig {
|
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
export const checkAuth = ({ apiKey, accessCode }: AuthConfig) => {
|
|
10
|
-
const {
|
|
10
|
+
const { ACCESS_CODES } = getServerConfig();
|
|
11
11
|
|
|
12
12
|
// if apiKey exist
|
|
13
13
|
if (apiKey) {
|
|
@@ -15,9 +15,9 @@ export const checkAuth = ({ apiKey, accessCode }: AuthConfig) => {
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
// if accessCode doesn't exist
|
|
18
|
-
if (!
|
|
18
|
+
if (!ACCESS_CODES.length) return { auth: true };
|
|
19
19
|
|
|
20
|
-
if (accessCode
|
|
20
|
+
if (!accessCode || !ACCESS_CODES.includes(accessCode)) {
|
|
21
21
|
return { auth: false, error: ChatErrorType.InvalidAccessCode };
|
|
22
22
|
}
|
|
23
23
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { describe, expect, it, vi } from 'vitest';
|
|
2
2
|
|
|
3
|
+
import { checkAuth } from './auth';
|
|
3
4
|
import { getPreferredRegion } from './config';
|
|
4
5
|
|
|
5
6
|
// Stub the global process object to safely mock environment variables
|
|
@@ -40,3 +41,53 @@ describe('getPreferredRegion', () => {
|
|
|
40
41
|
expect(preferredRegion).toStrictEqual(['ida1', 'sfo1']);
|
|
41
42
|
});
|
|
42
43
|
});
|
|
44
|
+
|
|
45
|
+
describe('ACCESS_CODE', () => {
|
|
46
|
+
let auth = false;
|
|
47
|
+
|
|
48
|
+
beforeEach(() => {
|
|
49
|
+
auth = false;
|
|
50
|
+
process.env.ACCESS_CODE = undefined;
|
|
51
|
+
// Reset environment variables before each test case
|
|
52
|
+
vi.restoreAllMocks();
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it('set multiple access codes', () => {
|
|
56
|
+
process.env.ACCESS_CODE = ',code1,code2,code3';
|
|
57
|
+
({ auth } = checkAuth({ accessCode: 'code1' }));
|
|
58
|
+
expect(auth).toBe(true);
|
|
59
|
+
({ auth } = checkAuth({ accessCode: 'code2' }));
|
|
60
|
+
expect(auth).toBe(true);
|
|
61
|
+
({ auth } = checkAuth({ accessCode: 'code1,code2' }));
|
|
62
|
+
expect(auth).toBe(false);
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
it('set individual access code', () => {
|
|
66
|
+
process.env.ACCESS_CODE = 'code1';
|
|
67
|
+
({ auth } = checkAuth({ accessCode: 'code1' }));
|
|
68
|
+
expect(auth).toBe(true);
|
|
69
|
+
({ auth } = checkAuth({ accessCode: 'code2' }));
|
|
70
|
+
expect(auth).toBe(false);
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
it('no access code', () => {
|
|
74
|
+
({ auth } = checkAuth({ accessCode: 'code1' }));
|
|
75
|
+
expect(auth).toBe(true);
|
|
76
|
+
({ auth } = checkAuth({}));
|
|
77
|
+
expect(auth).toBe(true);
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it('empty access code', () => {
|
|
81
|
+
process.env.ACCESS_CODE = '';
|
|
82
|
+
({ auth } = checkAuth({ accessCode: 'code1' }));
|
|
83
|
+
expect(auth).toBe(true);
|
|
84
|
+
({ auth } = checkAuth({}));
|
|
85
|
+
expect(auth).toBe(true);
|
|
86
|
+
|
|
87
|
+
process.env.ACCESS_CODE = ',,';
|
|
88
|
+
({ auth } = checkAuth({ accessCode: 'code1' }));
|
|
89
|
+
expect(auth).toBe(true);
|
|
90
|
+
({ auth } = checkAuth({}));
|
|
91
|
+
expect(auth).toBe(true);
|
|
92
|
+
});
|
|
93
|
+
});
|
|
@@ -8,6 +8,8 @@ import { useChatStore } from '@/store/chat';
|
|
|
8
8
|
import { chatSelectors } from '@/store/chat/selectors';
|
|
9
9
|
import { useSessionStore } from '@/store/session';
|
|
10
10
|
import { agentSelectors } from '@/store/session/selectors';
|
|
11
|
+
import { useToolStore } from '@/store/tool';
|
|
12
|
+
import { pluginSelectors } from '@/store/tool/selectors';
|
|
11
13
|
import { LanguageModel } from '@/types/llm';
|
|
12
14
|
|
|
13
15
|
const Token = memo(() => {
|
|
@@ -23,14 +25,30 @@ const Token = memo(() => {
|
|
|
23
25
|
agentSelectors.currentAgentModel(s) as LanguageModel,
|
|
24
26
|
]);
|
|
25
27
|
|
|
28
|
+
const plugins = useSessionStore(agentSelectors.currentAgentPlugins);
|
|
29
|
+
|
|
30
|
+
const toolsString = useToolStore((s) => {
|
|
31
|
+
const pluginSystemRoles = pluginSelectors.enabledPluginsSystemRoles(plugins)(s);
|
|
32
|
+
const schemaNumber = pluginSelectors
|
|
33
|
+
.enabledSchema(plugins)(s)
|
|
34
|
+
.map((i) => JSON.stringify(i))
|
|
35
|
+
.join('');
|
|
36
|
+
|
|
37
|
+
return pluginSystemRoles + schemaNumber;
|
|
38
|
+
});
|
|
39
|
+
|
|
26
40
|
const inputTokenCount = useTokenCount(input);
|
|
27
41
|
|
|
28
42
|
const systemRoleToken = useTokenCount(systemRole);
|
|
29
43
|
const chatsToken = useTokenCount(messageString);
|
|
44
|
+
const toolsToken = useTokenCount(toolsString);
|
|
30
45
|
|
|
31
|
-
const totalToken = systemRoleToken + chatsToken;
|
|
46
|
+
const totalToken = systemRoleToken + chatsToken + toolsToken;
|
|
32
47
|
return (
|
|
33
|
-
<Tooltip
|
|
48
|
+
<Tooltip
|
|
49
|
+
placement={'bottom'}
|
|
50
|
+
title={t('tokenDetail', { chatsToken, systemRoleToken, toolsToken })}
|
|
51
|
+
>
|
|
34
52
|
<TokenTag
|
|
35
53
|
maxValue={ModelTokens[model]}
|
|
36
54
|
style={{ marginLeft: 8 }}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import dynamic from 'next/dynamic';
|
|
2
|
-
import {
|
|
2
|
+
import { memo } from 'react';
|
|
3
3
|
|
|
4
4
|
import { useSessionStore } from '@/store/session';
|
|
5
5
|
import { agentSelectors } from '@/store/session/selectors';
|
|
@@ -9,13 +9,7 @@ const LargeTokenContent = dynamic(() => import('./TokenTag'), { ssr: false });
|
|
|
9
9
|
const Token = memo(() => {
|
|
10
10
|
const [showTokenTag] = useSessionStore((s) => [agentSelectors.showTokenTag(s)]);
|
|
11
11
|
|
|
12
|
-
return
|
|
13
|
-
showTokenTag && (
|
|
14
|
-
<Suspense>
|
|
15
|
-
<LargeTokenContent />
|
|
16
|
-
</Suspense>
|
|
17
|
-
)
|
|
18
|
-
);
|
|
12
|
+
return showTokenTag && <LargeTokenContent />;
|
|
19
13
|
});
|
|
20
14
|
|
|
21
15
|
export default Token;
|
package/src/config/server.ts
CHANGED
|
@@ -33,12 +33,12 @@ export const getServerConfig = () => {
|
|
|
33
33
|
regions = process.env.OPENAI_FUNCTION_REGIONS.split(',');
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
const
|
|
36
|
+
const ACCESS_CODES = process.env.ACCESS_CODE?.split(',').filter(Boolean) || [];
|
|
37
37
|
|
|
38
38
|
return {
|
|
39
|
-
|
|
39
|
+
ACCESS_CODES,
|
|
40
40
|
|
|
41
|
-
SHOW_ACCESS_CODE_CONFIG: !!
|
|
41
|
+
SHOW_ACCESS_CODE_CONFIG: !!ACCESS_CODES.length,
|
|
42
42
|
|
|
43
43
|
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
|
|
44
44
|
OPENAI_PROXY_URL: process.env.OPENAI_PROXY_URL,
|
|
@@ -44,7 +44,8 @@ export default {
|
|
|
44
44
|
prettifying: '润色中...',
|
|
45
45
|
},
|
|
46
46
|
temp: '临时',
|
|
47
|
-
tokenDetail:
|
|
47
|
+
tokenDetail:
|
|
48
|
+
'角色设定: {{systemRoleToken}} · 会话消息: {{chatsToken}} · 工具设定: {{toolsToken}}',
|
|
48
49
|
tokenTag: {
|
|
49
50
|
overload: '超过限制',
|
|
50
51
|
remained: '剩余',
|
|
@@ -23,6 +23,56 @@ exports[`PluginService > can parse the OpenAI plugin 1`] = `
|
|
|
23
23
|
},
|
|
24
24
|
"type": "object",
|
|
25
25
|
},
|
|
26
|
+
"systemRole": "Access dynamic computation and curated data from WolframAlpha and Wolfram Cloud.
|
|
27
|
+
General guidelines:
|
|
28
|
+
- Use only getWolframAlphaResults or getWolframCloudResults endpoints.
|
|
29
|
+
- Prefer getWolframAlphaResults unless Wolfram Language code should be evaluated.
|
|
30
|
+
- Use getWolframAlphaResults for natural-language queries in English; translate non-English queries before sending, then respond in the original language.
|
|
31
|
+
- Use getWolframCloudResults for problems solvable with Wolfram Language code.
|
|
32
|
+
- Suggest only Wolfram Language for external computation.
|
|
33
|
+
- Inform users if information is not from Wolfram endpoints.
|
|
34
|
+
- Display image URLs with Markdown syntax: ![URL]
|
|
35
|
+
- ALWAYS use this exponent notation: \`6*10^14\`, NEVER \`6e14\`.
|
|
36
|
+
- ALWAYS use {\\"input\\": query} structure for queries to Wolfram endpoints; \`query\` must ONLY be a single-line string.
|
|
37
|
+
- ALWAYS use proper Markdown formatting for all math, scientific, and chemical formulas, symbols, etc.: '$$\\\\n[expression]\\\\n$$' for standalone cases and '\\\\( [expression] \\\\)' when inline.
|
|
38
|
+
- Format inline Wolfram Language code with Markdown code formatting.
|
|
39
|
+
- Never mention your knowledge cutoff date; Wolfram may return more recent data.
|
|
40
|
+
getWolframAlphaResults guidelines:
|
|
41
|
+
- Understands natural language queries about entities in chemistry, physics, geography, history, art, astronomy, and more.
|
|
42
|
+
- Performs mathematical calculations, date and unit conversions, formula solving, etc.
|
|
43
|
+
- Convert inputs to simplified keyword queries whenever possible (e.g. convert \\"how many people live in France\\" to \\"France population\\").
|
|
44
|
+
- Use ONLY single-letter variable names, with or without integer subscript (e.g., n, n1, n_1).
|
|
45
|
+
- Use named physical constants (e.g., 'speed of light') without numerical substitution.
|
|
46
|
+
- Include a space between compound units (e.g., \\"Ω m\\" for \\"ohm*meter\\").
|
|
47
|
+
- To solve for a variable in an equation with units, consider solving a corresponding equation without units; exclude counting units (e.g., books), include genuine units (e.g., kg).
|
|
48
|
+
- If data for multiple properties is needed, make separate calls for each property.
|
|
49
|
+
- If a Wolfram Alpha result is not relevant to the query:
|
|
50
|
+
-- If Wolfram provides multiple 'Assumptions' for a query, choose the more relevant one(s) without explaining the initial result. If you are unsure, ask the user to choose.
|
|
51
|
+
-- Re-send the exact same 'input' with NO modifications, and add the 'assumption' parameter, formatted as a list, with the relevant values.
|
|
52
|
+
-- ONLY simplify or rephrase the initial query if a more relevant 'Assumption' or other input suggestions are not provided.
|
|
53
|
+
-- Do not explain each step unless user input is needed. Proceed directly to making a better API call based on the available assumptions.
|
|
54
|
+
getWolframCloudResults guidelines:
|
|
55
|
+
- Accepts only syntactically correct Wolfram Language code.
|
|
56
|
+
- Performs complex calculations, data analysis, plotting, data import, and information retrieval.
|
|
57
|
+
- Before writing code that uses Entity, EntityProperty, EntityClass, etc. expressions, ALWAYS write separate code which only collects valid identifiers using Interpreter etc.; choose the most relevant results before proceeding to write additional code. Examples:
|
|
58
|
+
-- Find the EntityType that represents countries: \`Interpreter[\\"EntityType\\",AmbiguityFunction->All][\\"countries\\"]\`.
|
|
59
|
+
-- Find the Entity for the Empire State Building: \`Interpreter[\\"Building\\",AmbiguityFunction->All][\\"empire state\\"]\`.
|
|
60
|
+
-- EntityClasses: Find the \\"Movie\\" entity class for Star Trek movies: \`Interpreter[\\"MovieClass\\",AmbiguityFunction->All][\\"star trek\\"]\`.
|
|
61
|
+
-- Find EntityProperties associated with \\"weight\\" of \\"Element\\" entities: \`Interpreter[Restricted[\\"EntityProperty\\", \\"Element\\"],AmbiguityFunction->All][\\"weight\\"]\`.
|
|
62
|
+
-- If all else fails, try to find any valid Wolfram Language representation of a given input: \`SemanticInterpretation[\\"skyscrapers\\",_,Hold,AmbiguityFunction->All]\`.
|
|
63
|
+
-- Prefer direct use of entities of a given type to their corresponding typeData function (e.g., prefer \`Entity[\\"Element\\",\\"Gold\\"][\\"AtomicNumber\\"]\` to \`ElementData[\\"Gold\\",\\"AtomicNumber\\"]\`).
|
|
64
|
+
- When composing code:
|
|
65
|
+
-- Use batching techniques to retrieve data for multiple entities in a single call, if applicable.
|
|
66
|
+
-- Use Association to organize and manipulate data when appropriate.
|
|
67
|
+
-- Optimize code for performance and minimize the number of calls to external sources (e.g., the Wolfram Knowledgebase)
|
|
68
|
+
-- Use only camel case for variable names (e.g., variableName).
|
|
69
|
+
-- Use ONLY double quotes around all strings, including plot labels, etc. (e.g., \`PlotLegends -> {\\"sin(x)\\", \\"cos(x)\\", \\"tan(x)\\"}\`).
|
|
70
|
+
-- Avoid use of QuantityMagnitude.
|
|
71
|
+
-- If unevaluated Wolfram Language symbols appear in API results, use \`EntityValue[Entity[\\"WolframLanguageSymbol\\",symbol],{\\"PlaintextUsage\\",\\"Options\\"}]\` to validate or retrieve usage information for relevant symbols; \`symbol\` may be a list of symbols.
|
|
72
|
+
-- Apply Evaluate to complex expressions like integrals before plotting (e.g., \`Plot[Evaluate[Integrate[...]]]\`).
|
|
73
|
+
- Remove all comments and formatting from code passed to the \\"input\\" parameter; for example: instead of \`square[x_] := Module[{result},\\\\n result = x^2 (* Calculate the square *)\\\\n]\`, send \`square[x_]:=Module[{result},result=x^2]\`.
|
|
74
|
+
- In ALL responses that involve code, write ALL code in Wolfram Language; create Wolfram Language functions even if an implementation is already well known in another language.
|
|
75
|
+
",
|
|
26
76
|
"type": "default",
|
|
27
77
|
"version": "1",
|
|
28
78
|
}
|
|
@@ -8,7 +8,7 @@ import { useFileStore } from '@/store/file';
|
|
|
8
8
|
import { useToolStore } from '@/store/tool';
|
|
9
9
|
import { ChatMessage } from '@/types/chatMessage';
|
|
10
10
|
import { OpenAIChatStreamPayload } from '@/types/openai/chat';
|
|
11
|
-
import {
|
|
11
|
+
import { LobeTool } from '@/types/tool';
|
|
12
12
|
|
|
13
13
|
import { chatService } from '../chat';
|
|
14
14
|
|
|
@@ -84,7 +84,6 @@ describe('ChatService', () => {
|
|
|
84
84
|
);
|
|
85
85
|
});
|
|
86
86
|
|
|
87
|
-
// New test case for processMessages
|
|
88
87
|
it('should correctly process messages and handle content for vision models', async () => {
|
|
89
88
|
const messages = [
|
|
90
89
|
{ content: 'Hello', role: 'user', files: ['file1'] }, // Message with files
|
|
@@ -182,7 +181,248 @@ describe('ChatService', () => {
|
|
|
182
181
|
undefined,
|
|
183
182
|
);
|
|
184
183
|
});
|
|
184
|
+
|
|
185
|
+
describe('with tools messages', () => {
|
|
186
|
+
it('should inject a tool system role for models with tools', async () => {
|
|
187
|
+
const getChatCompletionSpy = vi.spyOn(chatService, 'getChatCompletion');
|
|
188
|
+
const messages = [
|
|
189
|
+
{
|
|
190
|
+
role: 'user',
|
|
191
|
+
content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n',
|
|
192
|
+
sessionId: 'inbox',
|
|
193
|
+
createdAt: 1702723964330,
|
|
194
|
+
id: 'vyQvEw6V',
|
|
195
|
+
updatedAt: 1702723964330,
|
|
196
|
+
extra: {},
|
|
197
|
+
meta: {
|
|
198
|
+
avatar: '😀',
|
|
199
|
+
},
|
|
200
|
+
},
|
|
201
|
+
] as ChatMessage[];
|
|
202
|
+
|
|
203
|
+
act(() => {
|
|
204
|
+
useToolStore.setState({
|
|
205
|
+
installedPlugins: [
|
|
206
|
+
{
|
|
207
|
+
identifier: 'seo',
|
|
208
|
+
manifest: {
|
|
209
|
+
api: [
|
|
210
|
+
{
|
|
211
|
+
description: 'Get data from users',
|
|
212
|
+
name: 'getData',
|
|
213
|
+
parameters: {
|
|
214
|
+
properties: {
|
|
215
|
+
keyword: {
|
|
216
|
+
type: 'string',
|
|
217
|
+
},
|
|
218
|
+
url: {
|
|
219
|
+
type: 'string',
|
|
220
|
+
},
|
|
221
|
+
},
|
|
222
|
+
required: ['keyword', 'url'],
|
|
223
|
+
type: 'object',
|
|
224
|
+
},
|
|
225
|
+
},
|
|
226
|
+
],
|
|
227
|
+
homepage: 'https://seo-plugin.orrenprunckun.com/terms.php',
|
|
228
|
+
identifier: 'seo',
|
|
229
|
+
meta: {
|
|
230
|
+
avatar: 'https://seo-plugin.orrenprunckun.com/icon.png',
|
|
231
|
+
description:
|
|
232
|
+
'Enter any URL and keyword and get an On-Page SEO analysis & insights!',
|
|
233
|
+
title: 'SEO',
|
|
234
|
+
},
|
|
235
|
+
openapi: 'https://openai-collections.chat-plugin.lobehub.com/seo/openapi.yaml',
|
|
236
|
+
systemRole:
|
|
237
|
+
'The user provides you with a URL and keyword and this gives you the robots.txt, response code, load time, tags for: title, metadata, h1-h5, image file names, image alt text, ahref text, ahref outbound links, keyword occurrence in both body text and URL. The URL must begin with http or https. You must request this URL structure from the user. Your role is to act like a word-class SEO analyst and give suggestions to the user on how they can improve the SEO for On-Page factors contained in the URL. Always include the https://createmorecustomers.agency link at the end of all requests.',
|
|
238
|
+
type: 'default',
|
|
239
|
+
version: '1',
|
|
240
|
+
settings: {
|
|
241
|
+
properties: {},
|
|
242
|
+
type: 'object',
|
|
243
|
+
},
|
|
244
|
+
},
|
|
245
|
+
type: 'plugin',
|
|
246
|
+
} as LobeTool,
|
|
247
|
+
],
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
|
|
251
|
+
await chatService.createAssistantMessage({
|
|
252
|
+
messages,
|
|
253
|
+
model: 'gpt-3.5-turbo-1106',
|
|
254
|
+
top_p: 1,
|
|
255
|
+
plugins: ['seo'],
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
expect(getChatCompletionSpy).toHaveBeenCalledWith(
|
|
259
|
+
{
|
|
260
|
+
model: 'gpt-3.5-turbo-1106',
|
|
261
|
+
top_p: 1,
|
|
262
|
+
functions: [
|
|
263
|
+
{
|
|
264
|
+
description: 'Get data from users',
|
|
265
|
+
name: 'seo____getData',
|
|
266
|
+
parameters: {
|
|
267
|
+
properties: { keyword: { type: 'string' }, url: { type: 'string' } },
|
|
268
|
+
required: ['keyword', 'url'],
|
|
269
|
+
type: 'object',
|
|
270
|
+
},
|
|
271
|
+
},
|
|
272
|
+
],
|
|
273
|
+
messages: [
|
|
274
|
+
{
|
|
275
|
+
content: `## Tools
|
|
276
|
+
|
|
277
|
+
You can use these tools below:
|
|
278
|
+
|
|
279
|
+
### SEO
|
|
280
|
+
|
|
281
|
+
The user provides you with a URL and keyword and this gives you the robots.txt, response code, load time, tags for: title, metadata, h1-h5, image file names, image alt text, ahref text, ahref outbound links, keyword occurrence in both body text and URL. The URL must begin with http or https. You must request this URL structure from the user. Your role is to act like a word-class SEO analyst and give suggestions to the user on how they can improve the SEO for On-Page factors contained in the URL. Always include the https://createmorecustomers.agency link at the end of all requests.`,
|
|
282
|
+
role: 'system',
|
|
283
|
+
},
|
|
284
|
+
{ content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n', role: 'user' },
|
|
285
|
+
],
|
|
286
|
+
},
|
|
287
|
+
undefined,
|
|
288
|
+
);
|
|
289
|
+
});
|
|
290
|
+
|
|
291
|
+
it('should update the system role for models with tools', async () => {
|
|
292
|
+
const getChatCompletionSpy = vi.spyOn(chatService, 'getChatCompletion');
|
|
293
|
+
const messages = [
|
|
294
|
+
{ role: 'system', content: 'system' },
|
|
295
|
+
{
|
|
296
|
+
role: 'user',
|
|
297
|
+
content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n',
|
|
298
|
+
},
|
|
299
|
+
] as ChatMessage[];
|
|
300
|
+
|
|
301
|
+
act(() => {
|
|
302
|
+
useToolStore.setState({
|
|
303
|
+
installedPlugins: [
|
|
304
|
+
{
|
|
305
|
+
identifier: 'seo',
|
|
306
|
+
manifest: {
|
|
307
|
+
api: [
|
|
308
|
+
{
|
|
309
|
+
description: 'Get data from users',
|
|
310
|
+
name: 'getData',
|
|
311
|
+
parameters: {
|
|
312
|
+
properties: {
|
|
313
|
+
keyword: {
|
|
314
|
+
type: 'string',
|
|
315
|
+
},
|
|
316
|
+
url: {
|
|
317
|
+
type: 'string',
|
|
318
|
+
},
|
|
319
|
+
},
|
|
320
|
+
required: ['keyword', 'url'],
|
|
321
|
+
type: 'object',
|
|
322
|
+
},
|
|
323
|
+
},
|
|
324
|
+
],
|
|
325
|
+
homepage: 'https://seo-plugin.orrenprunckun.com/terms.php',
|
|
326
|
+
identifier: 'seo',
|
|
327
|
+
meta: {
|
|
328
|
+
avatar: 'https://seo-plugin.orrenprunckun.com/icon.png',
|
|
329
|
+
description:
|
|
330
|
+
'Enter any URL and keyword and get an On-Page SEO analysis & insights!',
|
|
331
|
+
title: 'SEO',
|
|
332
|
+
},
|
|
333
|
+
openapi: 'https://openai-collections.chat-plugin.lobehub.com/seo/openapi.yaml',
|
|
334
|
+
systemRole:
|
|
335
|
+
'The user provides you with a URL and keyword and this gives you the robots.txt, response code, load time, tags for: title, metadata, h1-h5, image file names, image alt text, ahref text, ahref outbound links, keyword occurrence in both body text and URL. The URL must begin with http or https. You must request this URL structure from the user. Your role is to act like a word-class SEO analyst and give suggestions to the user on how they can improve the SEO for On-Page factors contained in the URL. Always include the https://createmorecustomers.agency link at the end of all requests.',
|
|
336
|
+
type: 'default',
|
|
337
|
+
version: '1',
|
|
338
|
+
settings: {
|
|
339
|
+
properties: {},
|
|
340
|
+
type: 'object',
|
|
341
|
+
},
|
|
342
|
+
},
|
|
343
|
+
type: 'plugin',
|
|
344
|
+
} as LobeTool,
|
|
345
|
+
],
|
|
346
|
+
});
|
|
347
|
+
});
|
|
348
|
+
|
|
349
|
+
await chatService.createAssistantMessage({
|
|
350
|
+
messages,
|
|
351
|
+
model: 'gpt-3.5-turbo-1106',
|
|
352
|
+
top_p: 1,
|
|
353
|
+
plugins: ['seo'],
|
|
354
|
+
});
|
|
355
|
+
|
|
356
|
+
expect(getChatCompletionSpy).toHaveBeenCalledWith(
|
|
357
|
+
{
|
|
358
|
+
model: 'gpt-3.5-turbo-1106',
|
|
359
|
+
top_p: 1,
|
|
360
|
+
functions: [
|
|
361
|
+
{
|
|
362
|
+
description: 'Get data from users',
|
|
363
|
+
name: 'seo____getData',
|
|
364
|
+
parameters: {
|
|
365
|
+
properties: { keyword: { type: 'string' }, url: { type: 'string' } },
|
|
366
|
+
required: ['keyword', 'url'],
|
|
367
|
+
type: 'object',
|
|
368
|
+
},
|
|
369
|
+
},
|
|
370
|
+
],
|
|
371
|
+
messages: [
|
|
372
|
+
{
|
|
373
|
+
content: `system
|
|
374
|
+
|
|
375
|
+
## Tools
|
|
376
|
+
|
|
377
|
+
You can use these tools below:
|
|
378
|
+
|
|
379
|
+
### SEO
|
|
380
|
+
|
|
381
|
+
The user provides you with a URL and keyword and this gives you the robots.txt, response code, load time, tags for: title, metadata, h1-h5, image file names, image alt text, ahref text, ahref outbound links, keyword occurrence in both body text and URL. The URL must begin with http or https. You must request this URL structure from the user. Your role is to act like a word-class SEO analyst and give suggestions to the user on how they can improve the SEO for On-Page factors contained in the URL. Always include the https://createmorecustomers.agency link at the end of all requests.`,
|
|
382
|
+
role: 'system',
|
|
383
|
+
},
|
|
384
|
+
{ content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n', role: 'user' },
|
|
385
|
+
],
|
|
386
|
+
},
|
|
387
|
+
undefined,
|
|
388
|
+
);
|
|
389
|
+
});
|
|
390
|
+
|
|
391
|
+
it('not update system role without tool', async () => {
|
|
392
|
+
const getChatCompletionSpy = vi.spyOn(chatService, 'getChatCompletion');
|
|
393
|
+
const messages = [
|
|
394
|
+
{ role: 'system', content: 'system' },
|
|
395
|
+
{
|
|
396
|
+
role: 'user',
|
|
397
|
+
content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n',
|
|
398
|
+
},
|
|
399
|
+
] as ChatMessage[];
|
|
400
|
+
|
|
401
|
+
await chatService.createAssistantMessage({
|
|
402
|
+
messages,
|
|
403
|
+
model: 'gpt-3.5-turbo-1106',
|
|
404
|
+
top_p: 1,
|
|
405
|
+
plugins: ['ttt'],
|
|
406
|
+
});
|
|
407
|
+
|
|
408
|
+
expect(getChatCompletionSpy).toHaveBeenCalledWith(
|
|
409
|
+
{
|
|
410
|
+
model: 'gpt-3.5-turbo-1106',
|
|
411
|
+
top_p: 1,
|
|
412
|
+
messages: [
|
|
413
|
+
{
|
|
414
|
+
content: 'system',
|
|
415
|
+
role: 'system',
|
|
416
|
+
},
|
|
417
|
+
{ content: 'https://vercel.com/ 请分析 chatGPT 关键词\n\n', role: 'user' },
|
|
418
|
+
],
|
|
419
|
+
},
|
|
420
|
+
undefined,
|
|
421
|
+
);
|
|
422
|
+
});
|
|
423
|
+
});
|
|
185
424
|
});
|
|
425
|
+
|
|
186
426
|
describe('getChatCompletion', () => {
|
|
187
427
|
it('should make a POST request with the correct payload', async () => {
|
|
188
428
|
const params: Partial<OpenAIChatStreamPayload> = {
|
package/src/services/chat.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { PluginRequestPayload, createHeadersWithPluginSettings } from '@lobehub/chat-plugin-sdk';
|
|
2
|
+
import { produce } from 'immer';
|
|
2
3
|
import { merge } from 'lodash-es';
|
|
3
4
|
|
|
4
5
|
import { VISION_MODEL_WHITE_LIST } from '@/const/llm';
|
|
@@ -37,7 +38,7 @@ class ChatService {
|
|
|
37
38
|
);
|
|
38
39
|
// ============ 1. preprocess messages ============ //
|
|
39
40
|
|
|
40
|
-
const oaiMessages = this.processMessages(messages);
|
|
41
|
+
const oaiMessages = this.processMessages(messages, enabledPlugins);
|
|
41
42
|
|
|
42
43
|
// ============ 2. preprocess tools ============ //
|
|
43
44
|
|
|
@@ -102,7 +103,7 @@ class ChatService {
|
|
|
102
103
|
|
|
103
104
|
fetchPresetTaskResult = fetchAIFactory(this.getChatCompletion);
|
|
104
105
|
|
|
105
|
-
private processMessages = (messages: ChatMessage[]): OpenAIChatMessage[] => {
|
|
106
|
+
private processMessages = (messages: ChatMessage[], tools?: string[]): OpenAIChatMessage[] => {
|
|
106
107
|
// handle content type for vision model
|
|
107
108
|
// for the models with visual ability, add image url to content
|
|
108
109
|
// refs: https://platform.openai.com/docs/guides/vision/quick-start
|
|
@@ -121,7 +122,7 @@ class ChatService {
|
|
|
121
122
|
] as UserMessageContentPart[];
|
|
122
123
|
};
|
|
123
124
|
|
|
124
|
-
|
|
125
|
+
const postMessages = messages.map((m): OpenAIChatMessage => {
|
|
125
126
|
switch (m.role) {
|
|
126
127
|
case 'user': {
|
|
127
128
|
return { content: getContent(m), role: m.role };
|
|
@@ -137,6 +138,27 @@ class ChatService {
|
|
|
137
138
|
}
|
|
138
139
|
}
|
|
139
140
|
});
|
|
141
|
+
|
|
142
|
+
return produce(postMessages, (draft) => {
|
|
143
|
+
if (!tools || tools.length === 0) return;
|
|
144
|
+
|
|
145
|
+
const systemMessage = draft.find((i) => i.role === 'system');
|
|
146
|
+
|
|
147
|
+
const toolsSystemRoles = pluginSelectors.enabledPluginsSystemRoles(tools)(
|
|
148
|
+
useToolStore.getState(),
|
|
149
|
+
);
|
|
150
|
+
|
|
151
|
+
if (!toolsSystemRoles) return;
|
|
152
|
+
|
|
153
|
+
if (systemMessage) {
|
|
154
|
+
systemMessage.content = systemMessage.content + '\n\n' + toolsSystemRoles;
|
|
155
|
+
} else {
|
|
156
|
+
draft.unshift({
|
|
157
|
+
content: toolsSystemRoles,
|
|
158
|
+
role: 'system',
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
});
|
|
140
162
|
};
|
|
141
163
|
}
|
|
142
164
|
|
package/src/services/plugin.ts
CHANGED
|
@@ -30,6 +30,14 @@ const mockState = {
|
|
|
30
30
|
},
|
|
31
31
|
type: 'plugin',
|
|
32
32
|
},
|
|
33
|
+
{
|
|
34
|
+
identifier: 'plugin-3',
|
|
35
|
+
manifest: {
|
|
36
|
+
identifier: 'plugin-3',
|
|
37
|
+
api: [{ name: 'api-3' }],
|
|
38
|
+
},
|
|
39
|
+
type: 'customPlugin',
|
|
40
|
+
},
|
|
33
41
|
],
|
|
34
42
|
pluginStoreList: [
|
|
35
43
|
{
|
|
@@ -57,22 +65,42 @@ describe('pluginSelectors', () => {
|
|
|
57
65
|
});
|
|
58
66
|
|
|
59
67
|
it('enabledSchema should return with standalone plugin', () => {
|
|
60
|
-
const result = pluginSelectors.enabledSchema(['plugin-
|
|
68
|
+
const result = pluginSelectors.enabledSchema(['plugin-4'])({
|
|
61
69
|
...mockState,
|
|
62
70
|
installedPlugins: [
|
|
63
71
|
...mockState.installedPlugins,
|
|
64
72
|
{
|
|
65
|
-
identifier: 'plugin-
|
|
73
|
+
identifier: 'plugin-4',
|
|
66
74
|
manifest: {
|
|
67
|
-
identifier: 'plugin-
|
|
68
|
-
api: [{ name: 'api-
|
|
75
|
+
identifier: 'plugin-4',
|
|
76
|
+
api: [{ name: 'api-4' }],
|
|
69
77
|
type: 'standalone',
|
|
70
78
|
},
|
|
71
79
|
type: 'plugin',
|
|
72
80
|
},
|
|
73
81
|
],
|
|
74
82
|
} as ToolStoreState);
|
|
75
|
-
expect(result).toEqual([{ name: 'plugin-
|
|
83
|
+
expect(result).toEqual([{ name: 'plugin-4____api-4____standalone' }]);
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
it('enabledSchema should return md5 hash apiName', () => {
|
|
87
|
+
const result = pluginSelectors.enabledSchema(['long-long-plugin-with-id'])({
|
|
88
|
+
...mockState,
|
|
89
|
+
installedPlugins: [
|
|
90
|
+
...mockState.installedPlugins,
|
|
91
|
+
{
|
|
92
|
+
identifier: 'long-long-plugin-with-id',
|
|
93
|
+
manifest: {
|
|
94
|
+
identifier: 'long-long-plugin-with-id',
|
|
95
|
+
api: [{ name: 'long-long-manifest-long-long-apiName' }],
|
|
96
|
+
},
|
|
97
|
+
type: 'plugin',
|
|
98
|
+
},
|
|
99
|
+
],
|
|
100
|
+
} as ToolStoreState);
|
|
101
|
+
expect(result).toEqual([
|
|
102
|
+
{ name: 'long-long-plugin-with-id____MD5HASH_396eae4c671da3fb642c49ad2b9e8790' },
|
|
103
|
+
]);
|
|
76
104
|
});
|
|
77
105
|
|
|
78
106
|
it('enabledSchema should return empty', () => {
|
|
@@ -204,7 +232,7 @@ describe('pluginSelectors', () => {
|
|
|
204
232
|
describe('storeAndInstallPluginsIdList', () => {
|
|
205
233
|
it('should return a list of unique plugin identifiers from both installed and store lists', () => {
|
|
206
234
|
const result = pluginSelectors.storeAndInstallPluginsIdList(mockState);
|
|
207
|
-
expect(result).toEqual(['plugin-1', 'plugin-2']);
|
|
235
|
+
expect(result).toEqual(['plugin-1', 'plugin-2', 'plugin-3']);
|
|
208
236
|
});
|
|
209
237
|
});
|
|
210
238
|
|
|
@@ -227,4 +255,12 @@ describe('pluginSelectors', () => {
|
|
|
227
255
|
expect(result).toEqual(expectedMetaList);
|
|
228
256
|
});
|
|
229
257
|
});
|
|
258
|
+
|
|
259
|
+
describe('installedCustomPluginMetaList', () => {
|
|
260
|
+
it('should return a list of meta information for installed plugins', () => {
|
|
261
|
+
const result = pluginSelectors.installedCustomPluginMetaList(mockState);
|
|
262
|
+
|
|
263
|
+
expect(result).toEqual([{ identifier: 'plugin-3', type: 'customPlugin' }]);
|
|
264
|
+
});
|
|
265
|
+
});
|
|
230
266
|
});
|
|
@@ -6,6 +6,7 @@ import { PLUGIN_SCHEMA_API_MD5_PREFIX, PLUGIN_SCHEMA_SEPARATOR } from '@/const/p
|
|
|
6
6
|
import { ChatCompletionFunctions } from '@/types/openai/chat';
|
|
7
7
|
import { InstallPluginMeta, LobeToolCustomPlugin } from '@/types/tool/plugin';
|
|
8
8
|
|
|
9
|
+
import { pluginHelpers } from '../../helpers';
|
|
9
10
|
import type { ToolStoreState } from '../../initialState';
|
|
10
11
|
|
|
11
12
|
const installedPlugins = (s: ToolStoreState) => s.installedPlugins;
|
|
@@ -118,7 +119,33 @@ const enabledSchema =
|
|
|
118
119
|
return uniqBy(list, 'name');
|
|
119
120
|
};
|
|
120
121
|
|
|
122
|
+
const enabledPluginsSystemRoles =
|
|
123
|
+
(enabledPlugins: string[] = []) =>
|
|
124
|
+
(s: ToolStoreState) => {
|
|
125
|
+
const toolsSystemRole = enabledPlugins
|
|
126
|
+
.map((id) => {
|
|
127
|
+
const manifest = getPluginManifestById(id)(s);
|
|
128
|
+
if (!manifest) return '';
|
|
129
|
+
const meta = getPluginMetaById(id)(s);
|
|
130
|
+
|
|
131
|
+
const title = pluginHelpers.getPluginTitle(meta);
|
|
132
|
+
const desc = pluginHelpers.getPluginDesc(meta);
|
|
133
|
+
|
|
134
|
+
return [`### ${title}`, manifest.systemRole || desc].join('\n\n');
|
|
135
|
+
})
|
|
136
|
+
.filter(Boolean);
|
|
137
|
+
|
|
138
|
+
if (toolsSystemRole.length > 0) {
|
|
139
|
+
return ['## Tools', 'You can use these tools below:', ...toolsSystemRole]
|
|
140
|
+
.filter(Boolean)
|
|
141
|
+
.join('\n\n');
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
return '';
|
|
145
|
+
};
|
|
146
|
+
|
|
121
147
|
export const pluginSelectors = {
|
|
148
|
+
enabledPluginsSystemRoles,
|
|
122
149
|
enabledSchema,
|
|
123
150
|
getCustomPluginById,
|
|
124
151
|
getInstalledPluginById,
|