docs images

Signed-off-by: Carson Yang <yangchuansheng33@gmail.com>

.github/imgs/logo.svg

@@ -0,0 +1,14 @@
+<svg width="32" height="32" viewBox="0 0 1041 1348" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M340.837 0.33933L681.068 0.338989V0.455643C684.032 0.378397 686.999 0.339702 689.967 0.339702C735.961 0.3397 781.504 9.62899 823.997 27.6772C866.49 45.7254 905.099 72.1791 937.622 105.528C970.144 138.877 995.942 178.467 1013.54 222.04C1031.14 265.612 1040.2 312.312 1040.2 359.474L340.836 359.474L340.836 1347.84C296.157 1347.84 251.914 1338.55 210.636 1320.49C169.357 1302.43 131.85 1275.95 100.257 1242.58C68.6636 1209.21 43.6023 1169.59 26.5041 1125.99C11.3834 1087.43 2.75216 1046.42 0.957956 1004.81H0.605869L0.605897 368.098H0.70363C0.105752 341.831 2.23741 315.443 7.14306 289.411C20.2709 219.745 52.6748 155.754 100.257 105.528C147.839 55.3017 208.462 21.0975 274.461 7.24017C296.426 2.62833 318.657 0.339101 340.837 0.33933Z" fill="url(#paint0_linear_1172_228)"/>
+<path d="M633.639 904.645H513.029V576.37H635.422V576.377C678.161 576.607 720.454 585.093 759.951 601.37C799.997 617.874 836.384 642.064 867.033 672.559C897.683 703.054 921.996 739.257 938.583 779.101C955.171 818.944 963.709 861.648 963.709 904.775H633.639V904.645Z" fill="url(#paint1_linear_1172_228)"/>
+<defs>
+<linearGradient id="paint0_linear_1172_228" x1="520.404" y1="0.338989" x2="520.404" y2="1347.84" gradientUnits="userSpaceOnUse">
+<stop stop-color="#326DFF"/>
+<stop offset="1" stop-color="#8EAEFF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1172_228" x1="738.369" y1="576.37" x2="738.369" y2="904.775" gradientUnits="userSpaceOnUse">
+<stop stop-color="#326DFF"/>
+<stop offset="1" stop-color="#8EAEFF"/>
+</linearGradient>
+</defs>
+</svg>

.github/workflows/deploy-docs.yml

@@ -0,0 +1,71 @@
+name: deploy-docs
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'docSite/**'
+    branches:
+      - 'main'
+    tags:
+      - 'v*.*.*'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains jobs "deploy-production"
+  deploy-production:
+    # The environment this job references
+    environment:
+      name: Production
+      url: ${{ steps.vercel-action.outputs.preview-url }}
+
+    # The type of runner that the job will run on
+    runs-on: ubuntu-22.04
+
+    # Job outputs
+    outputs:
+      docs: ${{ steps.filter.outputs.docs }}
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Step 1 - Checks-out your repository under $GITHUB_WORKSPACE
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive # Fetch submodules
+          fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
+
+      # Step 2 Detect changes to Docs Content
+      - name: Detect changes in doc content
+        uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            docs:
+              - 'docSite/content/docs/**'
+          base: main
+
+      # Step 3 - Install Hugo (specific version)
+      - name: Install Hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: '0.117.0'
+          extended: true
+
+      # Step 4 - Builds the site using Hugo
+      - name: Build
+        run: cd docSite && hugo mod get -u github.com/colinwilson/lotusdocs && hugo -v --minify
+        env:
+          HUGO_BASEURL: ${{ vars.BASE_URL }}
+
+      # Step 5 - Push our generated site to Vercel
+      - name: Deploy to Vercel
+        uses: amondnet/vercel-action@v25
+        id: vercel-action
+        with:
+          vercel-token: ${{ secrets.VERCEL_TOKEN }} # Required
+          vercel-org-id: ${{ secrets.VERCEL_ORG_ID }} #Required
+          vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }} #Required
+          github-comment: false
+          vercel-args: '--prod --local-config ../vercel.json' # Optional
+          working-directory: docSite/public

.github/workflows/fastgpt-image.yml

@@ -77,3 +77,28 @@ jobs:
         run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}}
       - name: Push image to Docker Hub
         run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}}
+  push-to-ali-hub:
+    needs: build-fastgpt-images
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Login to Ali Hub
+        uses: docker/login-action@v2
+        with:
+          registry: registry.cn-hangzhou.aliyuncs.com
+          username: ${{ secrets.ALI_HUB_USERNAME }}
+          password: ${{ secrets.ALI_HUB_PASSWORD }}
+      - name: Set DOCKER_REPO_TAGGED based on branch or tag
+        run: |
+          if [[ "${{ github.ref_name }}" == "main" ]]; then
+            echo "IMAGE_TAG=latest" >> $GITHUB_ENV
+          else
+            echo "IMAGE_TAG=${{ github.ref_name }}" >> $GITHUB_ENV
+          fi
+      - name: Pull image from GitHub Container Registry
+        run: docker pull ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}}
+      - name: Tag image with Docker Hub repository name and version tag
+        run: docker tag ghcr.io/${{ github.repository_owner }}/fastgpt:${{env.IMAGE_TAG}} ${{ secrets.ALI_IMAGE_NAME }}:${{env.IMAGE_TAG}}
+      - name: Push image to Docker Hub
+        run: docker push ${{ secrets.ALI_IMAGE_NAME }}:${{env.IMAGE_TAG}}

.gitignore

@@ -29,4 +29,8 @@ next-env.d.ts
 platform.json
 testApi/
 local/
-dist/
+dist/
+
+# hugo
+**/.hugo_build.lock
+docSite/public/

LICENSE

@@ -1,201 +1,35 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+# FastGPT Open Source License
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+The FastGPT is licensed under the Apache License 2.0, with the following additional conditions:
 
-   1. Definitions.
+1. FastGPT is permitted to be used for commercialization. You can use FastGPT as a "backend-as-a-service" for your other applications, or delivering it to enterprises as an application development platform. However, when the following conditions are met, you must contact the producer to obtain a commercial license:
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+a. Multi-tenant SaaS service: Unless explicitly authorized by FastGPT in writing, you may not use the FastGPT.AI source code to operate a multi-tenant SaaS service that is similar to the FastGPT.
+b. LOGO and copyright information: In the process of using FastGPT, you may not remove or moFastGPT the LOGO or copyright information in the FastGPT console.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+Please contact yujinlong@sealos.io by email to inquire about licensing matters.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+2. As a contributor, you should agree that your contributed code:
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+a. The producer can adjust the open-source agreement to be more strict or relaxed.
+b. Can be used for commercial purposes, such as FastGPT's cloud business.
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+Apart from this, all other rights and restrictions follow the Apache License 2.0. If you need more detailed information, you can refer to the full version of Apache License 2.0.
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+The interactive design of this product is protected by appearance patent.
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+© 2023 Sealos.
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+---
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -1,39 +1,93 @@
+<div align="center">
+
+<a href="https://fastgpt.run/"><img src="/.github/imgs/logo.svg" width="120" height="120" alt="fastgpt logo"></a>
+
 # FastGPT
 
 FastGPT 是一个基于 LLM 大语言模型的知识库问答系统，提供开箱即用的数据处理、模型调用等能力。同时可以通过 Flow 可视化进行工作流编排，从而实现复杂的问答场景！
 
+</div>
+
+<p align="center">
+  <a href="https://fastgpt.run/">线上体验</a>
+  ·
+  <a href="https://doc.fastgpt.run/docs/intro">相关文档</a>
+  ·
+  <a href="https://doc.fastgpt.run/docs/development">本地开发</a>
+  ·
+  <a href="https://github.com/labring/FastGPT#-%E7%9B%B8%E5%85%B3%E9%A1%B9%E7%9B%AE">相关项目</a>
+</p>
+
 ## 🛸 在线体验
 
