Merge remote-tracking branch 'upstream/main'

bentwnghk · Feb 2, 2024 · fb95774 · fb95774
2 parents 39dd3f9 + 2b720c2
commit fb95774
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -186,14 +186,14 @@ e-commerce platform data access, and various third-party services.
 
 <!-- PLUGIN LIST -->
 
-| Recent Submits                                                                                                       | Description                                                                                                                                                                                                                     |
-| -------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [TokenInsights](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **feednews** on **2024-01-27**</sup>    | Get realtime crypto price, BTC, ETH, BNB, and the latest insights.The latest coin news and airdrop opportunities.<br/>`crypto` `btc` `eth` `bnb`                                                                                |
-| [Bilibili](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **2024-01-27**</sup>          | Dive into Bilibili's vast content with features like keyword video search, replay access, interactive danmaku, trending video recommendations, and hot-search insights, all at your fingertips.<br/>`video` `bilibili` `search` |
-| [Steam](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **2024-01-27**</sup>             | Obtain game information and user reviews from Steam.<br/>`steam` `game`                                                                                                                                                         |
-| [Current Time Assistant](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **cc** on **2024-01-26**</sup> | A plugin to provide current time information<br/>`time`                                                                                                                                                                         |
-
-> 📊 Total plugins: [<kbd>**60**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
+| Recent Submits                                                                                                    | Description                                                                                                                                                                                                                     |
+| ----------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [Social Search](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **say-apps** on **2024-02-02**</sup> | The Social Search provides access to tweets, users, followers, images, media and more.<br/>`social` `twitter` `x` `search`                                                                                                      |
+| [TokenInsights](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **feednews** on **2024-01-27**</sup> | Get realtime crypto price, BTC, ETH, BNB, and the latest insights.The latest coin news and airdrop opportunities.<br/>`crypto` `btc` `eth` `bnb`                                                                                |
+| [Bilibili](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **2024-01-27**</sup>       | Dive into Bilibili's vast content with features like keyword video search, replay access, interactive danmaku, trending video recommendations, and hot-search insights, all at your fingertips.<br/>`video` `bilibili` `search` |
+| [Steam](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **2024-01-27**</sup>          | Obtain game information and user reviews from Steam.<br/>`steam` `game`                                                                                                                                                         |
+
+> 📊 Total plugins: [<kbd>**61**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
 
  <!-- PLUGIN LIST -->
 

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -172,12 +172,12 @@ LobeChat 的插件生态系统是其核心功能的重要扩展，它极大地
 
 | 最近新增                                                                                                          | 插件描述                                                                                                                                      |
 | ----------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
+| [社交搜索](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **say-apps** on **2024-02-02**</sup>      | 社交搜索提供访问推文、用户、关注者、图片、媒体等功能。<br/>`社交` `推特` `x` `搜索`                                                           |
 | [TokenInsights](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **feednews** on **2024-01-27**</sup> | 获取实时加密货币价格，BTC，ETH，BNB 和最新见解。最新的币新闻和空投机会。<br/>`加密货币` `btc` `eth` `bnb`                                     |
 | [哔哩哔哩](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **2024-01-27**</sup>       | 通过关键词视频搜索、回放访问、互动弹幕、热门视频推荐和热搜洞察等功能，深入体验哔哩哔哩丰富的内容，尽在您的指尖。<br/>`视频` `哔哩哔哩` `搜索` |
 | [Steam](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **LobeHub** on **2024-01-27**</sup>          | 从 Steam 获取游戏信息和用户评论。<br/>`steam` `game`                                                                                          |
-| [当前时间助手](https://chat-preview.lobehub.com/settings/agent)<br/><sup>By **cc** on **2024-01-26**</sup>        | 提供当前时间信息的插件<br/>`时间`                                                                                                             |
 
-> 📊 Total plugins: [<kbd>**60**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
+> 📊 Total plugins: [<kbd>**61**</kbd>](https://github.com/lobehub/lobe-chat-plugins)
 
  <!-- PLUGIN LIST -->
 

diff --git a/docs/Deployment/Docker-Deployment.md b/docs/Deployment/Docker-Deployment.md
@@ -81,7 +81,7 @@ First, create a `lobe.env` configuration file with various environment variables
 OPENAI_API_KEY=sk-xxxx
 OPENAI_PROXY_URL=https://api-proxy.com/v1
 ACCESS_CODE=arthals2333
-CUSTOM_MODELS=-gpt-4,-gpt-4-32k,-gpt-3.5-turbo-16k,gpt-3.5-turbo-1106=gpt-3.5-turbo-16k,gpt-4-1106-preview=gpt-4-turbo,gpt-4-vision-preview=gpt-4-vision
+CUSTOM_MODELS=-gpt-4,-gpt-4-32k,-gpt-3.5-turbo-16k,gpt-3.5-turbo-1106=gpt-3.5-turbo-16k,gpt-4-0125-preview=gpt-4-turbo,gpt-4-vision-preview=gpt-4-vision
 ```
 
 Then, you can use the following script to automatically update:

diff --git a/docs/Deployment/Docker-Deployment.zh-CN.md b/docs/Deployment/Docker-Deployment.zh-CN.md
@@ -81,7 +81,7 @@ $ docker run -d -p 3210:3210 \
 OPENAI_API_KEY=sk-xxxx
 OPENAI_PROXY_URL=https://api-proxy.com/v1
 ACCESS_CODE=arthals2333
-CUSTOM_MODELS=-gpt-4,-gpt-4-32k,-gpt-3.5-turbo-16k,gpt-3.5-turbo-1106=gpt-3.5-turbo-16k,gpt-4-1106-preview=gpt-4-turbo,gpt-4-vision-preview=gpt-4-vision
+CUSTOM_MODELS=-gpt-4,-gpt-4-32k,-gpt-3.5-turbo-16k,gpt-3.5-turbo-1106=gpt-3.5-turbo-16k,gpt-4-0125-preview=gpt-4-turbo,gpt-4-vision-preview=gpt-4-vision
 ```
 
 然后，你可以使用以下脚本来自动更新：

diff --git a/docs/Deployment/Environment-Variable.md b/docs/Deployment/Environment-Variable.md
@@ -37,9 +37,9 @@ LobeChat provides additional configuration options during deployment, which can
 - Type: Optional
 - Description: Used to control the model list. Use `+` to add a model, `-` to hide a model, and `model_name=display_name` to customize the display name of a model, separated by commas.
 - Default: `-`
-- Example: `+qwen-7b-chat,+glm-6b,-gpt-3.5-turbo,gpt-4-1106-preview=gpt-4-turbo`
+- Example: `+qwen-7b-chat,+glm-6b,-gpt-3.5-turbo,gpt-4-0125-preview=gpt-4-turbo`
 
-The above example adds `qwen-7b-chat` and `glm-6b` to the model list, removes `gpt-3.5-turbo` from the list, and displays the model name `gpt-4-1106-preview` as `gpt-4-turbo`. If you want to disable all models first and then enable specific models, you can use `-all,+gpt-3.5-turbo`, which means only `gpt-3.5-turbo` will be enabled.
+The above example adds `qwen-7b-chat` and `glm-6b` to the model list, removes `gpt-3.5-turbo` from the list, and displays the model name `gpt-4-0125-preview` as `gpt-4-turbo`. If you want to disable all models first and then enable specific models, you can use `-all,+gpt-3.5-turbo`, which means only `gpt-3.5-turbo` will be enabled.
 
 ## OpenAI
 

diff --git a/docs/Deployment/Environment-Variable.zh-CN.md b/docs/Deployment/Environment-Variable.zh-CN.md
@@ -37,9 +37,9 @@ LobeChat 在部署时提供了一些额外的配置项，使用环境变量进
 - 类型：可选
 - 描述：用来控制模型列表，使用 `+` 增加一个模型，使用 `-` 来隐藏一个模型，使用 `模型名=展示名` 来自定义模型的展示名，用英文逗号隔开。
 - 默认值：`-`
-- 示例：`+qwen-7b-chat,+glm-6b,-gpt-3.5-turbo,gpt-4-1106-preview=gpt-4-turbo`
+- 示例：`+qwen-7b-chat,+glm-6b,-gpt-3.5-turbo,gpt-4-0125-preview=gpt-4-turbo`
 
-上面示例表示增加 `qwen-7b-chat` 和 `glm-6b` 到模型列表，而从列表中删除 `gpt-3.5-turbo`，并将 `gpt-4-1106-preview` 模型名字展示为 `gpt-4-turbo`。如果你想先禁用所有模型，再启用指定模型，可以使用 `-all,+gpt-3.5-turbo`，则表示仅启用 `gpt-3.5-turbo`。
+上面示例表示增加 `qwen-7b-chat` 和 `glm-6b` 到模型列表，而从列表中删除 `gpt-3.5-turbo`，并将 `gpt-4-0125-preview` 模型名字展示为 `gpt-4-turbo`。如果你想先禁用所有模型，再启用指定模型，可以使用 `-all,+gpt-3.5-turbo`，则表示仅启用 `gpt-3.5-turbo`。
 
 ## OpenAI
 

diff --git a/src/database/core/migrations/migrateSettingsToUser/fixtures/input.json b/src/database/core/migrations/migrateSettingsToUser/fixtures/input.json
@@ -36,7 +36,7 @@
         "gpt-3.5-turbo-16k",
         "gpt-4",
         "gpt-4-32k",
-        "gpt-4-1106-preview",
+        "gpt-4-0125-preview",
         "gpt-4-vision-preview"
       ],
       "customModelName": "+glm-4,+glm-4v",

diff --git a/src/database/core/migrations/migrateSettingsToUser/fixtures/output.json b/src/database/core/migrations/migrateSettingsToUser/fixtures/output.json
@@ -39,7 +39,7 @@
           "gpt-3.5-turbo-16k",
           "gpt-4",
           "gpt-4-32k",
-          "gpt-4-1106-preview",
+          "gpt-4-0125-preview",
           "gpt-4-vision-preview"
         ],
         "customModelName": "+glm-4,+glm-4v",

diff --git a/src/store/global/slices/settings/selectors/__snapshots__/modelProvider.test.ts.snap b/src/store/global/slices/settings/selectors/__snapshots__/modelProvider.test.ts.snap
@@ -12,7 +12,7 @@ exports[`modelProviderSelectors > CUSTOM_MODELS > custom deletion, addition, and
   },
   {
     "displayName": "gpt-4-32k",
-    "name": "gpt-4-1106-preview",
+    "name": "gpt-4-0125-preview",
   },
 ]
 `;
@@ -45,7 +45,7 @@ exports[`modelProviderSelectors > CUSTOM_MODELS > duplicate naming model 1`] = `
   },
   {
     "displayName": "gpt-4-32k",
-    "name": "gpt-4-1106-preview",
+    "name": "gpt-4-0125-preview",
   },
 ]
 `;
@@ -73,8 +73,8 @@ exports[`modelProviderSelectors > CUSTOM_MODELS > only add the model 1`] = `
     "name": "gpt-4-32k",
   },
   {
-    "displayName": "gpt-4-1106-preview",
-    "name": "gpt-4-1106-preview",
+    "displayName": "gpt-4-0125-preview",
+    "name": "gpt-4-0125-preview",
   },
   {
     "displayName": "gpt-4-vision-preview",

diff --git a/src/store/global/slices/settings/selectors/modelProvider.test.ts b/src/store/global/slices/settings/selectors/modelProvider.test.ts
@@ -7,7 +7,7 @@ describe('modelProviderSelectors', () => {
       const s = {
         serverConfig: {
           customModelName:
-            '-all,+llama,+claude-2，-gpt-3.5-turbo,gpt-4-1106-preview=gpt-4-turbo,gpt-4-1106-preview=gpt-4-32k',
+            '-all,+llama,+claude-2，-gpt-3.5-turbo,gpt-4-0125-preview=gpt-4-turbo,gpt-4-0125-preview=gpt-4-32k',
         },
         settings: {
           languageModel: {
@@ -27,7 +27,7 @@ describe('modelProviderSelectors', () => {
         settings: {
           languageModel: {
             openAI: {
-              customModelName: 'gpt-4-1106-preview=gpt-4-turbo，gpt-4-1106-preview=gpt-4-32k',
+              customModelName: 'gpt-4-0125-preview=gpt-4-turbo，gpt-4-0125-preview=gpt-4-32k',
             },
           },
         },
@@ -70,8 +70,8 @@ describe('modelProviderSelectors', () => {
           name: 'gpt-4-32k',
         },
         {
-          displayName: 'gpt-4-1106-preview',
-          name: 'gpt-4-1106-preview',
+          displayName: 'gpt-4-0125-preview',
+          name: 'gpt-4-0125-preview',
         },
         {
           displayName: 'gpt-4-vision-preview',

diff --git a/src/types/llm.ts b/src/types/llm.ts
@@ -13,7 +13,7 @@ export enum LanguageModel {
    */
   GPT4 = 'gpt-4',
   GPT4_32K = 'gpt-4-32k',
-  GPT4_PREVIEW = 'gpt-4-1106-preview',
+  GPT4_PREVIEW = 'gpt-4-0125-preview',
   GPT4_VISION_PREVIEW = 'gpt-4-vision-preview',
 }