Merge remote-tracking branch 'upstream/main'

CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.122.8](https://github.com/lobehub/lobe-chat/compare/v0.122.7...v0.122.8)
+
+<sup>Released on **2024-02-03**</sup>
+
+#### 💄 Styles
+
+- **misc**: Allow user to add agent without redirection.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Allow user to add agent without redirection, closes [#1199](https://github.com/lobehub/lobe-chat/issues/1199) ([6577ca1](https://github.com/lobehub/lobe-chat/commit/6577ca1))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.122.7](https://github.com/lobehub/lobe-chat/compare/v0.122.6...v0.122.7)
+
+<sup>Released on **2024-02-02**</sup>
+
+#### 💄 Styles
+
+- **misc**: Update the gpt-4-1106-preview model to gpt-4-0125-preview.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Update the gpt-4-1106-preview model to gpt-4-0125-preview, closes [#1210](https://github.com/lobehub/lobe-chat/issues/1210) ([fe623e1](https://github.com/lobehub/lobe-chat/commit/fe623e1))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.122.6](https://github.com/lobehub/lobe-chat/compare/v0.122.5...v0.122.6)
 
 <sup>Released on **2024-01-31**</sup>

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 -->
 

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 -->
 

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:

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
 ```
 
 然后，你可以使用以下脚本来自动更新：

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
 

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
 

locales/ar/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "إضافة وكيل",
+  "addAgentAndConverse": "إضافة وكيل وبدء المحادثة",
+  "addAgentSuccess": "تمت الإضافة بنجاح",
   "guide": {
     "func1": {
       "desc1": "في نافذة الدردشة، انتقل إلى صفحة إعدادات الوكيل التي ترغب في تقديمها من الزاوية اليمنى العلوية.",

locales/de-DE/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Helfer hinzufügen",
+  "addAgentAndConverse": "Assistent hinzufügen und Konversation starten",
+  "addAgentSuccess": "Erfolgreich hinzugefügt",
   "guide": {
     "func1": {
       "desc1": "Gehen Sie im Chatfenster über das Einstellungssymbol oben rechts zur Seite, auf der Sie die Einstellungen für Ihren Helfer einreichen können.",

locales/en-US/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Add Agent",
+  "addAgentAndConverse": "Add Agent and Converse",
+  "addAgentSuccess": "Successfully Added",
   "guide": {
     "func1": {
       "desc1": "Enter the settings page you want to submit to the assistant by clicking on the settings icon in the upper right corner of the chat window.",

locales/es-ES/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Añadir asistente",
+  "addAgentAndConverse": "Agregar agente y conversar",
+  "addAgentSuccess": "Agente agregado con éxito",
   "guide": {
     "func1": {
       "desc1": "En la ventana de chat, accede a la página de configuración del asistente a través del icono de ajustes en la esquina superior derecha.",

locales/fr-FR/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Ajouter un assistant",
+  "addAgentAndConverse": "Ajouter un agent et converser",
+  "addAgentSuccess": "Ajout réussi",
   "guide": {
     "func1": {
       "desc1": "Accédez à la page de configuration de l'assistant que vous souhaitez soumettre en cliquant sur l'icône Paramètres en haut à droite de la fenêtre de conversation.",

locales/it-IT/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Aggiungi assistente",
+  "addAgentAndConverse": "Aggiungi assistente e avvia la conversazione",
+  "addAgentSuccess": "Aggiunta riuscita",
   "guide": {
     "func1": {
       "desc1": "Nella finestra di chat, accedi alle impostazioni nell'angolo in alto a destra per accedere alla pagina di configurazione dell'assistente che desideri inviare;",

locales/ja-JP/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "エージェントを追加する",
+  "addAgentAndConverse": "エージェントを追加して会話する",
+  "addAgentSuccess": "追加に成功しました",
   "guide": {
     "func1": {
       "desc1": "セッションウィンドウで右上隅の設定にアクセスして、アシスタントの設定ページに移動します。",

locales/ko-KR/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "보조 프로그램 추가",
+  "addAgentAndConverse": "에이전트 추가 및 대화",
+  "addAgentSuccess": "추가 성공",
   "guide": {
     "func1": {
       "desc1": "세션 창에서 오른쪽 상단 설정으로 이동하여 도우미를 제출할 설정 페이지로 이동합니다.",

locales/nl-NL/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Voeg een assistent toe",
+  "addAgentAndConverse": "Voeg een assistent toe en start een gesprek",
+  "addAgentSuccess": "Succesvol toegevoegd",
   "guide": {
     "func1": {
       "desc1": "Ga naar de instellingen in de rechterbovenhoek van het chatvenster om naar de pagina te gaan waar je de assistent kunt toevoegen.",

locales/pl-PL/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Dodaj asystenta",
+  "addAgentAndConverse": "Dodaj asystenta i rozpocznij rozmowę",
+  "addAgentSuccess": "Dodano pomyślnie",
   "guide": {
     "func1": {
       "desc1": "Przejdź do strony ustawień, klikając prawy górny róg okna rozmowy, aby przejść do strony ustawień asystenta, którego chcesz złożyć.",

locales/pt-BR/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Adicionar assistente",
+  "addAgentAndConverse": "Adicionar assistente e conversar",
+  "addAgentSuccess": "Adição bem-sucedida",
   "guide": {
     "func1": {
       "desc1": "Na janela de conversa, acesse a página de configurações que você deseja enviar para o assistente através do ícone no canto superior direito;",

locales/ru-RU/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Добавить агента",
+  "addAgentAndConverse": "Добавить агента и начать разговор",
+  "addAgentSuccess": "Агент успешно добавлен",
   "guide": {
     "func1": {
       "desc1": "Перейдите на страницу настроек, нажав на значок в правом верхнем углу окна сеанса.",

locales/tr-TR/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Asistan Ekle",
+  "addAgentAndConverse": "Asistan Ekle ve Konuşma Başlat",
+  "addAgentSuccess": "Ekleme Başarılı",
   "guide": {
     "func1": {
       "desc1": "Sohbet penceresinin sağ üst köşesindeki ayarlar simgesine tıklayarak asistana göndermek istediğiniz ayarlar sayfasına girin.",

locales/vi-VN/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "Thêm trợ lý",
+  "addAgentAndConverse": "Thêm trợ lý và trò chuyện",
+  "addAgentSuccess": "Thêm thành công",
   "guide": {
     "func1": {
       "desc1": "Trong cửa sổ trò chuyện, nhấp vào cài đặt ở góc trên bên phải để vào trang cài đặt trợ lý bạn muốn gửi;",

locales/zh-CN/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "添加助手",
+  "addAgentAndConverse": "添加助手并会话",
+  "addAgentSuccess": "添加成功",
   "guide": {
     "func1": {
       "desc1": "在会话窗口中通过右上角设置进入你想提交助手的设置页面;",

locales/zh-TW/market.json

@@ -1,5 +1,7 @@
 {
   "addAgent": "新增助理",
+  "addAgentAndConverse": "新增助理並開始對話",
+  "addAgentSuccess": "新增成功",
   "guide": {
     "func1": {
       "desc1": "在會話視窗中通過右上角設置進入你想提交助手的設置頁面;",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.122.6",
+  "version": "0.122.8",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

src/app/market/features/AgentDetailContent/AgentInfo/Header.tsx

@@ -1,5 +1,5 @@
 import { Avatar, Tag } from '@lobehub/ui';
-import { Button, Typography } from 'antd';
+import { App, Button, Typography } from 'antd';
 import { startCase } from 'lodash-es';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -20,6 +20,7 @@ const Header = memo(() => {
   const createSession = useSessionStore((s) => s.createSession);
   const switchSideBar = useGlobalStore((s) => s.switchSideBar);
   const agentItem = useMarketStore(agentMarketSelectors.currentAgentItem);
+  const { message } = App.useApp();
 
   const { meta, createAt, author, homepage, config } = agentItem;
   const { avatar, title, description, tags, backgroundColor } = meta;
@@ -58,6 +59,17 @@ const Header = memo(() => {
           switchSideBar(SidebarTabKey.Chat);
         }}
         type={'primary'}
+      >
+        {t('addAgentAndConverse')}
+      </Button>
+      <Button
+        block
+        onClick={() => {
+          if (!agentItem) return;
+
+          createSession({ config, meta }, false);
+          message.success(t('addAgentSuccess'));
+        }}
       >
         {t('addAgent')}
       </Button>

src/app/market/features/AgentDetailContent/AgentInfo/Loading.tsx

@@ -31,6 +31,7 @@ const Loading = memo(() => {
           }}
         />
         <Skeleton.Button active block />
+        <Skeleton.Button active block />
         <Skeleton
           active
           className={styles.loading}

src/database/core/migrations/migrateSettingsToUser/fixtures/input.json

@@ -35,7 +35,8 @@
         "gpt-3.5-turbo-1106",
         "gpt-3.5-turbo-16k",
         "gpt-4",
-        "gpt-4-1106-preview",
+        "gpt-4-32k",
+        "gpt-4-0125-preview",
         "gpt-4-vision-preview"
       ],
       "customModelName": "+glm-4,+glm-4v",

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",

src/locales/default/market.ts

@@ -1,5 +1,7 @@
 export default {
   addAgent: '添加助手',
+  addAgentAndConverse: '添加助手并会话',
+  addAgentSuccess: '添加成功',
   guide: {
     func1: {
       desc1: '在会话窗口中通过右上角设置进入你想提交助手的设置页面;',