-🎉 [fastgpt.run](https://fastgpt.run/)（服务器在新加坡，部分地区可能无法直连）
+[fastgpt.run](https://fastgpt.run/)（服务器在新加坡，部分地区可能无法直连）
 
 |                                    |                                    |
 | ---------------------------------- | ---------------------------------- |
 | ![Demo](./.github/imgs/intro1.png) | ![Demo](./.github/imgs/intro2.png) |
 | ![Demo](./.github/imgs/intro3.png) | ![Demo](./.github/imgs/intro4.png) |
 
+## 💡 功能
+
+1. 强大的可视化编排，轻松构建 AI 应用
+   - [x] 提供简易模式，无需操作编排
+   - [x] 用户对话前引导
+   - [x] 全局变量
+   - [x] 知识库搜索
+   - [x] 多 LLM 模型对话
+   - [x] 文本内容提取成结构化数据
+   - [x] HTTP 扩展
+   - [ ] 沙盒 JS 运行模块
+   - [ ] 连续对话引导
+   - [ ] 对话多路线选择
+   - [ ] 源文件引用追踪
+2. 丰富的知识库预处理
+   - [x] 多库复用，混用
+   - [x] chunk 记录修改和删除
+   - [x] 支持直接分段导入
+   - [x] 支持 QA 拆分导入
+   - [x] 支持手动输入内容
+   - [x] 支持 url 读取导入
+   - [x] 支持 CSV 批量导入问答对
+   - [ ] 支持知识库单独设置向量模型
+   - [ ] 源文件存储
+3. 多种效果测试渠道
+   - [x] 知识库单点搜索测试
+   - [x] 对话时反馈引用并可修改与删除
+   - [x] 完整上下文呈现
+   - [ ] 完整模块中间值呈现
+4. OpenAPI
+   - [x] completions 接口（对齐 GPT 接口）
+   - [ ] 知识库 CRUD
+5. 运营功能
+   - [x] 免登录分享窗口
+   - [x] Iframe 一键嵌入
+   - [ ] 统一查阅对话记录
+
 ## 👨‍💻 开发
 
 项目技术栈: NextJs + TS + ChakraUI + Mongo + Postgres（Vector 插件）
 
-- [快开始本地开发](https://doc.fastgpt.run/docs/develop/dev)
-- [部署 FastGPT](https://doc.fastgpt.run/docs/category/deploy)
+- **⚡ 快速部署**
 
-## :point_right: RoadMap
+  > Sealos 的服务器在国外，不需要额外处理网络问题，无需服务器、无需魔法、无需域名，支持高并发 & 动态伸缩。点击以下按钮即可一键部署 👇
 
-- [FastGpt RoadMap](https://kjqvjse66l.feishu.cn/docx/RVUxdqE2WolDYyxEKATcM0XXnte)
+  [![](https://cdn.jsdelivr.us/gh/labring-actions/templates@main/Deploy-on-Sealos.svg)](https://cloud.sealos.io/?openapp=system-fastdeploy%3FtemplateName%3Dfastgpt)
+
+  由于需要部署数据库，部署完后需要等待 2~4 分钟才能正常访问。默认用了最低配置，首次访问时会有些慢。
+
+* [快开始本地开发](https://doc.fastgpt.run/docs/development)
+* [部署 FastGPT](https://doc.fastgpt.run/docs/installation)
+* [系统配置文件说明](https://doc.fastgpt.run/docs/installation/reference)
+* [多模型配置](https://doc.fastgpt.run/docs/installation/reference/models)
+* [版本升级](https://doc.fastgpt.run/docs/installation/upgrading)
+* [API 文档](https://kjqvjse66l.feishu.cn/docx/DmLedTWtUoNGX8xui9ocdUEjnNh?pre_pathname=%2Fdrive%2Fhome%2F)
 
 ## 🏘️ 社区交流群
 
-| 交流群                                            | 小助手                                         |
-| ------------------------------------------------- | ---------------------------------------------- |
-| ![](https://otnvvf-imgs.oss.laf.run/wxqun300.jpg) | ![](https://otnvvf-imgs.oss.laf.run/wx300.jpg) |
-
-## Powered by
-
-- [TuShan: 5 分钟搭建后台管理系统](https://github.com/msgbyte/tushan)
-- [Laf: 3 分钟快速接入三方应用](https://github.com/labring/laf)
-- [Sealos: 快速部署集群应用](https://github.com/labring/sealos)
-- [One API: 令牌管理 & 二次分发，支持 Azure](https://github.com/songquanpeng/one-api)
+| 交流群                                                | 小助手                                         |
+| ----------------------------------------------------- | ---------------------------------------------- |
+| ![](https://otnvvf-imgs.oss.laf.run/wxqun300-222.jpg) | ![](https://otnvvf-imgs.oss.laf.run/wx300.jpg) |
 
 ## 👀 其他
 
@@ -42,10 +96,26 @@ FastGPT 是一个基于 LLM 大语言模型的知识库问答系统，提供开
 - [公众号接入视频教程](https://www.bilibili.com/video/BV1xh4y1t7fy/)
 - [FastGpt 知识库演示](https://www.bilibili.com/video/BV1Wo4y1p7i1/)
 
-## 第三方生态
+## 💪 相关项目
+
+- [Laf: 3 分钟快速接入三方应用](https://github.com/labring/laf)
+- [Sealos: 快速部署集群应用](https://github.com/labring/sealos)
+- [One API: 多模型管理，支持 Azure、文心一言等](https://github.com/songquanpeng/one-api)
+- [TuShan: 5 分钟搭建后台管理系统](https://github.com/msgbyte/tushan)
+
+## 🤝 第三方生态
 
 - [luolinAI: 企微机器人，开箱即用](https://github.com/luolin-ai/FastGPT-Enterprise-WeChatbot)
 
 ## 🌟 Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=labring/FastGPT&type=Date)](https://star-history.com/#labring/FastGPT&Date)
+
+## 使用协议
+
+本仓库遵循 [FastGPT Open Source License](./LICENSE) 开源协议。
+
+1. 允许作为后台服务直接商用，但不允许直接使用 saas 服务商用。
+2. 需保留相关版权信息。
+3. 完整请查看 [FastGPT Open Source License](./LICENSE)
+4. 联系方式：yujinlong@sealos.io, [点击查看定价策略](https://fael3z0zfze.feishu.cn/docx/F155dbirfo8vDDx2WgWc6extnwf)

README_en.md

@@ -0,0 +1,115 @@
+<div align="center">
+<a href="https://fastgpt.run/"><img src="/.github/imgs/logo.svg" width="120" height="120" alt="fastgpt logo"></a>
+
+# FastGPT
+
+FastGPT is a knowledge-based question answering system based on the LLM language model, providing out-of-the-box capabilities for data processing, model invocation, and more. It also allows for complex question answering scenarios through visual workflow orchestration using Flow!
+
+</div>
+
+<p align="center">
+<a href="https://fastgpt.run/">Online</a>
+·
+<a href="https://doc.fastgpt.run/docs/intro">Document</a>
+·
+<a href="https://doc.fastgpt.run/docs/development">Development</a>
+·
+<a href="https://doc.fastgpt.run/docs/installation">Deploy</a>
+·
+<a href="#powered-by">Power By</a>
+</p>
+
+## 🛸 Online
+
+[fastgpt.run](https://fastgpt.run/)
+| | |
+| ---------------------------------- | ---------------------------------- |
+| ![Demo](./.github/imgs/intro1.png) | ![Demo](./.github/imgs/intro2.png) |
+| ![Demo](./.github/imgs/intro3.png) | ![Demo](./.github/imgs/intro4.png) |
+
+## 💡 Features
+
+1. Powerful visual orchestration for easy AI application building
+
+   - [x] Provides a simple mode without the need for orchestration operations
+   - [x] User dialogue pre-guidance
+   - [x] Global variables
+   - [x] Knowledge base search
+   - [x] Multi-LLM model dialogue
+   - [x] Extraction of text content into structured data
+   - [x] HTTP extension
+   - [ ] Sandbox JS runtime module
+   - [ ] Continuous dialogue guidance
+   - [ ] Dialogue multi-path selection
+   - [ ] Source file reference tracking
+
+2. Rich knowledge base preprocessing
+
+   - [x] Multiple library reuse and mixing
+   - [x] Chunk record modification and deletion
+   - [x] Supports direct segment import
+   - [x] Supports QA split import
+   - [x] Supports manual input content
+   - [ ] Supports URL import reading
+   - [x] Supports batch import of Q&A pairs in CSV format
+   - [ ] Supports separate vector model settings for knowledge bases
+   - [ ] Source file storage
+
+3. Multiple effect testing channels
+
+   - [x] Knowledge base single point search testing
+   - [x] Feedback references and ability to modify and delete during dialogue
+   - [x] Complete context presentation
+   - [ ] Complete module intermediate value presentation
+
+4. OpenAPI
+
+   - [x] completions interface (aligned with GPT interface)
+   - [ ] Knowledge base CRUD
+
+5. Operational functions
+
+   - [x] Login-free sharing window
+   - [x] One-click embedding with Iframe
+   - [ ] Unified access to dialogue records
+
+## 👨‍💻 Development
+
+Project tech stack: NextJs + TS + ChakraUI + Mongo + Postgres (Vector plugin)
+
+- [Getting Started with Local Development](https://doc.fastgpt.run/docs/development)
+- [Deploying FastGPT](https://doc.fastgpt.run/docs/installation)
+- [System Configuration File Explanation](https://doc.fastgpt.run/docs/installation/reference)
+- [Multi-model Configuration](https://doc.fastgpt.run/docs/installation/reference/models)
+- [V3 Upgrade V4 Initialization](https://doc.fastgpt.run/docs/installation/upgrading)
+
+<!-- ## :point_right: RoadMap
+- [FastGpt RoadMap](https://kjqvjse66l.feishu.cn/docx/RVUxdqE2WolDYyxEKATcM0XXnte) -->
+
+<!-- ## 🏘️ Community
+
+| Community Group                                   | Assistant                                      |
+| ------------------------------------------------- | ---------------------------------------------- |
+| ![](https://otnvvf-imgs.oss.laf.run/wxqun300.jpg) | ![](https://otnvvf-imgs.oss.laf.run/wx300.jpg) | -->
+
+## 👀 Others
+
+- [FastGpt FAQ](https://kjqvjse66l.feishu.cn/docx/HtrgdT0pkonP4kxGx8qcu6XDnGh)
+- [Docker Deployment Tutorial Video](https://www.bilibili.com/video/BV1jo4y147fT/)
+- [Official Account Integration Video Tutorial](https://www.bilibili.com/video/BV1xh4y1t7fy/)
+- [FastGpt Knowledge Base Demo](https://www.bilibili.com/video/BV1Wo4y1p7i1/)
+
+## 💪 Related Projects
+
+- [Laf: 3-minute quick access to third-party applications](https://github.com/labring/laf)
+- [Sealos: Rapid deployment of cluster applications](https://github.com/labring/sealos)
+- [One API: Multi-model management, supports Azure, Wenxin Yiyuan, etc.](https://github.com/songquanpeng/one-api)
+- [TuShan: Build a backend management system in 5 minutes](https://github.com/msgbyte/tushan)
+
+## 🤝 Third-party Ecosystem
+
+- [luolinAI: Enterprise WeChat bot, ready to use](https://github.com/luolin-ai/FastGPT-Enterprise-WeChatbot)
+
+## 🌟 Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=labring/FastGPT&type=Date)](https://star-history.com/#labring/FastGPT&Date)

client/.env.template

@@ -12,15 +12,10 @@ ROOT_KEY=fdafasd
 # openai 基本地址，可用作中转。
 OPENAI_BASE_URL=https://api.openai.com/v1
 # oneapi 地址，可以使用 oneapi 来实现多模型接入
-ONEAPI_URL=https://xxxx.cloud.sealos.io/openai/v1
+# ONEAPI_URL=https://xxxx.cloud.sealos.io/openai/v1
 # 通用key。可以是 openai 的也可以是 oneapi 的。
 # 此处逻辑：优先走 ONEAPI_URL，如果填写了 ONEAPI_URL，key 也需要是 ONEAPI 的 key
 CHAT_API_KEY=sk-xxxx
 # db
-MONGODB_URI=mongodb://username:password@0.0.0.0:27017/?authSource=admin
-MONGODB_NAME=fastgpt
-PG_HOST=0.0.0.0
-PG_PORT=8100
-PG_USER=root
-PG_PASSWORD=psw
-PG_DB_NAME=dbname
+MONGODB_URI=mongodb://username:password@0.0.0.0:27017/fastgpt
+PG_URL=postgresql://username:password@host:port/postgres

client/data/config.json

@@ -5,9 +5,10 @@
     "show_appStore": false,
     "show_userDetail": false,
     "show_git": true,
-    "systemTitle": "FastAI",
-    "authorText": "Made by FastAI Team.",
-    "gitLoginKey": ""
+    "systemTitle": "FastGPT",
+    "authorText": "Made by FastGPT Team.",
+    "gitLoginKey": "",
+    "scripts": []
   },
   "SystemParams": {
     "gitLoginSecret": "",
@@ -15,49 +16,48 @@
     "qaMaxProcess": 15,
     "pgIvfflatProbe": 20
   },
-  "plugins": {},
   "ChatModels": [
     {
       "model": "gpt-3.5-turbo",
-      "name": "FastAI-4k",
+      "name": "GPT35-4k",
       "contextMaxToken": 4000,
       "quoteMaxToken": 2000,
       "maxTemperature": 1.2,
-      "price": 1.5,
+      "price": 0,
       "defaultSystem": ""
     },
     {
       "model": "gpt-3.5-turbo-16k",
-      "name": "FastAI-16k",
+      "name": "GPT35-16k",
       "contextMaxToken": 16000,
       "quoteMaxToken": 8000,
       "maxTemperature": 1.2,
-      "price": 3,
+      "price": 0,
       "defaultSystem": ""
     },
     {
       "model": "gpt-4",
-      "name": "FastAI-Plus",
+      "name": "GPT4-8k",
       "contextMaxToken": 8000,
       "quoteMaxToken": 4000,
       "maxTemperature": 1.2,
-      "price": 45,
+      "price": 0,
       "defaultSystem": ""
     }
   ],
-  "QAModels": [
-    {
-      "model": "gpt-3.5-turbo-16k",
-      "name": "FastAI-16k",
-      "maxToken": 16000,
-      "price": 3
-    }
-  ],
   "VectorModels": [
     {
       "model": "text-embedding-ada-002",
       "name": "Embedding-2",
-      "price": 0.2
+      "price": 0,
+      "defaultToken": 500,
+      "maxToken": 3000
     }
-  ]
+  ],
+  "QAModel": {
+    "model": "gpt-3.5-turbo-16k",
+    "name": "GPT35-16k",
+    "maxToken": 16000,
+    "price": 0
+  }
 }

client/package.json

@@ -15,6 +15,7 @@
     "@dqbd/tiktoken": "^1.0.7",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
+    "@mozilla/readability": "^0.4.4",
     "@next/font": "13.1.6",
     "@tanstack/react-query": "^4.24.10",
     "@types/nprogress": "^0.2.0",
@@ -30,6 +31,7 @@
     "i18next": "^22.5.1",
     "immer": "^9.0.19",
     "js-cookie": "^3.0.5",
+    "jsdom": "^22.1.0",
     "jsonwebtoken": "^9.0.0",
     "lodash": "^4.17.21",
     "mammoth": "^1.5.1",
@@ -58,6 +60,8 @@
     "request-ip": "^3.3.0",
     "sass": "^1.58.3",
     "tunnel": "^0.0.6",
+    "winston": "^3.10.0",
+    "winston-mongodb": "^5.1.1",
     "zustand": "^4.3.5"
   },
   "devDependencies": {
@@ -65,6 +69,7 @@
     "@types/cookie": "^0.5.1",
     "@types/formidable": "^2.0.5",
     "@types/js-cookie": "^3.0.3",
+    "@types/jsdom": "^21.1.1",
     "@types/jsonwebtoken": "^9.0.1",
     "@types/lodash": "^4.14.191",
     "@types/node": "18.14.0",

client/public/docs/chatProblem.md

@@ -1,12 +1,11 @@
 ### 常见问题
 
-**一键部署**：V4 版本未正式开源，目前仅提供一键部署方案:
+- [**Git 地址**,点击查看项目地址](https://github.com/labring/FastGPT)
+- [本地部署 FastGPT](https://doc.fastgpt.run/docs/installation)
+- [API 文档](https://kjqvjse66l.feishu.cn/docx/DmLedTWtUoNGX8xui9ocdUEjnNh?pre_pathname=%2Fdrive%2Fhome%2F)
+- **反馈问卷**: 如果你遇到任何使用问题或有期望的功能，可以[填写该问卷](https://www.wjx.cn/vm/rLIw1uD.aspx#)
+- **问题文档**: [先看文档，再提问](https://kjqvjse66l.feishu.cn/docx/HtrgdT0pkonP4kxGx8qcu6XDnGh)
 
-[![](https://raw.githubusercontent.com/labring-actions/templates/main/Deploy-on-Sealos.svg)](https://cloud.sealos.io/?openapp=system-fastdeploy%3FtemplateName%3Dfastgpt)
-
-**Git 地址**: [项目地址。V4-beta 暂未开源，在正式版发布后会开源。](https://github.com/labring/FastGPT)
-**反馈问卷**: 如果你遇到任何使用问题或有期望的功能，可以[填写该问卷](https://www.wjx.cn/vm/rLIw1uD.aspx#)
-**问题文档**: [先看文档，再提问](https://kjqvjse66l.feishu.cn/docx/HtrgdT0pkonP4kxGx8qcu6XDnGh)  
 **价格表**
 | 计费项 | 价格: 元/ 1K tokens（包含上下文）|
 | --- | --- |

client/public/docs/versionIntro.md

@@ -1,8 +1,8 @@
-### Fast GPT V4.0-beta
+### Fast GPT V4.2
 
-1. 全新交互，增加采用模块组合的方式构建知识库，同时保留表单的简易模式。
-2. 问题分类 - 可以对用户的问题进行分类，再执行不同的操作。
-3. 对话引导 - 增加开场引导和变量，提高对话可玩性。
-4. 新增 - 每轮对话均可展示完整的上下文状态。
-5. 新增 - 网页嵌入（简单版），可直接接入现有网页。在 【应用详情-外部使用-创建新链接-嵌入网页】 中获取嵌入脚本。
-6. 新增 - 个人 openai 账号可以使用网页上 OpenAI 对话模型。
+1. 新增 - 应用日志初版，可观测到所有对话记录
+2. 新增 - 好友邀请链接，[点击查看](/account?currentTab=promotion)
+3. 新增 - Iframe 嵌入页面图标可拖拽
+4. 优化 - 知识库搜索提示词
+5. 优化 - [使用文档](https://doc.fastgpt.run/docs/intro/)
+6. [点击查看高级编排介绍文档](https://doc.fastgpt.run/docs/workflow)

client/public/icon/logo.svg

@@ -0,0 +1,14 @@
+<svg width="32" height="32" viewBox="0 0 1041 1348" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M340.837 0.33933L681.068 0.338989V0.455643C684.032 0.378397 686.999 0.339702 689.967 0.339702C735.961 0.3397 781.504 9.62899 823.997 27.6772C866.49 45.7254 905.099 72.1791 937.622 105.528C970.144 138.877 995.942 178.467 1013.54 222.04C1031.14 265.612 1040.2 312.312 1040.2 359.474L340.836 359.474L340.836 1347.84C296.157 1347.84 251.914 1338.55 210.636 1320.49C169.357 1302.43 131.85 1275.95 100.257 1242.58C68.6636 1209.21 43.6023 1169.59 26.5041 1125.99C11.3834 1087.43 2.75216 1046.42 0.957956 1004.81H0.605869L0.605897 368.098H0.70363C0.105752 341.831 2.23741 315.443 7.14306 289.411C20.2709 219.745 52.6748 155.754 100.257 105.528C147.839 55.3017 208.462 21.0975 274.461 7.24017C296.426 2.62833 318.657 0.339101 340.837 0.33933Z" fill="url(#paint0_linear_1172_228)"/>
+<path d="M633.639 904.645H513.029V576.37H635.422V576.377C678.161 576.607 720.454 585.093 759.951 601.37C799.997 617.874 836.384 642.064 867.033 672.559C897.683 703.054 921.996 739.257 938.583 779.101C955.171 818.944 963.709 861.648 963.709 904.775H633.639V904.645Z" fill="url(#paint1_linear_1172_228)"/>
+<defs>
+<linearGradient id="paint0_linear_1172_228" x1="520.404" y1="0.338989" x2="520.404" y2="1347.84" gradientUnits="userSpaceOnUse">
+<stop stop-color="#326DFF"/>
+<stop offset="1" stop-color="#8EAEFF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1172_228" x1="738.369" y1="576.37" x2="738.369" y2="904.775" gradientUnits="userSpaceOnUse">
+<stop stop-color="#326DFF"/>
+<stop offset="1" stop-color="#8EAEFF"/>
+</linearGradient>
+</defs>
+</svg>

client/public/imgs/files/url.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692418843591" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4084" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M511.5 82c-236.6 0-429 192.4-429 429 0 236.5 192.5 429 429 429 236.6 0 429-192.4 429-429 0-236.5-192.4-429-429-429z m377.6 403.8H734.3c-4-139.9-41.4-259.9-97.5-331.9C776.5 203 879 332 889.1 485.8z m-402.8-349v349h-147c5.5-175.5 68.6-322.6 147-349z m0 399.4v349c-78.4-26.4-141.4-173.5-147-349h147z m50.5 349v-349h147c-5.6 175.5-68.6 322.6-147 349z m0-399.4v-349c78.4 26.4 141.4 173.5 147 349h-147zM386.3 153.9c-56.1 72-93.5 192-97.5 331.9H133.9C144.1 332 246.5 203 386.3 153.9zM133.9 536.2h154.8c4 139.9 41.4 259.9 97.5 331.9C246.5 819 144.1 690 133.9 536.2z m502.8 331.9c56.1-72 93.5-192 97.5-331.9H889C879 690 776.5 819 636.7 868.1z" fill="#5F9BEB" p-id="4085"></path></svg>

client/public/js/iframe.js

@@ -20,11 +20,9 @@ async function embedChatbot() {
   const ChatBtn = document.createElement('div');
   ChatBtn.id = chatBtnId;
   ChatBtn.style.cssText =
-    'position: fixed; bottom: 1rem; right: 1rem; width: 40px; height: 40px; cursor: pointer; z-index: 2147483647; ';
+    'position: fixed; bottom: 1rem; right: 1rem; width: 40px; height: 40px; cursor: pointer; z-index: 2147483647; transition: 0;';
 
   const ChatBtnDiv = document.createElement('div');
-  ChatBtnDiv.style.cssText =
-    'transition: all 0.2s ease-in-out 0s; left: unset; transform: scale(1); :hover {transform: scale(1.1);} display: flex; align-items: center; justify-content: center; width: 100%; height: 100%; z-index: 9999;';
   ChatBtnDiv.innerHTML = MessageIcon;
 
   const iframe = document.createElement('iframe');
@@ -38,7 +36,15 @@ async function embedChatbot() {
 
   document.body.appendChild(iframe);
 
+  let chatBtnDragged = false;
+  let chatBtnDown = false;
+  let chatBtnMouseX;
+  let chatBtnMouseY;
   ChatBtn.addEventListener('click', function () {
+    if (chatBtnDragged) {
+      chatBtnDragged = false;
+      return;
+    }
     const chatWindow = document.getElementById(chatWindowId);
 
     if (!chatWindow) return;
@@ -52,6 +58,31 @@ async function embedChatbot() {
     }
   });
 
+  ChatBtn.addEventListener('mousedown', (e) => {
+    if (!chatBtnMouseX && !chatBtnMouseY) {
+      chatBtnMouseX = e.clientX;
+      chatBtnMouseY = e.clientY;
+    }
+
+    chatBtnDown = true;
+  });
+  ChatBtn.addEventListener('mousemove', (e) => {
+    if (!chatBtnDown) return;
+    chatBtnDragged = true;
+    const transformX = e.clientX - chatBtnMouseX;
+    const transformY = e.clientY - chatBtnMouseY;
+
+    ChatBtn.style.transform = `translate3d(${transformX}px, ${transformY}px, 0)`;
+
+    e.stopPropagation();
+  });
+  ChatBtn.addEventListener('mouseup', (e) => {
+    chatBtnDown = false;
+  });
+  ChatBtn.addEventListener('mouseleave', (e) => {
+    chatBtnDown = false;
+  });
+
   ChatBtn.appendChild(ChatBtnDiv);
   document.body.appendChild(ChatBtn);
 }

client/public/locales/en/common.json

@@ -3,42 +3,79 @@
   "Cancel": "No",
   "Confirm": "Yes",
   "Running": "Running",
+  "UnKnow": "UnKnow",
   "Warning": "Warning",
   "app": {
     "Advance App TestTip": "The current application is advanced editing mode \n. If you need to switch to [simple mode], please click the save button on the left",
     "App Detail": "App Detail",
+    "Chat Logs Tips": "Logs record the app's online, shared, and API conversations",
+    "Chat logs": "Chat Logs",
     "Confirm Del App Tip": "Confirm to delete the app and all its chats",
     "Confirm Save App Tip": "The application may be in advanced orchestration mode, and the advanced orchestration configuration will be overwritten after saving, please confirm!",
     "Connection is invalid": "Connecting is invalid",
     "Connection type is different": "Connection type is different",
+    "Copy Module Config": "Copy config",
+    "Export Config Successful": "The configuration has been copied. Please check for important data",
+    "Export Configs": "Export Configs",
+    "Import Config": "Import Config",
+    "Import Config Failed": "Failed to import the configuration, please ensure that the configuration is normal!",
+    "Import Configs": "Import Configs",
     "Input Field Settings": "Input Field Settings",
+    "Logs Empty": "Logs is empty",
+    "Logs Message Total": "Message Count",
+    "Logs Source": "Source",
+    "Logs Time": "Time",
+    "Logs Title": "Title",
     "My Apps": "My Apps",
-    "Output Field Settings": "Output Field Settings"
+    "Output Field Settings": "Output Field Settings",
+    "Paste Config": "Paste Config"
   },
   "chat": {
+    "Complete Response": "Complete Response",
     "Confirm to clear history": "Confirm to clear history?",
     "Exit Chat": "Exit",
     "History": "History",
     "New Chat": "New Chat",
-    "You need to a chat app": "You need to a chat app"
+    "You need to a chat app": "You need to a chat app",
+    "logs": {
+      "api": "API",
+      "online": "Online Chat",
+      "share": "Share",
+      "test": "Test Chat "
+    }
+  },
+  "commom": {
+    "Password inconsistency": "Password inconsistency"
   },
   "common": {
     "Add": "Add",
     "Cancel": "Cancel",
     "Collect": "Collect",
     "Copy": "Copy",
+    "Copy Successful": "Copy Successful",
     "Course": "",
     "Delete": "Delete",
     "Filed is repeat": "Filed is repeated",
     "Filed is repeated": "",
     "Input": "Input",
-    "Output": "Output"
+    "Output": "Output",
+    "export": ""
+  },
+  "dataset": {
+    "Confirm to delete the data": "Confirm to delete the data?",
+    "Queue Desc": "This data refers to the current amount of training for the entire system. FastGPT uses queued training, and if you have too much data to train, you may need to wait for a while",
+    "System Data Queue": "Data Queue"
   },
   "file": {
     "Click to download CSV template": "Click to download CSV template",
-    "Drag and drop": "Drag and drop files here, or click",
+    "Create File": "Create File",
+    "Create file": "Create file",
+    "Drag and drop": "Drag and drop files here",
+    "Fetch Url": "Fetch Url",
     "If the imported file is garbled, please convert CSV to UTF-8 encoding format": "If the imported file is garbled, please convert CSV to UTF-8 encoding format",
     "Release the mouse to upload the file": "Release the mouse to upload the file",
+    "Select a maximum of 10 files": "Select a maximum of 10 files",
+    "max 10": "Max 10 files",
     "select a document": "select a document",
     "support": "support {{fileExtension}} file",
     "upload error description": "Only upload multiple files or one folder at a time"
@@ -83,8 +120,8 @@
     "Start Now": "Start Now",
     "Visual AI orchestration": "Visual AI orchestration",
     "Why FastGPT": "",
-    "desc": "",
-    "slogan": ""
+    "desc": "AI knowledge base question and answer platform based on LLM large model",
+    "slogan": "Let the AI know more about you"
   },
   "navbar": {
     "Account": "Account",
@@ -96,17 +133,26 @@
   },
   "user": {
     "Account": "Account",
+    "Amount of earnings": "Earnings",
+    "Amount of inviter": "Inviter",
     "Application Name": "Application Name",
     "Avatar": "Avatar",
     "Balance": "Balance",
     "Bill Detail": "Bill Detail",
     "Change": "Change",
+    "Copy invite url": "Copy invitation link",
+    "Invite Url": "Invite Url",
+    "Invite url tip": "Friends who register through this link will be permanently bound to you, and you will get a certain balance reward when they recharge. In addition, when friends register with their mobile phone number, you will get 5 yuan reward immediately.",
     "Notice": "Notice",
     "Old password is error": "Old password is error",
     "OpenAI Account Setting": "OpenAI Account Setting",
     "Password": "Password",
     "Pay": "Pay",
     "Personal Information": "Personal",
+    "Promotion": "Promotion",
+    "Promotion Rate": "Promotion Rate",
+    "Promotion Record": "Promotion",
+    "Promotion rate tip": "You will be rewarded with a percentage of the balance when your friends top up",
     "Recharge Record": "Recharge",
     "Replace": "Replace",
     "Set OpenAI Account Failed": "Set OpenAI account failed",
@@ -117,6 +163,10 @@
     "Update Password": "Update Password",
     "Update password failed": "Update password failed",
     "Update password succseful": "Update password succseful",
-    "Usage Record": "Usage"
+    "Usage Record": "Usage",
+    "promotion": {
+      "pay": "",
+      "register": ""
+    }
   }
 }

client/public/locales/zh/common.json

@@ -4,40 +4,78 @@
   "Confirm": "确认",
   "Running": "运行中",
   "Warning": "提示",
+  "UnKnow": "未知",
   "app": {
     "Advance App TestTip": "当前应用为高级编排模式\n如需切换为【简易模式】请点击左侧保存按键",
     "App Detail": "应用详情",
+    "Chat Logs Tips": "日志会记录该应用的在线、分享和 API 对话记录",
+    "Chat logs": "对话日志",
     "Confirm Del App Tip": "确认删除该应用及其所有聊天记录？",
     "Confirm Save App Tip": "该应用可能为高级编排模式，保存后将会覆盖高级编排配置，请确认！",
     "Connection is invalid": "连接无效",
     "Connection type is different": "连接的类型不一致",
+    "Copy Module Config": "复制配置",
+    "Export Config Successful": "已复制配置，请注意检查是否有重要数据",
+    "Export Configs": "导出配置",
+    "Import Config": "导入配置",
+    "Import Config Failed": "导入配置失败，请确保配置正常！",
+    "Import Configs": "导入配置",
     "Input Field Settings": "输入字段编辑",
+    "Logs Empty": "还没有日志噢~",
+    "Logs Message Total": "消息总数",
+    "Logs Source": "来源",
+    "Logs Time": "时间",
+    "Logs Title": "标题",
     "My Apps": "我的应用",
-    "Output Field Settings": "输出字段编辑"
+    "Output Field Settings": "输出字段编辑",
+    "Paste Config": "粘贴配置"
   },
   "chat": {
+    "Complete Response": "完整响应",
     "Confirm to clear history": "确认清空该应用的聊天记录？",
     "Exit Chat": "退出聊天",
     "History": "记录",
     "New Chat": "新对话",
-    "You need to a chat app": "你需要创建一个应用"
+    "You need to a chat app": "你需要创建一个应用",
+    "logs": {
+      "api": "API 调用",
+      "online": "在线使用",
+      "share": "外部链接调用",
+      "test": "测试"
+    }
+  },
+  "commom": {
+    "Password inconsistency": "两次密码不一致"
   },
   "common": {
     "Add": "添加",
     "Cancel": "取消",
     "Collect": "收藏",
     "Copy": "复制",
+    "Copy Successful": "复制成功",
+    "Course": "",
     "Delete": "删除",
     "Filed is repeat": "",
     "Filed is repeated": "字段重复了",
     "Input": "输入",
-    "Output": "输出"
+    "Output": "输出",
+    "export": ""
+  },
+  "dataset": {
+    "Confirm to delete the data": "确认删除该数据？",
+    "Queue Desc": "该数据是指整个系统当前待训练的数量。FastGPT 采用排队训练的方式，如果待训练的数据过多，可能需要等待一段时间",
+    "System Data Queue": "排队长度"
   },
   "file": {
     "Click to download CSV template": "点击下载 CSV 模板",
-    "Drag and drop": "拖拽文件至此，或点击",
+    "Create File": "创建新文件",
+    "Create file": "创建文件",
+    "Drag and drop": "拖拽文件至此",
+    "Fetch Url": "链接读取",
     "If the imported file is garbled, please convert CSV to UTF-8 encoding format": "如果导入文件乱码，请将 CSV 转成 UTF-8 编码格式",
     "Release the mouse to upload the file": "松开鼠标上传文件",
+    "Select a maximum of 10 files": "最多选择10个文件",
+    "max 10": "最多选择 10 个文件",
     "select a document": "选择文件",
     "support": "支持 {{fileExtension}} 文件",
     "upload error description": "单次只支持上传多个文件或者一个文件夹"
@@ -95,17 +133,26 @@
   },
   "user": {
     "Account": "账号",
+    "Amount of earnings": "收益（￥）",
+    "Amount of inviter": "累计邀请人数",
     "Application Name": "应用名",
     "Avatar": "头像",
     "Balance": "余额",
     "Bill Detail": "账单详情",
     "Change": "变更",
+    "Copy invite url": "复制邀请链接",
+    "Invite Url": "邀请链接",
+    "Invite url tip": "通过该链接注册的好友将永久与你绑定，其充值时你会获得一定余额奖励。\n此外，好友使用手机号注册时，你将立即获得 5 元奖励。",
     "Notice": "通知",
     "Old password is error": "旧密码错误",
     "OpenAI Account Setting": "OpenAI 账号配置",
     "Password": "密码",
     "Pay": "充值",
     "Personal Information": "个人信息",
+    "Promotion": "",
+    "Promotion Rate": "返现比例",
+    "Promotion Record": "推广记录",
+    "Promotion rate tip": "好友充值时你将获得一定比例的余额奖励",
     "Recharge Record": "充值记录",
     "Replace": "更换",
     "Set OpenAI Account Failed": "设置 OpenAI 账号异常",
@@ -116,6 +163,10 @@
     "Update Password": "修改密码",
     "Update password failed": "修改密码异常",
     "Update password succseful": "修改密码成功",
-    "Usage Record": "使用记录"
+    "Usage Record": "使用记录",
+    "promotion": {
+      "pay": "好友充值",
+      "register": "好友注册"
+    }
   }
 }

client/src/api/app.ts

@@ -51,3 +51,6 @@ export const getAppTotalUsage = (data: { appId: string }) =>
     start: addDays(new Date(), -13),
     end: addDays(new Date(), 1)
   }).then((res) => (res.length === 0 ? [{ date: new Date(), total: 0 }] : res));
+
+export const getAppChatLogs = (data: RequestPaging & { appId: string }) =>
+  POST(`/app/getChatLogs`, data);

client/src/api/chat.ts

@@ -27,20 +27,10 @@ export const delChatHistoryById = (chatId: string) => DELETE(`/chat/removeHistor
  */
 export const clearChatHistoryByAppId = (appId: string) => DELETE(`/chat/removeHistory`, { appId });
 
-/**
- * update history quote status
- */
-export const updateHistoryQuote = (params: {
-  chatId: string;
-  contentId: string;
-  quoteId: string;
-  sourceText: string;
-}) => PUT(`/chat/history/updateHistoryQuote`, params);
-
 /**
  * 删除一句对话
  */
-export const delChatRecordByIndex = (data: { chatId: string; contentId: string }) =>
+export const delChatRecordById = (data: { chatId: string; contentId: string }) =>
   DELETE(`/chat/delChatRecordByContentId`, data);
 
 /**

client/src/api/fetch.ts

@@ -74,7 +74,7 @@ export const streamFetch = ({
             if (!eventName || !data) return;
 
             if (eventName === sseResponseEventEnum.answer && data !== '[DONE]') {
-              const answer: string = data?.choices?.[0].delta.content || '';
+              const answer: string = data?.choices?.[0]?.delta?.content || '';
               onMessage({ text: answer });
               responseText += answer;
             } else if (

client/src/api/plugins/common.ts

@@ -0,0 +1,6 @@
+import { GET, POST, PUT, DELETE } from '../request';
+
+import type { FetchResultItem } from '@/types/plugin';
+
+export const fetchUrls = (urlList: string[]) =>
+  POST<FetchResultItem[]>(`/plugins/urlFetch`, { urlList });

client/src/api/plugins/kb.ts

@@ -12,20 +12,14 @@ import {
 } from '@/pages/api/openapi/kb/searchTest';
 import { Response as KbDataItemType } from '@/pages/api/plugins/kb/data/getDataById';
 import { Props as UpdateDataProps } from '@/pages/api/openapi/kb/updateData';
-
-export type KbUpdateParams = {
-  id: string;
-  name: string;
-  tags: string;
-  avatar: string;
-};
+import type { KbUpdateParams, CreateKbParams } from '../request/kb';
 
 /* knowledge base */
 export const getKbList = () => GET<KbListItemType[]>(`/plugins/kb/list`);
 
 export const getKbById = (id: string) => GET<KbItemType>(`/plugins/kb/detail?id=${id}`);
 
-export const postCreateKb = (data: { name: string }) => POST<string>(`/plugins/kb/create`, data);
+export const postCreateKb = (data: CreateKbParams) => POST<string>(`/plugins/kb/create`, data);
 
 export const putKbById = (data: KbUpdateParams) => PUT(`/plugins/kb/update`, data);
 
@@ -60,6 +54,9 @@ export const getTrainingData = (data: { kbId: string; init: boolean }) =>
     vectorListLen: number;
   }>(`/plugins/kb/data/getTrainingData`, data);
 
+/* get length of system training queue */
+export const getTrainingQueueLen = () => GET<number>(`/plugins/kb/data/getQueueLen`);
+
 export const getKbDataItemById = (dataId: string) =>
   GET<KbDataItemType>(`/plugins/kb/data/getDataById`, { dataId });
 

client/src/api/request/kb.d.ts

@@ -0,0 +1,12 @@
+export type KbUpdateParams = {
+  id: string;
+  name: string;
+  tags: string;
+  avatar: string;
+};
+export type CreateKbParams = {
+  name: string;
+  tags: string[];
+  avatar: string;
+  vectorModel: string;
+};

client/src/api/service/plugins.ts

@@ -0,0 +1,8 @@
+import { GET, POST } from './request';
+
+export const textCensor = (data: { text: string }) =>
+  POST<{ code?: number; message: string }>('/plugins/censor/text_baidu', data).then((res) => {
+    if (res?.code === 5000) {
+      return Promise.reject(res.message);
+    }
+  });

client/src/api/service/request.ts

@@ -1,6 +1,5 @@
 import axios, { Method, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
-import { clearToken, getToken } from '@/utils/user';
-import { TOKEN_ERROR_CODE } from '@/service/errorCode';
+import { baseUrl } from '../../service/ai/openai';
 
 interface ConfigType {
   headers?: { [key: string]: string };
@@ -18,7 +17,7 @@ interface ResponseDataType {
  */
 function requestStart(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig {
   if (config.headers) {
-    // config.headers.token = getToken();
+    config.headers.rootkey = process.env.ROOT_KEY;
   }
 
   return config;
@@ -53,14 +52,7 @@ function responseError(err: any) {
   if (typeof err === 'string') {
     return Promise.reject({ message: err });
   }
-  // 有报错响应
-  if (err?.code in TOKEN_ERROR_CODE) {
-    clearToken();
-    window.location.replace(
-      `/login?lastRoute=${encodeURIComponent(location.pathname + location.search)}`
-    );
-    return Promise.reject({ message: 'token过期，重新登录' });
-  }
+
   if (err?.response?.data) {
     return Promise.reject(err?.response?.data);
   }
@@ -80,7 +72,11 @@ instance.interceptors.request.use(requestStart, (err) => Promise.reject(err));
 /* 响应拦截 */
 instance.interceptors.response.use(responseSuccess, (err) => Promise.reject(err));
 
-function request(url: string, data: any, config: ConfigType, method: Method): any {
+export function request(url: string, data: any, config: ConfigType, method: Method): any {
+  if (!global.systemEnv?.pluginBaseUrl) {
+    return Promise.reject('商业版插件加载中...');
+  }
+
   /* 去空 */
   for (const key in data) {
     if (data[key] === null || data[key] === undefined) {
@@ -90,6 +86,7 @@ function request(url: string, data: any, config: ConfigType, method: Method): an
 
   return instance
     .request({
+      baseURL: global.systemEnv.pluginBaseUrl,
       url,
       method,
       data: ['POST', 'PUT'].includes(method) ? data : null,
@@ -107,22 +104,18 @@ function request(url: string, data: any, config: ConfigType, method: Method): an
  * @param {Object} config
  * @returns
  */
-export function GET<T>(url?: string, params = {}, config: ConfigType = {}): Promise<T> {
-  if (!url) return Promise.reject('The Plugin is not installed');
+export function GET<T>(url: string, params = {}, config: ConfigType = {}): Promise<T> {
   return request(url, params, config, 'GET');
 }
 
-export function POST<T>(url?: string, data = {}, config: ConfigType = {}): Promise<T> {
-  if (!url) return Promise.reject('The Plugin is not installed');
+export function POST<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
   return request(url, data, config, 'POST');
 }
 
-export function PUT<T>(url?: string, data = {}, config: ConfigType = {}): Promise<T> {
-  if (!url) return Promise.reject('The Plugin is not installed');
+export function PUT<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
   return request(url, data, config, 'PUT');
 }
 
-export function DELETE<T>(url?: string, data = {}, config: ConfigType = {}): Promise<T> {
-  if (!url) return Promise.reject('The Plugin is not installed');
+export function DELETE<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
   return request(url, data, config, 'DELETE');
 }

client/src/api/user.ts

@@ -1,6 +1,6 @@
 import { GET, POST, PUT } from './request';
 import { createHashPassword } from '@/utils/tools';
-import { ResLogin } from './response/user';
+import type { ResLogin, PromotionRecordType } from './response/user';
 import { UserAuthTypeEnum } from '@/constants/common';
 import { UserBillType, UserType, UserUpdateParams } from '@/types/user';
 import type { PagingData, RequestPaging } from '@/types';
@@ -10,10 +10,11 @@ export const sendAuthCode = (data: {
   username: string;
   type: `${UserAuthTypeEnum}`;
   googleToken: string;
-}) => POST('/user/sendAuthCode', data);
+}) => POST(`/plusApi/user/account/sendCode`, data);
 
 export const getTokenLogin = () => GET<UserType>('/user/account/tokenLogin');
-export const gitLogin = (code: string) => GET<ResLogin>('/user/account/gitLogin', { code });
+export const gitLogin = (params: { code: string; inviterId?: string }) =>
+  GET<ResLogin>('/user/account/gitLogin', params);
 
 export const postRegister = ({
   username,
@@ -24,9 +25,9 @@ export const postRegister = ({
   username: string;
   code: string;
   password: string;
-  inviterId: string;
+  inviterId?: string;
 }) =>
-  POST<ResLogin>('/user/account/register', {
+  POST<ResLogin>(`/plusApi/user/account/register`, {
     username,
     code,
     inviterId,
@@ -42,7 +43,7 @@ export const postFindPassword = ({
   code: string;
   password: string;
 }) =>
-  POST<ResLogin>('/user/account/updatePasswordByCode', {
+  POST<ResLogin>(`/plusApi/user/account/updatePasswordByCode`, {
     username,
     code,
     password: createHashPassword(password)
@@ -73,12 +74,29 @@ export const getPayCode = (amount: number) =>
   GET<{
     codeUrl: string;
     payId: string;
-  }>(`/user/getPayCode?amount=${amount}`);
+  }>(`/plusApi/user/pay/getPayCode`, { amount });
 
-export const checkPayResult = (payId: string) => GET<number>(`/user/checkPayResult?payId=${payId}`);
+export const checkPayResult = (payId: string) =>
+  GET<number>(`/plusApi/user/pay/checkPayResult`, { payId }).then(() => {
+    try {
+      GET('/user/account/paySuccess');
+    } catch (error) {}
+    return 'success';
+  });
 
 export const getInforms = (data: RequestPaging) =>
   POST<PagingData<informSchema>>(`/user/inform/list`, data);
 
 export const getUnreadCount = () => GET<number>(`/user/inform/countUnread`);
 export const readInform = (id: string) => GET(`/user/inform/read`, { id });
+
+/* get promotion init data */
+export const getPromotionInitData = () =>
+  GET<{
+    invitedAmount: number;
+    earningsAmount: number;
+  }>('/user/promotion/getPromotionData');
+
+/* promotion records */
+export const getPromotionRecords = (data: RequestPaging) =>
+  POST<PromotionRecordType>(`/user/promotion/getPromotions`, data);

client/src/components/ChatBox/QuoteModal.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { ModalBody, ModalCloseButton, ModalHeader, Box, useTheme } from '@chakra-ui/react';
+import { ModalBody, Box, useTheme } from '@chakra-ui/react';
 import { getKbDataItemById } from '@/api/plugins/kb';
 import { useLoading } from '@/hooks/useLoading';
 import { useToast } from '@/hooks/useToast';
@@ -9,13 +9,21 @@ import MyIcon from '@/components/Icon';
 import InputDataModal from '@/pages/kb/detail/components/InputDataModal';
 import MyModal from '../MyModal';
 
+type SearchType = {
+  kb_id?: string;
+  id?: string;
+  q: string;
+  a?: string;
+  source?: string | undefined;
+};
+
 const QuoteModal = ({
   onUpdateQuote,
   rawSearch = [],
   onClose
 }: {
   onUpdateQuote: (quoteId: string, sourceText: string) => Promise<void>;
-  rawSearch: QuoteItemType[];
+  rawSearch: SearchType[];
   onClose: () => void;
 }) => {
   const theme = useTheme();
@@ -32,7 +40,8 @@ const QuoteModal = ({
    * click edit, get new kbDataItem
    */
   const onclickEdit = useCallback(
-    async (item: QuoteItemType) => {
+    async (item: SearchType) => {
+      if (!item.id) return;
       try {
         setIsLoading(true);
         const data = (await getKbDataItemById(item.id)) as QuoteItemType;
@@ -77,9 +86,9 @@ const QuoteModal = ({
         }
       >
         <ModalBody pt={0} whiteSpace={'pre-wrap'} textAlign={'justify'} fontSize={'sm'}>
-          {rawSearch.map((item) => (
+          {rawSearch.map((item, i) => (
             <Box
-              key={item.id}
+              key={i}
               flex={'1 0 0'}
               p={2}
               borderRadius={'lg'}
@@ -87,35 +96,38 @@ const QuoteModal = ({
               _notLast={{ mb: 2 }}
               position={'relative'}
               _hover={{ '& .edit': { display: 'flex' } }}
+              overflow={'hidden'}
             >
               {item.source && <Box color={'myGray.600'}>({item.source})</Box>}
               <Box>{item.q}</Box>
               <Box>{item.a}</Box>
-              <Box
-                className="edit"
-                display={'none'}
-                position={'absolute'}
-                right={0}
-                top={0}
-                bottom={0}
-                w={'40px'}
-                bg={'rgba(255,255,255,0.9)'}
-                alignItems={'center'}
-                justifyContent={'center'}
-                boxShadow={'-10px 0 10px rgba(255,255,255,1)'}
-              >
-                <MyIcon
-                  name={'edit'}
-                  w={'18px'}
-                  h={'18px'}
-                  cursor={'pointer'}
-                  color={'myGray.600'}
-                  _hover={{
-                    color: 'myBlue.700'
-                  }}
-                  onClick={() => onclickEdit(item)}
-                />
-              </Box>
+              {item.id && (
+                <Box
+                  className="edit"
+                  display={'none'}
+                  position={'absolute'}
+                  right={0}
+                  top={0}
+                  bottom={0}
+                  w={'40px'}
+                  bg={'rgba(255,255,255,0.9)'}
+                  alignItems={'center'}
+                  justifyContent={'center'}
+                  boxShadow={'-10px 0 10px rgba(255,255,255,1)'}
+                >
+                  <MyIcon
+                    name={'edit'}
+                    w={'18px'}
+                    h={'18px'}
+                    cursor={'pointer'}
+                    color={'myGray.600'}
+                    _hover={{
+                      color: 'myBlue.700'
+                    }}
+                    onClick={() => onclickEdit(item)}
+                  />
+                </Box>
+              )}
             </Box>
           ))}
         </ModalBody>

client/src/components/ChatBox/ResponseTags.tsx

@@ -1,14 +1,17 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { ChatModuleEnum } from '@/constants/chat';
 import { ChatHistoryItemResType, ChatItemType, QuoteItemType } from '@/types/chat';
-import { Flex, BoxProps } from '@chakra-ui/react';
+import { Flex, BoxProps, useDisclosure } from '@chakra-ui/react';
+import { useTranslation } from 'react-i18next';
+import { useGlobalStore } from '@/store/global';
 import dynamic from 'next/dynamic';
 import Tag from '../Tag';
 import MyTooltip from '../MyTooltip';
 const QuoteModal = dynamic(() => import('./QuoteModal'), { ssr: false });
 const ContextModal = dynamic(() => import('./ContextModal'), { ssr: false });
+const WholeResponseModal = dynamic(() => import('./WholeResponseModal'), { ssr: false });
 
-const ResponseDetailModal = ({
+const ResponseTags = ({
   chatId,
   contentId,
   responseData = []
@@ -17,28 +20,30 @@ const ResponseDetailModal = ({
   contentId?: string;
   responseData?: ChatHistoryItemResType[];
 }) => {
+  const { isPc } = useGlobalStore();
+  const { t } = useTranslation();
   const [quoteModalData, setQuoteModalData] = useState<QuoteItemType[]>();
   const [contextModalData, setContextModalData] = useState<ChatItemType[]>();
+  const {
+    isOpen: isOpenWholeModal,
+    onOpen: onOpenWholeModal,
+    onClose: onCloseWholeModal
+  } = useDisclosure();
 
   const {
-    tokens = 0,
     quoteList = [],
-    completeMessages = []
+    completeMessages = [],
+    tokens = 0
   } = useMemo(() => {
     const chatData = responseData.find((item) => item.moduleName === ChatModuleEnum.AIChat);
     if (!chatData) return {};
     return {
-      tokens: chatData.tokens,
       quoteList: chatData.quoteList,
-      completeMessages: chatData.completeMessages
+      completeMessages: chatData.completeMessages,
+      tokens: responseData.reduce((sum, item) => sum + (item.tokens || 0), 0)
     };
   }, [responseData]);
 
-  const isEmpty = useMemo(
-    () => quoteList.length === 0 && completeMessages.length === 0 && tokens === 0,
-    [completeMessages.length, quoteList.length, tokens]
-  );
-
   const updateQuote = useCallback(async (quoteId: string, sourceText: string) => {}, []);
 
   const TagStyles: BoxProps = {
@@ -46,7 +51,7 @@ const ResponseDetailModal = ({
     bg: 'transparent'
   };
 
-  return isEmpty ? null : (
+  return responseData.length === 0 ? null : (
     <Flex alignItems={'center'} mt={2} flexWrap={'wrap'}>
       {quoteList.length > 0 && (
         <MyTooltip label="查看引用">
@@ -72,11 +77,17 @@ const ResponseDetailModal = ({
           </Tag>
         </MyTooltip>
       )}
-      {tokens > 0 && (
-        <Tag colorSchema="gray" cursor={'default'} {...TagStyles}>
-          {tokens}tokens
+      {isPc && tokens > 0 && (
+        <Tag colorSchema="purple" cursor={'default'} {...TagStyles}>
+          {tokens}Tokens
         </Tag>
       )}
+      <MyTooltip label={'点击查看完整响应值'}>
+        <Tag colorSchema="gray" cursor={'pointer'} {...TagStyles} onClick={onOpenWholeModal}>
+          {t('chat.Complete Response')}
+        </Tag>
+      </MyTooltip>
+
       {!!quoteModalData && (
         <QuoteModal
           rawSearch={quoteModalData}
@@ -87,8 +98,11 @@ const ResponseDetailModal = ({
       {!!contextModalData && (
         <ContextModal context={contextModalData} onClose={() => setContextModalData(undefined)} />
       )}
+      {isOpenWholeModal && (
+        <WholeResponseModal response={responseData} onClose={onCloseWholeModal} />
+      )}
     </Flex>
   );
 };
 
-export default ResponseDetailModal;
+export default ResponseTags;

client/src/components/ChatBox/WholeResponseModal.tsx

@@ -0,0 +1,71 @@
+import React, { useMemo } from 'react';
+import { Box, ModalBody, useTheme, ModalHeader, Flex } from '@chakra-ui/react';
+import type { ChatHistoryItemResType } from '@/types/chat';
+import { useTranslation } from 'react-i18next';
+
+import MyModal from '../MyModal';
+import MyTooltip from '../MyTooltip';
+import { QuestionOutlineIcon } from '@chakra-ui/icons';
+
+const ResponseModal = ({
+  response,
+  onClose
+}: {
+  response: ChatHistoryItemResType[];
+  onClose: () => void;
+}) => {
+  const { t } = useTranslation();
+  const theme = useTheme();
+
+  const formatResponse = useMemo(
+    () =>
+      response.map((item) => {
+        const copy = { ...item };
+        delete copy.completeMessages;
+        delete copy.quoteList;
+        return copy;
+      }),
+    [response]
+  );
+
+  return (
+    <MyModal
+      isOpen={true}
+      onClose={onClose}
+      h={['90vh', '80vh']}
+      minW={['90vw', '600px']}
+      title={
+        <Flex alignItems={'center'}>
+          {t('chat.Complete Response')}
+          <MyTooltip
+            label={
+              'moduleName: 模型名\nprice: 价格，倍率：100000\nmodel?: 模型名\ntokens?: token 消耗\n\nanswer?: 回答内容\nquestion?: 问题\ntemperature?: 温度\nmaxToken?: 最大 tokens\n\nsimilarity?: 相似度\nlimit?: 单次搜索结果\n\ncqList?: 问题分类列表\ncqResult?: 分类结果\n\nextractDescription?: 内容提取描述\nextractResult?: 提取结果'
+            }
+          >
+            <QuestionOutlineIcon ml={2} />
+          </MyTooltip>
+        </Flex>
+      }
+      isCentered
+    >
+      <ModalBody>
+        {formatResponse.map((item, i) => (
+          <Box
+            key={i}
+            p={2}
+            pt={[0, 2]}
+            borderRadius={'lg'}
+            border={theme.borders.base}
+            _notLast={{ mb: 2 }}
+            position={'relative'}
+            whiteSpace={'pre-wrap'}
+          >
+            {JSON.stringify(item, null, 2)}
+          </Box>
+        ))}
+      </ModalBody>
+    </MyModal>
+  );
+};
+
+export default ResponseModal;

client/src/components/ChatBox/index.tsx

@@ -40,6 +40,7 @@ import { useRouter } from 'next/router';
 import { useGlobalStore } from '@/store/global';
 import { TaskResponseKeyEnum, getDefaultChatVariables } from '@/constants/chat';
 import { useTranslation } from 'react-i18next';
+import { customAlphabet } from 'nanoid';
 
 import MyIcon from '@/components/Icon';
 import Avatar from '@/components/Avatar';
@@ -47,13 +48,16 @@ import Markdown from '@/components/Markdown';
 import MySelect from '@/components/Select';
 import MyTooltip from '../MyTooltip';
 import dynamic from 'next/dynamic';
-const ResponseDetailModal = dynamic(() => import('./ResponseDetailModal'));
+const ResponseTags = dynamic(() => import('./ResponseTags'));
 
 import styles from './index.module.scss';
 
+const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 24);
+
 const textareaMinH = '22px';
 type generatingMessageProps = { text?: string; name?: string; status?: 'running' | 'finish' };
 export type StartChatFnProps = {
+  chatList: ChatSiteItemType[];
   messages: MessageItemType[];
   controller: AbortController;
   variables: Record<string, any>;
@@ -137,7 +141,7 @@ const ChatBox = (
     variableModules?: VariableItemType[];
     welcomeText?: string;
     onUpdateVariable?: (e: Record<string, any>) => void;
-    onStartChat: (e: StartChatFnProps) => Promise<{
+    onStartChat?: (e: StartChatFnProps) => Promise<{
       responseText: string;
       [TaskResponseKeyEnum.responseData]: ChatHistoryItemResType[];
     }>;
@@ -235,8 +239,7 @@ const ChatBox = (
   // 复制内容
   const onclickCopy = useCallback(
     (value: string) => {
-      const val = value.replace(/\n+/g, '\n');
-      copyData(val);
+      copyData(value);
     },
     [copyData]
   );
@@ -260,6 +263,7 @@ const ChatBox = (
    */
   const sendPrompt = useCallback(
     async (variables: Record<string, any> = {}, inputVal = '') => {
+      if (!onStartChat) return;
       if (isChatting) {
         toast({
           title: '正在聊天中...请等待结束',
@@ -268,7 +272,7 @@ const ChatBox = (
         return;
       }
       // get input value
-      const val = inputVal.trim().replace(/\n\s*/g, '\n');
+      const val = inputVal.trim();
 
       if (!val) {
         toast({
@@ -281,13 +285,13 @@ const ChatBox = (
       const newChatList: ChatSiteItemType[] = [
         ...chatHistory,
         {
-          _id: String(new Types.ObjectId()),
+          dataId: nanoid(),
           obj: 'Human',
           value: val,
           status: 'finish'
         },
         {
-          _id: String(new Types.ObjectId()),
+          dataId: nanoid(),
           obj: 'AI',
           value: '',
           status: 'loading'
@@ -311,6 +315,7 @@ const ChatBox = (
         const messages = adaptChatItem_openAI({ messages: newChatList, reserveId: true });
 
         const { responseData } = await onStartChat({
+          chatList: newChatList,
           messages,
           controller: abortSignal,
           generatingMessage,
@@ -550,7 +555,7 @@ const ChatBox = (
             {chatHistory.map((item, index) => (
               <Flex
                 position={'relative'}
-                key={item._id}
+                key={item.dataId}
                 flexDirection={'column'}
                 alignItems={item.obj === 'Human' ? 'flex-end' : 'flex-start'}
                 py={5}
@@ -581,10 +586,10 @@ const ChatBox = (
                               _hover={{ color: 'red.600' }}
                               onClick={() => {
                                 setChatHistory((state) =>
-                                  state.filter((chat) => chat._id !== item._id)
+                                  state.filter((chat) => chat.dataId !== item.dataId)
                                 );
                                 onDelMessage({
-                                  contentId: item._id,
+                                  contentId: item.dataId,
                                   index
                                 });
                               }}
@@ -628,10 +633,10 @@ const ChatBox = (
                               _hover={{ color: 'red.600' }}
                               onClick={() => {
                                 setChatHistory((state) =>
-                                  state.filter((chat) => chat._id !== item._id)
+                                  state.filter((chat) => chat.dataId !== item.dataId)
                                 );
                                 onDelMessage({
-                                  contentId: item._id,
+                                  contentId: item.dataId,
                                   index
                                 });
                               }}
@@ -678,9 +683,9 @@ const ChatBox = (
                           source={item.value}
                           isChatting={index === chatHistory.length - 1 && isChatting}
                         />
-                        <ResponseDetailModal
+                        <ResponseTags
                           chatId={chatId}
-                          contentId={item._id}
+                          contentId={item.dataId}
                           responseData={item.responseData}
                         />
                       </Card>
@@ -693,7 +698,7 @@ const ChatBox = (
         </Box>
       </Box>
       {/* input */}
-      {variableIsFinish ? (
+      {onStartChat && variableIsFinish ? (
         <Box m={['0 auto', '10px auto']} w={'100%'} maxW={['auto', 'min(750px, 100%)']} px={[0, 5]}>
           <Box
             py={'18px'}

client/src/components/Icon/icons/light/logs.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692867122828"
+    class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4021"
+    xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64">
+    <path
+        d="M269.844659 81.4308h44.821057v166.626082h-44.821057zM677.140966 491.719232c52.335426 0 102.092273 19.937769 140.105639 56.13883 38.126482 36.31053 60.461599 85.284073 62.891788 137.900467 2.5056 54.276658-16.27424 106.280032-52.881549 146.431672-36.60731 40.15164-86.65972 63.643469-140.936379 66.150285-3.180653 0.147174-6.401444 0.221369-9.576016 0.221369-52.341508 0-102.102004-19.936552-140.114153-56.136398-38.126482-36.309314-60.461599-85.284073-62.891789-137.902899-2.5056-54.276658 16.27424-106.280032 52.88155-146.431672 36.60731-40.15164 86.65972-63.643469 140.936379-66.149069a208.122961 208.122961 0 0 1 9.576016-0.221369h0.008514m-0.00973-44.822274c-3.859355 0-7.746684 0.088791-11.642528 0.268805-136.951744 6.3236-242.847422 122.470346-236.525038 259.422091 6.143586 133.0559 115.942406 236.793842 247.779562 236.793842 3.859355 0 7.747901-0.088791 11.642529-0.268804 136.951744-6.322384 242.847422-122.470346 236.525037-259.422091-6.143586-133.057117-115.942406-236.798708-247.779562-236.793843z"
+        p-id="4022"></path>
+    <path
+        d="M490.264524 891.110734a272.361206 272.361206 0 0 1-32.682275-37.369937H180.453104c-20.912034 0-37.927007-17.013757-37.927007-37.92579v-590.263526c0-20.912034 17.013757-37.927007 37.927007-37.927007H732.799354c20.912034 0 37.925791 17.013757 37.925791 37.927007V441.15597a268.605238 268.605238 0 0 1 44.821057 21.463023V225.551481c0-45.70045-37.047614-82.746848-82.746848-82.746849H180.453104c-45.70045 0-82.746848 37.047614-82.746848 82.746849v590.263526c0 45.70045 37.047614 82.746848 82.746848 82.746848h317.980164a273.587248 273.587248 0 0 1-8.168744-7.451121z"
+        p-id="4023"></path>
+    <path
+        d="M770.725145 489.61623a225.243754 225.243754 0 0 1 44.821057 27.231985v-0.21407a225.182938 225.182938 0 0 0-44.821057-27.114003v0.096088zM812.590566 778.530212H646.820768V576.105667h44.821057v157.604704h120.948741zM209.55091 380.121489h498.255687v44.821057H209.55091zM600.682445 81.4308h44.821058v166.626082h-44.821058zM406.842623 712.17437H209.55091v44.821057h203.864657a272.351476 272.351476 0 0 1-6.572944-44.821057zM450.941192 546.147929H209.55091v44.821057h217.435038a268.707408 268.707408 0 0 1 23.955244-44.821057z"
+        p-id="4024"></path>
+</svg>

client/src/components/Icon/icons/light/promotion.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692522401431"
+    class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4063"
+    xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64">
+    <path
+        d="M855 789.1V127.4L633 274.9H169V641h81l59.5 255.7H508L448.4 641H633l222 148.1z m-46-86l-146-97.5V310.2l146-97v489.9zM450 850.6H346L297.1 641h104L450 850.6zM239.2 595H215V320.9h274V595H239.2z m377.8 0h-82V320.9h82V595z"
+        p-id="4064"></path>
+</svg>

client/src/components/Icon/index.tsx

@@ -75,7 +75,9 @@ const map = {
   outlink_iframe: require('./icons/outlink/iframe.svg').default,
   addCircle: require('./icons/circle/add.svg').default,
   playFill: require('./icons/fill/play.svg').default,
-  courseLight: require('./icons/light/course.svg').default
+  courseLight: require('./icons/light/course.svg').default,
+  promotionLight: require('./icons/light/promotion.svg').default,
+  logsLight: require('./icons/light/logs.svg').default
 };
 
 export type IconName = keyof typeof map;

client/src/components/Markdown/Link.tsx

@@ -1,32 +0,0 @@
-import React, { useMemo } from 'react';
-import { Box } from '@chakra-ui/react';
-import Image from './img/Image';
-
-const regex = /((http|https|ftp):\/\/[^\s\u4e00-\u9fa5\u3000-\u303f\uff00-\uffef]+)/gi;
-
-const Link = (props: { href?: string; children?: any }) => {
-  const Html = useMemo(() => {
-    const decText = decodeURIComponent(props.href || '');
-
-    return decText.replace(regex, (match, p1) => {
-      let text = decText === props.children?.[0] ? p1 : props.children?.[0];
-      const isInternal = /^\/#/i.test(p1);
-      const target = isInternal ? '_self' : '_blank';
-
-      if (props?.children?.[0]?.props?.node?.tagName === 'img') {
-        // eslint-disable-next-line @next/next/no-img-element
-        text = `<img src="${props?.children?.[0]?.props?.src}" />`;
-      }
-
-      return `<a href="${p1}" target=${target}>${text}</a>`;
-    });
-  }, [props.children, props.href]);
-
-  return typeof Html === 'string' ? (
-    <Box as={'span'} dangerouslySetInnerHTML={{ __html: Html }} />
-  ) : (
-    Html
-  );
-};
-
-export default React.memo(Link);

client/src/components/Markdown/index.tsx

@@ -9,7 +9,6 @@ import 'katex/dist/katex.min.css';
 import styles from './index.module.scss';
 import dynamic from 'next/dynamic';
 
-import Link from './Link';
 import CodeLight from './CodeLight';
 
 const MermaidCodeBlock = dynamic(() => import('./img/MermaidCodeBlock'));
@@ -50,7 +49,6 @@ const Markdown = ({
 }) => {
   const components = useMemo(
     () => ({
-      a: Link,
       img: Image,
       pre: 'div',
       p: 'div',
@@ -68,6 +66,7 @@ const Markdown = ({
       rehypePlugins={[RehypeKatex]}
       // @ts-ignore
       components={components}
+      linkTarget={'_blank'}
     >
       {source}
     </ReactMarkdown>

client/src/components/SideTabs/index.tsx

@@ -1,8 +1,7 @@
 import React, { useMemo } from 'react';
-import { Box, Flex, useTheme } from '@chakra-ui/react';
+import { Box, Flex } from '@chakra-ui/react';
 import type { GridProps } from '@chakra-ui/react';
 import MyIcon, { type IconName } from '../Icon';
-import { useTranslation } from 'next-i18next';
 
 // @ts-ignore
 export interface Props extends GridProps {
@@ -13,7 +12,6 @@ export interface Props extends GridProps {
 }
 
 const SideTabs = ({ list, size = 'md', activeId, onChange, ...props }: Props) => {
-  const { t } = useTranslation();
   const sizeMap = useMemo(() => {
     switch (size) {
       case 'sm':
@@ -63,7 +61,7 @@ const SideTabs = ({ list, size = 'md', activeId, onChange, ...props }: Props) =>
           }}
         >
           <MyIcon mr={2} name={item.icon as IconName} w={'16px'} />
-          {t(item.label)}
+          {item.label}
         </Flex>
       ))}
     </Box>

client/src/components/Tabs/index.tsx

@@ -42,6 +42,7 @@ const Tabs = ({ list, size = 'md', activeId, onChange, ...props }: Props) => {
       p={sizeMap.outP}
       borderRadius={'sm'}
       fontSize={sizeMap.fontSize}
+      overflowX={'auto'}
       {...props}
     >
       {list.map((item) => (
@@ -50,6 +51,8 @@ const Tabs = ({ list, size = 'md', activeId, onChange, ...props }: Props) => {
           py={sizeMap.inlineP}
           textAlign={'center'}
           borderBottom={'2px solid transparent'}
+          px={3}
+          whiteSpace={'nowrap'}
           {...(activeId === item.id
             ? {
                 color: 'myBlue.700',

client/src/components/Tag/index.tsx

@@ -3,7 +3,7 @@ import { Flex, type FlexProps } from '@chakra-ui/react';
 
 interface Props extends FlexProps {
   children: React.ReactNode | React.ReactNode[];
-  colorSchema?: 'blue' | 'green' | 'gray';
+  colorSchema?: 'blue' | 'green' | 'gray' | 'purple';
 }
 
 const Tag = ({ children, colorSchema = 'blue', ...props }: Props) => {
@@ -19,6 +19,11 @@ const Tag = ({ children, colorSchema = 'blue', ...props }: Props) => {
         bg: '#f8fff8',
         color: '#67c13b'
       },
+      purple: {
+        borderColor: '#A558C9',
+        bg: '#F6EEFA',
+        color: '#A558C9'
+      },
       gray: {
         borderColor: '#979797',
         bg: '#F7F7F7',

client/src/constants/chat.ts

@@ -31,7 +31,7 @@ export const ChatRoleMap = {
 };
 
 export enum ChatSourceEnum {
-  'test' = 'test',
+  test = 'test',
   online = 'online',
   share = 'share',
   api = 'api'
@@ -39,16 +39,16 @@ export enum ChatSourceEnum {
 
 export const ChatSourceMap = {
   [ChatSourceEnum.test]: {
-    name: '调试测试'
+    name: 'chat.logs.test'
   },
   [ChatSourceEnum.online]: {
-    name: '在线使用'
+    name: 'chat.logs.online'
   },
   [ChatSourceEnum.share]: {
-    name: '链接分享'
+    name: 'chat.logs.share'
   },
   [ChatSourceEnum.api]: {
-    name: 'API调用'
+    name: 'chat.logs.api'
   }
 };
 
@@ -56,7 +56,8 @@ export enum ChatModuleEnum {
   'AIChat' = 'AI Chat',
   'KBSearch' = 'KB Search',
   'CQ' = 'Classify Question',
-  'Extract' = 'Content Extract'
+  'Extract' = 'Content Extract',
+  'Http' = 'Http'
 }
 
 export enum OutLinkTypeEnum {
@@ -64,8 +65,8 @@ export enum OutLinkTypeEnum {
   'iframe' = 'iframe'
 }
 
-export const HUMAN_ICON = `https://fastgpt.run/icon/human.png`;
-export const LOGO_ICON = `https://fastgpt.run/icon/logo.png`;
+export const HUMAN_ICON = `/icon/human.png`;
+export const LOGO_ICON = `/icon/logo.svg`;
 
 export const getDefaultChatVariables = () => ({
   cTime: dayjs().format('YYYY/MM/DD HH:mm:ss')

client/src/constants/flow/ModuleTemplate.ts

@@ -184,8 +184,9 @@ export const ChatModule: FlowModuleTemplateType = {
     {
       key: TaskResponseKeyEnum.answerText,
       label: '模型回复',
-      description: '直接响应，无需配置',
-      type: FlowOutputItemTypeEnum.hidden,
+      description: '将在 stream 回复完毕后触发',
+      valueType: FlowValueTypeEnum.string,
+      type: FlowOutputItemTypeEnum.source,
       targets: []
     },
     {
@@ -217,7 +218,7 @@ export const KBSearchModule: FlowModuleTemplateType = {
       key: 'similarity',
       type: FlowInputItemTypeEnum.slider,
       label: '相似度',
-      value: 0.8,
+      value: 0.4,
       min: 0,
       max: 1,
       step: 0.01,
@@ -280,15 +281,24 @@ export const AnswerModule: FlowModuleTemplateType = {
     Input_Template_TFSwitch,
     {
       key: SpecialInputKeyEnum.answerText,
-      value: '',
       type: FlowInputItemTypeEnum.textarea,
       valueType: FlowValueTypeEnum.string,
+      value: '',
       label: '回复的内容',
       description:
         '可以使用 \\n 来实现换行。也可以通过外部模块输入实现回复，外部模块输入时会覆盖当前填写的内容'
     }
   ],
-  outputs: []
+  outputs: [
+    {
+      key: 'finish',
+      label: '回复结束',
+      description: '回复完成后触发',
+      valueType: FlowValueTypeEnum.boolean,
+      type: FlowOutputItemTypeEnum.source,
+      targets: []
+    }
+  ]
 };
 export const TFSwitchModule: FlowModuleTemplateType = {
   logo: '',
@@ -330,11 +340,11 @@ export const ClassifyQuestionModule: FlowModuleTemplateType = {
       key: 'systemPrompt',
       type: FlowInputItemTypeEnum.textarea,
       valueType: FlowValueTypeEnum.string,
+      value: '',
       label: '系统提示词',
       description:
         '你可以添加一些特定内容的介绍，从而更好的识别用户的问题类型。这个内容通常是给模型介绍一个它不知道的内容。',
-      placeholder: '例如: \n1. Laf 是一个云函数开发平台……\n2. Sealos 是一个集群操作系统',
-      value: ''
+      placeholder: '例如: \n1. Laf 是一个云函数开发平台……\n2. Sealos 是一个集群操作系统'
     },
     Input_Template_History,
     Input_Template_UserChatInput,
@@ -392,12 +402,11 @@ export const ContextExtractModule: FlowModuleTemplateType = {
       key: ContextExtractEnum.description,
       type: FlowInputItemTypeEnum.textarea,
       valueType: FlowValueTypeEnum.string,
+      value: '',
       label: '提取要求描述',
       description: '写一段提取要求，告诉 AI 需要提取哪些内容',
       required: true,
-      placeholder:
-        '例如: \n1. 你是一个实验室预约助手。根据用户问题，提取出姓名、实验室号和预约时间',
-      value: ''
+      placeholder: '例如: \n1. 你是一个实验室预约助手。根据用户问题，提取出姓名、实验室号和预约时间'
     },
     Input_Template_History,
     {
@@ -836,7 +845,7 @@ export const appTemplates: (AppItemType & { avatar: string; intro: string })[] =
             key: 'similarity',
             type: 'slider',
             label: '相似度',
-            value: 0.8,
+            value: 0.4,
             min: 0,
             max: 1,
             step: 0.01,

client/src/constants/kb.ts

@@ -3,10 +3,14 @@ import type { KbItemType } from '@/types/plugin';
 export const defaultKbDetail: KbItemType = {
   _id: '',
   userId: '',
-  updateTime: new Date(),
-  avatar: '/icon/logo.png',
+  avatar: '/icon/logo.svg',
   name: '',
   tags: '',
-  totalData: 0,
-  model: 'text-embedding-ada-002'
+  vectorModel: {
+    model: 'text-embedding-ada-002',
+    name: 'Embedding-2',
+    price: 0.2,
+    defaultToken: 500,
+    maxToken: 8000
+  }
 };

client/src/constants/model.ts

@@ -13,7 +13,7 @@ export const defaultApp: AppSchema = {
   userId: 'userId',
   name: '模型加载中',
   type: 'basic',
-  avatar: '/icon/logo.png',
+  avatar: '/icon/logo.svg',
   intro: '',
   updateTime: Date.now(),
   share: {

client/src/constants/plugin.ts

@@ -6,3 +6,5 @@ export const TrainingTypeMap = {
   [TrainingModeEnum.qa]: 'qa',
   [TrainingModeEnum.index]: 'index'
 };
+
+export const PgTrainingTableName = 'modeldata';

client/src/constants/user.ts

@@ -16,17 +16,10 @@ export const BillSourceMap: Record<`${BillSourceEnum}`, string> = {
 };
 
 export enum PromotionEnum {
-  invite = 'invite',
-  shareModel = 'shareModel',
-  withdraw = 'withdraw'
+  register = 'register',
+  pay = 'pay'
 }
 
-export const PromotionTypeMap = {
-  [PromotionEnum.invite]: '好友充值',
-  [PromotionEnum.shareModel]: '应用分享',
-  [PromotionEnum.withdraw]: '提现'
-};
-
 export enum InformTypeEnum {
   system = 'system'
 }

client/src/hooks/useSelectFile.tsx

@@ -1,8 +1,12 @@
 import React, { useRef, useCallback } from 'react';
 import { Box } from '@chakra-ui/react';
+import { useToast } from './useToast';
+import { useTranslation } from 'react-i18next';
 
 export const useSelectFile = (props?: { fileType?: string; multiple?: boolean }) => {
+  const { t } = useTranslation();
   const { fileType = '*', multiple = false } = props || {};
+  const { toast } = useToast();
   const SelectFileDom = useRef<HTMLInputElement>(null);
 
   const File = useCallback(
@@ -15,12 +19,18 @@ export const useSelectFile = (props?: { fileType?: string; multiple?: boolean })
           multiple={multiple}
           onChange={(e) => {
             if (!e.target.files || e.target.files?.length === 0) return;
+            if (e.target.files.length > 10) {
+              return toast({
+                status: 'warning',
+                title: t('file.Select a maximum of 10 files')
+              });
+            }
             onSelect(Array.from(e.target.files));
           }}
         />
       </Box>
     ),
-    [fileType, multiple]
+    [fileType, multiple, t, toast]
   );
 
   const onOpen = useCallback(() => {

client/src/hooks/useSendCode.ts

@@ -1,10 +1,11 @@
 import { useState, useMemo, useCallback } from 'react';
 import { sendAuthCode } from '@/api/user';
 import { UserAuthTypeEnum } from '@/constants/common';
-let timer: any;
 import { useToast } from './useToast';
-import { getClientToken } from '@/utils/plugin/google';
 import { feConfigs } from '@/store/static';
+import { getErrText } from '@/utils/tools';
+
+let timer: any;
 
 export const useSendCode = () => {
   const { toast } = useToast();
@@ -45,7 +46,7 @@ export const useSendCode = () => {
         });
       } catch (error: any) {
         toast({
-          title: error.message || '发送验证码异常',
+          title: getErrText(error, '验证码发送异常'),
           status: 'error'
         });
       }
@@ -61,3 +62,20 @@ export const useSendCode = () => {
     codeCountDown
   };
 };
+
+export function getClientToken(googleClientVerKey?: string) {
+  if (!googleClientVerKey || typeof window.grecaptcha === 'undefined' || !window.grecaptcha?.ready)
+    return '';
+  return new Promise<string>((resolve, reject) => {
+    window.grecaptcha.ready(async () => {
+      try {
+        const token = await window.grecaptcha.execute(googleClientVerKey, {
+          action: 'submit'
+        });
+        resolve(token);
+      } catch (error) {
+        reject(error);
+      }
+    });
+  });
+}

client/src/pages/_app.tsx

@@ -10,11 +10,12 @@ import NProgress from 'nprogress'; //nprogress module
 import Router from 'next/router';
 import { clientInitData, feConfigs } from '@/store/static';
 import { appWithTranslation, useTranslation } from 'next-i18next';
-import { getLangStore } from '@/utils/i18n';
+import { getLangStore, setLangStore } from '@/utils/i18n';
 import { useRouter } from 'next/router';
 
 import 'nprogress/nprogress.css';
 import '@/styles/reset.scss';
+import { FeConfigsType } from '@/types';
 
 //Binding events.
 Router.events.on('routeChangeStart', () => NProgress.start());
@@ -27,37 +28,43 @@ const queryClient = new QueryClient({
     queries: {
       refetchOnWindowFocus: false,
       retry: false,
-      cacheTime: 0
+      cacheTime: 10
     }
   }
 });
 
 function App({ Component, pageProps }: AppProps) {
   const router = useRouter();
+  const { hiId } = router.query as { hiId?: string };
   const { i18n } = useTranslation();
 
+  const [scripts, setScripts] = useState<FeConfigsType['scripts']>([]);
   const [googleClientVerKey, setGoogleVerKey] = useState<string>();
-  const [baiduTongjiUrl, setBaiduTongjiUrl] = useState<string>();
 
   useEffect(() => {
     (async () => {
       const {
-        feConfigs: { googleClientVerKey, baiduTongjiUrl }
+        feConfigs: { scripts, googleClientVerKey }
       } = await clientInitData();
+      setScripts(scripts || []);
       setGoogleVerKey(googleClientVerKey);
-      setBaiduTongjiUrl(baiduTongjiUrl);
     })();
   }, []);
 
+  useEffect(() => {
+    hiId && localStorage.setItem('inviterId', hiId);
+  }, [hiId]);
+
   useEffect(() => {
     const lang = getLangStore() || 'zh';
     i18n?.changeLanguage?.(lang);
+    setLangStore(lang);
   }, [router.asPath]);
 
   return (
     <>
       <Head>
-        <title>{feConfigs?.systemTitle || 'FastAI'}</title>
+        <title>{feConfigs?.systemTitle || 'FastGPT'}</title>
         <meta name="description" content="Embedding + LLM, Build AI knowledge base" />
         <meta
           name="viewport"
@@ -68,12 +75,14 @@ function App({ Component, pageProps }: AppProps) {
       <Script src="/js/qrcode.min.js" strategy="lazyOnload"></Script>
       <Script src="/js/pdf.js" strategy="lazyOnload"></Script>
       <Script src="/js/html2pdf.bundle.min.js" strategy="lazyOnload"></Script>
-      {baiduTongjiUrl && <Script src={baiduTongjiUrl} strategy="lazyOnload"></Script>}
+      {scripts?.map((item, i) => (
+        <Script key={i} strategy="lazyOnload" {...item}></Script>
+      ))}
       {googleClientVerKey && (
         <>
           <Script
             src={`https://www.recaptcha.net/recaptcha/api.js?render=${googleClientVerKey}`}
-            strategy="afterInteractive"
+            strategy="lazyOnload"
           ></Script>
         </>
       )}

client/src/pages/account/components/OpenAIAccountModal.tsx

@@ -32,8 +32,7 @@ const OpenAIAccountModal = ({
     <MyModal isOpen onClose={onClose} title={t('user.OpenAI Account Setting')}>
       <ModalBody>
         <Box fontSize={'sm'} color={'myGray.500'}>
-          如果你填写了该内容，在线上平台使用 OpenAI Chat
-          模型不会计费（不包含知识库训练、索引生成、分享窗口和 API 调用）
+          如果你填写了该内容，在线上平台使用 OpenAI Chat 模型不会计费（不包含知识库训练、索引生成）
         </Box>
         <Flex alignItems={'center'} mt={5}>
           <Box flex={'0 0 65px'}>API Key:</Box>

client/src/pages/account/components/PayRecordTable.tsx

@@ -26,6 +26,12 @@ const PayRecordTable = () => {
   const [payOrders, setPayOrders] = useState<PaySchema[]>([]);
   const { toast } = useToast();
 
+  const { isInitialLoading, refetch } = useQuery(['initPayOrder'], getPayOrders, {
+    onSuccess(res) {
+      setPayOrders(res);
+    }
+  });
+
   const handleRefreshPayOrder = useCallback(
     async (payId: string) => {
       setIsLoading(true);
@@ -36,8 +42,6 @@ const PayRecordTable = () => {
           title: data,
           status: 'success'
         });
-        const res = await getPayOrders();
-        setPayOrders(res);
       } catch (error: any) {
         toast({
           title: error?.message,
@@ -45,18 +49,15 @@ const PayRecordTable = () => {
         });
         console.log(error);
       }
+      try {
+        refetch();
+      } catch (error) {}
 
       setIsLoading(false);
     },
-    [setIsLoading, toast]
+    [refetch, setIsLoading, toast]
   );
 
-  const { isInitialLoading } = useQuery(['initPayOrder'], getPayOrders, {
-    onSuccess(res) {
-      setPayOrders(res);
-    }
-  });
-
   return (
     <Box position={'relative'} h={'100%'}>
       {!isInitialLoading && payOrders.length === 0 ? (

client/src/pages/account/components/Promotion.tsx

@@ -0,0 +1,148 @@
+import React from 'react';
+import {
+  Grid,
+  Box,
+  Flex,
+  BoxProps,
+  useTheme,
+  Button,
+  Table,
+  Thead,
+  Tbody,
+  Tr,
+  Th,
+  Td,
+  TableContainer
+} from '@chakra-ui/react';
+import { useTranslation } from 'next-i18next';
+import { useQuery } from '@tanstack/react-query';
+import { getPromotionInitData, getPromotionRecords } from '@/api/user';
+import { useUserStore } from '@/store/user';
+import { useLoading } from '@/hooks/useLoading';
+
+import MyTooltip from '@/components/MyTooltip';
+import { QuestionOutlineIcon } from '@chakra-ui/icons';
+import { useCopyData } from '@/utils/tools';
+import { usePagination } from '@/hooks/usePagination';
+import { PromotionRecordType } from '@/api/response/user';
+import MyIcon from '@/components/Icon';
+import dayjs from 'dayjs';
+
+const Promotion = () => {
+  const { t } = useTranslation();
+  const theme = useTheme();
+  const { copyData } = useCopyData();
+  const { userInfo } = useUserStore();
+  const { Loading } = useLoading();
+
+  const {
+    data: promotionRecords,
+    isLoading,
+    total,
+    pageSize,
+    Pagination
+  } = usePagination<PromotionRecordType>({
+    api: getPromotionRecords
+  });
+
+  const { data: { invitedAmount = 0, earningsAmount = 0 } = {} } = useQuery(
+    ['getPromotionInitData'],
+    getPromotionInitData
+  );
+
+  const statisticsStyles: BoxProps = {
+    p: [4, 5],
+    border: theme.borders.base,
+    textAlign: 'center',
+    fontSize: ['md', 'xl'],
+    borderRadius: 'md'
+  };
+  const titleStyles: BoxProps = {
+    mt: 2,
+    fontSize: ['lg', '28px'],
+    fontWeight: 'bold'
+  };
+
+  return (
+    <Flex flexDirection={'column'} py={[0, 5]} px={5} h={'100%'} position={'relative'}>
+      <Grid gridTemplateColumns={['1fr 1fr', 'repeat(2,1fr)', 'repeat(4,1fr)']} gridGap={5}>
+        <Box {...statisticsStyles}>
+          <Box>{t('user.Amount of inviter')}</Box>
+          <Box {...titleStyles}>{invitedAmount}</Box>
+        </Box>
+        <Box {...statisticsStyles}>
+          <Box>{t('user.Amount of earnings')}</Box>
+          <Box {...titleStyles}>{earningsAmount}</Box>
+        </Box>
+        <Box {...statisticsStyles}>
+          <Flex alignItems={'center'} justifyContent={'center'}>
+            <Box>{t('user.Promotion Rate')}</Box>
+            <MyTooltip label={t('user.Promotion rate tip')}>
+              <QuestionOutlineIcon ml={1} />
+            </MyTooltip>
+          </Flex>
+          <Box {...titleStyles}>{userInfo?.promotionRate || 15}%</Box>
+        </Box>
+        <Box {...statisticsStyles}>
+          <Flex alignItems={'center'} justifyContent={'center'}>
+            <Box>{t('user.Invite Url')}</Box>
+            <MyTooltip label={t('user.Invite url tip')}>
+              <QuestionOutlineIcon ml={1} />
+            </MyTooltip>
+          </Flex>
+          <Button
+            mt={4}
+            variant={'base'}
+            fontSize={'sm'}
+            onClick={() => {
+              copyData(`${location.origin}/?hiId=${userInfo?._id}`);
+            }}
+          >
+            {t('user.Copy invite url')}
+          </Button>
+        </Box>
+      </Grid>
+      <Box mt={5}>
+        <TableContainer position={'relative'} overflow={'hidden'} minH={'100px'}>
+          <Table>
+            <Thead>
+              <Tr>
+                <Th>时间</Th>
+                <Th>类型</Th>
+                <Th>金额(￥)</Th>
+              </Tr>
+            </Thead>
+            <Tbody fontSize={'sm'}>
+              {promotionRecords.map((item) => (
+                <Tr key={item._id}>
+                  <Td>
+                    {item.createTime ? dayjs(item.createTime).format('YYYY/MM/DD HH:mm:ss') : '-'}
+                  </Td>
+                  <Td>{t(`user.promotion.${item.type}`)}</Td>
+                  <Td>{item.amount}</Td>
+                </Tr>
+              ))}
+            </Tbody>
+          </Table>
+        </TableContainer>
+
+        {!isLoading && promotionRecords.length === 0 && (
+          <Flex mt={'10vh'} flexDirection={'column'} alignItems={'center'}>
+            <MyIcon name="empty" w={'48px'} h={'48px'} color={'transparent'} />
+            <Box mt={2} color={'myGray.500'}>
+              无邀请记录~
+            </Box>
+          </Flex>
+        )}
+        {total > pageSize && (
+          <Flex mt={4} justifyContent={'flex-end'}>
+            <Pagination />
+          </Flex>
+        )}
+        <Loading loading={isLoading} fixed={false} />
+      </Box>
+    </Flex>
+  );
+};
+
+export default Promotion;

client/src/pages/account/components/UpdatePswModal.tsx

@@ -6,9 +6,15 @@ import { useForm } from 'react-hook-form';
 import { useRequest } from '@/hooks/useRequest';
 import { updatePasswordByOld } from '@/api/user';
 
+type FormType = {
+  oldPsw: string;
+  newPsw: string;
+  confirmPsw: string;
+};
+
 const UpdatePswModal = ({ onClose }: { onClose: () => void }) => {
   const { t } = useTranslation();
-  const { register, handleSubmit } = useForm({
+  const { register, handleSubmit } = useForm<FormType>({
     defaultValues: {
       oldPsw: '',
       newPsw: '',
@@ -17,7 +23,10 @@ const UpdatePswModal = ({ onClose }: { onClose: () => void }) => {
   });
 
   const { mutate: onSubmit, isLoading } = useRequest({
-    mutationFn: (data) => {
+    mutationFn: (data: FormType) => {
+      if (data.newPsw !== data.confirmPsw) {
+        return Promise.reject(t('commom.Password inconsistency'));
+      }
       return updatePasswordByOld(data);
     },
     onSuccess() {
@@ -36,11 +45,31 @@ const UpdatePswModal = ({ onClose }: { onClose: () => void }) => {
         </Flex>
         <Flex alignItems={'center'} mt={5}>
           <Box flex={'0 0 70px'}>新密码:</Box>
-          <Input flex={1} type={'password'} {...register('newPsw', { required: true })}></Input>
+          <Input
+            flex={1}
+            type={'password'}
+            {...register('newPsw', {
+              required: true,
+              maxLength: {
+                value: 20,
+                message: '密码最少 4 位最多 20 位'
+              }
+            })}
+          ></Input>
         </Flex>
         <Flex alignItems={'center'} mt={5}>
           <Box flex={'0 0 70px'}>确认密码:</Box>
-          <Input flex={1} type={'password'} {...register('confirmPsw', { required: true })}></Input>
+          <Input
+            flex={1}
+            type={'password'}
+            {...register('confirmPsw', {
+              required: true,
+              maxLength: {
+                value: 20,
+                message: '密码最少 4 位最多 20 位'
+              }
+            })}
+          ></Input>
         </Flex>
       </ModalBody>
       <ModalFooter>

client/src/pages/account/index.tsx

@@ -11,19 +11,17 @@ import SideTabs from '@/components/SideTabs';
 import Tabs from '@/components/Tabs';
 import UserInfo from './components/Info';
 import { serviceSideProps } from '@/utils/i18n';
+import { feConfigs } from '@/store/static';
+import { useTranslation } from 'react-i18next';
 
-const BillTable = dynamic(() => import('./components/BillTable'), {
-  ssr: false
-});
-const PayRecordTable = dynamic(() => import('./components/PayRecordTable'), {
-  ssr: false
-});
-const InformTable = dynamic(() => import('./components/InformTable'), {
-  ssr: false
-});
+const Promotion = dynamic(() => import('./components/Promotion'));
+const BillTable = dynamic(() => import('./components/BillTable'));
+const PayRecordTable = dynamic(() => import('./components/PayRecordTable'));
+const InformTable = dynamic(() => import('./components/InformTable'));
 
 enum TabEnum {
   'info' = 'info',
+  'promotion' = 'promotion',
   'bill' = 'bill',
   'pay' = 'pay',
   'inform' = 'inform',
@@ -31,36 +29,42 @@ enum TabEnum {
 }
 
 const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
+  const { t } = useTranslation();
   const tabList = useRef([
     {
       icon: 'meLight',
-      label: 'user.Personal Information',
-      id: TabEnum.info,
-      Component: <BillTable />
+      label: t('user.Personal Information'),
+      id: TabEnum.info
     },
+
     {
       icon: 'billRecordLight',
-      label: 'user.Usage Record',
-      id: TabEnum.bill,
-      Component: <BillTable />
-    },
-    {
-      icon: 'payRecordLight',
-      label: 'user.Recharge Record',
-      id: TabEnum.pay,
-      Component: <PayRecordTable />
+      label: t('user.Usage Record'),
+      id: TabEnum.bill
     },
+    ...(feConfigs?.show_userDetail
+      ? [
+          {
+            icon: 'promotionLight',
+            label: t('user.Promotion Record'),
+            id: TabEnum.promotion
+          },
+          {
+            icon: 'payRecordLight',
+            label: t('user.Recharge Record'),
+            id: TabEnum.pay
+          }
+        ]
+      : []),
     {
       icon: 'informLight',
-      label: 'user.Notice',
-      id: TabEnum.inform,
-      Component: <InformTable />
+      label: t('user.Notice'),
+      id: TabEnum.inform
     },
     {
       icon: 'loginoutLight',
-      label: 'user.Sign Out',
-      id: TabEnum.loginout,
-      Component: () => <></>
+      label: t('user.Sign Out'),
+      id: TabEnum.loginout
     }
   ]);
 
@@ -117,7 +121,6 @@ const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
           <Box mb={3}>
             <Tabs
               m={'auto'}
-              w={'90%'}
               size={isPc ? 'md' : 'sm'}
               list={tabList.current.map((item) => ({
                 id: item.id,
@@ -131,6 +134,7 @@ const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
 
         <Box flex={'1 0 0'} h={'100%'} pb={[4, 0]}>
           {currentTab === TabEnum.info && <UserInfo />}
+          {currentTab === TabEnum.promotion && <Promotion />}
           {currentTab === TabEnum.bill && <BillTable />}
           {currentTab === TabEnum.pay && <PayRecordTable />}
           {currentTab === TabEnum.inform && <InformTable />}

client/src/pages/api/admin/initChat.ts

@@ -45,9 +45,7 @@ async function init(limit: number, skip: number) {
       chatId: { $exists: false }
     },
     '_id'
-  )
-    .limit(limit)
-    .skip(skip);
+  ).limit(limit);
 
   await Promise.all(
     chats.map((chat) =>

client/src/pages/api/admin/initChatItem.ts

@@ -0,0 +1,98 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { authUser } from '@/service/utils/auth';
+import { connectToDatabase, Chat, ChatItem } from '@/service/mongo';
+import { customAlphabet } from 'nanoid';
+const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 24);
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await authUser({ req, authRoot: true });
+    await connectToDatabase();
+
+    const { limit = 100 } = req.body as { limit: number };
+    let skip = 0;
+
+    const total = await Chat.countDocuments({
+      content: { $exists: true, $not: { $size: 0 } },
+      isInit: { $ne: true }
+    });
+    const totalChat = await Chat.aggregate([
+      {
+        $project: {
+          contentLength: { $size: '$content' }
+        }
+      },
+      {
+        $group: {
+          _id: null,
+          totalLength: { $sum: '$contentLength' }
+        }
+      }
+    ]);
+
+    console.log('chatLen:', total, totalChat);
+
+    let promise = Promise.resolve();
+
+    for (let i = 0; i < total; i += limit) {
+      const skipVal = skip;
+      skip += limit;
+      promise = promise
+        .then(() => init(limit))
+        .then(() => {
+          console.log(skipVal);
+        });
+    }
+
+    await promise;
+
+    jsonRes(res, {});
+  } catch (error) {
+    jsonRes(res, {
+      code: 500,
+      error
+    });
+  }
+}
+
+async function init(limit: number) {
+  // 遍历 app
+  const chats = await Chat.find(
+    {
+      content: { $exists: true, $not: { $size: 0 } },
+      isInit: { $ne: true }
+    },
+    '_id userId appId chatId content'
+  )
+    .sort({ updateTime: -1 })
+    .limit(limit);
+
+  await Promise.all(
+    chats.map(async (chat) => {
+      const inserts = chat.content
+        .map((item) => ({
+          dataId: nanoid(),
+          chatId: chat.chatId,
+          userId: chat.userId,
+          appId: chat.appId,
+          obj: item.obj,
+          value: item.value,
+          responseData: item.responseData
+        }))
+        .filter((item) => item.chatId && item.userId && item.appId && item.obj && item.value);
+
+      try {
+        await Promise.all(inserts.map((item) => ChatItem.create(item)));
+        await Chat.findByIdAndUpdate(chat._id, {
+          isInit: true
+        });
+      } catch (error) {
+        console.log(error);
+
+        await ChatItem.deleteMany({ chatId: chat.chatId });
+      }
+    })
+  );
+}

client/src/pages/api/admin/initv4.ts

@@ -408,9 +408,7 @@ async function init(limit: number, skip: number) {
       // userId: '63f9a14228d2a688d8dc9e1b'
     },
     '_id chat'
-  )
-    .limit(limit)
-    .skip(skip);
+  ).limit(limit);
 
   return Promise.all(
     apps.map(async (app) => {

client/src/pages/api/app/getChatLogs.ts

@@ -0,0 +1,72 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { Chat, ChatItem, connectToDatabase } from '@/service/mongo';
+import { authUser } from '@/service/utils/auth';
+import type { PagingData } from '@/types';
+import { AppLogsListItemType } from '@/types/app';
+import { Types } from 'mongoose';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    const {
+      pageNum = 1,
+      pageSize = 20,
+      appId
+    } = req.body as { pageNum: number; pageSize: number; appId: string };
+
+    if (!appId) {
+      throw new Error('缺少参数');
+    }
+    await connectToDatabase();
+
+    // 凭证校验
+    const { userId } = await authUser({ req, authToken: true });
+
+    const where = {
+      appId: new Types.ObjectId(appId),
+      userId: new Types.ObjectId(userId)
+    };
+
+    const [data, total] = await Promise.all([
+      Chat.aggregate([
+        { $match: where },
+        { $sort: { updateTime: -1 } },
+        { $skip: (pageNum - 1) * pageSize },
+        { $limit: pageSize },
+        {
+          $lookup: {
+            from: 'chatitems',
+            localField: 'chatId',
+            foreignField: 'chatId',
+            as: 'messageCount'
+          }
+        },
+        {
+          $project: {
+            id: '$chatId',
+            title: 1,
+            source: 1,
+            time: '$updateTime',
+            messageCount: { $size: '$messageCount' },
+            callbackCount: { $literal: 0 }
+          }
+        }
+      ]),
+      Chat.countDocuments(where)
+    ]);
+
+    jsonRes<PagingData<AppLogsListItemType>>(res, {
+      data: {
+        pageNum,
+        pageSize,
+        data,
+        total
+      }
+    });
+  } catch (error) {
+    jsonRes(res, {
+      code: 500,
+      error
+    });
+  }
+}

client/src/pages/api/app/share/getModels.ts

@@ -57,7 +57,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       {
         $project: {
           _id: 1,
-          avatar: { $ifNull: ['$avatar', '/icon/logo.png'] },
+          avatar: { $ifNull: ['$avatar', '/icon/logo.svg'] },
           name: 1,
           userId: 1,
           intro: 1,

client/src/pages/api/chat/chatTest.ts

@@ -4,16 +4,14 @@ import { authUser } from '@/service/utils/auth';
 import { sseErrRes } from '@/service/response';
 import { sseResponseEventEnum } from '@/constants/chat';
 import { sseResponse } from '@/service/utils/tools';
-import { type ChatCompletionRequestMessage } from 'openai';
 import { AppModuleItemType } from '@/types/app';
 import { dispatchModules } from '../openapi/v1/chat/completions';
-import { gptMessage2ChatType } from '@/utils/adapt';
 import { pushTaskBill } from '@/service/events/pushBill';
 import { BillSourceEnum } from '@/constants/user';
+import { ChatItemType } from '@/types/chat';
 
-export type MessageItemType = ChatCompletionRequestMessage & { _id?: string };
 export type Props = {
-  history: MessageItemType[];
+  history: ChatItemType[];
   prompt: string;
   modules: AppModuleItemType[];
   variables: Record<string, any>;
@@ -51,7 +49,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       variables,
       user,
       params: {
-        history: gptMessage2ChatType(history),
+        history,
         userChatInput: prompt
       },
       stream: true,
@@ -83,3 +81,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     res.end();
   }
 }
+
+export const config = {
+  api: {
+    bodyParser: {
+      sizeLimit: '20mb'
+    }
+  }
+};

client/src/pages/api/chat/delChatRecordByContentId.ts

@@ -1,35 +1,23 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, Chat } from '@/service/mongo';
+import { connectToDatabase, ChatItem } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     const { chatId, contentId } = req.query as { chatId: string; contentId: string };
 
-    if (!chatId || !contentId) {
-      throw new Error('缺少参数');
-    }
-
     await connectToDatabase();
 
     // 凭证校验
     const { userId } = await authUser({ req, authToken: true });
 
-    const chatRecord = await Chat.findOne({ chatId });
-
-    if (!chatRecord) {
-      throw new Error('找不到对话');
-    }
-
     // 删除一条数据库记录
-    await Chat.updateOne(
-      {
-        chatId,
-        userId
-      },
-      { $pull: { content: { _id: contentId } } }
-    );
+    await ChatItem.deleteOne({
+      dataId: contentId,
+      chatId,
+      userId
+    });
 
     jsonRes(res);
   } catch (err) {

client/src/pages/api/chat/history/updateHistoryQuote.ts

@@ -1,57 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
-import { connectToDatabase, Chat } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
-import { Types } from 'mongoose';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    let {
-      chatId,
-      contentId,
-      quoteId,
-      sourceText = ''
-    } = req.body as {
-      chatId: string;
-      contentId: string;
-      quoteId: string;
-      sourceText: string;
-    };
-    await connectToDatabase();
-
-    const { userId } = await authUser({ req, authToken: true });
-
-    if (!contentId || !chatId || !quoteId) {
-      throw new Error('params is error');
-    }
-
-    await Chat.updateOne(
-      {
-        chatId,
-        userId: new Types.ObjectId(userId),
-        'content._id': new Types.ObjectId(contentId)
-      },
-      {
-        $set: {
-          'content.$.rawSearch.$[quoteElem].source': sourceText
-        }
-      },
-      {
-        arrayFilters: [
-          {
-            'quoteElem.id': quoteId
-          }
-        ]
-      }
-    );
-
-    jsonRes(res, {
-      data: ''
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}

client/src/pages/api/chat/init.ts

@@ -1,11 +1,10 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, Chat } from '@/service/mongo';
+import { Chat, ChatItem } from '@/service/mongo';
 import type { InitChatResponse } from '@/api/response/chat';
 import { authUser } from '@/service/utils/auth';
 import { ChatItemType } from '@/types/chat';
 import { authApp } from '@/service/utils/auth';
-import mongoose from 'mongoose';
 import type { ChatSchema } from '@/types/mongoSchema';
 import { getSpecialModule, getChatModelNameList } from '@/components/ChatBox/utils';
 import { TaskResponseKeyEnum } from '@/constants/chat';
@@ -27,8 +26,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       });
     }
 
-    await connectToDatabase();
-
     // 校验使用权限
     const app = (
       await authApp({
@@ -39,49 +36,42 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       })
     ).app;
 
-    // 历史记录
+    // get app and history
     const { chat, history = [] }: { chat?: ChatSchema; history?: ChatItemType[] } =
       await (async () => {
         if (chatId) {
           // auth chatId
           const [chat, history] = await Promise.all([
-            Chat.findOne({
-              chatId,
-              userId
-            }),
-            Chat.aggregate([
+            Chat.findOne(
               {
-                $match: {
-                  chatId,
-                  userId: new mongoose.Types.ObjectId(userId)
-                }
+                chatId,
+                userId
               },
+              'title variables'
+            ),
+            ChatItem.find(
               {
-                $project: {
-                  content: {
-                    $slice: ['$content', -30] // 返回 content 数组的最后 30 个元素
-                  }
-                }
+                chatId,
+                userId
               },
-              { $unwind: '$content' },
-              {
-                $project: {
-                  _id: '$content._id',
-                  obj: '$content.obj',
-                  value: '$content.value',
-                  [TaskResponseKeyEnum.responseData]: `$content.${TaskResponseKeyEnum.responseData}`
-                }
-              }
-            ])
+              `dataId obj value ${TaskResponseKeyEnum.responseData}`
+            )
+              .sort({ _id: -1 })
+              .limit(30)
           ]);
           if (!chat) {
             throw new Error('聊天框不存在');
           }
-          return { history, chat };
+          history.reverse();
+          return { app, history, chat };
         }
         return {};
       })();
 
+    if (!app) {
+      throw new Error('Auth App Error');
+    }
+
     const isOwner = String(app.userId) === userId;
 
     jsonRes<InitChatResponse>(res, {
@@ -108,3 +98,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     });
   }
 }
+
+export const config = {
+  api: {
+    bodyParser: {
+      sizeLimit: '10mb'
+    }
+  }
+};

client/src/pages/api/chat/removeHistory.ts

@@ -1,6 +1,6 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, Chat } from '@/service/mongo';
+import { connectToDatabase, Chat, ChatItem } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 
 type Props = {
@@ -17,16 +17,28 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     await connectToDatabase();
 
     if (chatId) {
-      await Chat.findOneAndRemove({
-        chatId,
-        userId
-      });
+      await Promise.all([
+        Chat.findOneAndRemove({
+          chatId,
+          userId
+        }),
+        ChatItem.deleteMany({
+          userId,
+          chatId
+        })
+      ]);
     }
     if (appId) {
-      await Chat.deleteMany({
-        appId,
-        userId
-      });
+      await Promise.all([
+        Chat.deleteMany({
+          appId,
+          userId
+        }),
+        ChatItem.deleteMany({
+          userId,
+          appId
+        })
+      ]);
     }
 
     jsonRes(res);

client/src/pages/api/openapi/kb/delDataById.ts

@@ -3,6 +3,7 @@ import { jsonRes } from '@/service/response';
 import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 import { withNextCors } from '@/service/utils/tools';
+import { PgTrainingTableName } from '@/constants/plugin';
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -17,7 +18,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     // 凭证校验
     const { userId } = await authUser({ req });
 
-    await PgClient.delete('modelData', {
+    await PgClient.delete(PgTrainingTableName, {
       where: [['user_id', userId], 'AND', ['id', dataId]]
     });
 

client/src/pages/api/openapi/kb/pushData.ts

@@ -1,10 +1,10 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, TrainingData } from '@/service/mongo';
+import { connectToDatabase, TrainingData, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { authKb } from '@/service/utils/auth';
 import { withNextCors } from '@/service/utils/tools';
-import { TrainingModeEnum } from '@/constants/plugin';
+import { PgTrainingTableName, TrainingModeEnum } from '@/constants/plugin';
 import { startQueue } from '@/service/utils/tools';
 import { PgClient } from '@/service/pg';
 import { modelToolMap } from '@/utils/plugin';
@@ -14,7 +14,6 @@ export type DateItemType = { a: string; q: string; source?: string };
 export type Props = {
   kbId: string;
   data: DateItemType[];
-  model: string;
   mode: `${TrainingModeEnum}`;
   prompt?: string;
 };
@@ -30,23 +29,12 @@ const modeMaxToken = {
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { kbId, data, mode, prompt, model } = req.body as Props;
+    const { kbId, data, mode, prompt } = req.body as Props;
 
-    if (!kbId || !Array.isArray(data) || !model) {
+    if (!kbId || !Array.isArray(data)) {
       throw new Error('缺少参数');
     }
 
-    // auth model
-    if (mode === TrainingModeEnum.qa && !global.qaModels.find((item) => item.model === model)) {
-      throw new Error('不支持的 QA 拆分模型');
-    }
-    if (
-      mode === TrainingModeEnum.index &&
-      !global.vectorModels.find((item) => item.model === model)
-    ) {
-      throw new Error('不支持的向量生成模型');
-    }
-
     await connectToDatabase();
 
     // 凭证校验
@@ -58,8 +46,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
         data,
         userId,
         mode,
-        prompt,
-        model
+        prompt
       })
     });
   } catch (err) {
@@ -75,8 +62,7 @@ export async function pushDataToKb({
   kbId,
   data,
   mode,
-  prompt,
-  model
+  prompt
 }: { userId: string } & Props): Promise<Response> {
   await authKb({
     userId,
@@ -90,15 +76,14 @@ export async function pushDataToKb({
   data.forEach((item) => {
     const text = item.q + item.a;
 
-    if (mode === TrainingModeEnum.qa) {
-      // count token
-      const token = modelToolMap.countTokens({
-        model: 'gpt-3.5-turbo-16k',
-        messages: [{ obj: 'System', value: item.q }]
-      });
-      if (token > modeMaxToken[TrainingModeEnum.qa]) {
-        return;
-      }
+    // count token
+    const token = modelToolMap.countTokens({
+      model: 'gpt-3.5-turbo',
+      messages: [{ obj: 'System', value: item.q }]
+    });
+
+    if (token > modeMaxToken[TrainingModeEnum.qa]) {
+      return;
     }
 
     if (!set.has(text)) {
@@ -130,7 +115,7 @@ export async function pushDataToKb({
         try {
           const { rows } = await PgClient.query(`
             SELECT COUNT(*) > 0 AS exists
-            FROM  modelData 
+            FROM  ${PgTrainingTableName} 
             WHERE md5(q)=md5('${q}') AND md5(a)=md5('${a}') AND user_id='${userId}' AND kb_id='${kbId}'
           `);
           const exists = rows[0]?.exists || false;
@@ -153,17 +138,24 @@ export async function pushDataToKb({
     .filter((item) => item.status === 'fulfilled')
     .map<DateItemType>((item: any) => item.value);
 
+  const vectorModel = await (async () => {
+    if (mode === TrainingModeEnum.index) {
+      return (await KB.findById(kbId, 'vectorModel'))?.vectorModel || global.vectorModels[0].model;
+    }
+    return global.vectorModels[0].model;
+  })();
+
   // 插入记录
   await TrainingData.insertMany(
     insertData.map((item) => ({
       q: item.q,
       a: item.a,
-      model,
       source: item.source,
       userId,
       kbId,
       mode,
-      prompt
+      prompt,
+      vectorModel
     }))
   );
 

client/src/pages/api/openapi/kb/searchTest.ts

@@ -5,9 +5,10 @@ import { PgClient } from '@/service/pg';
 import { withNextCors } from '@/service/utils/tools';
 import { getVector } from '../plugin/vector';
 import type { KbTestItemType } from '@/types/plugin';
+import { PgTrainingTableName } from '@/constants/plugin';
+import { KB } from '@/service/mongo';
 
 export type Props = {
-  model: string;
   kbId: string;
   text: string;
 };
@@ -15,21 +16,24 @@ export type Response = KbTestItemType['results'];
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { kbId, text, model } = req.body as Props;
+    const { kbId, text } = req.body as Props;
 
-    if (!kbId || !text || !model) {
+    if (!kbId || !text) {
       throw new Error('缺少参数');
     }
 
     // 凭证校验
-    const { userId } = await authUser({ req });
+    const [{ userId }, kb] = await Promise.all([
+      authUser({ req }),
+      KB.findById(kbId, 'vectorModel')
+    ]);
 
-    if (!userId) {
+    if (!userId || !kb) {
       throw new Error('缺少用户ID');
     }
 
     const { vectors } = await getVector({
-      model,
+      model: kb.vectorModel,
       userId,
       input: [text]
     });
@@ -39,7 +43,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
         SET LOCAL ivfflat.probes = ${global.systemEnv.pgIvfflatProbe || 10};
         select id,q,a,source,(vector <#> '[${
           vectors[0]
-        }]') * -1 AS score from modelData where kb_id='${kbId}' AND user_id='${userId}' order by vector <#> '[${
+        }]') * -1 AS score from ${PgTrainingTableName} where kb_id='${kbId}' AND user_id='${userId}' order by vector <#> '[${
         vectors[0]
       }]' limit 12;
         COMMIT;`

client/src/pages/api/openapi/kb/updateData.ts

@@ -5,6 +5,7 @@ import { PgClient } from '@/service/pg';
 import { withNextCors } from '@/service/utils/tools';
 import { KB, connectToDatabase } from '@/service/mongo';
 import { getVector } from '../plugin/vector';
+import { PgTrainingTableName } from '@/constants/plugin';
 
 export type Props = {
   dataId: string;
@@ -23,11 +24,8 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
 
     await connectToDatabase();
 
-    // 凭证校验
-    const { userId } = await authUser({ req });
-
-    // find model
-    const kb = await KB.findById(kbId, 'model');
+    // auth user and get kb
+    const [{ userId }, kb] = await Promise.all([authUser({ req }), KB.findById(kbId, 'model')]);
 
     if (!kb) {
       throw new Error("Can't find database");
@@ -39,14 +37,14 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
         return getVector({
           userId,
           input: [q],
-          model: kb.model
+          model: kb.vectorModel
         });
       }
       return { vectors: [[]] };
     })();
 
     // 更新 pg 内容.仅修改a，不需要更新向量。
-    await PgClient.update('modelData', {
+    await PgClient.update(PgTrainingTableName, {
       where: [['id', dataId], 'AND', ['user_id', userId]],
       values: [
         { key: 'source', value: '手动修改' },

client/src/pages/api/openapi/plugin/vector.ts

@@ -67,13 +67,13 @@ export async function getVector({
       }
     )
     .then((res) => {
-      if (!res.data?.usage?.total_tokens) {
+      if (!res.data?.data?.[0]?.embedding) {
         // @ts-ignore
         return Promise.reject(res.data?.error?.message || 'Embedding Error');
       }
       return {
         tokenLen: res.data.usage.total_tokens || 0,
-        vectors: res.data.data.map((item) => item.embedding)
+        vectors: res.data.data.map((item) => unityDimensional(item.embedding))
       };
     });
 
@@ -86,3 +86,12 @@ export async function getVector({
 
   return result;
 }
+
+function unityDimensional(vector: number[]) {
+  let resultVector = vector;
+  const vectorLen = vector.length;
+
+  const zeroVector = new Array(1536 - vectorLen).fill(0);
+
+  return resultVector.concat(zeroVector);
+}

client/src/pages/api/openapi/v1/chat/completions.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { connectToDatabase } from '@/service/mongo';
 import { authUser, authApp, authShareChat, AuthUserTypeEnum } from '@/service/utils/auth';
 import { sseErrRes, jsonRes } from '@/service/response';
-import { withNextCors } from '@/service/utils/tools';
+import { addLog, withNextCors } from '@/service/utils/tools';
 import { ChatRoleEnum, ChatSourceEnum, sseResponseEventEnum } from '@/constants/chat';
 import {
   dispatchHistory,
@@ -27,8 +27,9 @@ import { pushTaskBill } from '@/service/events/pushBill';
 import { BillSourceEnum } from '@/constants/user';
 import { ChatHistoryItemResType } from '@/types/chat';
 import { UserModelSchema } from '@/types/mongoSchema';
+import { SystemInputEnum } from '@/constants/app';
 
-export type MessageItemType = ChatCompletionRequestMessage & { _id?: string };
+export type MessageItemType = ChatCompletionRequestMessage & { dataId?: string };
 type FastGptWebChatProps = {
   chatId?: string; // undefined: nonuse history, '': new chat, 'xxxxx': use history
   appId?: string;
@@ -94,9 +95,9 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     if (!user) {
       throw new Error('Account is error');
     }
-    if (authType === AuthUserTypeEnum.apikey || shareId) {
-      user.openaiAccount = undefined;
-    }
+    // if (authType === AuthUserTypeEnum.apikey || shareId) {
+    //   user.openaiAccount = undefined;
+    // }
 
     appId = appId ? appId : authAppid;
     if (!appId) {
@@ -172,7 +173,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
         content: [
           prompt,
           {
-            _id: messages[messages.length - 1]._id,
+            dataId: messages[messages.length - 1].dataId,
             obj: ChatRoleEnum.AI,
             value: answerText,
             responseData
@@ -181,7 +182,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       });
     }
 
-    console.log(`finish time: ${(Date.now() - startTime) / 1000}s`);
+    addLog.info(`completions running time: ${(Date.now() - startTime) / 1000}s`);
 
     if (stream) {
       sseResponse({
@@ -302,6 +303,8 @@ export async function dispatchModules({
 
         if (!set.has(module.moduleId) && checkInputFinish()) {
           set.add(module.moduleId);
+          // remove switch
+          updateInputValue(SystemInputEnum.switch, undefined);
           return moduleRun(module);
         }
       })
@@ -324,6 +327,7 @@ export async function dispatchModules({
             // find module
             const targetModule = runningModules.find((item) => item.moduleId === target.moduleId);
             if (!targetModule) return;
+
             return moduleInput(targetModule, { [target.key]: outputItem.value });
           })
         );
@@ -332,7 +336,6 @@ export async function dispatchModules({
   }
   async function moduleRun(module: RunningModuleItemType): Promise<any> {
     if (res.closed) return Promise.resolve();
-    console.log('run=========', module.flowType);
 
     if (stream && detail && module.showStatus) {
       responseStatus({
@@ -351,6 +354,7 @@ export async function dispatchModules({
       res,
       stream,
       detail,
+      outputs: module.outputs,
       userOpenaiAccount: user?.openaiAccount,
       ...params
     };
@@ -446,3 +450,11 @@ export function responseStatus({
     })
   });
 }
+
+export const config = {
+  api: {
+    bodyParser: {
+      sizeLimit: '20mb'
+    }
+  }
+};

client/src/pages/api/openapi/v1/chat/getHistory.ts

@@ -2,7 +2,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { authUser } from '@/service/utils/auth';
-import { connectToDatabase, Chat } from '@/service/mongo';
+import { connectToDatabase, ChatItem } from '@/service/mongo';
 import { Types } from 'mongoose';
 import type { ChatItemType } from '@/types/chat';
 
@@ -36,29 +36,37 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 export async function getChatHistory({
   chatId,
   userId,
-  limit = 20
+  limit = 30
 }: Props & { userId: string }): Promise<Response> {
   if (!chatId) {
     return { history: [] };
   }
 
-  const history = await Chat.aggregate([
-    { $match: { chatId, userId: new Types.ObjectId(userId) } },
+  const history = await ChatItem.aggregate([
     {
-      $project: {
-        content: {
-          $slice: ['$content', -limit] // 返回 content 数组的最后20个元素
-        }
+      $match: {
+        chatId,
+        userId: new Types.ObjectId(userId)
       }
     },
-    { $unwind: '$content' },
+    {
+      $sort: {
+        _id: -1
+      }
+    },
+    {
+      $limit: limit
+    },
     {
       $project: {
-        obj: '$content.obj',
-        value: '$content.value'
+        dataId: 1,
+        obj: 1,
+        value: 1
       }
     }
   ]);
 
+  history.reverse();
+
   return { history };
 }

client/src/pages/api/plugins/kb/create.ts

@@ -2,15 +2,13 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
+import type { CreateKbParams } from '@/api/request/kb';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { name, tags } = req.body as {
-      name: string;
-      tags: string[];
-    };
+    const { name, tags, avatar, vectorModel } = req.body as CreateKbParams;
 
-    if (!name) {
+    if (!name || !vectorModel) {
       throw new Error('缺少参数');
     }
 
@@ -22,7 +20,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     const { _id } = await KB.create({
       name,
       userId,
-      tags
+      tags,
+      vectorModel,
+      avatar
     });
 
     jsonRes(res, { data: _id });

client/src/pages/api/plugins/kb/data/exportModelData.ts

@@ -3,6 +3,7 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase, User } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
+import { PgTrainingTableName } from '@/constants/plugin';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -38,16 +39,19 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     }
 
     // 统计数据
-    const count = await PgClient.count('modelData', {
+    const count = await PgClient.count(PgTrainingTableName, {
       where: [['kb_id', kbId], 'AND', ['user_id', userId]]
     });
     // 从 pg 中获取所有数据
-    const pgData = await PgClient.select<{ q: string; a: string; source: string }>('modelData', {
-      where: [['kb_id', kbId], 'AND', ['user_id', userId]],
-      fields: ['q', 'a', 'source'],
-      order: [{ field: 'id', mode: 'DESC' }],
-      limit: count
-    });
+    const pgData = await PgClient.select<{ q: string; a: string; source: string }>(
+      PgTrainingTableName,
+      {
+        where: [['kb_id', kbId], 'AND', ['user_id', userId]],
+        fields: ['q', 'a', 'source'],
+        order: [{ field: 'id', mode: 'DESC' }],
+        limit: count
+      }
+    );
 
     const data: [string, string, string][] = pgData.rows.map((item) => [
       item.q.replace(/\n/g, '\\n'),

client/src/pages/api/plugins/kb/data/getDataById.ts

@@ -4,6 +4,7 @@ import { connectToDatabase } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 import type { KbDataItemType } from '@/types/plugin';
+import { PgTrainingTableName } from '@/constants/plugin';
 
 export type Response = {
   id: string;
@@ -28,7 +29,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 
     const where: any = [['user_id', userId], 'AND', ['id', dataId]];
 
-    const searchRes = await PgClient.select<KbDataItemType>('modelData', {
+    const searchRes = await PgClient.select<KbDataItemType>(PgTrainingTableName, {
       fields: ['kb_id', 'id', 'q', 'a', 'source'],
       where,
       limit: 1

client/src/pages/api/plugins/kb/data/getDataList.ts

@@ -4,6 +4,7 @@ import { connectToDatabase } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 import type { KbDataItemType } from '@/types/plugin';
+import { PgTrainingTableName } from '@/constants/plugin';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -41,14 +42,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     ];
 
     const [searchRes, total] = await Promise.all([
-      PgClient.select<KbDataItemType>('modelData', {
+      PgClient.select<KbDataItemType>(PgTrainingTableName, {
         fields: ['id', 'q', 'a', 'source'],
         where,
         order: [{ field: 'id', mode: 'DESC' }],
         limit: pageSize,
         offset: pageSize * (pageNum - 1)
       }),
-      PgClient.count('modelData', {
+      PgClient.count(PgTrainingTableName, {
         fields: ['id'],
         where
       })

client/src/pages/api/plugins/kb/data/getQueueLen.ts

@@ -0,0 +1,25 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { TrainingData } from '@/service/mongo';
+import { authUser } from '@/service/utils/auth';
+
+/* 拆分数据成QA */
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await authUser({ req, authToken: true });
+
+    // split queue data
+    const result = await TrainingData.countDocuments({
+      lockTime: { $lt: new Date('2040/1/1') }
+    });
+
+    jsonRes(res, {
+      data: result
+    });
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}

client/src/pages/api/plugins/kb/delete.ts

@@ -4,6 +4,7 @@ import { connectToDatabase, KB, App, TrainingData } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 import { Types } from 'mongoose';
+import { PgTrainingTableName } from '@/constants/plugin';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -21,7 +22,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     await connectToDatabase();
 
     // delete all pg data
-    await PgClient.delete('modelData', {
+    await PgClient.delete(PgTrainingTableName, {
       where: [['user_id', userId], 'AND', ['kb_id', id]]
     });
 

client/src/pages/api/plugins/kb/detail.ts

@@ -2,6 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
+import { getVectorModel } from '@/service/utils/data';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -33,7 +34,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
         avatar: data.avatar,
         name: data.name,
         userId: data.userId,
-        model: data.model,
+        vectorModel: getVectorModel(data.vectorModel),
         tags: data.tags.join(' ')
       }
     });

client/src/pages/api/plugins/kb/list.ts

@@ -3,6 +3,7 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { KbListItemType } from '@/types/plugin';
+import { getVectorModel } from '@/service/utils/data';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -15,7 +16,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       {
         userId
       },
-      '_id avatar name tags'
+      '_id avatar name tags vectorModel'
     ).sort({ updateTime: -1 });
 
     const data = await Promise.all(
@@ -23,7 +24,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
         _id: item._id,
         avatar: item.avatar,
         name: item.name,
-        tags: item.tags
+        tags: item.tags,
+        vectorModel: getVectorModel(item.vectorModel)
       }))
     );
 

client/src/pages/api/plugins/kb/update.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import type { KbUpdateParams } from '@/api/plugins/kb';
+import type { KbUpdateParams } from '@/api/request/kb';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {

client/src/pages/api/plugins/urlFetch.ts

@@ -0,0 +1,71 @@
+// pages/api/fetchContent.ts
+import { NextApiRequest, NextApiResponse } from 'next';
+import axios from 'axios';
+import { JSDOM } from 'jsdom';
+import { Readability } from '@mozilla/readability';
+import { jsonRes } from '@/service/response';
+import { authUser } from '@/service/utils/auth';
+import type { FetchResultItem } from '@/types/plugin';
+import { simpleText } from '@/utils/file';
+
+export type UrlFetchResponse = FetchResultItem[];
+
+const fetchContent = async (req: NextApiRequest, res: NextApiResponse) => {
+  try {
+    let { urlList = [] } = req.body as { urlList: string[] };
+
+    if (!urlList || urlList.length === 0) {
+      throw new Error('urlList is empty');
+    }
+
+    await authUser({ req });
+
+    urlList = urlList.filter((url) => /^(http|https):\/\/[^ "]+$/.test(url));
+
+    const response = (
+      await Promise.allSettled(
+        urlList.map(async (url) => {
+          try {
+            const fetchRes = await axios.get(url, {
+              timeout: 30000
+            });
+
+            const dom = new JSDOM(fetchRes.data, {
+              url,
+              contentType: 'text/html'
+            });
+
+            const reader = new Readability(dom.window.document);
+            const article = reader.parse();
+
+            const content = article?.textContent || '';
+
+            return {
+              url,
+              content: simpleText(`${article?.title}\n${content}`)
+            };
+          } catch (error) {
+            return {
+              url,
+              content: ''
+            };
+          }
+        })
+      )
+    )
+      .filter((item) => item.status === 'fulfilled')
+      .map((item: any) => item.value)
+      .filter((item) => item.content);
+
+    jsonRes<UrlFetchResponse>(res, {
+      data: response
+    });
+  } catch (error: any) {
+    jsonRes(res, {
+      code: 500,
+      error: error
+    });
+  }
+};
+
+export default fetchContent;

client/src/pages/api/plusApi/[...path].ts

@@ -0,0 +1,44 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { request } from '@/api/service/request';
+import type { Method } from 'axios';
+import { connectToDatabase } from '@/service/mongo';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await connectToDatabase();
+
+    const method = (req.method || 'POST') as Method;
+    const { path = [], ...query } = req.query as any;
+
+    const url = `/${path?.join('/')}`;
+
+    if (!url) {
+      throw new Error('url is empty');
+    }
+
+    const data = {
+      ...req.body,
+      ...query
+    };
+
+    const repose = await request(
+      url,
+      data,
+      {
+        // @ts-ignore
+        headers: req.headers
+      },
+      method
+    );
+
+    jsonRes(res, {
+      data: repose
+    });
+  } catch (error) {
+    jsonRes(res, {
+      code: 500,
+      error
+    });
+  }
+}

client/src/pages/api/system/getInitData.ts

@@ -10,7 +10,7 @@ import {
 
 export type InitDateResponse = {
   chatModels: ChatModelItemType[];
-  qaModels: QAModelItemType[];
+  qaModel: QAModelItemType;
   vectorModels: VectorModelItemType[];
   feConfigs: FeConfigsType;
 };
@@ -23,7 +23,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     data: {
       feConfigs: global.feConfigs,
       chatModels: global.chatModels,
-      qaModels: global.qaModels,
+      qaModel: global.qaModel,
       vectorModels: global.vectorModels
     }
   });
@@ -40,48 +40,49 @@ const defaultFeConfigs = {
   show_appStore: false,
   show_userDetail: false,
   show_git: true,
-  systemTitle: 'FastAI',
-  authorText: 'Made by FastAI Team.'
+  systemTitle: 'FastGPT',
+  authorText: 'Made by FastGPT Team.'
 };
 const defaultChatModels = [
   {
     model: 'gpt-3.5-turbo',
-    name: 'FastAI-4k',
+    name: 'GPT35-4k',
     contextMaxToken: 4000,
     quoteMaxToken: 2400,
     maxTemperature: 1.2,
-    price: 1.5
+    price: 0
   },
   {
     model: 'gpt-3.5-turbo-16k',
-    name: 'FastAI-16k',
+    name: 'GPT35-16k',
     contextMaxToken: 16000,
     quoteMaxToken: 8000,
     maxTemperature: 1.2,
-    price: 3
+    price: 0
   },
   {
     model: 'gpt-4',
-    name: 'FastAI-Plus',
+    name: 'GPT4-8k',
     contextMaxToken: 8000,
     quoteMaxToken: 4000,
     maxTemperature: 1.2,
-    price: 45
+    price: 0
   }
 ];
-const defaultQAModels = [
-  {
-    model: 'gpt-3.5-turbo-16k',
-    name: 'FastAI-16k',
-    maxToken: 16000,
-    price: 3
-  }
-];
-const defaultVectorModels = [
+const defaultQAModel = {
+  model: 'gpt-3.5-turbo-16k',
+  name: 'GPT35-16k',
+  maxToken: 16000,
+  price: 0
+};
+
+const defaultVectorModels: VectorModelItemType[] = [
   {
     model: 'text-embedding-ada-002',
     name: 'Embedding-2',
-    price: 0.2
+    price: 0,
+    defaultToken: 500,
+    maxToken: 3000
   }
 ];
 
@@ -95,9 +96,8 @@ export async function getInitConfig() {
     global.systemEnv = res.SystemParams || defaultSystemEnv;
     global.feConfigs = res.FeConfig || defaultFeConfigs;
     global.chatModels = res.ChatModels || defaultChatModels;
-    global.qaModels = res.QAModels || defaultQAModels;
+    global.qaModel = res.QAModel || defaultQAModel;
     global.vectorModels = res.VectorModels || defaultVectorModels;
-    global.systemPlugins = res.plugins || {};
   } catch (error) {
     setDefaultData();
     console.log('get init config error, set default', error);
@@ -108,7 +108,6 @@ export function setDefaultData() {
   global.systemEnv = defaultSystemEnv;
   global.feConfigs = defaultFeConfigs;
   global.chatModels = defaultChatModels;
-  global.qaModels = defaultQAModels;
+  global.qaModel = defaultQAModel;
   global.vectorModels = defaultVectorModels;
-  global.systemPlugins = {};
 }

client/src/pages/api/user/account/gitLogin.ts

@@ -24,7 +24,7 @@ type GithubUserType = {
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { code } = req.query as { code: string };
+    const { code, inviterId } = req.query as { code: string; inviterId?: string };
 
     const { data: gitAccessToken } = await axios.post<string>(
       `https://github.com/login/oauth/access_token?client_id=${global.feConfigs.gitLoginKey}&client_secret=${global.systemEnv.gitLoginSecret}&code=${code}`
@@ -51,7 +51,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     } catch (err: any) {
       if (err?.code === 500) {
         jsonRes(res, {
-          data: await registerUser({ username, avatar: avatar_url, res })
+          data: await registerUser({ username, avatar: avatar_url, res, inviterId })
         });
         return;
       }
@@ -88,16 +88,19 @@ export async function loginByUsername({
 export async function registerUser({
   username,
   avatar,
+  inviterId,
   res
 }: {
   username: string;
   avatar?: string;
+  inviterId?: string;
   res: NextApiResponse;
 }) {
   const response = await User.create({
     username,
     avatar,
-    password: nanoid()
+    password: nanoid(),
+    inviterId: inviterId ? inviterId : undefined
   });
 
   // 根据 id 获取用户信息

client/src/pages/api/user/account/paySuccess.ts

@@ -0,0 +1,30 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { TrainingData } from '@/service/mongo';
+import { startQueue } from '@/service/utils/tools';
+import { authUser } from '@/service/utils/auth';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+  try {
+    const { userId } = await authUser({ req, authToken: true });
+    await unlockTask(userId);
+  } catch (error) {}
+  jsonRes(res);
+}
+
+async function unlockTask(userId: string) {
+  try {
+    await TrainingData.updateMany(
+      {
+        userId
+      },
+      {
+        lockTime: new Date('2000/1/1')
+      }
+    );
+
+    startQueue();
+  } catch (error) {
+    unlockTask(userId);
+  }
+}

client/src/pages/api/user/account/register.ts

@@ -1,64 +0,0 @@
-// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
-import { User } from '@/service/models/user';
-import { connectToDatabase } from '@/service/mongo';
-import { generateToken, setCookie } from '@/service/utils/tools';
-import { UserAuthTypeEnum } from '@/constants/common';
-import { authCode } from '@/service/api/plugins';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
-  try {
-    const { username, code, password, inviterId } = req.body;
-
-    if (!username || !code || !password) {
-      throw new Error('缺少参数');
-    }
-
-    await connectToDatabase();
-
-    // 验证码校验
-    await authCode({
-      username,
-      type: UserAuthTypeEnum.register,
-      code
-    });
-
-    // 重名校验
-    const authRepeat = await User.findOne({
-      username
-    });
-
-    if (authRepeat) {
-      throw new Error('该用户已被注册');
-    }
-
-    const response = await User.create({
-      username,
-      password,
-      inviterId: inviterId ? inviterId : undefined
-    });
-
-    // 根据 id 获取用户信息
-    const user = await User.findById(response._id);
-
-    if (!user) {
-      throw new Error('获取用户信息异常');
-    }
-
-    const token = generateToken(user._id);
-    setCookie(res, token);
-
-    jsonRes(res, {
-      data: {
-        user,
-        token
-      }
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}

client/src/pages/api/user/account/updatePasswordByCode.ts

@@ -1,65 +0,0 @@
-// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
-import { User } from '@/service/models/user';
-import { connectToDatabase } from '@/service/mongo';
-import { UserAuthTypeEnum } from '@/constants/common';
-import { generateToken, setCookie } from '@/service/utils/tools';
-import { authCode } from '@/service/api/plugins';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
-  try {
-    const { username, code, password } = req.body;
-
-    if (!username || !code || !password) {
-      throw new Error('缺少参数');
-    }
-
-    await connectToDatabase();
-
-    // 验证码校验
-    await authCode({
-      username,
-      code,
-      type: UserAuthTypeEnum.findPassword
-    });
-
-    if (!authCode) {
-      throw new Error('验证码错误');
-    }
-
-    // 更新对应的记录
-    await User.updateOne(
-      {
-        username
-      },
-      {
-        password
-      }
-    );
-
-    // 根据 username 获取用户信息
-    const user = await User.findOne({
-      username
-    });
-
-    if (!user) {
-      throw new Error('获取用户信息异常');
-    }
-
-    const token = generateToken(user._id);
-    setCookie(res, token);
-
-    jsonRes(res, {
-      data: {
-        user,
-        token
-      }
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}

client/src/pages/api/user/checkPayResult.ts

@@ -1,112 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
-import { User, Pay, TrainingData } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
-import { PaySchema } from '@/types/mongoSchema';
-import dayjs from 'dayjs';
-import { startQueue } from '@/service/utils/tools';
-import { getWxPayQRResult } from '@/service/api/plugins';
-
-/* 校验支付结果 */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    const { payId } = req.query as { payId: string };
-
-    const { userId } = await authUser({ req, authToken: true });
-
-    // 查找订单记录校验
-    const payOrder = await Pay.findById<PaySchema>(payId);
-
-    if (!payOrder) {
-      throw new Error('订单不存在');
-    }
-    if (payOrder.status !== 'NOTPAY') {
-      throw new Error('订单已结算');
-    }
-
-    // 获取当前用户
-    const user = await User.findById(userId);
-    if (!user) {
-      throw new Error('找不到用户');
-    }
-
-    const payRes = await getWxPayQRResult(payOrder.orderId);
-
-    if (payRes.trade_state === 'SUCCESS') {
-      // 订单已支付
-      try {
-        // 更新订单状态. 如果没有合适的订单，说明订单重复了
-        const updateRes = await Pay.updateOne(
-          {
-            _id: payId,
-            status: 'NOTPAY'
-          },
-          {
-            status: 'SUCCESS'
-          }
-        );
-        if (updateRes.modifiedCount === 1) {
-          // 给用户账号充钱
-          await User.findByIdAndUpdate(userId, {
-            $inc: { balance: payOrder.price }
-          });
-
-          unlockTask(userId);
-          return jsonRes(res, {
-            data: '支付成功'
-          });
-        }
-      } catch (error) {
-        console.log(error);
-        // roll back status
-        try {
-          await Pay.findByIdAndUpdate(payId, {
-            status: 'NOTPAY'
-          });
-        } catch (error) {}
-      }
-      return jsonRes(res, {
-        code: 500,
-        data: '更新订单失败,请重试'
-      });
-    }
-
-    // 校验下是否超过一天
-    const orderTime = dayjs(payOrder.createTime);
-    const diffInHours = dayjs().diff(orderTime, 'hours');
-
-    if (payRes.trade_state === 'CLOSED' || diffInHours > 24) {
-      // 订单已关闭
-      await Pay.findByIdAndUpdate(payId, {
-        status: 'CLOSED'
-      });
-      return jsonRes(res, {
-        code: 500,
-        data: '订单已过期'
-      });
-    }
-    throw new Error(payRes?.trade_state_desc || '订单无效');
-  } catch (err) {
-    // console.log(err);
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}
-
-async function unlockTask(userId: string) {
-  try {
-    await TrainingData.updateMany(
-      {
-        userId
-      },
-      {
-        lockTime: new Date('2000/1/1')
-      }
-    );
-    startQueue();
-  } catch (error) {
-    unlockTask(userId);
-  }
-}

client/src/pages/api/user/getPayCode.ts

@@ -1,37 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
-import { authUser } from '@/service/utils/auth';
-import { Pay } from '@/service/mongo';
-import { PRICE_SCALE } from '@/constants/common';
-import { getWxPayQRUrl } from '@/service/api/plugins';
-
-/* 获取支付二维码 */
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    let { amount = 0 } = req.query as { amount: string };
-    amount = +amount;
-
-    const { userId } = await authUser({ req, authToken: true });
-
-    const { code_url, orderId } = await getWxPayQRUrl(amount);
-
-    // add one pay record
-    const payOrder = await Pay.create({
-      userId,
-      price: amount * PRICE_SCALE,
-      orderId
-    });
-
-    jsonRes(res, {
-      data: {
-        payId: payOrder._id,
-        codeUrl: code_url
-      }
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}

client/src/pages/api/user/promotion/getPromotionData.ts

@@ -0,0 +1,51 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { connectToDatabase, User, promotionRecord } from '@/service/mongo';
+import { authUser } from '@/service/utils/auth';
+import mongoose from 'mongoose';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await connectToDatabase();
+    const { userId } = await authUser({ req, authToken: true });
+
+    const invitedAmount = await User.countDocuments({
+      inviterId: userId
+    });
+
+    // 计算累计合
+    const countHistory: { totalAmount: number }[] = await promotionRecord.aggregate([
+      {
+        $match: {
+          userId: new mongoose.Types.ObjectId(userId),
+          amount: { $gt: 0 }
+        }
+      },
+      {
+        $group: {
+          _id: null, // 分组条件，这里使用 null 表示不分组
+          totalAmount: { $sum: '$amount' } // 计算 amount 字段的总和
+        }
+      },
+      {
+        $project: {
+          _id: false, // 排除 _id 字段
+          totalAmount: true // 只返回 totalAmount 字段
+        }
+      }
+    ]);
+
+    jsonRes(res, {
+      data: {
+        invitedAmount,
+        earningsAmount: countHistory[0]?.totalAmount || 0
+      }
+    });
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}

client/src/pages/api/user/promotion/getPromotions.ts

@@ -0,0 +1,44 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { connectToDatabase, promotionRecord } from '@/service/mongo';
+import { authUser } from '@/service/utils/auth';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    let { pageNum = 1, pageSize = 10 } = req.body as {
+      pageNum: number;
+      pageSize: number;
+    };
+
+    const { userId } = await authUser({ req, authToken: true });
+
+    await connectToDatabase();
+
+    const data = await promotionRecord
+      .find(
+        {
+          userId
+        },
+        '_id createTime type amount'
+      )
+      .sort({ _id: -1 })
+      .skip((pageNum - 1) * pageSize)
+      .limit(pageSize);
+
+    jsonRes(res, {
+      data: {
+        pageNum,
+        pageSize,
+        data,
+        total: await promotionRecord.countDocuments({
+          userId
+        })
+      }
+    });
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}

client/src/pages/api/user/sendAuthCode.ts

@@ -1,47 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
-import { jsonRes } from '@/service/response';
-import { UserAuthTypeEnum } from '@/constants/common';
-import { authGoogleToken } from '@/utils/plugin/google';
-import requestIp from 'request-ip';
-import { sendCode } from '@/service/api/plugins';
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  try {
-    const { username, type, googleToken } = req.body as {
-      username: string;
-      type: `${UserAuthTypeEnum}`;
-      googleToken: string;
-    };
-
-    if (!username || !type) {
-      throw new Error('缺少参数');
-    }
-
-    // google auth
-    global.systemEnv.googleServiceVerKey &&
-      (await authGoogleToken({
-        secret: global.systemEnv.googleServiceVerKey,
-        response: googleToken,
-        remoteip: requestIp.getClientIp(req) || undefined
-      }));
-
-    // register switch
-    if (type === UserAuthTypeEnum.register && !global.feConfigs?.show_register) {
-      throw new Error('Register is closed');
-    }
-
-    await sendCode({
-      username,
-      type
-    });
-
-    jsonRes(res, {
-      message: '发送验证码成功'
-    });
-  } catch (err) {
-    jsonRes(res, {
-      code: 500,
-      error: err
-    });
-  }
-}

client/src/pages/app/detail/components/AdEdit/components/ChatTest.tsx

@@ -38,19 +38,19 @@ const ChatTest = (
   const isOpen = useMemo(() => modules && modules.length > 0, [modules]);
 
   const startChat = useCallback(
-    async ({ messages, controller, generatingMessage, variables }: StartChatFnProps) => {
+    async ({ chatList, controller, generatingMessage, variables }: StartChatFnProps) => {
       const historyMaxLen =
         modules
           ?.find((item) => item.flowType === FlowModuleTypeEnum.historyNode)
           ?.inputs?.find((item) => item.key === 'maxContext')?.value || 0;
-      const history = messages.slice(-historyMaxLen - 2, -2);
+      const history = chatList.slice(-historyMaxLen - 2, -2);
 
       // 流请求，获取数据
       const { responseText, responseData } = await streamFetch({
         url: '/api/chat/chatTest',
         data: {
           history,
-          prompt: messages[messages.length - 2].content,
+          prompt: chatList[chatList.length - 2].value,
           modules,
           variables,
           appId: app._id,

client/src/pages/app/detail/components/AdEdit/components/ImportSettings.tsx

@@ -0,0 +1,54 @@
+import React, { useState } from 'react';
+import { Textarea, Button, ModalBody, ModalFooter } from '@chakra-ui/react';
+import MyModal from '@/components/MyModal';
+import { AppModuleItemType } from '@/types/app';
+import { useTranslation } from 'react-i18next';
+import { useToast } from '@/hooks/useToast';
+
+const ImportSettings = ({
+  onClose,
+  onSuccess
+}: {
+  onClose: () => void;
+  onSuccess: (modules: AppModuleItemType[]) => void;
+}) => {
+  const { t } = useTranslation();
+  const { toast } = useToast();
+  const [value, setValue] = useState('');
+
+  return (
+    <MyModal isOpen w={'600px'} onClose={onClose} title={t('app.Import Config')}>
+      <ModalBody>
+        <Textarea
+          placeholder={t('app.Paste Config') || 'app.Paste Config'}
+          defaultValue={value}
+          rows={16}
+          onChange={(e) => setValue(e.target.value)}
+        />
+      </ModalBody>
+      <ModalFooter>
+        <Button
+          variant="base"
+          onClick={() => {
+            if (!value) {
+              return onClose();
+            }
+            try {
+              const data = JSON.parse(value);
+              onSuccess(data);
+              onClose();
+            } catch (error) {
+              toast({
+                title: t('app.Import Config Failed')
+              });
+            }
+          }}
+        >
+          确认
+        </Button>
+      </ModalFooter>
+    </MyModal>
+  );
+};
+
+export default ImportSettings;

client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeAnswer.tsx

@@ -2,17 +2,17 @@ import React from 'react';
 import { NodeProps } from 'reactflow';
 import NodeCard from '../modules/NodeCard';
 import { FlowModuleItemType } from '@/types/flow';
-import Divider from '../modules/Divider';
 import Container from '../modules/Container';
 import RenderInput from '../render/RenderInput';
+import RenderOutput from '../render/RenderOutput';
 
-const NodeAnswer = ({
-  data: { moduleId, inputs, outputs, onChangeNode, ...props }
-}: NodeProps<FlowModuleItemType>) => {
+const NodeAnswer = ({ data }: NodeProps<FlowModuleItemType>) => {
+  const { moduleId, inputs, outputs, onChangeNode } = data;
   return (
-    <NodeCard minW={'400px'} moduleId={moduleId} {...props}>
+    <NodeCard minW={'400px'} {...data}>
       <Container borderTop={'2px solid'} borderTopColor={'myGray.200'}>
         <RenderInput moduleId={moduleId} onChangeNode={onChangeNode} flowInputList={inputs} />
+        <RenderOutput onChangeNode={onChangeNode} moduleId={moduleId} flowOutputList={outputs} />
       </Container>
     </NodeCard>
   );

client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeCQNode.tsx

@@ -13,11 +13,10 @@ import MyIcon from '@/components/Icon';
 import { FlowOutputItemTypeEnum, FlowValueTypeEnum, SpecialInputKeyEnum } from '@/constants/flow';
 import SourceHandle from '../render/SourceHandle';
 
-const NodeCQNode = ({
-  data: { moduleId, inputs, outputs, onChangeNode, ...props }
-}: NodeProps<FlowModuleItemType>) => {
+const NodeCQNode = ({ data }: NodeProps<FlowModuleItemType>) => {
+  const { moduleId, inputs, outputs, onChangeNode } = data;
   return (
-    <NodeCard minW={'400px'} moduleId={moduleId} {...props}>
+    <NodeCard minW={'400px'} {...data}>
       <Divider text="Input" />
       <Container>
         <RenderInput

client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeChat.tsx

@@ -13,16 +13,15 @@ import MySlider from '@/components/Slider';
 import { Box } from '@chakra-ui/react';
 import { formatPrice } from '@/utils/user';
 
-const NodeChat = ({
-  data: { moduleId, inputs, outputs, onChangeNode, ...props }
-}: NodeProps<FlowModuleItemType>) => {
+const NodeChat = ({ data }: NodeProps<FlowModuleItemType>) => {
+  const { moduleId, inputs, outputs, onChangeNode } = data;
   const outputsLen = useMemo(
     () => outputs.filter((item) => item.type !== FlowOutputItemTypeEnum.hidden).length,
     [outputs]
   );
 
   return (
-    <NodeCard minW={'400px'} moduleId={moduleId} {...props}>
+    <NodeCard minW={'400px'} {...data}>
       <Divider text="Input" />
       <Container>
         <RenderInput

client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeEmpty.tsx

@@ -3,7 +3,7 @@ import { NodeProps } from 'reactflow';
 import NodeCard from '../modules/NodeCard';
 import { FlowModuleItemType } from '@/types/flow';
 
-const NodeAnswer = ({ data: { ...props } }: NodeProps<FlowModuleItemType>) => {
-  return <NodeCard {...props}></NodeCard>;
+const NodeAnswer = ({ data }: NodeProps<FlowModuleItemType>) => {
+  return <NodeCard {...data}></NodeCard>;
 };
 export default React.memo(NodeAnswer);