update doc (#3136)

* fix: null pointer

* perf: not input text

* update doc url

docSite/content/zh-cn/docs/development/upgrading/464.md

@@ -32,7 +32,7 @@ curl --location --request POST 'https://{{host}}/api/admin/initv464' \
 4. 优化 - 历史记录模块。弃用旧的历史记录模块，直接在对应地方填写数值即可。
 5. 调整 - 知识库搜索模块 topk 逻辑，采用 MaxToken 计算，兼容不同长度的文本块
 6. 调整鉴权顺序，提高 apikey 的优先级，避免cookie抢占 apikey 的鉴权。
-7. 链接读取支持多选择器。参考[Web 站点同步用法](/docs/guide/knowledge_base/websync/)
+7. 链接读取支持多选择器。参考[Web 站点同步用法](/docs/course/websync)
 8. 修复 - 分享链接图片上传鉴权问题
 9. 修复 - Mongo 连接池未释放问题。
 10. 修复 - Dataset Intro 无法更新

docSite/content/zh-cn/docs/development/upgrading/465.md

@@ -21,10 +21,10 @@ weight: 831
 
 ## V4.6.5 功能介绍
 
-1. 新增 - [问题优化模块](/docs/guide/workbench/workflow/coreferenceresolution/)
-2. 新增 - [文本编辑模块](/docs/guide/workbench/workflow/text_editor/)
-3. 新增 - [判断器模块](/docs/guide/workbench/workflow/tfswitch//)
-4. 新增 - [自定义反馈模块](/docs/guide/workbench/workflow/custom_feedback/)
+1. 新增 - [问题优化模块](/docs/workflow/modules/coreferenceresolution/)
+2. 新增 - [文本编辑模块](/docs/workflow/modules/text_editor/)
+3. 新增 - [判断器模块](/docs/workflow/modules/tfswitch/)
+4. 新增 - [自定义反馈模块](/docs/workflow/modules/custom_feedback/)
 5. 新增 - 【内容提取】模块支持选择模型，以及字段枚举
 6. 优化 - docx读取，兼容表格（表格转markdown）
 7. 优化 - 高级编排连接线交互

docSite/content/zh-cn/docs/development/upgrading/466.md

@@ -25,7 +25,7 @@ weight: 830
 
 1. 查看 [FastGPT 2024 RoadMap](https://github.com/labring/FastGPT?tab=readme-ov-file#-%E5%9C%A8%E7%BA%BF%E4%BD%BF%E7%94%A8)
 2. 新增 - Http 模块请求头支持 Json 编辑器。
-3. 新增 - [ReRank模型部署](/docs/development/custom-models/bge-rerank/)
+3. 新增 - [ReRank模型部署](/docs/development/custom-models/reranker/)
 4. 新增 - 搜索方式：分离向量语义检索，全文检索和重排，通过 RRF 进行排序合并。
 5. 优化 - 问题分类提示词，id引导。测试国产商用 api 模型（百度阿里智谱讯飞）使用 Prompt 模式均可分类。
 6. UI 优化，未来将逐步替换新的UI设计。

docSite/content/zh-cn/docs/development/upgrading/468.md

@@ -91,7 +91,7 @@ curl --location --request POST 'https://{{host}}/api/init/v468' \
 
 1. 新增 - 知识库搜索合并模块。
 2. 新增 - 新的 Http 模块，支持更加灵活的参数传入。同时支持了输入输出自动数据类型转化，例如：接口输出的 JSON 类型会自动转成字符串类型，直接给其他模块使用。此外，还补充了一些例子，可在文档中查看。
-3. 优化 - 内容补全。将内容补全内置到【知识库搜索】中，并实现了一次内容补全，即可完成“指代消除”和“问题扩展”。FastGPT知识库搜索详细流程可查看：[知识库搜索介绍](/docs/guide/workbench/workflow/dataset_search/)
+3. 优化 - 内容补全。将内容补全内置到【知识库搜索】中，并实现了一次内容补全，即可完成“指代消除”和“问题扩展”。FastGPT知识库搜索详细流程可查看：[知识库搜索介绍](/docs/course/data_search/)
 4. 优化 - LLM 模型配置，不再区分对话、分类、提取模型。同时支持模型的默认参数，避免不同模型参数冲突，可通过`defaultConfig`传入默认的配置。
 5. 优化 - 流响应，参考了`ChatNextWeb`的流，更加丝滑。此外，之前提到的乱码、中断，刷新后又正常了，可能会修复）
 6. 修复 - 语音输入文件无法上传。

docSite/content/zh-cn/docs/development/upgrading/4813.md

@@ -1,5 +1,5 @@
 ---
-title: 'V4.8.13'
+title: 'V4.8.13(进行中)'
 description: 'FastGPT V4.8.13 更新说明'
 icon: 'upgrade'
 draft: false
@@ -13,15 +13,11 @@ weight: 811
 
 ### 2. 修改镜像
 
-- 更新 FastGPT 镜像 tag: v4.8.13-fix
-- 更新 FastGPT 商业版镜像 tag: v4.8.13-fix （fastgpt-pro镜像）
+- 更新 FastGPT 镜像 tag: v4.8.13-alpha
+- 更新 FastGPT 管理端镜像 tag: v4.8.13-alpha （fastgpt-pro镜像）
 - Sandbox 镜像，可以不更新
 
-### 3. 添加环境变量
-
-- 给 fastgpt 和 fastgpt-pro 镜像添加环境变量：`FE_DOMAIN=http://xx.com`，值为 fastgpt 前端访问地址，注意后面不要加`/`。如果没加到话，图片识别可能会有问题。
-
-### 4. 调整文件上传编排
+### 3. 调整文件上传编排
 
 虽然依然兼容旧版的文件上传编排，但是未来两个版本内将会去除兼容代码，请尽快调整编排，以适应最新的文件上传逻辑。尤其是嵌套应用的文件传递，未来将不会自动传递，必须手动指定传递的文件。
 
@@ -43,9 +39,6 @@ weight: 811
 14. 优化 - Markdown 组件自动空格，避免分割 url 中的中文。  
 15. 优化 - 工作流上下文拆分，性能优化。 
 16. 优化 - 语音播报，不支持 mediaSource 的浏览器可等待完全生成语音后输出。 
-17. 优化 - 对话引导 csv 读取，自动识别编码
-18. 优化 - csv 导入问题引导可能乱码
-19. 修复 - Dockerfile pnpm install 支持代理。。
-20. 修复 - Dockerfile pnpm install 支持代理。 
-21. 修复 - BI 图表生成无法写入文件。同时优化其解析，支持数字类型数组。
-22. 修复 - 分享链接首次加载时，标题显示不正确。 
+17. 修复 - Dockerfile pnpm install 支持代理。 
+18. 修复 - BI 图表生成无法写入文件。同时优化其解析，支持数字类型数组。
+19. 修复 - 分享链接首次加载时，标题显示不正确。 

docSite/content/zh-cn/docs/development/upgrading/4814.md

@@ -1,13 +0,0 @@
----
-title: 'V4.8.14(进行中)'
-description: 'FastGPT V4.8.14 更新说明'
-icon: 'upgrade'
-draft: false
-toc: true
-weight: 810
----
-
-## 更新预告
-
-1. 
-2. 新增 - 工作流支持进入聊天框/点击开始对话后，自动触发一轮对话。

docSite/content/zh-cn/docs/guide/course/ai_settings.md

@@ -66,7 +66,7 @@ Tips: 可以通过点击上下文按键查看完整的上下文组成，便于
 
 FastGPT 知识库采用 QA 对(不一定都是问答格式，仅代表两个变量)的格式存储，在转义成字符串时候会根据**引用模板**来进行格式化。知识库包含多个可用变量： q, a, sourceId（数据的ID）, index(第n个数据), source(数据的集合名、文件名)，score(距离得分，0-1) 可以通过 {{q}} {{a}} {{sourceId}} {{index}} {{source}} {{score}} 按需引入。下面一个模板例子：
 
-可以通过 [知识库结构讲解](/docs/guide/knowledge_base/dataset_engine/) 了解详细的知识库的结构。
+可以通过 [知识库结构讲解](/docs/course/dataset_engine/) 了解详细的知识库的结构。
 
 #### 引用模板
 

docSite/content/zh-cn/docs/guide/workbench/workflow/ai_chat.md

@@ -30,5 +30,5 @@ weight: 232
 
 
 {{% alert icon="🍅" context="success" %}}
-具体配置参数介绍可以参考: [AI参数配置说明](/docs/guide/course/ai_settings/)
+具体配置参数介绍可以参考: [AI参数配置说明](/docs/course/ai_settings)
 {{% /alert %}}

docSite/content/zh-cn/docs/guide/workbench/workflow/coreferenceResolution.md

@@ -36,4 +36,4 @@ weight: 264
 
 ## 示例
 
-- [接入谷歌搜索](/docs/use-cases/app-cases/google_search/)
+- [接入谷歌搜索](/docs/workflow/examples/google_search/)

docSite/content/zh-cn/docs/guide/workbench/workflow/form_input.md

@@ -5,28 +5,4 @@ icon: "form_input"
 draft: false
 toc: true
 weight: 244
----
-
-## 特点 
-
-- 用户交互
-- 可重复添加
-- 触发执行
-
-![](/imgs/form_input1.png)
-
-## 功能 
-
-「表单输入」节点属于用户交互节点，当触发这个节点时，对话会进入“交互”状态，会记录工作流的状态，等用户完成交互后，继续向下执行工作流
-
-![](/imgs/form_input2.png)
-
-比如上图中的例子，当触发表单输入节点时，对话框隐藏，对话进入“交互状态”
-
-![](/imgs/form_input3.png)
-
-当用户填完必填的信息并点击提交后，节点能够收集用户填写的表单信息，传递到后续的节点中使用
-
-## 作用
-
-能够精准收集需要的用户信息，再根据用户信息进行后续操作
+---

docSite/content/zh-cn/docs/guide/workbench/workflow/http.md

@@ -250,6 +250,6 @@ export default async function (ctx: FunctionContext) {
 
 ## 相关示例
 
-- [谷歌搜索](/docs/use-cases/app-cases/google_search/)
-- [发送飞书webhook](/docs/use-cases/app-cases/feishu_webhook/)
-- [实验室预约（操作数据库）](/docs/use-cases/app-cases/lab_appointment/)
+- [谷歌搜索](/docs/workflow/examples/google_search/)
+- [发送飞书webhook](/docs/workflow/examples/feishu_webhook/)
+- [实验室预约（操作数据库）](/docs/workflow/examples/lab_appointment/)

docSite/content/zh-cn/docs/guide/workbench/workflow/text_editor.md

@@ -29,4 +29,4 @@ weight: 246
 
 ## 示例
 
-- [接入谷歌搜索](/docs/use-cases/app-cases/google_search/)
+- [接入谷歌搜索](/docs/workflow/examples/google_search/)

docSite/content/zh-cn/docs/guide/workbench/workflow/tool.md

@@ -7,21 +7,20 @@ toc: true
 weight: 236
 ---
 
-
 ![](/imgs/flow-tool1.png)
 
-### **什么是工具**
+## 什么是工具
 
 工具可以是一个系统模块，例如：AI对话、知识库搜索、HTTP模块等。也可以是一个插件。
 
 工具调用可以让 LLM 更动态的决策流程，而不都是固定的流程。（当然，缺点就是费tokens）
 
-### **工具的组成**
+## 工具的组成
 
 1. 工具介绍。通常是模块的介绍或插件的介绍，这个介绍会告诉LLM，这个工具的作用是什么。
 2. 工具参数。对于系统模块来说，工具参数已经是固定的，无需额外配置。对于插件来说，工具参数是一个可配置项。
 
-### **工具是如何运行的**
+## 工具是如何运行的
 
 要了解工具如何运行的，首先需要知道它的运行条件。
 
@@ -30,57 +29,43 @@ weight: 236
 
 结合工具的介绍、参数介绍和参数是否必须，LLM会决定是否调用这个工具。有以下几种情况：
 
+
 1. 无参数的工具：直接根据工具介绍，决定是否需要执行。例如：获取当前时间。
 2. 有参数的工具：
    1. 无必须的参数：尽管上下文中，没有适合的参数，也可以调用该工具。但有时候，LLM会自己伪造一个参数。
    2. 有必须的参数：如果没有适合的参数，LLM可能不会调用该工具。可以通过提示词，引导用户提供参数。
 
-#### **工具调用逻辑**
-
 在支持`函数调用`的模型中，可以一次性调用多个工具，调用逻辑如下：
 
 ![](/imgs/flow-tool2.png)
 
-### **怎么用**
+## 怎么用
 
-<div style="display: flex; gap: 10px;">
-    <img src="/imgs/flow-tool3.png" alt="工具调用模块示例 3" width="40%" />
-    <img src="/imgs/flow-tool4.png" alt="工具调用模块示例 4" width="60%" />
-</div>
+| 有工具调用模块 | 无工具调用模块 |
+| --- | --- |
+| ![](/imgs/flow-tool3.png) | ![](/imgs/flow-tool4.png) |
 
-<!-- ![](/imgs/flow-tool3.png)!![](/imgs/flow-tool4.png) -->
+高级编排中，托动工具调用的连接点，可用的工具头部会出现一个菱形，可以将它与工具调用模块底部的菱形相连接。
 
-高级编排中，拖动工具调用的连接点，可用的工具头部会出现一个菱形，可以将它与工具调用模块底部的菱形相连接。
-
-被连接的工具，会自动分离工具输入与普通的输入，并且可以编辑`介绍`，可以通过调整介绍，使得该工具调用时机更加精确。
+被连接的工具，会自动分离工具输入与普通的输入，并且可以编辑`描述`，可以通过调整介绍，使得该工具调用时机更加精确。对于一些内置的节点，务必修改`描述`才能让模型正常调用。
 
 关于工具调用，如何调试仍然是一个玄学，所以建议，不要一次性增加太多工具，选择少量工具调优后再进一步尝试。
 
-#### 用途
+## 组合节点
 
-默认清空下，工具调用节点，在决定调用工具后，会将工具运行的结果，返回给AI，让 AI 对工具运行的结果进行总结输出。有时候，如果你不需要 AI 进行进一步的总结输出，可以使用该节点，将其接入对于工具流程的末尾。
+### 工具调用终止
 
-如下图，在执行知识库搜索后，发送给了 HTTP 请求，搜索将不会返回搜索的结果给工具调用进行 AI 总结。
+工具调用默认会把子流程运行的结果作为`工具结果`，返回给模型进行回答。有时候，你可能不希望模型做回答，你可以给对应子流程的末尾增加上一个`工具调用终止`节点，这样，子流程的结果就不会被返回给模型。
 
-![](/imgs/flow-tool5.png)
-
-### 附加节点
-
-当您使用了工具调用节点，同时就会出现工具调用终止节点和自定义变量节点，能够进一步提升工具调用的使用体验。
-
-#### 工具调用终止
-
-工具调用终止可用于结束本次调用，即可以接在某个工具后面，当工作流执行到这个节点时，便会强制结束本次工具调用，不再调用其他工具，也不会再调用 AI 针对工具调用结果回答问题。
-
-![](/imgs/flow-tool6.png)
+![alt text](/imgs/image-3.png)
 
 ### 自定义工具变量
 
-自定义变量可以扩展工具的变量输入，即对于一些未被视作工具参数或无法工具调用的节点，可以自定义工具变量，填上对应的参数描述，那么工具调用便会相对应的调用这个节点，进而调用其之后的工作流。
+工具调用的子流程运行，有时候会依赖`AI`生成的一些变量，为了简化交互流程，我们给系统内置的节点都指定了`工具变量`。然而，有些时候，你需要的变量不仅是目标流程的`首个节点`的变量，而是需要更复杂的变量，此时你可以使用`自定义工具变量`。它允许你完全自定义该`工具流程`的变量。
 
-![](/imgs/flow-tool7.png)
+![alt text](/imgs/image-4.png)
 
-### **相关示例**
+## 相关示例
 
-- [谷歌搜索](https://doc.fastgpt.in/docs/use-cases/app-cases/google_search/)
-- [发送飞书webhook](https://doc.fastgpt.in/docs/use-cases/app-cases/feishu_webhook/)
+- [谷歌搜索](/docs/workflow/examples/google_search/)
+- [发送飞书webhook](/docs/workflow/examples/feishu_webhook/)

docSite/content/zh-cn/docs/use-cases/external-integration/official_account.md

@@ -37,40 +37,46 @@ weight: 506
 私有部署的用户可自行查阅自己的 IP 地址。
 
 海外版用户（cloud.tryfastgpt.ai)可以填写下面的 IP 白名单：
-如果仍无响应，可输入命令: `nslookup cloud.sealos.io | awk '/^Address: [0-9]/ {print $2}'` 获取最新 IP
 
 ```
-34.143.240.160
-35.197.149.75
-34.87.173.252
-34.87.20.189
-34.87.44.74
-34.124.189.116
-34.126.163.205
+34.87.20.17
 35.247.161.35
-34.87.110.152
 34.87.51.146
-34.87.102.86
+34.87.110.152	
 35.247.163.68
+34.126.163.205
+34.87.20.189
+34.87.102.86
 35.240.227.100
-34.142.157.52
+35.198.192.104
+34.143.149.171
 34.87.152.33
 34.124.237.188
-34.143.149.171
+35.197.149.75
+34.87.44.74
+34.124.189.116
 34.87.79.202
+34.87.173.252
+34.143.240.160
 34.87.180.104
-35.198.192.104
+34.142.157.52
 ```
 
 国内版用户（fastgpt.cn)可以填写下面的 IP 白名单：
-如果仍无响应，可输入命令: `nslookup hzh.sealos.run | awk '/^Address: [0-9]/ {print $2}'` 获取最新 IP
 
 ```
-47.98.36.227
-118.31.58.217
-121.40.213.28
-120.26.162.94
-223.4.211.186
+47.97.59.172
+121.43.108.48
+121.41.75.88
+121.41.178.7
+121.40.65.187
+121.196.235.183
+120.55.195.90
+120.55.193.112
+120.26.229.115
+112.124.41.79
+101.37.205.32
+47.98.190.173
 ```
 
 ## 4. 获取AES Key，选择加密方式

docSite/content/zh-cn/docs/use-cases/external-integration/onwechat.md

@@ -11,7 +11,7 @@ weight: 509
 
 [chatgpt-on-wechat GitHub 地址](https://github.com/zhayujie/chatgpt-on-wechat)
 
-由于 FastGPT 的 API 接口和 OpenAI 的规范一致，可以无需变更原来的应用即可使用 FastGPT 上编排好的应用。API 使用可参考 [这篇文章](/docs/use-cases/external-integration/openapi/)。编排示例，可参考 [高级编排介绍](/docs/workflow/intro)
+由于 FastGPT 的 API 接口和 OpenAI 的规范一致，可以无需变更原来的应用即可使用 FastGPT 上编排好的应用。API 使用可参考 [这篇文章](/docs/course/openapi/)。编排示例，可参考 [高级编排介绍](/docs/workflow/intro)
 
 ## 1. 获取 OpenAPI 密钥
 

files/docker/docker-compose-milvus.yml

@@ -139,6 +139,8 @@ services:
       - OPENAI_BASE_URL=http://oneapi:3000/v1
       # AI模型的API Key。（这里默认填写了OneAPI的快速默认key，测试通后，务必及时修改）
       - CHAT_API_KEY=sk-fastgpt
+      # 是否将图片转成 base64 传递给模型，本地开发和内网环境使用共有模型时候需要设置为 true
+      - MULTIPLE_DATA_TO_BASE64=false
       # 数据库最大连接数
       - DB_MAX_LINK=30
       # 登录凭证密钥

files/docker/docker-compose-pgvector.yml

@@ -97,6 +97,8 @@ services:
       - OPENAI_BASE_URL=http://oneapi:3000/v1
       # AI模型的API Key。（这里默认填写了OneAPI的快速默认key，测试通后，务必及时修改）
       - CHAT_API_KEY=sk-fastgpt
+      # 是否将图片转成 base64 传递给模型，本地开发和内网环境使用共有模型时候需要设置为 true
+      - MULTIPLE_DATA_TO_BASE64=false
       # 数据库最大连接数
       - DB_MAX_LINK=30
       # 登录凭证密钥

files/docker/docker-compose-zilliz.yml

@@ -77,6 +77,8 @@ services:
       - OPENAI_BASE_URL=http://oneapi:3000/v1
       # AI模型的API Key。（这里默认填写了OneAPI的快速默认key，测试通后，务必及时修改）
       - CHAT_API_KEY=sk-fastgpt
+      # 是否将图片转成 base64 传递给模型，本地开发和内网环境使用共有模型时候需要设置为 true
+      - MULTIPLE_DATA_TO_BASE64=false
       # 数据库最大连接数
       - DB_MAX_LINK=30
       # 登录凭证密钥

packages/global/common/file/constants.ts

@@ -16,7 +16,7 @@ export const bucketNameMap = {
   }
 };
 
-export const ReadFileBaseUrl = `${process.env.FE_DOMAIN || ''}${process.env.NEXT_PUBLIC_BASE_URL || ''}/api/common/file/read`;
+export const ReadFileBaseUrl = `${process.env.FE_DOMAIN || ''}${process.env.NEXT_PUBLIC_BASE_URL}/api/common/file/read`;
 
 export const documentFileType = '.txt, .docx, .csv, .xlsx, .pdf, .md, .html, .pptx';
 export const imageFileType =

packages/global/common/string/markdown.ts

@@ -1,6 +1,5 @@
 import { batchRun } from '../fn/utils';
-import { getNanoid, simpleText } from './tools';
-import type { ImageType } from '../../../service/worker/readFile/type';
+import { simpleText } from './tools';
 
 /* Delete redundant text in markdown */
 export const simpleMarkdownText = (rawText: string) => {
@@ -93,25 +92,3 @@ export const markdownProcess = async ({
 
   return simpleMarkdownText(imageProcess);
 };
-
-export const matchMdImgTextAndUpload = (text: string) => {
-  const base64Regex = /"(data:image\/[^;]+;base64[^"]+)"/g;
-  const imageList: ImageType[] = [];
-  const images = Array.from(text.match(base64Regex) || []);
-  for (const image of images) {
-    const uuid = `IMAGE_${getNanoid(12)}_IMAGE`;
-    const mime = image.split(';')[0].split(':')[1];
-    const base64 = image.split(',')[1];
-    text = text.replace(image, uuid);
-    imageList.push({
-      uuid,
-      base64,
-      mime
-    });
-  }
-
-  return {
-    text,
-    imageList
-  };
-};

packages/global/common/system/types/index.d.ts

@@ -56,7 +56,6 @@ export type FastGPTFeConfigsType = {
     github?: string;
     google?: string;
     wechat?: string;
-    microsoft?: string;
   };
   limit?: {
     exportDatasetLimitMinutes?: number;

packages/global/core/chat/utils.ts

@@ -78,15 +78,11 @@ export const getHistoryPreview = (
 };
 
 export const filterPublicNodeResponseData = ({
-  flowResponses = [],
-  responseDetail = false
+  flowResponses = []
 }: {
   flowResponses?: ChatHistoryItemResType[];
-  responseDetail?: boolean;
 }) => {
-  const filedList = responseDetail
-    ? ['quoteList', 'moduleType', 'pluginOutput', 'runningTime']
-    : ['moduleType', 'pluginOutput', 'runningTime'];
+  const filedList = ['quoteList', 'moduleType', 'pluginOutput', 'runningTime'];
   const filterModuleTypeList: any[] = [
     FlowNodeTypeEnum.pluginModule,
     FlowNodeTypeEnum.datasetSearchNode,

packages/global/core/workflow/template/system/datasetSearch.ts

@@ -95,10 +95,10 @@ export const DatasetSearchModule: FlowNodeTemplateType = {
     },
     {
       key: NodeInputKeyEnum.collectionFilterMatch,
-      renderTypeList: [FlowNodeInputTypeEnum.textarea, FlowNodeInputTypeEnum.reference],
+      renderTypeList: [FlowNodeInputTypeEnum.JSONEditor, FlowNodeInputTypeEnum.reference],
       label: i18nT('workflow:collection_metadata_filter'),
 
-      valueType: WorkflowIOValueTypeEnum.string,
+      valueType: WorkflowIOValueTypeEnum.object,
       isPro: true,
       description: i18nT('workflow:filter_description')
     }

packages/global/support/user/constant.ts

@@ -14,6 +14,5 @@ export const userStatusMap = {
 export enum OAuthEnum {
   github = 'github',
   google = 'google',
-  wechat = 'wechat',
-  microsoft = 'microsoft'
+  wechat = 'wechat'
 }

packages/plugins/register.ts

@@ -5,7 +5,18 @@ import { cloneDeep } from 'lodash';
 import { WorkerNameEnum, runWorker } from '@fastgpt/service/worker/utils';
 
 // Run in main thread
-const staticPluginList = ['getTime', 'fetchUrl', 'feishu', 'google', 'bing'];
+const staticPluginList = [
+  'getTime',
+  'fetchUrl',
+  'Doc2X',
+  'Doc2X/URLPDF2text',
+  'Doc2X/URLImg2text',
+  `Doc2X/FilePDF2text`,
+  `Doc2X/FileImg2text`,
+  'feishu',
+  'google',
+  'bing'
+];
 // Run in worker thread (Have npm packages)
 const packagePluginList = [
   'mathExprVal',
@@ -17,9 +28,7 @@ const packagePluginList = [
   'drawing',
   'drawing/baseChart',
   'wiki',
-  'databaseConnection',
-  'Doc2X',
-  'Doc2X/PDF2text'
+  'databaseConnection'
 ];
 
 export const list = [...staticPluginList, ...packagePluginList];
@@ -46,8 +55,6 @@ export const getCommunityPlugins = () => {
 };
 
 export const getSystemPluginTemplates = () => {
-  if (!global.systemPlugins) return [];
-
   const oldPlugins = global.communityPlugins ?? [];
   return [...oldPlugins, ...cloneDeep(global.systemPlugins)];
 };
@@ -89,3 +96,7 @@ export const getCommunityCb = async () => {
     {}
   );
 };
+
+export const getSystemPluginCb = async () => {
+  return global.systemPluginCb;
+};

packages/plugins/src/Doc2X/FileImg2text/index.ts

@@ -0,0 +1,172 @@
+import { delay } from '@fastgpt/global/common/system/utils';
+import { addLog } from '@fastgpt/service/common/system/log';
+
+type Props = {
+  apikey: string;
+  files: Array<string>;
+  img_correction: boolean;
+  formula: boolean;
+};
+
+type Response = Promise<{
+  result: string;
+  failreason: string;
+  success: boolean;
+}>;
+
+const main = async ({ apikey, files, img_correction, formula }: Props): Response => {
+  // Check the apikey
+  if (!apikey) {
+    return {
+      result: '',
+      failreason: `API key is required`,
+      success: false
+    };
+  }
+
+  let real_api_key = apikey;
+  if (!apikey.startsWith('sk-')) {
+    const response = await fetch('https://api.doc2x.noedgeai.com/api/token/refresh', {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${apikey}`
+      }
+    });
+    if (response.status !== 200) {
+      return {
+        result: '',
+        failreason: `Get token failed: ${await response.text()}`,
+        success: false
+      };
+    }
+    const data = await response.json();
+    real_api_key = data.data.token;
+  }
+
+  let final_result = '';
+  let fail_reason = '';
+  let flag = false;
+  //Process each file one by one
+  for await (const url of files) {
+    // Fetch the image and check its content type
+    const imageResponse = await fetch(url);
+    if (!imageResponse.ok) {
+      fail_reason += `\n---\nFile:${url} \n<Content>\nFailed to fetch image from URL\n</Content>\n`;
+      flag = true;
+      continue;
+    }
+
+    const contentType = imageResponse.headers.get('content-type');
+    const fileName = url.match(/read\?filename=([^&]+)/)?.[1] || 'unknown.png';
+    if (!contentType || !contentType.startsWith('image/')) {
+      fail_reason += `\n---\nFile:${url} \n<Content>\nThe provided URL does not point to an image: ${contentType}\n</Content>\n`;
+      flag = true;
+      continue;
+    }
+
+    const blob = await imageResponse.blob();
+    const formData = new FormData();
+    formData.append('file', blob, fileName);
+    formData.append('img_correction', img_correction ? '1' : '0');
+    formData.append('equation', formula ? '1' : '0');
+
+    let upload_url = 'https://api.doc2x.noedgeai.com/api/platform/async/img';
+    if (real_api_key.startsWith('sk-')) {
+      upload_url = 'https://api.doc2x.noedgeai.com/api/v1/async/img';
+    }
+
+    let uuid;
+    let upload_flag = true;
+    const uploadAttempts = [1, 2, 3];
+    for await (const attempt of uploadAttempts) {
+      const upload_response = await fetch(upload_url, {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${real_api_key}`
+        },
+        body: formData
+      });
+
+      if (!upload_response.ok) {
+        // Rate limit, wait for 10s and retry at most 3 times
+        if (upload_response.status === 429 && attempt < 3) {
+          await delay(10000);
+          continue;
+        }
+        fail_reason += `\n---\nFile:${fileName}\n<Content>\nFailed to upload file: ${await upload_response.text()}\n</Content>\n`;
+        flag = true;
+        upload_flag = false;
+        break;
+      }
+      if (!upload_flag) {
+        continue;
+      }
+
+      const upload_data = await upload_response.json();
+      uuid = upload_data.data.uuid;
+      break;
+    }
+
+    // Get the result by uuid
+    let result_url = 'https://api.doc2x.noedgeai.com/api/platform/async/status?uuid=' + uuid;
+    if (real_api_key.startsWith('sk-')) {
+      result_url = 'https://api.doc2x.noedgeai.com/api/v1/async/status?uuid=' + uuid;
+    }
+
+    let required_flag = true;
+    const maxAttempts = 100;
+    // Wait for the result, at most 100s
+    for await (const _ of Array(maxAttempts).keys()) {
+      const result_response = await fetch(result_url, {
+        headers: {
+          Authorization: `Bearer ${real_api_key}`
+        }
+      });
+      if (!result_response.ok) {
+        fail_reason += `\n---\nFile:${fileName}\n<Content>\nFailed to get result: ${await result_response.text()}\n</Content>\n`;
+        flag = true;
+        required_flag = false;
+        break;
+      }
+      const result_data = await result_response.json();
+      if (['ready', 'processing'].includes(result_data.data.status)) {
+        await delay(1000);
+      } else if (result_data.data.status === 'pages limit exceeded') {
+        fail_reason += `\n---\nFile:${fileName}\n<Content>\nFailed to get result: pages limit exceeded\n</Content>\n`;
+        flag = true;
+        required_flag = false;
+        break;
+      } else if (result_data.data.status === 'success') {
+        let result;
+        try {
+          result = result_data.data.result.pages[0].md;
+          result = result.replace(/\\[\(\)]/g, '$').replace(/\\[\[\]]/g, '$$');
+        } catch {
+          // no pages
+          final_result += `\n---\nFile:${fileName}\n<Content>\n \n</Content>\n`;
+          required_flag = false;
+        }
+        final_result += `\n---\nFile:${fileName}\n<Content>\n${result}\n</Content>\n`;
+        required_flag = false;
+        break;
+      } else {
+        fail_reason += `\n---\nFile:${fileName}\n<Content>\nFailed to get result: ${result_data.data.status}\n</Content>\n`;
+        flag = true;
+        required_flag = false;
+        break;
+      }
+    }
+    if (required_flag) {
+      fail_reason += `\n---\nFile:${fileName}\n<Content>\nTimeout waiting for result\n</Content>\n`;
+      flag = true;
+    }
+  }
+
+  return {
+    result: final_result,
+    failreason: fail_reason,
+    success: !flag
+  };
+};
+
+export default main;

packages/plugins/src/Doc2X/FileImg2text/template.json

@@ -0,0 +1,500 @@
+{
+  "author": "Menghuan1918",
+  "version": "488",
+  "name": "Doc2X 图像(文件)识别",
+  "avatar": "plugins/doc2x",
+  "intro": "将上传的图片文件发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
+  "courseUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
+  "showStatus": true,
+  "weight": 10,
+
+  "isTool": true,
+  "templateType": "tools",
+
+  "workflow": {
+    "nodes": [
+      {
+        "nodeId": "pluginConfig",
+        "name": "common:core.module.template.system_config",
+        "intro": "",
+        "avatar": "core/workflow/template/systemConfig",
+        "flowNodeType": "pluginConfig",
+        "position": {
+          "x": -90.53591960393504,
+          "y": -17.580286776561252
+        },
+        "version": "4811",
+        "inputs": [],
+        "outputs": []
+      },
+      {
+        "nodeId": "pluginInput",
+        "name": "插件开始",
+        "intro": "可以配置插件需要哪些输入，利用这些输入来运行插件",
+        "avatar": "core/workflow/template/workflowStart",
+        "flowNodeType": "pluginInput",
+        "showStatus": false,
+        "position": {
+          "x": 368.6800424053505,
+          "y": -17.580286776561252
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "renderTypeList": ["input"],
+            "selectedTypeIndex": 0,
+            "valueType": "string",
+            "canEdit": true,
+            "key": "apikey",
+            "label": "apikey",
+            "description": "Doc2X的验证密匙，对于个人用户可以从Doc2X官网 - 个人信息 - 身份令牌获得",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": ""
+          },
+          {
+            "renderTypeList": ["reference"],
+            "selectedTypeIndex": 0,
+            "valueType": "arrayString",
+            "canEdit": true,
+            "key": "files",
+            "label": "files",
+            "description": "待处理图片文件",
+            "required": true,
+            "toolDescription": "待处理图片文件"
+          },
+          {
+            "renderTypeList": ["switch"],
+            "selectedTypeIndex": 0,
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "img_correction",
+            "label": "img_correction",
+            "description": "是否启用图形矫正功能",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": false
+          },
+          {
+            "renderTypeList": ["switch"],
+            "selectedTypeIndex": 0,
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "formula",
+            "label": "formula",
+            "description": "是否开启纯公式识别(仅适用于图片内容仅有公式时)",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": false
+          }
+        ],
+        "outputs": [
+          {
+            "id": "apikey",
+            "valueType": "string",
+            "key": "apikey",
+            "label": "apikey",
+            "type": "hidden"
+          },
+          {
+            "id": "url",
+            "valueType": "arrayString",
+            "key": "files",
+            "label": "files",
+            "type": "hidden"
+          },
+          {
+            "id": "img_correction",
+            "valueType": "boolean",
+            "key": "img_correction",
+            "label": "img_correction",
+            "type": "hidden"
+          },
+          {
+            "id": "formula",
+            "valueType": "boolean",
+            "key": "formula",
+            "label": "formula",
+            "type": "hidden"
+          }
+        ]
+      },
+      {
+        "nodeId": "pluginOutput",
+        "name": "插件输出",
+        "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出",
+        "avatar": "core/workflow/template/pluginOutput",
+        "flowNodeType": "pluginOutput",
+        "showStatus": false,
+        "position": {
+          "x": 1796.2235867744578,
+          "y": 6.419713223438748
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "result",
+            "label": "result",
+            "description": "处理结果(或者是报错信息)",
+            "value": ["zHG5jJBkXmjB", "xWQuEf50F3mr"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "failreason",
+            "label": "failreason",
+            "description": "文件处理失败原因，由文件名以及报错组成，多个文件之间由横线分隔开",
+            "value": ["zHG5jJBkXmjB", "jbv4nVZvmFXm"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "success",
+            "label": "success",
+            "description": "是否全部文件都处理成功，如有没有处理成功的文件，失败原因将会输出在failreason中",
+            "value": ["zHG5jJBkXmjB", "k46cjNulVk5Y"]
+          }
+        ],
+        "outputs": []
+      },
+      {
+        "nodeId": "zHG5jJBkXmjB",
+        "name": "HTTP 请求",
+        "intro": "可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）",
+        "avatar": "core/workflow/template/httpRequest",
+        "flowNodeType": "httpRequest468",
+        "showStatus": true,
+        "position": {
+          "x": 1081.967607938733,
+          "y": -426.08028677656125
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "key": "system_addInputParam",
+            "renderTypeList": ["addInputParam"],
+            "valueType": "dynamic",
+            "label": "",
+            "required": false,
+            "description": "common:core.module.input.description.HTTP Dynamic Input",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpMethod",
+            "renderTypeList": ["custom"],
+            "valueType": "string",
+            "label": "",
+            "value": "POST",
+            "required": true,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpTimeout",
+            "renderTypeList": ["custom"],
+            "valueType": "number",
+            "label": "",
+            "value": 30,
+            "min": 5,
+            "max": 600,
+            "required": true,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpReqUrl",
+            "renderTypeList": ["hidden"],
+            "valueType": "string",
+            "label": "",
+            "description": "common:core.module.input.description.Http Request Url",
+            "placeholder": "https://api.ai.com/getInventory",
+            "required": false,
+            "value": "Doc2X/FileImg2text",
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpHeader",
+            "renderTypeList": ["custom"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "description": "common:core.module.input.description.Http Request Header",
+            "placeholder": "common:core.module.input.description.Http Request Header",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpParams",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpJsonBody",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": "{\n  \"apikey\": \"{{apikey}}\",\n  \"files\": {{files}},\n  \"img_correction\": {{img_correction}},\n  \"formula\": {{formula}}\n}",
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpFormBody",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpContentType",
+            "renderTypeList": ["hidden"],
+            "valueType": "string",
+            "value": "json",
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "apikey",
+            "label": "apikey",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "apikey"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "arrayString",
+            "canEdit": true,
+            "key": "files",
+            "label": "files",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "url"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "img_correction",
+            "label": "img_correction",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "img_correction"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "formula",
+            "label": "formula",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "formula"]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "error",
+            "key": "error",
+            "label": "workflow:request_error",
+            "description": "HTTP请求错误信息，成功时返回空",
+            "valueType": "object",
+            "type": "static"
+          },
+          {
+            "id": "httpRawResponse",
+            "key": "httpRawResponse",
+            "required": true,
+            "label": "workflow:raw_response",
+            "description": "HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。",
+            "valueType": "any",
+            "type": "static"
+          },
+          {
+            "id": "system_addOutputParam",
+            "key": "system_addOutputParam",
+            "type": "dynamic",
+            "valueType": "dynamic",
+            "label": "",
+            "customFieldConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": false
+            }
+          },
+          {
+            "id": "xWQuEf50F3mr",
+            "valueType": "string",
+            "type": "dynamic",
+            "key": "result",
+            "label": "result"
+          },
+          {
+            "id": "jbv4nVZvmFXm",
+            "valueType": "string",
+            "type": "dynamic",
+            "key": "failreason",
+            "label": "failreason"
+          },
+          {
+            "id": "k46cjNulVk5Y",
+            "valueType": "boolean",
+            "type": "dynamic",
+            "key": "success",
+            "label": "success"
+          }
+        ]
+      }
+    ],
+    "edges": [
+      {
+        "source": "pluginInput",
+        "target": "zHG5jJBkXmjB",
+        "sourceHandle": "pluginInput-source-right",
+        "targetHandle": "zHG5jJBkXmjB-target-left"
+      },
+      {
+        "source": "zHG5jJBkXmjB",
+        "target": "pluginOutput",
+        "sourceHandle": "zHG5jJBkXmjB-source-right",
+        "targetHandle": "pluginOutput-target-left"
+      }
+    ]
+  }
+}

packages/plugins/src/Doc2X/FilePDF2text/index.ts

@@ -0,0 +1,165 @@
+import { delay } from '@fastgpt/global/common/system/utils';
+import { addLog } from '@fastgpt/service/common/system/log';
+import { result } from 'lodash';
+
+type Props = {
+  apikey: string;
+  files: Array<string>;
+  ocr: boolean;
+};
+
+// Response type same as HTTP outputs
+type Response = Promise<{
+  result: string;
+  failreason: string;
+  success: boolean;
+}>;
+
+const main = async ({ apikey, files, ocr }: Props): Response => {
+  // Check the apikey
+  if (!apikey) {
+    return {
+      result: '',
+      failreason: `API key is required`,
+      success: false
+    };
+  }
+
+  let real_api_key = apikey;
+  if (!apikey.startsWith('sk-')) {
+    const response = await fetch('https://api.doc2x.noedgeai.com/api/token/refresh', {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${apikey}`
+      }
+    });
+    if (response.status !== 200) {
+      return {
+        result: '',
+        failreason: `Get token failed: ${await response.text()}`,
+        success: false
+      };
+    }
+    const data = await response.json();
+    real_api_key = data.data.token;
+  }
+
+  let final_result = '';
+  let fail_reason = '';
+  let flag = false;
+  //Process each file one by one
+  for await (const url of files) {
+    //Fetch the pdf and check its contene type
+    const PDFResponse = await fetch(url);
+    if (!PDFResponse.ok) {
+      fail_reason += `\n---\nFile:${url} \n<Content>\nFailed to fetch PDF from URL\n</Content>\n`;
+      flag = true;
+      continue;
+    }
+
+    const contentType = PDFResponse.headers.get('content-type');
+    const file_name = url.match(/read\?filename=([^&]+)/)?.[1] || 'unknown.pdf';
+    if (!contentType || !contentType.startsWith('application/pdf')) {
+      fail_reason += `\n---\nFile:${file_name}\n<Content>\nThe provided file does not point to a PDF: ${contentType}\n</Content>\n`;
+      flag = true;
+      continue;
+    }
+
+    const blob = await PDFResponse.blob();
+    const formData = new FormData();
+    formData.append('file', blob, file_name);
+    formData.append('ocr', ocr ? '1' : '0');
+
+    let upload_url = 'https://api.doc2x.noedgeai.com/api/platform/async/pdf';
+    if (real_api_key.startsWith('sk-')) {
+      upload_url = 'https://api.doc2x.noedgeai.com/api/v1/async/pdf';
+    }
+
+    let uuid;
+    let upload_flag = true;
+    const uploadAttempts = [1, 2, 3];
+    for await (const attempt of uploadAttempts) {
+      const upload_response = await fetch(upload_url, {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${real_api_key}`
+        },
+        body: formData
+      });
+      if (!upload_response.ok) {
+        // Rate limit, wait for 10s and retry at most 3 times
+        if (upload_response.status === 429 && attempt < 3) {
+          await delay(10000);
+          continue;
+        }
+        fail_reason += `\n---\nFile:${file_name}\n<Content>\nFailed to upload file: ${await upload_response.text()}\n</Content>\n`;
+        flag = true;
+        upload_flag = false;
+      }
+      if (!upload_flag) {
+        continue;
+      }
+      const upload_data = await upload_response.json();
+      uuid = upload_data.data.uuid;
+      break;
+    }
+
+    // Get the result by uuid
+    let result_url = 'https://api.doc2x.noedgeai.com/api/platform/async/status?uuid=' + uuid;
+    if (real_api_key.startsWith('sk-')) {
+      result_url = 'https://api.doc2x.noedgeai.com/api/v1/async/status?uuid=' + uuid;
+    }
+
+    let required_flag = true;
+    let result = '';
+    // Wait for the result, at most 100s
+    const maxAttempts = 100;
+    for await (const _ of Array(maxAttempts).keys()) {
+      const result_response = await fetch(result_url, {
+        headers: {
+          Authorization: `Bearer ${real_api_key}`
+        }
+      });
+      if (!result_response.ok) {
+        fail_reason += `\n---\nFile:${file_name}\n<Content>\nFailed to get result: ${await result_response.text()}\n</Content>\n`;
+        flag = true;
+        required_flag = false;
+        break;
+      }
+      const result_data = await result_response.json();
+      if (['ready', 'processing'].includes(result_data.data.status)) {
+        await delay(1000);
+      } else if (result_data.data.status === 'pages limit exceeded') {
+        fail_reason += `\n---\nFile:${file_name}\n<Content>\nPages limit exceeded\n</Content>\n`;
+        flag = true;
+        required_flag = false;
+        break;
+      } else if (result_data.data.status === 'success') {
+        result = await Promise.all(
+          result_data.data.result.pages.map((page: { md: any }) => page.md)
+        ).then((pages) => pages.join('\n'));
+        result = result.replace(/\\[\(\)]/g, '$').replace(/\\[\[\]]/g, '$$');
+        final_result += `\n---\nFile:${file_name}\n<Content>\n${result}\n</Content>\n`;
+        required_flag = false;
+        break;
+      } else {
+        fail_reason += `\n---\nFile:${file_name}\n<Content>\nFailed to get result: ${result_data.data.status}\n</Content>\n`;
+        flag = true;
+        required_flag = false;
+        break;
+      }
+    }
+    if (required_flag) {
+      fail_reason += `\n---\nFile:${file_name}\n<Content>\nTimeout after 100s for uuid ${uuid}\n</Content>\n`;
+      flag = true;
+    }
+  }
+
+  return {
+    result: final_result,
+    failreason: fail_reason,
+    success: !flag
+  };
+};
+
+export default main;

packages/plugins/src/Doc2X/FilePDF2text/template.json

@@ -1,9 +1,9 @@
 {
   "author": "Menghuan1918",
   "version": "488",
-  "name": "PDF识别",
+  "name": "Doc2X PDF文件(文件)识别",
   "avatar": "plugins/doc2x",
-  "intro": "将PDF文件发送至Doc2X进行解析，返回结构化的LaTeX公式的文本(markdown)，支持传入String类型的URL或者流程输出中的文件链接变量",
+  "intro": "将上传的PDF文件发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
   "courseUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
   "showStatus": true,
   "weight": 10,
@@ -13,16 +13,30 @@
 
   "workflow": {
     "nodes": [
+      {
+        "nodeId": "pluginConfig",
+        "name": "common:core.module.template.system_config",
+        "intro": "",
+        "avatar": "core/workflow/template/systemConfig",
+        "flowNodeType": "pluginConfig",
+        "position": {
+          "x": -30.474351356537454,
+          "y": -101.45216221730038
+        },
+        "version": "4811",
+        "inputs": [],
+        "outputs": []
+      },
       {
         "nodeId": "pluginInput",
-        "name": "自定义插件输入",
+        "name": "插件开始",
         "intro": "可以配置插件需要哪些输入，利用这些输入来运行插件",
         "avatar": "core/workflow/template/workflowStart",
         "flowNodeType": "pluginInput",
         "showStatus": false,
         "position": {
-          "x": -137.96875104510553,
-          "y": -90.9968973555371
+          "x": 407.2817920483865,
+          "y": -101.45216221730038
         },
         "version": "481",
         "inputs": [
@@ -33,25 +47,33 @@
             "canEdit": true,
             "key": "apikey",
             "label": "apikey",
-            "description": "Doc2X的API密匙，可以从Doc2X开放平台获得",
+            "description": "Doc2X的验证密匙，对于个人用户可以从Doc2X官网 - 个人信息 - 身份令牌获得",
             "required": true,
-            "defaultValue": "",
-            "list": []
+            "toolDescription": "",
+            "defaultValue": ""
           },
           {
-            "renderTypeList": ["fileSelect"],
+            "renderTypeList": ["reference"],
             "selectedTypeIndex": 0,
             "valueType": "arrayString",
             "canEdit": true,
             "key": "files",
             "label": "files",
-            "description": "需要处理的PDF地址",
+            "description": "待处理的PDF文件",
             "required": true,
-            "list": [],
-            "canSelectFile": true,
-            "canSelectImg": false,
-            "maxFiles": 14,
-            "defaultValue": ""
+            "toolDescription": "待处理的PDF文件"
+          },
+          {
+            "renderTypeList": ["switch"],
+            "selectedTypeIndex": 0,
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "ocr",
+            "label": "ocr",
+            "description": "是否开启对PDF文件内图片的OCR识别，建议开启",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": true
           }
         ],
         "outputs": [
@@ -68,19 +90,26 @@
             "key": "files",
             "label": "files",
             "type": "hidden"
+          },
+          {
+            "id": "formula",
+            "valueType": "boolean",
+            "key": "ocr",
+            "label": "ocr",
+            "type": "hidden"
           }
         ]
       },
       {
         "nodeId": "pluginOutput",
-        "name": "自定义插件输出",
+        "name": "插件输出",
         "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出",
         "avatar": "core/workflow/template/pluginOutput",
         "flowNodeType": "pluginOutput",
         "showStatus": false,
         "position": {
-          "x": 1505.494975310334,
-          "y": -4.14668564643415
+          "x": 1842.070888321717,
+          "y": -101.45216221730038
         },
         "version": "481",
         "inputs": [
@@ -95,13 +124,12 @@
           },
           {
             "renderTypeList": ["reference"],
-            "valueType": "object",
+            "valueType": "string",
             "canEdit": true,
-            "key": "error",
-            "label": "error",
-            "description": "",
-            "value": ["zHG5jJBkXmjB", "httpRawResponse"],
-            "isToolOutput": true
+            "key": "failreason",
+            "label": "failreason",
+            "description": "文件处理失败原因，由文件名以及报错组成，多个文件之间由横线分隔开",
+            "value": ["zHG5jJBkXmjB", "yDxzW5CFalGw"]
           },
           {
             "renderTypeList": ["reference"],
@@ -110,8 +138,7 @@
             "key": "success",
             "label": "success",
             "description": "是否全部文件都处理成功，如有没有处理成功的文件，失败原因将会输出在failreason中",
-            "value": ["zHG5jJBkXmjB", "m6CJJj7GFud5"],
-            "isToolOutput": false
+            "value": ["zHG5jJBkXmjB", "m6CJJj7GFud5"]
           }
         ],
         "outputs": []
@@ -124,8 +151,8 @@
         "flowNodeType": "httpRequest468",
         "showStatus": true,
         "position": {
-          "x": 619.0661933308237,
-          "y": -472.91377894611503
+          "x": 1077.7986740892777,
+          "y": -496.9521622173004
         },
         "version": "481",
         "inputs": [
@@ -175,7 +202,7 @@
             "renderTypeList": ["custom"],
             "valueType": "number",
             "label": "",
-            "value": 300,
+            "value": 30,
             "min": 5,
             "max": 600,
             "required": true,
@@ -190,7 +217,7 @@
             "description": "common:core.module.input.description.Http Request Url",
             "placeholder": "https://api.ai.com/getInventory",
             "required": false,
-            "value": "Doc2X/PDF2text",
+            "value": "Doc2X/FilePDF2text",
             "debugLabel": "",
             "toolDescription": ""
           },
@@ -220,7 +247,7 @@
             "key": "system_httpJsonBody",
             "renderTypeList": ["hidden"],
             "valueType": "any",
-            "value": "{\n  \"apikey\": \"{{apikey}}\",\n  \"files\": {{files}}\n}",
+            "value": "{\n  \"apikey\": \"{{apikey}}\",\n  \"files\": {{files}},\n  \"ocr\": {{ocr}}\n}",
             "label": "",
             "required": false,
             "debugLabel": "",
@@ -304,7 +331,37 @@
               "showDefaultValue": true
             },
             "required": true,
-            "value": [["pluginInput", "url"]]
+            "value": ["pluginInput", "url"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "ocr",
+            "label": "ocr",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "formula"]
           }
         ],
         "outputs": [
@@ -365,42 +422,30 @@
             "type": "dynamic",
             "key": "success",
             "label": "success"
+          },
+          {
+            "id": "yDxzW5CFalGw",
+            "valueType": "string",
+            "type": "dynamic",
+            "key": "failreason",
+            "label": "failreason"
           }
         ]
       }
     ],
     "edges": [
-      {
-        "source": "zHG5jJBkXmjB",
-        "target": "pluginOutput",
-        "sourceHandle": "zHG5jJBkXmjB-source-right",
-        "targetHandle": "pluginOutput-target-left"
-      },
       {
         "source": "pluginInput",
         "target": "zHG5jJBkXmjB",
         "sourceHandle": "pluginInput-source-right",
         "targetHandle": "zHG5jJBkXmjB-target-left"
+      },
+      {
+        "source": "zHG5jJBkXmjB",
+        "target": "pluginOutput",
+        "sourceHandle": "zHG5jJBkXmjB-source-right",
+        "targetHandle": "pluginOutput-target-left"
       }
-    ],
-    "chatConfig": {
-      "questionGuide": false,
-      "ttsConfig": {
-        "type": "web"
-      },
-      "whisperConfig": {
-        "open": false,
-        "autoSend": false,
-        "autoTTSResponse": false
-      },
-      "chatInputGuide": {
-        "open": false,
-        "textList": [],
-        "customUrl": ""
-      },
-      "instruction": "",
-      "variables": [],
-      "welcomeText": ""
-    }
+    ]
   }
 }

packages/plugins/src/Doc2X/PDF2text/index.ts

@@ -1,157 +0,0 @@
-import { delay } from '@fastgpt/global/common/system/utils';
-import axios from 'axios';
-import { getErrText } from '@fastgpt/global/common/error/utils';
-
-type Props = {
-  apikey: string;
-  files: string[];
-};
-
-// Response type same as HTTP outputs
-type Response = Promise<{
-  result: string;
-  success: boolean;
-  error?: Record<string, any>;
-}>;
-
-const main = async ({ apikey, files }: Props): Response => {
-  // Check the apikey
-  if (!apikey) {
-    return Promise.reject(`API key is required`);
-  }
-  const successResult = [];
-  const failedResult = [];
-
-  const axiosInstance = axios.create({
-    timeout: 30000 // 30 seconds timeout
-  });
-
-  //Process each file one by one
-  for await (const url of files) {
-    try {
-      //Fetch the pdf and check its content type
-      const PDFResponse = await axiosInstance.get(url, { responseType: 'arraybuffer' });
-      if (PDFResponse.status !== 200) {
-        throw new Error(
-          `File:${url} \n<Content>\nFailed to fetch PDF from URL: ${PDFResponse.statusText}\n</Content>`
-        );
-      }
-
-      const contentType = PDFResponse.headers['content-type'];
-      const file_name = url.match(/read\/([^?]+)/)?.[1] || 'unknown.pdf';
-      if (!contentType || !contentType.startsWith('application/pdf')) {
-        throw new Error(
-          `File:${file_name}\n<Content>\nThe provided file does not point to a PDF: ${contentType}\n</Content>`
-        );
-      }
-
-      const blob = new Blob([PDFResponse.data], { type: 'application/pdf' });
-      // Get pre-upload URL first
-      const preupload_response = await axiosInstance.post(
-        'https://v2.doc2x.noedgeai.com/api/v2/parse/preupload',
-        null,
-        {
-          headers: {
-            Authorization: `Bearer ${apikey}`
-          }
-        }
-      );
-
-      if (preupload_response.status !== 200) {
-        throw new Error(
-          `File:${file_name}\n<Content>\nFailed to get pre-upload URL: ${preupload_response.statusText}\n</Content>`
-        );
-      }
-
-      const preupload_data = preupload_response.data;
-      if (preupload_data.code !== 'success') {
-        throw new Error(
-          `File:${file_name}\n<Content>\nFailed to get pre-upload URL: ${JSON.stringify(preupload_data)}\n</Content>`
-        );
-      }
-
-      const upload_url = preupload_data.data.url;
-      const uid = preupload_data.data.uid;
-      // Upload file to pre-signed URL with binary stream
-
-      const response = await axiosInstance.put(upload_url, blob, {
-        headers: {
-          'Content-Type': 'application/pdf'
-        }
-      });
-      if (response.status !== 200) {
-        throw new Error(`Upload failed with status ${response.status}: ${response.statusText}`);
-      }
-
-      // Get the result by uid
-
-      // Wait for the result, at most 90s
-      const checkResult = async (retry = 30) => {
-        if (retry <= 0)
-          return Promise.reject(
-            `File:${file_name}\n<Content>\nFailed to get result (uid: ${uid}): Get result timeout\n</Content>`
-          );
-
-        try {
-          const result_response = await axiosInstance.get(
-            `https://v2.doc2x.noedgeai.com/api/v2/parse/status?uid=${uid}`,
-            {
-              headers: {
-                Authorization: `Bearer ${apikey}`
-              }
-            }
-          );
-
-          const result_data = result_response.data;
-          if (!['ok', 'success'].includes(result_data.code)) {
-            return Promise.reject(
-              `File:${file_name}\n<Content>\nFailed to get result (uid: ${uid}): ${JSON.stringify(result_data)}\n</Content>`
-            );
-          }
-
-          if (['ready', 'processing'].includes(result_data.data.status)) {
-            await delay(3000);
-            return checkResult(retry - 1);
-          }
-
-          if (result_data.data.status === 'success') {
-            const result = (
-              await Promise.all(
-                result_data.data.result.pages.map((page: { md: any }) => page.md)
-              ).then((pages) => pages.join('\n'))
-            )
-              // Do some post-processing
-              .replace(/\\[\(\)]/g, '$')
-              .replace(/\\[\[\]]/g, '$$')
-              .replace(/<img\s+src="([^"]+)"(?:\s*\?[^>]*)?(?:\s*\/>|>)/g, '![img]($1)');
-
-            return `File:${file_name}\n<Content>\n${result}\n</Content>`;
-          }
-
-          await delay(100);
-          return checkResult(retry - 1);
-        } catch (error) {
-          await delay(100);
-          return checkResult(retry - 1);
-        }
-      };
-
-      const result = await checkResult();
-      successResult.push(result);
-    } catch (error) {
-      failedResult.push(
-        `File:${url} \n<Content>\nFailed to fetch image from URL: ${getErrText(error)}\n</Content>`
-      );
-    }
-  }
-
-  return {
-    result: successResult.join('\n******\n'),
-    error: {
-      message: failedResult.join('\n******\n')
-    },
-    success: failedResult.length === 0
-  };
-};
-
-export default main;

packages/plugins/src/Doc2X/URLImg2text/index.ts

@@ -0,0 +1,166 @@
+import { delay } from '@fastgpt/global/common/system/utils';
+import { addLog } from '@fastgpt/service/common/system/log';
+
+type Props = {
+  apikey: string;
+  url: string;
+  img_correction: boolean;
+  formula: boolean;
+};
+
+type Response = Promise<{
+  result: string;
+  success: boolean;
+}>;
+
+const main = async ({ apikey, url, img_correction, formula }: Props): Response => {
+  // Check the apikey
+  if (!apikey) {
+    return {
+      result: `API key is required`,
+      success: false
+    };
+  }
+
+  let real_api_key = apikey;
+  if (!apikey.startsWith('sk-')) {
+    const response = await fetch('https://api.doc2x.noedgeai.com/api/token/refresh', {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${apikey}`
+      }
+    });
+    if (response.status !== 200) {
+      return {
+        result: `Get token failed: ${await response.text()}`,
+        success: false
+      };
+    }
+    const data = await response.json();
+    real_api_key = data.data.token;
+  }
+
+  let imageResponse;
+  // Fetch the image and check its content type
+  try {
+    imageResponse = await fetch(url);
+  } catch (e) {
+    return {
+      result: `Failed to fetch image from URL: ${url} with error: ${e}`,
+      success: false
+    };
+  }
+
+  if (!imageResponse.ok) {
+    return {
+      result: `Failed to fetch image from URL: ${url}`,
+      success: false
+    };
+  }
+
+  const contentType = imageResponse.headers.get('content-type');
+  if (!contentType || !contentType.startsWith('image/')) {
+    return {
+      result: `The provided URL does not point to an image: ${contentType}`,
+      success: false
+    };
+  }
+
+  const blob = await imageResponse.blob();
+  const formData = new FormData();
+  const fileName = url.split('/').pop()?.split('?')[0] || 'image';
+  formData.append('file', blob, fileName);
+  formData.append('img_correction', img_correction ? '1' : '0');
+  formData.append('equation', formula ? '1' : '0');
+
+  let upload_url = 'https://api.doc2x.noedgeai.com/api/platform/async/img';
+  if (real_api_key.startsWith('sk-')) {
+    upload_url = 'https://api.doc2x.noedgeai.com/api/v1/async/img';
+  }
+
+  let uuid;
+  const uploadAttempts = [1, 2, 3];
+  for await (const attempt of uploadAttempts) {
+    const upload_response = await fetch(upload_url, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${real_api_key}`
+      },
+      body: formData
+    });
+
+    if (!upload_response.ok) {
+      // Rate limit, wait for 10s and retry at most 3 times
+      if (upload_response.status === 429 && attempt < 3) {
+        await delay(10000);
+        continue;
+      }
+      return {
+        result: `Failed to upload image: ${await upload_response.text()}`,
+        success: false
+      };
+    }
+
+    const upload_data = await upload_response.json();
+    uuid = upload_data.data.uuid;
+    break;
+  }
+
+  // Get the result by uuid
+  let result_url = 'https://api.doc2x.noedgeai.com/api/platform/async/status?uuid=' + uuid;
+  if (real_api_key.startsWith('sk-')) {
+    result_url = 'https://api.doc2x.noedgeai.com/api/v1/async/status?uuid=' + uuid;
+  }
+  const maxAttempts = 100;
+  // Wait for the result, at most 100s
+  for await (const _ of Array(maxAttempts).keys()) {
+    const result_response = await fetch(result_url, {
+      headers: {
+        Authorization: `Bearer ${real_api_key}`
+      }
+    });
+    if (!result_response.ok) {
+      return {
+        result: `Failed to get result: ${await result_response.text()}`,
+        success: false
+      };
+    }
+    const result_data = await result_response.json();
+    if (['ready', 'processing'].includes(result_data.data.status)) {
+      await delay(1000);
+    } else if (result_data.data.status === 'pages limit exceeded') {
+      return {
+        result: 'Doc2X Pages limit exceeded',
+        success: false
+      };
+    } else if (result_data.data.status === 'success') {
+      let result;
+      try {
+        result = result_data.data.result.pages[0].md;
+        result = result.replace(/\\[\(\)]/g, '$').replace(/\\[\[\]]/g, '$$');
+      } catch {
+        // no pages
+        return {
+          result: '',
+          success: true
+        };
+      }
+      return {
+        result: result,
+        success: true
+      };
+    } else {
+      return {
+        result: `Failed to get result: ${await result_data.text()}`,
+        success: false
+      };
+    }
+  }
+
+  return {
+    result: 'Timeout waiting for result',
+    success: false
+  };
+};
+
+export default main;

packages/plugins/src/Doc2X/URLImg2text/template.json

@@ -0,0 +1,484 @@
+{
+  "author": "Menghuan1918",
+  "version": "488",
+  "name": "Doc2X 图像(URL)识别",
+  "avatar": "plugins/doc2x",
+  "intro": "从URL下载图片并发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
+  "courseUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
+  "showStatus": true,
+  "weight": 10,
+
+  "isTool": true,
+  "templateType": "tools",
+
+  "workflow": {
+    "nodes": [
+      {
+        "nodeId": "pluginInput",
+        "name": "插件开始",
+        "intro": "可以配置插件需要哪些输入，利用这些输入来运行插件",
+        "avatar": "core/workflow/template/workflowStart",
+        "flowNodeType": "pluginInput",
+        "showStatus": false,
+        "position": {
+          "x": 353.91678143999377,
+          "y": -75.09744210499466
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "renderTypeList": ["input"],
+            "selectedTypeIndex": 0,
+            "valueType": "string",
+            "canEdit": true,
+            "key": "apikey",
+            "label": "apikey",
+            "description": "Doc2X的验证密匙，对于个人用户可以从Doc2X官网 - 个人信息 - 身份令牌获得",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": ""
+          },
+          {
+            "renderTypeList": ["reference"],
+            "selectedTypeIndex": 0,
+            "valueType": "string",
+            "canEdit": true,
+            "key": "url",
+            "label": "url",
+            "description": "待处理图片的URL",
+            "required": true,
+            "toolDescription": "待处理图片的URL"
+          },
+          {
+            "renderTypeList": ["switch"],
+            "selectedTypeIndex": 0,
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "img_correction",
+            "label": "img_correction",
+            "description": "是否启用图形矫正功能",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": false
+          },
+          {
+            "renderTypeList": ["switch"],
+            "selectedTypeIndex": 0,
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "formula",
+            "label": "formula",
+            "description": "是否开启纯公式识别(仅适用于图片内容仅有公式时)",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": false
+          }
+        ],
+        "outputs": [
+          {
+            "id": "apikey",
+            "valueType": "string",
+            "key": "apikey",
+            "label": "apikey",
+            "type": "hidden"
+          },
+          {
+            "id": "url",
+            "valueType": "string",
+            "key": "url",
+            "label": "url",
+            "type": "hidden"
+          },
+          {
+            "id": "img_correction",
+            "valueType": "boolean",
+            "key": "img_correction",
+            "label": "img_correction",
+            "type": "hidden"
+          },
+          {
+            "id": "formula",
+            "valueType": "boolean",
+            "key": "formula",
+            "label": "formula",
+            "type": "hidden"
+          }
+        ]
+      },
+      {
+        "nodeId": "pluginOutput",
+        "name": "插件输出",
+        "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出",
+        "avatar": "core/workflow/template/pluginOutput",
+        "flowNodeType": "pluginOutput",
+        "showStatus": false,
+        "position": {
+          "x": 1703.581616889916,
+          "y": -14.097442104994656
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "result",
+            "label": "result",
+            "description": "处理结果(或者是报错信息)",
+            "value": ["zHG5jJBkXmjB", "xWQuEf50F3mr"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "success",
+            "label": "success",
+            "description": "是否处理成功",
+            "value": ["zHG5jJBkXmjB", "m6CJJj7GFud5"]
+          }
+        ],
+        "outputs": []
+      },
+      {
+        "nodeId": "zHG5jJBkXmjB",
+        "name": "HTTP 请求",
+        "intro": "可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）",
+        "avatar": "core/workflow/template/httpRequest",
+        "flowNodeType": "httpRequest468",
+        "showStatus": true,
+        "position": {
+          "x": 1000.6685388413375,
+          "y": -457.0974421049947
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "key": "system_addInputParam",
+            "renderTypeList": ["addInputParam"],
+            "valueType": "dynamic",
+            "label": "",
+            "required": false,
+            "description": "common:core.module.input.description.HTTP Dynamic Input",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpMethod",
+            "renderTypeList": ["custom"],
+            "valueType": "string",
+            "label": "",
+            "value": "POST",
+            "required": true,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpTimeout",
+            "renderTypeList": ["custom"],
+            "valueType": "number",
+            "label": "",
+            "value": 30,
+            "min": 5,
+            "max": 600,
+            "required": true,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpReqUrl",
+            "renderTypeList": ["hidden"],
+            "valueType": "string",
+            "label": "",
+            "description": "common:core.module.input.description.Http Request Url",
+            "placeholder": "https://api.ai.com/getInventory",
+            "required": false,
+            "value": "Doc2X/URLImg2text",
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpHeader",
+            "renderTypeList": ["custom"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "description": "common:core.module.input.description.Http Request Header",
+            "placeholder": "common:core.module.input.description.Http Request Header",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpParams",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpJsonBody",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": "{\n  \"apikey\": \"{{apikey}}\",\n  \"url\": \"{{url}}\",\n  \"img_correction\": {{img_correction}},\n  \"formula\": {{formula}}\n}",
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpFormBody",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpContentType",
+            "renderTypeList": ["hidden"],
+            "valueType": "string",
+            "value": "json",
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "apikey",
+            "label": "apikey",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "apikey"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "url",
+            "label": "url",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "url"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "img_correction",
+            "label": "img_correction",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "img_correction"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "formula",
+            "label": "formula",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "formula"]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "error",
+            "key": "error",
+            "label": "workflow:request_error",
+            "description": "HTTP请求错误信息，成功时返回空",
+            "valueType": "object",
+            "type": "static"
+          },
+          {
+            "id": "httpRawResponse",
+            "key": "httpRawResponse",
+            "required": true,
+            "label": "workflow:raw_response",
+            "description": "HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。",
+            "valueType": "any",
+            "type": "static"
+          },
+          {
+            "id": "system_addOutputParam",
+            "key": "system_addOutputParam",
+            "type": "dynamic",
+            "valueType": "dynamic",
+            "label": "",
+            "customFieldConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": false
+            }
+          },
+          {
+            "id": "xWQuEf50F3mr",
+            "valueType": "string",
+            "type": "dynamic",
+            "key": "result",
+            "label": "result"
+          },
+          {
+            "id": "m6CJJj7GFud5",
+            "valueType": "boolean",
+            "type": "dynamic",
+            "key": "success",
+            "label": "success"
+          }
+        ]
+      },
+      {
+        "nodeId": "sWEDDSeuI9ar",
+        "name": "系统配置",
+        "intro": "",
+        "avatar": "core/workflow/template/systemConfig",
+        "flowNodeType": "pluginConfig",
+        "position": {
+          "x": -117.03701176267538,
+          "y": -75.09744210499466
+        },
+        "version": "4811",
+        "inputs": [],
+        "outputs": []
+      }
+    ],
+    "edges": [
+      {
+        "source": "pluginInput",
+        "target": "zHG5jJBkXmjB",
+        "sourceHandle": "pluginInput-source-right",
+        "targetHandle": "zHG5jJBkXmjB-target-left"
+      },
+      {
+        "source": "zHG5jJBkXmjB",
+        "target": "pluginOutput",
+        "sourceHandle": "zHG5jJBkXmjB-source-right",
+        "targetHandle": "pluginOutput-target-left"
+      }
+    ]
+  }
+}

packages/plugins/src/Doc2X/URLPDF2text/index.ts

@@ -0,0 +1,156 @@
+import { delay } from '@fastgpt/global/common/system/utils';
+import { addLog } from '@fastgpt/service/common/system/log';
+
+type Props = {
+  apikey: string;
+  url: string;
+  ocr: boolean;
+};
+
+// Response type same as HTTP outputs
+type Response = Promise<{
+  result: string;
+  success: boolean;
+}>;
+
+const main = async ({ apikey, url, ocr }: Props): Response => {
+  // Check the apikey
+  if (!apikey) {
+    return {
+      result: `API key is required`,
+      success: false
+    };
+  }
+
+  let real_api_key = apikey;
+  if (!apikey.startsWith('sk-')) {
+    const response = await fetch('https://api.doc2x.noedgeai.com/api/token/refresh', {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${apikey}`
+      }
+    });
+    if (response.status !== 200) {
+      return {
+        result: `Get token failed: ${await response.text()}`,
+        success: false
+      };
+    }
+    const data = await response.json();
+    real_api_key = data.data.token;
+  }
+
+  //Fetch the pdf and check its contene type
+  let PDFResponse;
+  try {
+    PDFResponse = await fetch(url);
+  } catch (e) {
+    return {
+      result: `Failed to fetch PDF from URL: ${url} with error: ${e}`,
+      success: false
+    };
+  }
+  if (!PDFResponse.ok) {
+    return {
+      result: `Failed to fetch PDF from URL: ${url}`,
+      success: false
+    };
+  }
+
+  const contentType = PDFResponse.headers.get('content-type');
+  if (!contentType || !contentType.startsWith('application/pdf')) {
+    return {
+      result: `The provided URL does not point to a PDF: ${contentType}`,
+      success: false
+    };
+  }
+
+  const blob = await PDFResponse.blob();
+  const formData = new FormData();
+  const fileName = url.split('/').pop()?.split('?')[0] || 'pdf';
+  formData.append('file', blob, fileName);
+  formData.append('ocr', ocr ? '1' : '0');
+
+  let upload_url = 'https://api.doc2x.noedgeai.com/api/platform/async/pdf';
+  if (real_api_key.startsWith('sk-')) {
+    upload_url = 'https://api.doc2x.noedgeai.com/api/v1/async/pdf';
+  }
+
+  let uuid;
+  const uploadAttempts = [1, 2, 3];
+  for await (const attempt of uploadAttempts) {
+    const upload_response = await fetch(upload_url, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${real_api_key}`
+      },
+      body: formData
+    });
+    if (!upload_response.ok) {
+      if (upload_response.status === 429 && attempt < 3) {
+        await delay(10000);
+        continue;
+      }
+      return {
+        result: `Failed to upload file: ${await upload_response.text()}`,
+        success: false
+      };
+    }
+    const upload_data = await upload_response.json();
+    uuid = upload_data.data.uuid;
+    break;
+  }
+
+  // Get the result by uuid
+  let result_url = 'https://api.doc2x.noedgeai.com/api/platform/async/status?uuid=' + uuid;
+  if (real_api_key.startsWith('sk-')) {
+    result_url = 'https://api.doc2x.noedgeai.com/api/v1/async/status?uuid=' + uuid;
+  }
+
+  let result = '';
+  // Wait for the result, at most 100s
+  const maxAttempts = 100;
+  for await (const _ of Array(maxAttempts).keys()) {
+    const result_response = await fetch(result_url, {
+      headers: {
+        Authorization: `Bearer ${real_api_key}`
+      }
+    });
+    if (!result_response.ok) {
+      return {
+        result: `Failed to get result: ${await result_response.text()}`,
+        success: false
+      };
+    }
+    const result_data = await result_response.json();
+    if (['ready', 'processing'].includes(result_data.data.status)) {
+      await delay(1000);
+    } else if (result_data.data.status === 'pages limit exceeded') {
+      return {
+        result: 'Doc2X Pages limit exceeded',
+        success: false
+      };
+    } else if (result_data.data.status === 'success') {
+      result = await Promise.all(
+        result_data.data.result.pages.map((page: { md: any }) => page.md)
+      ).then((pages) => pages.join('\n'));
+      result = result.replace(/\\[\(\)]/g, '$').replace(/\\[\[\]]/g, '$$');
+      return {
+        result: result,
+        success: true
+      };
+    } else {
+      return {
+        result: `Failed to get result: ${await result_data.text()}`,
+        success: false
+      };
+    }
+  }
+
+  return {
+    result: 'Timeout waiting for result',
+    success: false
+  };
+};
+
+export default main;

packages/plugins/src/Doc2X/URLPDF2text/template.json

@@ -0,0 +1,435 @@
+{
+  "author": "Menghuan1918",
+  "version": "488",
+  "name": "Doc2X PDF文件(URL)识别",
+  "avatar": "plugins/doc2x",
+  "intro": "从URL下载PDF文件，并发送至Doc2X进行解析，返回带LaTeX公式的markdown格式的文本",
+  "courseUrl": "https://fael3z0zfze.feishu.cn/wiki/Rkc5witXWiJoi5kORd2cofh6nDg?fromScene=spaceOverview",
+  "showStatus": true,
+  "weight": 10,
+
+  "isTool": true,
+  "templateType": "tools",
+
+  "workflow": {
+    "nodes": [
+      {
+        "nodeId": "pluginInput",
+        "name": "插件开始",
+        "intro": "可以配置插件需要哪些输入，利用这些输入来运行插件",
+        "avatar": "core/workflow/template/workflowStart",
+        "flowNodeType": "pluginInput",
+        "showStatus": false,
+        "position": {
+          "x": 388.243055058894,
+          "y": -75.09744210499466
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "renderTypeList": ["input"],
+            "selectedTypeIndex": 0,
+            "valueType": "string",
+            "canEdit": true,
+            "key": "apikey",
+            "label": "apikey",
+            "description": "Doc2X的验证密匙，对于个人用户可以从Doc2X官网 - 个人信息 - 身份令牌获得",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": ""
+          },
+          {
+            "renderTypeList": ["reference"],
+            "selectedTypeIndex": 0,
+            "valueType": "string",
+            "canEdit": true,
+            "key": "url",
+            "label": "url",
+            "description": "待处理PDF文件的URL",
+            "required": true,
+            "toolDescription": "待处理PDF文件的URL"
+          },
+          {
+            "renderTypeList": ["switch"],
+            "selectedTypeIndex": 0,
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "ocr",
+            "label": "ocr",
+            "description": "是否开启对PDF文件内图片的OCR识别，建议开启",
+            "required": true,
+            "toolDescription": "",
+            "defaultValue": true
+          }
+        ],
+        "outputs": [
+          {
+            "id": "apikey",
+            "valueType": "string",
+            "key": "apikey",
+            "label": "apikey",
+            "type": "hidden"
+          },
+          {
+            "id": "url",
+            "valueType": "string",
+            "key": "url",
+            "label": "url",
+            "type": "hidden"
+          },
+          {
+            "id": "formula",
+            "valueType": "boolean",
+            "key": "ocr",
+            "label": "ocr",
+            "type": "hidden"
+          }
+        ]
+      },
+      {
+        "nodeId": "pluginOutput",
+        "name": "插件输出",
+        "intro": "自定义配置外部输出，使用插件时，仅暴露自定义配置的输出",
+        "avatar": "core/workflow/template/pluginOutput",
+        "flowNodeType": "pluginOutput",
+        "showStatus": false,
+        "position": {
+          "x": 1665.6420513111314,
+          "y": -40.597442104994656
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "result",
+            "label": "result",
+            "description": "处理结果(或者是报错信息)",
+            "value": ["zHG5jJBkXmjB", "xWQuEf50F3mr"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "success",
+            "label": "success",
+            "description": "是否处理成功",
+            "value": ["zHG5jJBkXmjB", "m6CJJj7GFud5"]
+          }
+        ],
+        "outputs": []
+      },
+      {
+        "nodeId": "zHG5jJBkXmjB",
+        "name": "HTTP 请求",
+        "intro": "可以发出一个 HTTP 请求，实现更为复杂的操作（联网搜索、数据库查询等）",
+        "avatar": "core/workflow/template/httpRequest",
+        "flowNodeType": "httpRequest468",
+        "showStatus": true,
+        "position": {
+          "x": 966.3422652224374,
+          "y": -446.5974421049947
+        },
+        "version": "481",
+        "inputs": [
+          {
+            "key": "system_addInputParam",
+            "renderTypeList": ["addInputParam"],
+            "valueType": "dynamic",
+            "label": "",
+            "required": false,
+            "description": "common:core.module.input.description.HTTP Dynamic Input",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpMethod",
+            "renderTypeList": ["custom"],
+            "valueType": "string",
+            "label": "",
+            "value": "POST",
+            "required": true,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpTimeout",
+            "renderTypeList": ["custom"],
+            "valueType": "number",
+            "label": "",
+            "value": 30,
+            "min": 5,
+            "max": 600,
+            "required": true,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpReqUrl",
+            "renderTypeList": ["hidden"],
+            "valueType": "string",
+            "label": "",
+            "description": "common:core.module.input.description.Http Request Url",
+            "placeholder": "https://api.ai.com/getInventory",
+            "required": false,
+            "value": "Doc2X/URLPDF2text",
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpHeader",
+            "renderTypeList": ["custom"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "description": "common:core.module.input.description.Http Request Header",
+            "placeholder": "common:core.module.input.description.Http Request Header",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpParams",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpJsonBody",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": "{\n  \"apikey\": \"{{apikey}}\",\n  \"url\": \"{{url}}\",\n  \"ocr\": {{ocr}}\n}",
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpFormBody",
+            "renderTypeList": ["hidden"],
+            "valueType": "any",
+            "value": [],
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "key": "system_httpContentType",
+            "renderTypeList": ["hidden"],
+            "valueType": "string",
+            "value": "json",
+            "label": "",
+            "required": false,
+            "debugLabel": "",
+            "toolDescription": ""
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "apikey",
+            "label": "apikey",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "apikey"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "string",
+            "canEdit": true,
+            "key": "url",
+            "label": "url",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "url"]
+          },
+          {
+            "renderTypeList": ["reference"],
+            "valueType": "boolean",
+            "canEdit": true,
+            "key": "ocr",
+            "label": "ocr",
+            "customInputConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "arrayAny",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": true
+            },
+            "required": true,
+            "value": ["pluginInput", "formula"]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "error",
+            "key": "error",
+            "label": "workflow:request_error",
+            "description": "HTTP请求错误信息，成功时返回空",
+            "valueType": "object",
+            "type": "static"
+          },
+          {
+            "id": "httpRawResponse",
+            "key": "httpRawResponse",
+            "required": true,
+            "label": "workflow:raw_response",
+            "description": "HTTP请求的原始响应。只能接受字符串或JSON类型响应数据。",
+            "valueType": "any",
+            "type": "static"
+          },
+          {
+            "id": "system_addOutputParam",
+            "key": "system_addOutputParam",
+            "type": "dynamic",
+            "valueType": "dynamic",
+            "label": "",
+            "customFieldConfig": {
+              "selectValueTypeList": [
+                "string",
+                "number",
+                "boolean",
+                "object",
+                "arrayString",
+                "arrayNumber",
+                "arrayBoolean",
+                "arrayObject",
+                "any",
+                "chatHistory",
+                "datasetQuote",
+                "dynamic",
+                "selectApp",
+                "selectDataset"
+              ],
+              "showDescription": false,
+              "showDefaultValue": false
+            }
+          },
+          {
+            "id": "xWQuEf50F3mr",
+            "valueType": "string",
+            "type": "dynamic",
+            "key": "result",
+            "label": "result"
+          },
+          {
+            "id": "m6CJJj7GFud5",
+            "valueType": "boolean",
+            "type": "dynamic",
+            "key": "success",
+            "label": "success"
+          }
+        ]
+      },
+      {
+        "nodeId": "rZmLfANEyyJe",
+        "name": "系统配置",
+        "intro": "",
+        "avatar": "core/workflow/template/systemConfig",
+        "flowNodeType": "pluginConfig",
+        "position": {
+          "x": -93.55061402342784,
+          "y": -55.907069101622824
+        },
+        "version": "4811",
+        "inputs": [],
+        "outputs": []
+      }
+    ],
+    "edges": [
+      {
+        "source": "pluginInput",
+        "target": "zHG5jJBkXmjB",
+        "sourceHandle": "pluginInput-source-right",
+        "targetHandle": "zHG5jJBkXmjB-target-left"
+      },
+      {
+        "source": "zHG5jJBkXmjB",
+        "target": "pluginOutput",
+        "sourceHandle": "zHG5jJBkXmjB-source-right",
+        "targetHandle": "pluginOutput-target-left"
+      }
+    ]
+  }
+}

packages/service/common/file/gridfs/controller.ts

@@ -36,7 +36,6 @@ export async function uploadFile({
   path,
   filename,
   contentType,
-  encoding,
   metadata = {}
 }: {
   bucketName: `${BucketNameEnum}`;
@@ -45,7 +44,6 @@ export async function uploadFile({
   path: string;
   filename: string;
   contentType?: string;
-  encoding: string;
   metadata?: Record<string, any>;
 }) {
   if (!path) return Promise.reject(`filePath is empty`);
@@ -54,7 +52,7 @@ export async function uploadFile({
   const stats = await fsp.stat(path);
   if (!stats.isFile()) return Promise.reject(`${path} is not a file`);
 
-  const readStream = fs.createReadStream(path);
+  const { stream: readStream, encoding } = await stream2Encoding(fs.createReadStream(path));
 
   // Add default metadata
   metadata.teamId = teamId;

packages/service/common/file/read/utils.ts

@@ -4,17 +4,16 @@ import FormData from 'form-data';
 
 import { WorkerNameEnum, runWorker } from '../../../worker/utils';
 import fs from 'fs';
+import { detectFileEncoding } from '@fastgpt/global/common/file/tools';
 import type { ReadFileResponse } from '../../../worker/readFile/type';
 import axios from 'axios';
 import { addLog } from '../../system/log';
 import { batchRun } from '@fastgpt/global/common/fn/utils';
 import { addHours } from 'date-fns';
-import { matchMdImgTextAndUpload } from '@fastgpt/global/common/string/markdown';
 
 export type readRawTextByLocalFileParams = {
   teamId: string;
   path: string;
-  encoding: string;
   metadata?: Record<string, any>;
 };
 export const readRawTextByLocalFile = async (params: readRawTextByLocalFileParams) => {
@@ -23,12 +22,13 @@ export const readRawTextByLocalFile = async (params: readRawTextByLocalFileParam
   const extension = path?.split('.')?.pop()?.toLowerCase() || '';
 
   const buffer = fs.readFileSync(path);
+  const encoding = detectFileEncoding(buffer);
 
   const { rawText } = await readRawContentByFileBuffer({
     extension,
     isQAImport: false,
     teamId: params.teamId,
-    encoding: params.encoding,
+    encoding,
     buffer,
     metadata: params.metadata
   });
@@ -53,7 +53,6 @@ export const readRawContentByFileBuffer = async ({
   encoding: string;
   metadata?: Record<string, any>;
 }) => {
-  // Custom read file service
   const customReadfileUrl = process.env.CUSTOM_READ_FILE_URL;
   const customReadFileExtension = process.env.CUSTOM_READ_FILE_EXTENSION || '';
   const ocrParse = process.env.CUSTOM_READ_FILE_OCR || 'false';
@@ -79,7 +78,6 @@ export const readRawContentByFileBuffer = async ({
       data: {
         page: number;
         markdown: string;
-        duration: number;
       };
     }>(customReadfileUrl, data, {
       timeout: 600000,
@@ -91,12 +89,10 @@ export const readRawContentByFileBuffer = async ({
     addLog.info(`Use custom read file service, time: ${Date.now() - start}ms`);
 
     const rawText = response.data.markdown;
-    const { text, imageList } = matchMdImgTextAndUpload(rawText);
 
     return {
-      rawText: text,
-      formatText: rawText,
-      imageList
+      rawText,
+      formatText: rawText
     };
   };
 
@@ -123,9 +119,6 @@ export const readRawContentByFileBuffer = async ({
         }
       });
       rawText = rawText.replace(item.uuid, src);
-      if (formatText) {
-        formatText = formatText.replace(item.uuid, src);
-      }
     });
   }
 
@@ -134,7 +127,7 @@ export const readRawContentByFileBuffer = async ({
     if (isQAImport) {
       rawText = rawText || '';
     } else {
-      rawText = formatText || rawText;
+      rawText = formatText || '';
     }
   }
 

packages/service/core/ai/config.ts

@@ -1,11 +1,5 @@
 import type { UserModelSchema } from '@fastgpt/global/support/user/type';
 import OpenAI from '@fastgpt/global/core/ai';
-import {
-  ChatCompletionCreateParamsNonStreaming,
-  ChatCompletionCreateParamsStreaming
-} from '@fastgpt/global/core/ai/type';
-import { getErrText } from '@fastgpt/global/common/error/utils';
-import { addLog } from '../../common/system/log';
 
 export const openaiBaseUrl = process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1';
 
@@ -40,55 +34,3 @@ export const getAxiosConfig = (props?: { userKey?: UserModelSchema['openaiAccoun
     authorization: `Bearer ${apiKey}`
   };
 };
-
-type CompletionsBodyType =
-  | ChatCompletionCreateParamsNonStreaming
-  | ChatCompletionCreateParamsStreaming;
-type InferResponseType<T extends CompletionsBodyType> =
-  T extends ChatCompletionCreateParamsStreaming
-    ? OpenAI.Chat.Completions.ChatCompletionChunk
-    : OpenAI.Chat.Completions.ChatCompletion;
-
-export const createChatCompletion = async <T extends CompletionsBodyType>({
-  body,
-  userKey,
-  timeout,
-  options
-}: {
-  body: T;
-  userKey?: UserModelSchema['openaiAccount'];
-  timeout?: number;
-  options?: OpenAI.RequestOptions;
-}): Promise<{
-  response: InferResponseType<T>;
-  isStreamResponse: boolean;
-}> => {
-  try {
-    const formatTimeout = timeout ? timeout : body.stream ? 60000 : 600000;
-    const ai = getAIApi({
-      userKey,
-      timeout: formatTimeout
-    });
-    const response = await ai.chat.completions.create(body, options);
-
-    const isStreamResponse =
-      typeof response === 'object' &&
-      response !== null &&
-      ('iterator' in response || 'controller' in response);
-
-    return {
-      response: response as InferResponseType<T>,
-      isStreamResponse
-    };
-  } catch (error) {
-    addLog.error(`LLM response error`, error);
-    addLog.warn(`LLM response error`, {
-      baseUrl: userKey?.baseUrl,
-      requestBody: body
-    });
-    if (userKey?.baseUrl) {
-      return Promise.reject(`您的 OpenAI key 出错了: ${getErrText(error)}`);
-    }
-    return Promise.reject(error);
-  }
-};

packages/service/core/ai/embedding/index.ts

@@ -55,7 +55,7 @@ export async function getVectorsByText({ model, input, type }: GetVectorProps) {
 
     return result;
   } catch (error) {
-    addLog.error(`Embedding Error`, error);
+    console.log(`Embedding Error`, error);
 
     return Promise.reject(error);
   }

packages/service/core/ai/functions/createQuestionGuide.ts

@@ -1,5 +1,5 @@
 import type { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type.d';
-import { createChatCompletion } from '../config';
+import { getAIApi } from '../config';
 import { countGptMessagesTokens } from '../../../common/string/tiktoken/index';
 import { loadRequestMessages } from '../../chat/utils';
 import { llmCompletionsBodyFormat } from '../utils';
@@ -29,8 +29,11 @@ export async function createQuestionGuide({
     }
   ];
 
-  const { response: data } = await createChatCompletion({
-    body: llmCompletionsBodyFormat(
+  const ai = getAIApi({
+    timeout: 480000
+  });
+  const data = await ai.chat.completions.create(
+    llmCompletionsBodyFormat(
       {
         model,
         temperature: 0.1,
@@ -43,7 +46,7 @@ export async function createQuestionGuide({
       },
       model
     )
-  });
+  );
 
   const answer = data.choices?.[0]?.message?.content || '';
 

packages/service/core/ai/functions/queryExtension.ts

@@ -1,7 +1,8 @@
 import { replaceVariable } from '@fastgpt/global/common/string/tools';
-import { createChatCompletion } from '../config';
+import { getAIApi } from '../config';
 import { ChatItemType } from '@fastgpt/global/core/chat/type';
 import { countGptMessagesTokens } from '../../../common/string/tiktoken/index';
+import { ChatCompletion, ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type';
 import { chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
 import { getLLMModel } from '../model';
 import { llmCompletionsBodyFormat } from '../utils';
@@ -137,6 +138,10 @@ A: ${chatBg}
 
   const modelData = getLLMModel(model);
 
+  const ai = getAIApi({
+    timeout: 480000
+  });
+
   const messages = [
     {
       role: 'user',
@@ -145,19 +150,20 @@ A: ${chatBg}
         histories: concatFewShot
       })
     }
-  ] as any;
+  ] as ChatCompletionMessageParam[];
 
-  const { response: result } = await createChatCompletion({
-    body: llmCompletionsBodyFormat(
+  const result = (await ai.chat.completions.create(
+    llmCompletionsBodyFormat(
       {
         stream: false,
         model: modelData.model,
         temperature: 0.01,
+        // @ts-ignore
         messages
       },
       modelData
     )
-  });
+  )) as ChatCompletion;
 
   let answer = result.choices?.[0]?.message?.content || '';
   if (!answer) {

packages/service/core/ai/utils.ts

@@ -48,17 +48,14 @@ export const computedTemperature = ({
 type CompletionsBodyType =
   | ChatCompletionCreateParamsNonStreaming
   | ChatCompletionCreateParamsStreaming;
-type InferCompletionsBody<T> = T extends { stream: true }
-  ? ChatCompletionCreateParamsStreaming
-  : ChatCompletionCreateParamsNonStreaming;
 
 export const llmCompletionsBodyFormat = <T extends CompletionsBodyType>(
   body: T,
   model: string | LLMModelItemType
-): InferCompletionsBody<T> => {
+) => {
   const modelData = typeof model === 'string' ? getLLMModel(model) : model;
   if (!modelData) {
-    return body as InferCompletionsBody<T>;
+    return body;
   }
 
   const requestBody: T = {
@@ -84,5 +81,5 @@ export const llmCompletionsBodyFormat = <T extends CompletionsBodyType>(
 
   // console.log(requestBody);
 
-  return requestBody as InferCompletionsBody<T>;
+  return requestBody;
 };

packages/service/core/chat/utils.ts

@@ -109,7 +109,7 @@ export const loadRequestMessages = async ({
     }
     return Promise.all(
       messages.map(async (item) => {
-        if (item.type === 'image_url') {
+        if (item.type === 'image_url' && process.env.MULTIPLE_DATA_TO_BASE64 === 'true') {
           // Remove url origin
           const imgUrl = (() => {
             if (origin && item.image_url.url.startsWith(origin)) {

packages/service/core/dataset/search/controller.ts

@@ -118,10 +118,7 @@ export async function searchDatasetData(props: SearchDatasetDataProps) {
     let createTimeCollectionIdList: string[] | undefined = undefined;
 
     try {
-      const jsonMatch =
-        typeof collectionFilterMatch === 'object'
-          ? collectionFilterMatch
-          : json5.parse(collectionFilterMatch);
+      const jsonMatch = json5.parse(collectionFilterMatch);
 
       // Tag
       let andTags = jsonMatch?.tags?.$and as (string | null)[] | undefined;
@@ -350,7 +347,7 @@ export async function searchDatasetData(props: SearchDatasetDataProps) {
                 teamId: new Types.ObjectId(teamId),
                 datasetId: new Types.ObjectId(id),
                 $text: { $search: jiebaSplit({ text: query }) },
-                ...(filterCollectionIdList
+                ...(filterCollectionIdList && filterCollectionIdList.length > 0
                   ? {
                       collectionId: {
                         $in: filterCollectionIdList.map((id) => new Types.ObjectId(id))

packages/service/core/workflow/dispatch/agent/classifyQuestion.ts

@@ -2,7 +2,7 @@ import { chats2GPTMessages } from '@fastgpt/global/core/chat/adapt';
 import { countMessagesTokens } from '../../../../common/string/tiktoken/index';
 import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
-import { createChatCompletion } from '../../../ai/config';
+import { getAIApi } from '../../../ai/config';
 import type { ClassifyQuestionAgentItemType } from '@fastgpt/global/core/workflow/template/system/classifyQuestion/type';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
@@ -120,8 +120,13 @@ const completions = async ({
     useVision: false
   });
 
-  const { response: data } = await createChatCompletion({
-    body: llmCompletionsBodyFormat(
+  const ai = getAIApi({
+    userKey: user.openaiAccount,
+    timeout: 480000
+  });
+
+  const data = await ai.chat.completions.create(
+    llmCompletionsBodyFormat(
       {
         model: cqModel.model,
         temperature: 0.01,
@@ -129,9 +134,8 @@ const completions = async ({
         stream: false
       },
       cqModel
-    ),
-    userKey: user.openaiAccount
-  });
+    )
+  );
   const answer = data.choices?.[0].message?.content || '';
 
   // console.log(JSON.stringify(chats2GPTMessages({ messages, reserveId: false }), null, 2));

packages/service/core/workflow/dispatch/agent/extract.ts

@@ -6,7 +6,7 @@ import {
   countGptMessagesTokens
 } from '../../../../common/string/tiktoken/index';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
-import { createChatCompletion } from '../../../ai/config';
+import { getAIApi } from '../../../ai/config';
 import type { ContextExtractAgentItemType } from '@fastgpt/global/core/workflow/template/system/contextExtract/type';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
@@ -222,8 +222,13 @@ const toolChoice = async (props: ActionProps) => {
     }
   ];
 
-  const { response } = await createChatCompletion({
-    body: llmCompletionsBodyFormat(
+  const ai = getAIApi({
+    userKey: user.openaiAccount,
+    timeout: 480000
+  });
+
+  const response = await ai.chat.completions.create(
+    llmCompletionsBodyFormat(
       {
         model: extractModel.model,
         temperature: 0.01,
@@ -232,9 +237,8 @@ const toolChoice = async (props: ActionProps) => {
         tool_choice: { type: 'function', function: { name: agentFunName } }
       },
       extractModel
-    ),
-    userKey: user.openaiAccount
-  });
+    )
+  );
 
   const arg: Record<string, any> = (() => {
     try {
@@ -268,8 +272,13 @@ const functionCall = async (props: ActionProps) => {
   const { agentFunction, filterMessages } = await getFunctionCallSchema(props);
   const functions: ChatCompletionCreateParams.Function[] = [agentFunction];
 
-  const { response } = await createChatCompletion({
-    body: llmCompletionsBodyFormat(
+  const ai = getAIApi({
+    userKey: user.openaiAccount,
+    timeout: 480000
+  });
+
+  const response = await ai.chat.completions.create(
+    llmCompletionsBodyFormat(
       {
         model: extractModel.model,
         temperature: 0.01,
@@ -280,9 +289,8 @@ const functionCall = async (props: ActionProps) => {
         functions
       },
       extractModel
-    ),
-    userKey: user.openaiAccount
-  });
+    )
+  );
 
   try {
     const arg = JSON.parse(response?.choices?.[0]?.message?.function_call?.arguments || '');
@@ -350,8 +358,12 @@ Human: ${content}`
     useVision: false
   });
 
-  const { response: data } = await createChatCompletion({
-    body: llmCompletionsBodyFormat(
+  const ai = getAIApi({
+    userKey: user.openaiAccount,
+    timeout: 480000
+  });
+  const data = await ai.chat.completions.create(
+    llmCompletionsBodyFormat(
       {
         model: extractModel.model,
         temperature: 0.01,
@@ -359,9 +371,8 @@ Human: ${content}`
         stream: false
       },
       extractModel
-    ),
-    userKey: user.openaiAccount
-  });
+    )
+  );
   const answer = data.choices?.[0].message?.content || '';
 
   // parse response

packages/service/core/workflow/dispatch/agent/runTool/functionCall.ts

@@ -1,4 +1,5 @@
-import { createChatCompletion } from '../../../../ai/config';
+import { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
+import { getAIApi } from '../../../../ai/config';
 import { filterGPTMessageByMaxTokens, loadRequestMessages } from '../../../../chat/utils';
 import {
   ChatCompletion,
@@ -21,12 +22,12 @@ import { DispatchFlowResponse, WorkflowResponseType } from '../../type';
 import { countGptMessagesTokens } from '../../../../../common/string/tiktoken/index';
 import { getNanoid, sliceStrStartEnd } from '@fastgpt/global/common/string/tools';
 import { AIChatItemType } from '@fastgpt/global/core/chat/type';
-import { GPTMessages2Chats } from '@fastgpt/global/core/chat/adapt';
+import { chats2GPTMessages, GPTMessages2Chats } from '@fastgpt/global/core/chat/adapt';
 import { formatToolResponse, initToolCallEdges, initToolNodes } from './utils';
 import { computedMaxToken, llmCompletionsBodyFormat } from '../../../../ai/utils';
 import { toolValueTypeList } from '@fastgpt/global/core/workflow/constants';
 import { WorkflowInteractiveResponseType } from '@fastgpt/global/core/workflow/template/system/interactive/type';
-import { ChatItemValueTypeEnum } from '@fastgpt/global/core/chat/constants';
+import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { i18nT } from '../../../../../../web/i18n/utils';
 
 type FunctionRunResponseType = {
@@ -44,7 +45,7 @@ export const runToolWithFunctionCall = async (
     requestOrigin,
     runtimeNodes,
     runtimeEdges,
-    user,
+    node,
     stream,
     workflowStreamResponse,
     params: { temperature = 0, maxToken = 4000, aiChatVision }
@@ -216,18 +217,17 @@ export const runToolWithFunctionCall = async (
 
   // console.log(JSON.stringify(requestMessages, null, 2));
   /* Run llm */
-  const { response: aiResponse, isStreamResponse } = await createChatCompletion({
-    body: requestBody,
-    userKey: user.openaiAccount,
-    options: {
-      headers: {
-        Accept: 'application/json, text/plain, */*'
-      }
+  const ai = getAIApi({
+    timeout: 480000
+  });
+  const aiResponse = await ai.chat.completions.create(requestBody, {
+    headers: {
+      Accept: 'application/json, text/plain, */*'
     }
   });
 
   const { answer, functionCalls } = await (async () => {
-    if (res && isStreamResponse) {
+    if (res && stream) {
       return streamResponse({
         res,
         toolNodes,

packages/service/core/workflow/dispatch/agent/runTool/index.ts

@@ -29,7 +29,6 @@ import { getFileContentFromLinks, getHistoryFileLinks } from '../../tools/readFi
 import { parseUrlToFileType } from '@fastgpt/global/common/file/tools';
 import { Prompt_DocumentQuote } from '@fastgpt/global/core/ai/prompt/AIChat';
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
-import { postTextCensor } from '../../../../../common/api/requestPlusApi';
 
 type Response = DispatchNodeResultType<{
   [NodeOutputKeyEnum.answerText]: string;
@@ -46,7 +45,6 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
     requestOrigin,
     chatConfig,
     runningAppInfo: { teamId },
-    user,
     params: {
       model,
       systemPrompt,
@@ -152,15 +150,6 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
     return value;
   })();
 
-  // censor model and system key
-  if (toolModel.censor && !user.openaiAccount?.key) {
-    await postTextCensor({
-      text: `${systemPrompt}
-          ${userChatInput}
-        `
-    });
-  }
-
   const {
     toolWorkflowInteractiveResponse,
     dispatchFlowResponse, // tool flow response
@@ -228,14 +217,13 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
     tokens: toolNodeTokens,
     modelType: ModelTypeEnum.llm
   });
-  const toolAIUsage = user.openaiAccount?.key ? 0 : totalPoints;
 
   // flat child tool response
   const childToolResponse = dispatchFlowResponse.map((item) => item.flowResponses).flat();
 
   // concat tool usage
   const totalPointsUsage =
-    toolAIUsage +
+    totalPoints +
     dispatchFlowResponse.reduce((sum, item) => {
       const childrenTotal = item.flowUsages.reduce((sum, item) => sum + item.totalPoints, 0);
       return sum + childrenTotal;
@@ -252,7 +240,6 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
       .join(''),
     [DispatchNodeResponseKeyEnum.assistantResponses]: previewAssistantResponses,
     [DispatchNodeResponseKeyEnum.nodeResponse]: {
-      // 展示的积分消耗
       totalPoints: totalPointsUsage,
       toolCallTokens: toolNodeTokens,
       childTotalPoints: flatUsages.reduce((sum, item) => sum + item.totalPoints, 0),
@@ -267,14 +254,12 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
       mergeSignId: nodeId
     },
     [DispatchNodeResponseKeyEnum.nodeDispatchUsages]: [
-      // 工具调用本身的积分消耗
       {
         moduleName: name,
-        totalPoints: toolAIUsage,
+        totalPoints,
         model: modelName,
         tokens: toolNodeTokens
       },
-      // 工具的消耗
       ...flatUsages
     ],
     [DispatchNodeResponseKeyEnum.interactive]: toolWorkflowInteractiveResponse

packages/service/core/workflow/dispatch/agent/runTool/promptCall.ts

@@ -1,4 +1,4 @@
-import { createChatCompletion } from '../../../../ai/config';
+import { getAIApi } from '../../../../ai/config';
 import { filterGPTMessageByMaxTokens, loadRequestMessages } from '../../../../chat/utils';
 import {
   ChatCompletion,
@@ -52,7 +52,7 @@ export const runToolWithPromptCall = async (
     requestOrigin,
     runtimeNodes,
     runtimeEdges,
-    user,
+    node,
     stream,
     workflowStreamResponse,
     params: { temperature = 0, maxToken = 4000, aiChatVision }
@@ -225,15 +225,18 @@ export const runToolWithPromptCall = async (
 
   // console.log(JSON.stringify(requestMessages, null, 2));
   /* Run llm */
-  const { response: aiResponse, isStreamResponse } = await createChatCompletion({
-    body: requestBody,
-    userKey: user.openaiAccount,
-    options: {
-      headers: {
-        Accept: 'application/json, text/plain, */*'
-      }
+  const ai = getAIApi({
+    timeout: 480000
+  });
+  const aiResponse = await ai.chat.completions.create(requestBody, {
+    headers: {
+      Accept: 'application/json, text/plain, */*'
     }
   });
+  const isStreamResponse =
+    typeof aiResponse === 'object' &&
+    aiResponse !== null &&
+    ('iterator' in aiResponse || 'controller' in aiResponse);
 
   const answer = await (async () => {
     if (res && isStreamResponse) {

packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts

@@ -1,4 +1,4 @@
-import { createChatCompletion } from '../../../../ai/config';
+import { getAIApi } from '../../../../ai/config';
 import { filterGPTMessageByMaxTokens, loadRequestMessages } from '../../../../chat/utils';
 import {
   ChatCompletion,
@@ -92,7 +92,6 @@ export const runToolWithToolChoice = async (
     runtimeNodes,
     runtimeEdges,
     stream,
-    user,
     workflowStreamResponse,
     params: { temperature = 0, maxToken = 4000, aiChatVision }
   } = workflowProps;
@@ -272,265 +271,277 @@ export const runToolWithToolChoice = async (
   );
   // console.log(JSON.stringify(requestBody, null, 2), '==requestBody');
   /* Run llm */
-  const { response: aiResponse, isStreamResponse } = await createChatCompletion({
-    body: requestBody,
-    userKey: user.openaiAccount,
-    options: {
+  const ai = getAIApi({
+    timeout: 480000
+  });
+
+  try {
+    const aiResponse = await ai.chat.completions.create(requestBody, {
       headers: {
         Accept: 'application/json, text/plain, */*'
       }
-    }
-  });
+    });
+    const isStreamResponse =
+      typeof aiResponse === 'object' &&
+      aiResponse !== null &&
+      ('iterator' in aiResponse || 'controller' in aiResponse);
 
-  const { answer, toolCalls } = await (async () => {
-    if (res && isStreamResponse) {
-      return streamResponse({
-        res,
-        workflowStreamResponse,
-        toolNodes,
-        stream: aiResponse
-      });
-    } else {
-      const result = aiResponse as ChatCompletion;
-      const calls = result.choices?.[0]?.message?.tool_calls || [];
-      const answer = result.choices?.[0]?.message?.content || '';
+    const { answer, toolCalls } = await (async () => {
+      if (res && isStreamResponse) {
+        return streamResponse({
+          res,
+          workflowStreamResponse,
+          toolNodes,
+          stream: aiResponse
+        });
+      } else {
+        const result = aiResponse as ChatCompletion;
+        const calls = result.choices?.[0]?.message?.tool_calls || [];
+        const answer = result.choices?.[0]?.message?.content || '';
 
-      // 加上name和avatar
-      const toolCalls = calls.map((tool) => {
-        const toolNode = toolNodes.find((item) => item.nodeId === tool.function?.name);
-        return {
-          ...tool,
-          toolName: toolNode?.name || '',
-          toolAvatar: toolNode?.avatar || ''
-        };
-      });
+        // 加上name和avatar
+        const toolCalls = calls.map((tool) => {
+          const toolNode = toolNodes.find((item) => item.nodeId === tool.function?.name);
+          return {
+            ...tool,
+            toolName: toolNode?.name || '',
+            toolAvatar: toolNode?.avatar || ''
+          };
+        });
 
-      // 不支持 stream 模式的模型的流失响应
-      toolCalls.forEach((tool) => {
-        workflowStreamResponse?.({
-          event: SseResponseEventEnum.toolCall,
-          data: {
-            tool: {
-              id: tool.id,
-              toolName: tool.toolName,
-              toolAvatar: tool.toolAvatar,
-              functionName: tool.function.name,
-              params: tool.function?.arguments ?? '',
-              response: ''
+        // 不支持 stream 模式的模型的流失响应
+        toolCalls.forEach((tool) => {
+          workflowStreamResponse?.({
+            event: SseResponseEventEnum.toolCall,
+            data: {
+              tool: {
+                id: tool.id,
+                toolName: tool.toolName,
+                toolAvatar: tool.toolAvatar,
+                functionName: tool.function.name,
+                params: tool.function?.arguments ?? '',
+                response: ''
+              }
             }
-          }
-        });
-      });
-      if (answer) {
-        workflowStreamResponse?.({
-          event: SseResponseEventEnum.fastAnswer,
-          data: textAdaptGptResponse({
-            text: answer
-          })
-        });
-      }
-
-      return {
-        answer,
-        toolCalls: toolCalls
-      };
-    }
-  })();
-
-  // Run the selected tool by LLM.
-  const toolsRunResponse = (
-    await Promise.all(
-      toolCalls.map(async (tool) => {
-        const toolNode = toolNodes.find((item) => item.nodeId === tool.function?.name);
-
-        if (!toolNode) return;
-
-        const startParams = (() => {
-          try {
-            return json5.parse(tool.function.arguments);
-          } catch (error) {
-            return {};
-          }
-        })();
-
-        initToolNodes(runtimeNodes, [toolNode.nodeId], startParams);
-        const toolRunResponse = await dispatchWorkFlow({
-          ...workflowProps,
-          isToolCall: true
-        });
-
-        const stringToolResponse = formatToolResponse(toolRunResponse.toolResponses);
-
-        const toolMsgParams: ChatCompletionToolMessageParam = {
-          tool_call_id: tool.id,
-          role: ChatCompletionRequestMessageRoleEnum.Tool,
-          name: tool.function.name,
-          content: stringToolResponse
-        };
-
-        workflowStreamResponse?.({
-          event: SseResponseEventEnum.toolResponse,
-          data: {
-            tool: {
-              id: tool.id,
-              toolName: '',
-              toolAvatar: '',
-              params: '',
-              response: sliceStrStartEnd(stringToolResponse, 5000, 5000)
-            }
-          }
+          });
         });
+        if (answer) {
+          workflowStreamResponse?.({
+            event: SseResponseEventEnum.fastAnswer,
+            data: textAdaptGptResponse({
+              text: answer
+            })
+          });
+        }
 
         return {
-          toolRunResponse,
-          toolMsgParams
+          answer,
+          toolCalls: toolCalls
         };
-      })
-    )
-  ).filter(Boolean) as ToolRunResponseType;
-
-  const flatToolsResponseData = toolsRunResponse.map((item) => item.toolRunResponse).flat();
-  // concat tool responses
-  const dispatchFlowResponse = response
-    ? response.dispatchFlowResponse.concat(flatToolsResponseData)
-    : flatToolsResponseData;
-
-  if (toolCalls.length > 0 && !res?.closed) {
-    // Run the tool, combine its results, and perform another round of AI calls
-    const assistantToolMsgParams: ChatCompletionAssistantMessageParam[] = [
-      ...(answer
-        ? [
-            {
-              role: ChatCompletionRequestMessageRoleEnum.Assistant as 'assistant',
-              content: answer
-            }
-          ]
-        : []),
-      {
-        role: ChatCompletionRequestMessageRoleEnum.Assistant,
-        tool_calls: toolCalls
       }
-    ];
+    })();
 
-    /* 
+    // Run the selected tool by LLM.
+    const toolsRunResponse = (
+      await Promise.all(
+        toolCalls.map(async (tool) => {
+          const toolNode = toolNodes.find((item) => item.nodeId === tool.function?.name);
+
+          if (!toolNode) return;
+
+          const startParams = (() => {
+            try {
+              return json5.parse(tool.function.arguments);
+            } catch (error) {
+              return {};
+            }
+          })();
+
+          initToolNodes(runtimeNodes, [toolNode.nodeId], startParams);
+          const toolRunResponse = await dispatchWorkFlow({
+            ...workflowProps,
+            isToolCall: true
+          });
+
+          const stringToolResponse = formatToolResponse(toolRunResponse.toolResponses);
+
+          const toolMsgParams: ChatCompletionToolMessageParam = {
+            tool_call_id: tool.id,
+            role: ChatCompletionRequestMessageRoleEnum.Tool,
+            name: tool.function.name,
+            content: stringToolResponse
+          };
+
+          workflowStreamResponse?.({
+            event: SseResponseEventEnum.toolResponse,
+            data: {
+              tool: {
+                id: tool.id,
+                toolName: '',
+                toolAvatar: '',
+                params: '',
+                response: sliceStrStartEnd(stringToolResponse, 5000, 5000)
+              }
+            }
+          });
+
+          return {
+            toolRunResponse,
+            toolMsgParams
+          };
+        })
+      )
+    ).filter(Boolean) as ToolRunResponseType;
+
+    const flatToolsResponseData = toolsRunResponse.map((item) => item.toolRunResponse).flat();
+    // concat tool responses
+    const dispatchFlowResponse = response
+      ? response.dispatchFlowResponse.concat(flatToolsResponseData)
+      : flatToolsResponseData;
+
+    if (toolCalls.length > 0 && !res?.closed) {
+      // Run the tool, combine its results, and perform another round of AI calls
+      const assistantToolMsgParams: ChatCompletionAssistantMessageParam[] = [
+        ...(answer
+          ? [
+              {
+                role: ChatCompletionRequestMessageRoleEnum.Assistant as 'assistant',
+                content: answer
+              }
+            ]
+          : []),
+        {
+          role: ChatCompletionRequestMessageRoleEnum.Assistant,
+          tool_calls: toolCalls
+        }
+      ];
+
+      /* 
         ...
         user
         assistant: tool data
       */
-    const concatToolMessages = [
-      ...requestMessages,
-      ...assistantToolMsgParams
-    ] as ChatCompletionMessageParam[];
+      const concatToolMessages = [
+        ...requestMessages,
+        ...assistantToolMsgParams
+      ] as ChatCompletionMessageParam[];
 
-    // Only toolCall tokens are counted here, Tool response tokens count towards the next reply
-    const tokens = await countGptMessagesTokens(concatToolMessages, tools);
-    /* 
+      // Only toolCall tokens are counted here, Tool response tokens count towards the next reply
+      const tokens = await countGptMessagesTokens(concatToolMessages, tools);
+      /* 
         ...
         user
         assistant: tool data
         tool: tool response
       */
-    const completeMessages = [
-      ...concatToolMessages,
-      ...toolsRunResponse.map((item) => item?.toolMsgParams)
-    ];
+      const completeMessages = [
+        ...concatToolMessages,
+        ...toolsRunResponse.map((item) => item?.toolMsgParams)
+      ];
 
-    /* 
+      /* 
         Get tool node assistant response
         history assistant
         current tool assistant
         tool child assistant
       */
-    const toolNodeAssistant = GPTMessages2Chats([
-      ...assistantToolMsgParams,
-      ...toolsRunResponse.map((item) => item?.toolMsgParams)
-    ])[0] as AIChatItemType;
-    const toolChildAssistants = flatToolsResponseData
-      .map((item) => item.assistantResponses)
-      .flat()
-      .filter((item) => item.type !== ChatItemValueTypeEnum.interactive); // 交互节点留着下次记录
-    const toolNodeAssistants = [
-      ...assistantResponses,
-      ...toolNodeAssistant.value,
-      ...toolChildAssistants
-    ];
+      const toolNodeAssistant = GPTMessages2Chats([
+        ...assistantToolMsgParams,
+        ...toolsRunResponse.map((item) => item?.toolMsgParams)
+      ])[0] as AIChatItemType;
+      const toolChildAssistants = flatToolsResponseData
+        .map((item) => item.assistantResponses)
+        .flat()
+        .filter((item) => item.type !== ChatItemValueTypeEnum.interactive); // 交互节点留着下次记录
+      const toolNodeAssistants = [
+        ...assistantResponses,
+        ...toolNodeAssistant.value,
+        ...toolChildAssistants
+      ];
 
-    const runTimes =
-      (response?.runTimes || 0) +
-      flatToolsResponseData.reduce((sum, item) => sum + item.runTimes, 0);
-    const toolNodeTokens = response ? response.toolNodeTokens + tokens : tokens;
+      const runTimes =
+        (response?.runTimes || 0) +
+        flatToolsResponseData.reduce((sum, item) => sum + item.runTimes, 0);
+      const toolNodeTokens = response ? response.toolNodeTokens + tokens : tokens;
 
-    // Check stop signal
-    const hasStopSignal = flatToolsResponseData.some(
-      (item) => !!item.flowResponses?.find((item) => item.toolStop)
-    );
-    // Check interactive response(Only 1 interaction is reserved)
-    const workflowInteractiveResponseItem = toolsRunResponse.find(
-      (item) => item.toolRunResponse.workflowInteractiveResponse
-    );
-    if (hasStopSignal || workflowInteractiveResponseItem) {
-      // Get interactive tool data
-      const workflowInteractiveResponse =
-        workflowInteractiveResponseItem?.toolRunResponse.workflowInteractiveResponse;
+      // Check stop signal
+      const hasStopSignal = flatToolsResponseData.some(
+        (item) => !!item.flowResponses?.find((item) => item.toolStop)
+      );
+      // Check interactive response(Only 1 interaction is reserved)
+      const workflowInteractiveResponseItem = toolsRunResponse.find(
+        (item) => item.toolRunResponse.workflowInteractiveResponse
+      );
+      if (hasStopSignal || workflowInteractiveResponseItem) {
+        // Get interactive tool data
+        const workflowInteractiveResponse =
+          workflowInteractiveResponseItem?.toolRunResponse.workflowInteractiveResponse;
 
-      // Flashback traverses completeMessages, intercepting messages that know the first user
-      const firstUserIndex = completeMessages.findLastIndex((item) => item.role === 'user');
-      const newMessages = completeMessages.slice(firstUserIndex + 1);
+        // Flashback traverses completeMessages, intercepting messages that know the first user
+        const firstUserIndex = completeMessages.findLastIndex((item) => item.role === 'user');
+        const newMessages = completeMessages.slice(firstUserIndex + 1);
 
-      const toolWorkflowInteractiveResponse: WorkflowInteractiveResponseType | undefined =
-        workflowInteractiveResponse
-          ? {
-              ...workflowInteractiveResponse,
-              toolParams: {
-                entryNodeIds: workflowInteractiveResponse.entryNodeIds,
-                toolCallId: workflowInteractiveResponseItem?.toolMsgParams.tool_call_id,
-                memoryMessages: newMessages
+        const toolWorkflowInteractiveResponse: WorkflowInteractiveResponseType | undefined =
+          workflowInteractiveResponse
+            ? {
+                ...workflowInteractiveResponse,
+                toolParams: {
+                  entryNodeIds: workflowInteractiveResponse.entryNodeIds,
+                  toolCallId: workflowInteractiveResponseItem?.toolMsgParams.tool_call_id,
+                  memoryMessages: newMessages
+                }
               }
-            }
-          : undefined;
+            : undefined;
+
+        return {
+          dispatchFlowResponse,
+          toolNodeTokens,
+          completeMessages,
+          assistantResponses: toolNodeAssistants,
+          runTimes,
+          toolWorkflowInteractiveResponse
+        };
+      }
+
+      return runToolWithToolChoice(
+        {
+          ...props,
+          maxRunToolTimes: maxRunToolTimes - 1,
+          messages: completeMessages
+        },
+        {
+          dispatchFlowResponse,
+          toolNodeTokens,
+          assistantResponses: toolNodeAssistants,
+          runTimes
+        }
+      );
+    } else {
+      // No tool is invoked, indicating that the process is over
+      const gptAssistantResponse: ChatCompletionAssistantMessageParam = {
+        role: ChatCompletionRequestMessageRoleEnum.Assistant,
+        content: answer
+      };
+      const completeMessages = filterMessages.concat(gptAssistantResponse);
+      const tokens = await countGptMessagesTokens(completeMessages, tools);
+
+      // concat tool assistant
+      const toolNodeAssistant = GPTMessages2Chats([gptAssistantResponse])[0] as AIChatItemType;
 
       return {
-        dispatchFlowResponse,
-        toolNodeTokens,
+        dispatchFlowResponse: response?.dispatchFlowResponse || [],
+        toolNodeTokens: response ? response.toolNodeTokens + tokens : tokens,
         completeMessages,
-        assistantResponses: toolNodeAssistants,
-        runTimes,
-        toolWorkflowInteractiveResponse
+        assistantResponses: [...assistantResponses, ...toolNodeAssistant.value],
+        runTimes: (response?.runTimes || 0) + 1
       };
     }
-
-    return runToolWithToolChoice(
-      {
-        ...props,
-        maxRunToolTimes: maxRunToolTimes - 1,
-        messages: completeMessages
-      },
-      {
-        dispatchFlowResponse,
-        toolNodeTokens,
-        assistantResponses: toolNodeAssistants,
-        runTimes
-      }
-    );
-  } else {
-    // No tool is invoked, indicating that the process is over
-    const gptAssistantResponse: ChatCompletionAssistantMessageParam = {
-      role: ChatCompletionRequestMessageRoleEnum.Assistant,
-      content: answer
-    };
-    const completeMessages = filterMessages.concat(gptAssistantResponse);
-    const tokens = await countGptMessagesTokens(completeMessages, tools);
-
-    // concat tool assistant
-    const toolNodeAssistant = GPTMessages2Chats([gptAssistantResponse])[0] as AIChatItemType;
-
-    return {
-      dispatchFlowResponse: response?.dispatchFlowResponse || [],
-      toolNodeTokens: response ? response.toolNodeTokens + tokens : tokens,
-      completeMessages,
-      assistantResponses: [...assistantResponses, ...toolNodeAssistant.value],
-      runTimes: (response?.runTimes || 0) + 1
-    };
+  } catch (error) {
+    console.log(error);
+    addLog.warn(`LLM response error`, {
+      requestBody
+    });
+    return Promise.reject(error);
   }
 };
 

packages/service/core/workflow/dispatch/chat/oneapi.ts

@@ -4,7 +4,7 @@ import type { ChatItemType, UserChatItemValueItemType } from '@fastgpt/global/co
 import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import { SseResponseEventEnum } from '@fastgpt/global/core/workflow/runtime/constants';
 import { textAdaptGptResponse } from '@fastgpt/global/core/workflow/runtime/utils';
-import { createChatCompletion } from '../../../ai/config';
+import { getAIApi } from '../../../ai/config';
 import type { ChatCompletion, StreamChatType } from '@fastgpt/global/core/ai/type.d';
 import { formatModelChars2Points } from '../../../../support/wallet/usage/utils';
 import type { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
@@ -138,6 +138,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
       if (modelConstantsData.censor && !user.openaiAccount?.key) {
         return postTextCensor({
           text: `${systemPrompt}
+            ${datasetQuoteText}
             ${userChatInput}
           `
         });
@@ -170,16 +171,21 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
   );
   // console.log(JSON.stringify(requestBody, null, 2), '===');
   try {
-    const { response, isStreamResponse } = await createChatCompletion({
-      body: requestBody,
+    const ai = getAIApi({
       userKey: user.openaiAccount,
-      options: {
-        headers: {
-          Accept: 'application/json, text/plain, */*'
-        }
+      timeout: 480000
+    });
+    const response = await ai.chat.completions.create(requestBody, {
+      headers: {
+        Accept: 'application/json, text/plain, */*'
       }
     });
 
+    const isStreamResponse =
+      typeof response === 'object' &&
+      response !== null &&
+      ('iterator' in response || 'controller' in response);
+
     const { answerText } = await (async () => {
       if (res && isStreamResponse) {
         // sse response
@@ -256,6 +262,11 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
       history: chatCompleteMessages
     };
   } catch (error) {
+    addLog.warn(`LLM response error`, {
+      baseUrl: user.openaiAccount?.baseUrl,
+      requestBody
+    });
+
     if (user.openaiAccount?.baseUrl) {
       return Promise.reject(`您的 OpenAI key 出错了: ${getErrText(error)}`);
     }

packages/service/core/workflow/dispatch/dataset/search.ts

@@ -65,17 +65,7 @@ export async function dispatchDatasetSearch(
   }
 
   if (!userChatInput) {
-    return {
-      quoteQA: [],
-      [DispatchNodeResponseKeyEnum.nodeResponse]: {
-        totalPoints: 0,
-        query: '',
-        limit,
-        searchMode
-      },
-      nodeDispatchUsages: [],
-      [DispatchNodeResponseKeyEnum.toolResponses]: []
-    };
+    return Promise.reject(i18nT('common:core.chat.error.User input empty'));
   }
 
   // query extension

packages/service/core/workflow/dispatch/tools/http468.ts

@@ -18,6 +18,7 @@ import {
   textAdaptGptResponse,
   replaceEditorVariable
 } from '@fastgpt/global/core/workflow/runtime/utils';
+import { getSystemPluginCb } from '../../../../../plugins/register';
 import { ContentTypes } from '@fastgpt/global/core/workflow/constants';
 import { uploadFileFromBase64Img } from '../../../../common/file/gridfs/controller';
 import { ReadFileBaseUrl } from '@fastgpt/global/common/file/constants';
@@ -208,8 +209,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
 
   try {
     const { formatResponse, rawResponse } = await (async () => {
-      const systemPluginCb = global.systemPluginCb;
-      console.log(systemPluginCb, '-=', httpReqUrl);
+      const systemPluginCb = await getSystemPluginCb();
       if (systemPluginCb[httpReqUrl]) {
         const pluginResult = await replaceSystemPluginResponse({
           response: await systemPluginCb[httpReqUrl](requestBody),

packages/service/worker/htmlStr2Md/utils.ts

@@ -1,6 +1,5 @@
 import TurndownService from 'turndown';
 import { ImageType } from '../readFile/type';
-import { matchMdImgTextAndUpload } from '@fastgpt/global/common/string/markdown';
 // @ts-ignore
 const turndownPluginGfm = require('joplin-turndown-plugin-gfm');
 
@@ -25,10 +24,23 @@ export const html2md = (
     turndownService.remove(['i', 'script', 'iframe', 'style']);
     turndownService.use(turndownPluginGfm.gfm);
 
-    const { text, imageList } = matchMdImgTextAndUpload(html);
+    const base64Regex = /"(data:image\/[^;]+;base64[^"]+)"/g;
+    const imageList: ImageType[] = [];
+    const images = Array.from(html.match(base64Regex) || []);
+    for (const image of images) {
+      const uuid = crypto.randomUUID();
+      const mime = image.split(';')[0].split(':')[1];
+      const base64 = image.split(',')[1];
+      html = html.replace(image, uuid);
+      imageList.push({
+        uuid,
+        base64,
+        mime
+      });
+    }
 
     return {
-      rawText: turndownService.turndown(text),
+      rawText: turndownService.turndown(html),
       imageList
     };
   } catch (error) {

packages/service/worker/readFile/extension/rawText.ts

@@ -18,17 +18,9 @@ const rawEncodingList = [
 
 // 加载源文件内容
 export const readFileRawText = ({ buffer, encoding }: ReadRawTextByBuffer): ReadFileResponse => {
-  const content = (() => {
-    try {
-      if (rawEncodingList.includes(encoding)) {
-        return buffer.toString(encoding as BufferEncoding);
-      }
-
-      return iconv.decode(buffer, encoding);
-    } catch (error) {
-      return buffer.toString('utf-8');
-    }
-  })();
+  const content = rawEncodingList.includes(encoding)
+    ? buffer.toString(encoding as BufferEncoding)
+    : iconv.decode(buffer, 'gbk');
 
   return {
     rawText: content

packages/web/common/file/utils.ts

@@ -61,14 +61,7 @@ export const readFileRawText = ({
 
         reject(getErrText(err, 'Load file error'));
       };
-      detectFileEncoding(file).then((encoding) => {
-        console.log(encoding);
-
-        reader.readAsText(
-          file,
-          ['iso-8859-1', 'windows-1252'].includes(encoding) ? 'gb2312' : 'utf-8'
-        );
-      });
+      reader.readAsText(file);
     } catch (error) {
       reject('The browser does not support file content reading');
     }
@@ -78,24 +71,6 @@ export const readFileRawText = ({
 export const readCsvRawText = async ({ file }: { file: File }) => {
   const rawText = await readFileRawText({ file });
   const csvArr = Papa.parse(rawText).data as string[][];
+
   return csvArr;
 };
-
-async function detectFileEncoding(file: File): Promise<string> {
-  const buffer = await loadFile2Buffer({ file });
-  const encoding = (() => {
-    const encodings = ['utf-8', 'iso-8859-1', 'windows-1252'];
-    for (let encoding of encodings) {
-      try {
-        const decoder = new TextDecoder(encoding, { fatal: true });
-        decoder.decode(buffer);
-        return encoding; // 如果解码成功，返回当前编码
-      } catch (e) {
-        // continue to try next encoding
-      }
-    }
-    return null; // 如果没有编码匹配，返回null
-  })();
-
-  return encoding || 'utf-8';
-}

packages/web/components/common/Icon/constants.ts

@@ -50,7 +50,6 @@ export const iconPaths = {
   'common/list': () => import('./icons/common/list.svg'),
   'common/loading': () => import('./icons/common/loading.svg'),
   'common/logLight': () => import('./icons/common/logLight.svg'),
-  'common/microsoft': () => import('./icons/common/microsoft.svg'),
   'common/monitor': () => import('./icons/common/monitor.svg'),
   'common/navbar/pluginFill': () => import('./icons/common/navbar/pluginFill.svg'),
   'common/navbar/pluginLight': () => import('./icons/common/navbar/pluginLight.svg'),

packages/web/components/common/Icon/icons/common/microsoft.svg

@@ -1 +0,0 @@
-<svg t="1731513229844" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5087" width="200" height="200"><path d="M493.0048 492.9536H128.0512V128H493.056v364.9536z" fill="#F1511B" p-id="5088"></path><path d="M895.9488 492.9536H530.944V128H896v364.9536z" fill="#80CC28" p-id="5089"></path><path d="M493.0048 896H128v-364.9024H493.056V896z" fill="#00ADEF" p-id="5090"></path><path d="M895.8976 896h-364.9024v-364.9024h364.9024V896z" fill="#FBBC09" p-id="5091"></path></svg>

packages/web/components/common/MySelect/MultipleRowSelect.tsx

@@ -245,7 +245,13 @@ export const MultipleRowArraySelect = ({
                   onClick={() => handleSelect(item)}
                   {...(isSelected ? { color: 'primary.600' } : {})}
                 >
-                  {showCheckbox && <Checkbox isChecked={isChecked} mr={1} />}
+                  {showCheckbox && (
+                    <Checkbox
+                      isChecked={isChecked}
+                      icon={<MyIcon name={'common/check'} w={'12px'} />}
+                      mr={1}
+                    />
+                  )}
                   <Box>{item.label}</Box>
                 </Flex>
               );

packages/web/components/common/Textarea/CodeEditor/Editor.tsx

@@ -14,6 +14,7 @@ type EditorVariablePickerType = {
 };
 
 export type Props = Omit<BoxProps, 'resize' | 'onChange'> & {
+  height?: number;
   resize?: boolean;
   defaultValue?: string;
   value?: string;
@@ -110,7 +111,7 @@ const MyEditor = ({
       borderWidth={'1px'}
       borderRadius={'md'}
       borderColor={'myGray.200'}
-      py={1}
+      py={2}
       height={height}
       position={'relative'}
       pl={2}
@@ -131,8 +132,8 @@ const MyEditor = ({
       {resize && (
         <Box
           position={'absolute'}
-          right={'-2.5'}
-          bottom={'-3.5'}
+          right={'-1'}
+          bottom={'-1'}
           zIndex={10}
           cursor={'ns-resize'}
           px={'4px'}

packages/web/components/common/Textarea/CodeEditor/index.tsx

@@ -19,11 +19,9 @@ const CodeEditor = (props: Props) => {
         iconSrc="modal/edit"
         title={t('common:code_editor')}
         w={'full'}
-        h={'85vh'}
-        isCentered
       >
-        <ModalBody flex={'1 0 0'} overflow={'auto'}>
-          <MyEditor {...props} bg={'myGray.50'} height={'100%'} />
+        <ModalBody>
+          <MyEditor {...props} bg={'myGray.50'} defaultHeight={600} />
         </ModalBody>
         <ModalFooter>
           <Button mr={2} onClick={onClose} px={6}>

packages/web/hooks/useI18n.ts

@@ -12,27 +12,25 @@ const LANG_KEY = 'NEXT_LOCALE';
 
 export const useI18nLng = () => {
   const { i18n } = useTranslation();
-  const languageMap: Record<string, string> = {
-    zh: 'zh',
-    'zh-CN': 'zh',
-    'zh-Hans': 'zh',
-    en: 'en',
-    'en-US': 'en'
-  };
 
   const onChangeLng = (lng: string) => {
-    const lang = languageMap[lng] || 'en';
-
-    setCookie(LANG_KEY, lang, {
-      expires: 30
+    setCookie(LANG_KEY, lng, {
+      expires: 30,
+      sameSite: 'None',
+      secure: true
     });
-    i18n?.changeLanguage(lang);
+    i18n?.changeLanguage(lng);
   };
 
   const setUserDefaultLng = () => {
     if (!navigator || !localStorage) return;
     if (getCookie(LANG_KEY)) return onChangeLng(getCookie(LANG_KEY) as string);
 
+    const languageMap: Record<string, string> = {
+      zh: 'zh',
+      'zh-CN': 'zh'
+    };
+
     const lang = languageMap[navigator.language] || 'en';
 
     // currentLng not in userLang

packages/web/hooks/useWidthVariable.ts

@@ -11,14 +11,11 @@ export const useWidthVariable = <T = any>({
 }) => {
   const value = useMemo(() => {
     // 根据 width 计算，找到第一个大于 width 的值
-    const reversedWidthList = [...widthList].reverse();
-    const reversedList = [...list].reverse();
-    const index = reversedWidthList.findIndex((item) => width > item);
-
+    const index = widthList.findLastIndex((item) => width > item);
     if (index === -1) {
-      return reversedList[0];
+      return list[0];
     }
-    return reversedList[index];
+    return list[index];
   }, [list, width, widthList]);
 
   return value;

packages/web/i18n/en/common.json

@@ -997,7 +997,6 @@
   "support.user.login.Email": "Email",
   "support.user.login.Github": "GitHub Login",
   "support.user.login.Google": "Google Login",
-  "support.user.login.Microsoft": "Microsoft Login",
   "support.user.login.Password": "Password",
   "support.user.login.Password login": "Password Login",
   "support.user.login.Phone": "Phone Login",

packages/web/i18n/zh/common.json

@@ -18,6 +18,9 @@
   "FAQ.switch_package_a": "套餐使用规则为优先使用更高级的套餐，因此，购买的新套餐若比当前套餐更高级，则新套餐立即生效：否则将继续使用当前套餐。",
   "FAQ.switch_package_q": "是否切换订阅套餐？",
   "Folder": "文件夹",
+  "just_now": "刚刚",
+  "yesterday": "昨天",
+  "yesterday_detail_time": "昨天 {{time}}",
   "Login": "登录",
   "Move": "移动",
   "Name": "名称",
@@ -122,7 +125,6 @@
   "common.Documents": "文档",
   "common.Done": "完成",
   "common.Edit": "编辑",
-  "common.Error": "错误",
   "common.Exit": "退出",
   "common.Exit Directly": "直接退出",
   "common.Expired Time": "过期时间",
@@ -192,6 +194,7 @@
   "common.Update Successful": "更新成功",
   "common.Username": "用户名",
   "common.Waiting": "等待中",
+  "common.Error": "错误",
   "common.Warning": "警告",
   "common.Website": "网站",
   "common.all_result": "完整结果",
@@ -548,7 +551,6 @@
   "core.dataset.import.Chunk Range": "范围：{{min}}~{{max}}",
   "core.dataset.import.Chunk Split": "直接分段",
   "core.dataset.import.Chunk Split Tip": "将文本按一定的规则进行分段处理后，转成可进行语义搜索的格式，适合绝大多数场景。不需要调用模型额外处理，成本低。",
-  "core.dataset.import.Continue upload": "继续上传",
   "core.dataset.import.Custom process": "自定义规则",
   "core.dataset.import.Custom process desc": "自定义设置数据处理规则",
   "core.dataset.import.Custom prompt": "自定义提示词",
@@ -577,10 +579,11 @@
   "core.dataset.import.Select source": "选择来源",
   "core.dataset.import.Source name": "来源名",
   "core.dataset.import.Sources list": "来源列表",
+  "core.dataset.import.Continue upload": "继续上传",
+  "core.dataset.import.Upload complete": "完成上传",
   "core.dataset.import.Start upload": "开始上传",
   "core.dataset.import.Total files": "共 {{total}} 个文件",
   "core.dataset.import.Training mode": "训练模式",
-  "core.dataset.import.Upload complete": "完成上传",
   "core.dataset.import.Upload data": "确认上传",
   "core.dataset.import.Upload file progress": "文件上传进度",
   "core.dataset.import.Upload status": "状态",
@@ -891,7 +894,6 @@
   "is_using": "正在使用",
   "item_description": "字段描述",
   "item_name": "字段名",
-  "just_now": "刚刚",
   "key_repetition": "key 重复",
   "move.confirm": "确认移动",
   "navbar.Account": "账号",
@@ -996,7 +998,6 @@
   "support.user.login.Email": "邮箱",
   "support.user.login.Github": "GitHub 登录",
   "support.user.login.Google": "Google 登录",
-  "support.user.login.Microsoft": "微软登录",
   "support.user.login.Password": "密码",
   "support.user.login.Password login": "密码登录",
   "support.user.login.Phone": "手机号登录",
@@ -1213,7 +1214,5 @@
   "user.type": "类型",
   "verification": "验证",
   "xx_search_result": "{{key}} 的搜索结果",
-  "yes": "是",
-  "yesterday": "昨天",
-  "yesterday_detail_time": "昨天 {{time}}"
+  "yes": "是"
 }

projects/app/src/components/core/app/DatasetParamsModal.tsx

@@ -206,7 +206,12 @@ const DatasetParamsModal = ({
                   </Box>
                 </Box>
                 <Box position={'relative'} w={'18px'} h={'18px'}>
-                  <Checkbox colorScheme="primary" isChecked={getValues('usingReRank')} size="lg" />
+                  <Checkbox
+                    colorScheme="primary"
+                    isChecked={getValues('usingReRank')}
+                    size="lg"
+                    icon={<MyIcon name={'common/check'} w={'12px'} />}
+                  />
                   <Box position={'absolute'} top={0} right={0} bottom={0} left={0} zIndex={1}></Box>
                 </Box>
               </Flex>

projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ResponseTags.tsx

@@ -30,7 +30,6 @@ const ResponseTags = ({
   const { t } = useTranslation();
   const quoteListRef = React.useRef<HTMLDivElement>(null);
   const dataId = historyItem.dataId;
-
   const {
     totalQuoteList: quoteList = [],
     llmModuleAccount = 0,

projects/app/src/components/core/chat/ChatContainer/ChatBox/index.tsx

@@ -323,7 +323,7 @@ const ChatBox = (
               })
             };
           } else if (event === SseResponseEventEnum.updateVariables && variables) {
-            variablesForm.setValue('variables', variables);
+            variablesForm.reset(variables);
           } else if (event === SseResponseEventEnum.interactive) {
             const val: AIChatItemValueItemType = {
               type: ChatItemValueTypeEnum.interactive,
@@ -408,7 +408,7 @@ const ChatBox = (
       isInteractivePrompt = false
     }) => {
       variablesForm.handleSubmit(
-        async ({ variables = {} }) => {
+        async ({ variables }) => {
           if (!onStartChat) return;
           if (isChatting) {
             toast({
@@ -435,7 +435,7 @@ const ChatBox = (
           // Only declared variables are kept
           const requestVariables: Record<string, any> = {};
           allVariableList?.forEach((item) => {
-            requestVariables[item.key] = variables[item.key];
+            requestVariables[item.key] = variables[item.key] || '';
           });
 
           const responseChatId = getNanoid(24);

projects/app/src/components/support/permission/MemberManager/AddMemberModal.tsx

@@ -117,12 +117,11 @@ function AddMemberModal({ onClose, mode = 'member' }: AddModalPropsType) {
             <Flex flexDirection="column" mt="2" overflow={'auto'} maxH="400px">
               {filterGroups.map((group) => {
                 const onChange = () => {
-                  setSelectedGroupIdList((state) => {
-                    if (state.includes(group._id)) {
-                      return state.filter((v) => v !== group._id);
-                    }
-                    return [...state, group._id];
-                  });
+                  if (selectedGroupIdList.includes(group._id)) {
+                    setSelectedGroupIdList(selectedGroupIdList.filter((v) => v !== group._id));
+                  } else {
+                    setSelectedGroupIdList([...selectedGroupIdList, group._id]);
+                  }
                 };
                 const collaborator = collaboratorList.find((v) => v.groupId === group._id);
                 return (
@@ -142,7 +141,10 @@ function AddMemberModal({ onClose, mode = 'member' }: AddModalPropsType) {
                     }}
                     onClick={onChange}
                   >
-                    <Checkbox isChecked={selectedGroupIdList.includes(group._id)} />
+                    <Checkbox
+                      isChecked={selectedGroupIdList.includes(group._id)}
+                      icon={<MyIcon name={'common/check'} w={'12px'} />}
+                    />
                     <MyAvatar src={group.avatar} w="1.5rem" borderRadius={'50%'} />
                     <Box ml="2" w="full">
                       {group.name === DefaultGroupName ? userInfo?.team.teamName : group.name}
@@ -155,12 +157,11 @@ function AddMemberModal({ onClose, mode = 'member' }: AddModalPropsType) {
               })}
               {filterMembers.map((member) => {
                 const onChange = () => {
-                  setSelectedMembers((state) => {
-                    if (state.includes(member.tmbId)) {
-                      return state.filter((v) => v !== member.tmbId);
-                    }
-                    return [...state, member.tmbId];
-                  });
+                  if (selectedMemberIdList.includes(member.tmbId)) {
+                    setSelectedMembers(selectedMemberIdList.filter((v) => v !== member.tmbId));
+                  } else {
+                    setSelectedMembers([...selectedMemberIdList, member.tmbId]);
+                  }
                 };
                 const collaborator = collaboratorList.find((v) => v.tmbId === member.tmbId);
                 return (
@@ -204,12 +205,11 @@ function AddMemberModal({ onClose, mode = 'member' }: AddModalPropsType) {
             <Flex flexDirection="column" mt="2" overflow={'auto'} maxH="400px">
               {selectedGroupIdList.map((groupId) => {
                 const onChange = () => {
-                  setSelectedGroupIdList((state) => {
-                    if (state.includes(groupId)) {
-                      return state.filter((v) => v !== groupId);
-                    }
-                    return [...state, groupId];
-                  });
+                  if (selectedGroupIdList.includes(groupId)) {
+                    setSelectedGroupIdList(selectedGroupIdList.filter((v) => v !== groupId));
+                  } else {
+                    setSelectedGroupIdList([...selectedGroupIdList, groupId]);
+                  }
                 };
                 const group = groups.find((v) => String(v._id) === groupId);
                 return (

projects/app/src/components/support/user/inform/SystemMsgModal.tsx

@@ -1,12 +1,12 @@
 import React, { useCallback } from 'react';
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useUserStore } from '@/web/support/user/useUserStore';
+import { useQuery } from '@tanstack/react-query';
 import { Button, ModalBody, ModalFooter, useDisclosure } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import { LOGO_ICON } from '@fastgpt/global/common/system/constants';
 import { getSystemMsgModalData } from '@/web/support/user/inform/api';
 import dynamic from 'next/dynamic';
-import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 const Markdown = dynamic(() => import('@/components/Markdown'), { ssr: false });
 
 const SystemMsgModal = ({}: {}) => {
@@ -15,9 +15,7 @@ const SystemMsgModal = ({}: {}) => {
 
   const { isOpen, onOpen, onClose } = useDisclosure();
 
-  const { data } = useRequest2(getSystemMsgModalData, {
-    refreshDeps: [systemMsgReadId],
-    manual: false,
+  const { data } = useQuery(['initSystemMsgModal', systemMsgReadId], getSystemMsgModalData, {
     onSuccess(res) {
       if (res?.content && (!systemMsgReadId || res.id !== systemMsgReadId)) {
         onOpen();

projects/app/src/global/core/chat/utils.ts

@@ -6,15 +6,11 @@ import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 const isLLMNode = (item: ChatHistoryItemResType) =>
   item.moduleType === FlowNodeTypeEnum.chatNode || item.moduleType === FlowNodeTypeEnum.tools;
 
-export function transformPreviewHistories(
-  histories: ChatItemType[],
-  responseDetail: boolean
-): ChatItemType[] {
+export function transformPreviewHistories(histories: ChatItemType[]): ChatItemType[] {
   return histories.map((item) => {
     return {
       ...addStatisticalDataToHistoryItem(item),
-      responseData: undefined,
-      ...(responseDetail ? {} : { totalQuoteList: undefined })
+      responseData: undefined
     };
   });
 }
@@ -22,7 +18,6 @@ export function transformPreviewHistories(
 export function addStatisticalDataToHistoryItem(historyItem: ChatItemType) {
   if (historyItem.obj !== ChatRoleEnum.AI) return historyItem;
   if (historyItem.totalQuoteList !== undefined) return historyItem;
-  if (!historyItem.responseData) return historyItem;
 
   // Flat children
   const flatResData: ChatHistoryItemResType[] =

projects/app/src/pages/account/components/Info/index.tsx

@@ -45,7 +45,6 @@ import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant';
 import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
 import { useSystem } from '@fastgpt/web/hooks/useSystem';
 import MyImage from '@fastgpt/web/components/common/Image/MyImage';
-import { getWebReqUrl } from '@fastgpt/web/common/system/utils';
 
 const StandDetailModal = dynamic(() => import('./standardDetailModal'));
 const TeamMenu = dynamic(() => import('@/components/support/user/team/TeamMenu'));
@@ -495,7 +494,7 @@ const PlanUsage = () => {
             </Box>
           </Flex>
           <Link
-            href={getWebReqUrl(EXTRA_PLAN_CARD_ROUTE)}
+            href={EXTRA_PLAN_CARD_ROUTE}
             transform={'translateX(15px)'}
             display={'flex'}
             alignItems={'center'}

projects/app/src/pages/api/common/file/upload.ts

@@ -51,7 +51,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
       path: file.path,
       filename: file.originalname,
       contentType: file.mimetype,
-      encoding: file.encoding,
       metadata: metadata
     });
 

projects/app/src/pages/api/core/chat/getPaginationRecords.ts

@@ -82,16 +82,11 @@ async function handler(
     limit: pageSize
   });
 
-  const responseDetail = !shareChat || shareChat.responseDetail;
-
   // Remove important information
   if (shareChat && app.type !== AppTypeEnum.plugin) {
     histories.forEach((item) => {
       if (item.obj === ChatRoleEnum.AI) {
-        item.responseData = filterPublicNodeResponseData({
-          flowResponses: item.responseData,
-          responseDetail
-        });
+        item.responseData = filterPublicNodeResponseData({ flowResponses: item.responseData });
 
         if (shareChat.showNodeStatus === false) {
           item.value = item.value.filter((v) => v.type !== ChatItemValueTypeEnum.tool);
@@ -101,7 +96,7 @@ async function handler(
   }
 
   return {
-    list: isPlugin ? histories : transformPreviewHistories(histories, responseDetail),
+    list: isPlugin ? histories : transformPreviewHistories(histories),
     total
   };
 }

projects/app/src/pages/api/core/chat/getResData.ts

@@ -11,7 +11,6 @@ import { ChatHistoryItemResType } from '@fastgpt/global/core/chat/type';
 import { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat';
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { filterPublicNodeResponseData } from '@fastgpt/global/core/chat/utils';
-import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
 
 export type getResDataQuery = OutLinkChatAuthProps & {
   chatId?: string;
@@ -27,57 +26,44 @@ async function handler(
   req: ApiRequestProps<getResDataBody, getResDataQuery>,
   res: ApiResponseType<any>
 ): Promise<getResDataResponse> {
-  const { appId, chatId, dataId, shareId } = req.query;
+  const { appId, chatId, dataId } = req.query;
   if (!appId || !chatId || !dataId) {
     return {};
   }
 
   // 1. Un login api: share chat, team chat
   // 2. Login api: account chat, chat log
-  const authData = await (() => {
-    try {
-      return authChatCrud({
-        req,
-        authToken: true,
-        authApiKey: true,
-        ...req.query,
-        per: ReadPermissionVal
-      });
-    } catch (error) {
-      return authApp({
-        req,
-        authToken: true,
-        authApiKey: true,
-        appId,
-        per: ManagePermissionVal
-      });
-    }
-  })();
-
-  const [chatData] = await Promise.all([
-    MongoChatItem.findOne(
-      {
-        appId,
-        chatId,
-        dataId
-      },
-      'obj responseData'
-    ).lean(),
-    shareId ? MongoOutLink.findOne({ shareId }).lean() : Promise.resolve(null)
-  ]);
-
-  if (chatData?.obj !== ChatRoleEnum.AI) {
-    return {};
+  try {
+    await authChatCrud({
+      req,
+      authToken: true,
+      authApiKey: true,
+      ...req.query,
+      per: ReadPermissionVal
+    });
+  } catch (error) {
+    await authApp({
+      req,
+      authToken: true,
+      authApiKey: true,
+      appId,
+      per: ManagePermissionVal
+    });
   }
 
-  const flowResponses = chatData.responseData ?? {};
-  return req.query.shareId
-    ? filterPublicNodeResponseData({
-        // @ts-ignore
-        responseDetail: authData.responseDetail,
-        flowResponses: chatData.responseData
-      })
-    : flowResponses;
+  const chatData = await MongoChatItem.findOne(
+    {
+      appId,
+      chatId,
+      dataId
+    },
+    'obj responseData'
+  ).lean();
+
+  if (chatData?.obj === ChatRoleEnum.AI) {
+    const data = chatData.responseData || {};
+    return req.query.shareId ? filterPublicNodeResponseData(data) : data;
+  } else return {};
 }
 
 export default NextAPI(handler);

projects/app/src/pages/api/core/dataset/collection/create/localFile.ts

@@ -67,7 +67,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>): CreateCo
     const { rawText } = await readRawTextByLocalFile({
       teamId,
       path: file.path,
-      encoding: file.encoding,
       metadata: {
         ...fileMetadata,
         relatedId: relatedImgId
@@ -82,7 +81,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>): CreateCo
       path: file.path,
       filename: file.originalname,
       contentType: file.mimetype,
-      encoding: file.encoding,
       metadata: fileMetadata
     });
 

projects/app/src/pages/api/v1/chat/completions.ts

@@ -363,7 +363,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     /* select fe response field */
     const feResponseData = canWrite
       ? flowResponses
-      : filterPublicNodeResponseData({ flowResponses, responseDetail });
+      : filterPublicNodeResponseData({ flowResponses });
 
     if (stream) {
       workflowResponseWrite({
@@ -380,10 +380,12 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
       });
 
       if (detail) {
-        workflowResponseWrite({
-          event: SseResponseEventEnum.flowResponses,
-          data: feResponseData
-        });
+        if (responseDetail || isPlugin) {
+          workflowResponseWrite({
+            event: SseResponseEventEnum.flowResponses,
+            data: feResponseData
+          });
+        }
       }
 
       res.end();

projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx

@@ -104,10 +104,7 @@ const EditForm = ({
   const formatVariables = useMemo(
     () =>
       formatEditorVariablePickerIcon([
-        ...workflowSystemVariables.filter(
-          (variable) =>
-            !['appId', 'chatId', 'responseChatItemId', 'histories'].includes(variable.key)
-        ),
+        ...workflowSystemVariables,
         ...(appForm.chatConfig.variables || [])
       ]).map((item) => ({
         ...item,

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/InputEditModal.tsx

@@ -215,7 +215,6 @@ const FieldEditModal = ({
   );
   const onSubmitError = useCallback(
     (e: Object) => {
-      console.log('e', e);
       for (const item of Object.values(e)) {
         if (item.message) {
           toast({

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx

@@ -511,14 +511,22 @@ const InputTypeConfig = ({
               <FormLabel flex={'0 0 132px'} fontWeight={'medium'}>
                 {t('app:document_upload')}
               </FormLabel>
-              <Switch {...register('canSelectFile')} />
+              <Switch
+                {...register('canSelectFile', {
+                  required: true
+                })}
+              />
             </Flex>
             <Box w={'full'} minH={'40px'}>
               <Flex alignItems={'center'}>
                 <FormLabel flex={'0 0 132px'} fontWeight={'medium'}>
                   {t('app:image_upload')}
                 </FormLabel>
-                <Switch {...register('canSelectImg')} />
+                <Switch
+                  {...register('canSelectImg', {
+                    required: true
+                  })}
+                />
               </Flex>
               <Flex color={'myGray.500'}>
                 <Box fontSize={'xs'}>{t('app:image_upload_tip')}</Box>

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/Handle/ConnectionHandle.tsx

@@ -6,7 +6,6 @@ import { NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { useContextSelector } from 'use-context-selector';
 import { WorkflowContext } from '../../../../context';
 import { WorkflowNodeEdgeContext } from '../../../../context/workflowInitContext';
-import { FlowNodeItemType } from '@fastgpt/global/core/workflow/type/node';
 
 export const ConnectionSourceHandle = ({
   nodeId,
@@ -142,23 +141,15 @@ export const ConnectionTargetHandle = React.memo(function ConnectionTargetHandle
   const { connectingEdge, nodeList } = useContextSelector(WorkflowContext, (ctx) => ctx);
 
   const { LeftHandle, rightHandle, topHandle, bottomHandle } = useMemo(() => {
-    let node: FlowNodeItemType | undefined = undefined,
-      connectingNode: FlowNodeItemType | undefined = undefined;
-    for (const item of nodeList) {
-      if (item.nodeId === nodeId) {
-        node = item;
-      }
-      if (item.nodeId === connectingEdge?.nodeId) {
-        connectingNode = item;
-      }
-      if (node && (connectingNode || !connectingEdge?.nodeId)) break;
-    }
+    const node = nodeList.find((node) => node.nodeId === nodeId);
+    const connectingNode = nodeList.find((node) => node.nodeId === connectingEdge?.nodeId);
 
+    const connectingNodeSourceNodeIdMap = new Map<string, number>();
     let forbidConnect = false;
-    for (const edge of edges) {
-      if (forbidConnect) break;
-
-      if (edge.target === nodeId) {
+    edges.forEach((edge) => {
+      if (edge.target === connectingNode?.nodeId) {
+        connectingNodeSourceNodeIdMap.set(edge.source, 1);
+      } else if (edge.target === nodeId) {
         // Node has be connected tool, it cannot be connect by other handle
         if (edge.targetHandle === NodeOutputKeyEnum.selectedTools) {
           forbidConnect = true;
@@ -172,7 +163,7 @@ export const ConnectionTargetHandle = React.memo(function ConnectionTargetHandle
           forbidConnect = true;
         }
       }
-    }
+    });
 
     const showHandle = (() => {
       if (forbidConnect) return false;
@@ -187,6 +178,9 @@ export const ConnectionTargetHandle = React.memo(function ConnectionTargetHandle
       // Not the same parent node
       if (connectingNode && connectingNode?.parentNodeId !== node?.parentNodeId) return false;
 
+      // Unable to connect to the source node
+      if (connectingNodeSourceNodeIdMap.has(nodeId)) return false;
+
       return true;
     })();
 

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx

@@ -115,16 +115,6 @@ const NodeCard = (props: Props) => {
       }
     },
     {
-      onSuccess(res) {
-        if (!res) return;
-        // Execute forcibly updates the courseUrl field
-        onChangeNode({
-          nodeId,
-          type: 'attr',
-          key: 'courseUrl',
-          value: res?.courseUrl
-        });
-      },
       manual: false
     }
   );

projects/app/src/pages/dataset/detail/components/Import/Context.tsx

@@ -254,6 +254,8 @@ const DatasetImportContextProvider = ({ children }: { children: React.ReactNode
               icon={<MyIcon name={'common/backFill'} w={'14px'} />}
               aria-label={''}
               size={'smSquare'}
+              w={'26px'}
+              h={'26px'}
               borderRadius={'50%'}
               variant={'whiteBase'}
               mr={2}

projects/app/src/pages/login/components/LoginForm/components/FormLayout.tsx

@@ -59,16 +59,6 @@ const FormLayout = ({ children, setPageType, pageType }: Props) => {
           }
         ]
       : []),
-    ...(feConfigs?.oauth?.microsoft
-      ? [
-          {
-            label: t('common:support.user.login.Microsoft'),
-            provider: OAuthEnum.microsoft,
-            icon: 'common/microsoft',
-            redirectUrl: `https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=${feConfigs?.oauth?.microsoft}&response_type=code&redirect_uri=${redirectUri}&response_mode=query&scope=https%3A%2F%2Fgraph.microsoft.com%2Fuser.read&state=${state.current}`
-          }
-        ]
-      : []),
     ...(pageType !== LoginPageTypeEnum.passwordLogin
       ? [
           {

projects/app/src/pages/price/components/ExtraPlan.tsx

@@ -260,7 +260,7 @@ const ExtraPlan = () => {
               >
                 <MyNumberInput
                   name="points"
-                  register={registerExtraPoints}
+                  register={registerDatasetSize}
                   min={0}
                   max={10000}
                   size={'sm'}

projects/app/src/service/common/system/volumnMongoWatch.ts

@@ -1,4 +1,4 @@
-import { getSystemPluginCb } from '@/service/core/app/plugin';
+import { getSystemPlugins } from '@/service/core/app/plugin';
 import { initSystemConfig } from '.';
 import { createDatasetTrainingMongoWatch } from '@/service/core/dataset/training/utils';
 import { MongoSystemConfigs } from '@fastgpt/service/common/system/config/schema';
@@ -29,7 +29,7 @@ const refetchSystemPlugins = () => {
   changeStream.on('change', async (change) => {
     setTimeout(() => {
       try {
-        getSystemPluginCb(true);
+        getSystemPlugins(true);
       } catch (error) {}
     }, 5000);
   });

projects/app/src/service/core/app/plugin.ts

@@ -11,8 +11,7 @@ const getCommercialPlugins = () => {
   return GET<SystemPluginTemplateItemType[]>('/core/app/plugin/getSystemPlugins');
 };
 export const getSystemPlugins = async (refresh = false) => {
-  if (isProduction && global.systemPlugins && global.systemPlugins.length > 0 && !refresh)
-    return cloneDeep(global.systemPlugins);
+  if (isProduction && global.systemPlugins && !refresh) return cloneDeep(global.systemPlugins);
 
   try {
     if (!global.systemPlugins) {
@@ -55,22 +54,17 @@ const getCommercialCb = async () => {
     {}
   );
 };
-
-export const getSystemPluginCb = async (refresh = false) => {
-  if (
-    isProduction &&
-    global.systemPluginCb &&
-    Object.keys(global.systemPluginCb).length > 0 &&
-    !refresh
-  )
-    return global.systemPluginCb;
+export const getSystemPluginCb = async () => {
+  if (isProduction && global.systemPluginCb) return global.systemPluginCb;
 
   try {
-    global.systemPluginCb = {};
     await getSystemPlugins();
+    global.systemPluginCb = {};
     global.systemPluginCb = FastGPTProUrl ? await getCommercialCb() : await getCommunityCb();
     return global.systemPluginCb;
   } catch (error) {
+    //@ts-ignore
+    global.systemPluginCb = undefined;
     return Promise.reject(error);
   }
 };

projects/app/src/service/events/generateQA.ts

@@ -1,7 +1,7 @@
 import { MongoDatasetTraining } from '@fastgpt/service/core/dataset/training/schema';
 import { pushQAUsage } from '@/service/support/wallet/usage/push';
 import { TrainingModeEnum } from '@fastgpt/global/core/dataset/constants';
-import { createChatCompletion } from '@fastgpt/service/core/ai/config';
+import { getAIApi } from '@fastgpt/service/core/ai/config';
 import type { ChatCompletionMessageParam } from '@fastgpt/global/core/ai/type.d';
 import { addLog } from '@fastgpt/service/common/system/log';
 import { splitText2Chunks } from '@fastgpt/global/common/string/textSplitter';
@@ -109,8 +109,11 @@ ${replaceVariable(Prompt_AgentQA.fixedText, { text })}`;
       }
     ];
 
-    const { response: chatResponse } = await createChatCompletion({
-      body: llmCompletionsBodyFormat(
+    const ai = getAIApi({
+      timeout: 600000
+    });
+    const chatResponse = await ai.chat.completions.create(
+      llmCompletionsBodyFormat(
         {
           model: modelData.model,
           temperature: 0.3,
@@ -119,7 +122,7 @@ ${replaceVariable(Prompt_AgentQA.fixedText, { text })}`;
         },
         modelData
       )
-    });
+    );
     const answer = chatResponse.choices?.[0].message?.content || '';
 
     const qaArr = formatSplitText(answer, text); // 格式化后的QA对
@@ -162,7 +165,6 @@ ${replaceVariable(Prompt_AgentQA.fixedText, { text })}`;
     reduceQueue();
     generateQA();
   } catch (err: any) {
-    addLog.error(`[QA Queue] Error`);
     reduceQueue();
 
     if (await checkInvalidChunkAndLock({ err, data, errText: 'QA模型调用失败' })) {

projects/app/src/service/events/generateVector.ts

@@ -121,7 +121,6 @@ export async function generateVector(): Promise<any> {
     reduceQueue();
     generateVector();
   } catch (err: any) {
-    addLog.error(`[Vector Queue] Error`, err);
     reduceQueue();
 
     if (await checkInvalidChunkAndLock({ err, data, errText: '向量模型调用失败' })) {

projects/app/src/service/mongo.ts

@@ -32,9 +32,8 @@ export function connectToDatabase() {
       systemStartCb();
 
       //init system config；init vector database；init root user
-      await Promise.all([getInitConfig(), initVectorStore(), initRootUser()]);
+      await Promise.all([getInitConfig(), getSystemPluginCb(), initVectorStore(), initRootUser()]);
 
-      getSystemPluginCb();
       startMongoWatch();
       // cron
       startCron();

projects/app/src/service/support/permission/auth/chat.ts

@@ -42,19 +42,18 @@ export async function authChatCrud({
   chat?: ChatSchema;
   isOutLink: boolean;
   uid?: string;
-  responseDetail: boolean;
 }> {
   const isOutLink = Boolean((shareId || spaceTeamId) && outLinkUid);
-  if (!chatId) return { isOutLink, uid: outLinkUid, responseDetail: true };
+  if (!chatId) return { isOutLink, uid: outLinkUid };
 
   const chat = await MongoChat.findOne({ appId, chatId }).lean();
 
-  const { uid, responseDetail } = await (async () => {
+  const { uid } = await (async () => {
     // outLink Auth
     if (shareId && outLinkUid) {
-      const { uid, shareChat } = await authOutLink({ shareId, outLinkUid });
+      const { uid } = await authOutLink({ shareId, outLinkUid });
       if (!chat || (chat.shareId === shareId && chat.outLinkUid === uid)) {
-        return { uid, responseDetail: shareChat.responseDetail };
+        return { uid };
       }
       return Promise.reject(ChatErrEnum.unAuthChat);
     }
@@ -63,12 +62,12 @@ export async function authChatCrud({
       const { uid } = await authTeamSpaceToken({ teamId: spaceTeamId, teamToken });
       addLog.debug('Auth team token', { uid, spaceTeamId, teamToken, chatUid: chat?.outLinkUid });
       if (!chat || (String(chat.teamId) === String(spaceTeamId) && chat.outLinkUid === uid)) {
-        return { uid, responseDetail: true };
+        return { uid };
       }
       return Promise.reject(ChatErrEnum.unAuthChat);
     }
 
-    if (!chat) return { id: outLinkUid, responseDetail: true };
+    if (!chat) return { id: outLinkUid };
 
     // auth req
     const { teamId, tmbId, permission } = await authApp({
@@ -81,19 +80,18 @@ export async function authChatCrud({
 
     if (String(teamId) !== String(chat.teamId)) return Promise.reject(ChatErrEnum.unAuthChat);
 
-    if (permission.hasManagePer) return { uid: outLinkUid, responseDetail: true };
-    if (String(tmbId) === String(chat.tmbId)) return { uid: outLinkUid, responseDetail: true };
+    if (permission.hasManagePer) return { uid: outLinkUid };
+    if (String(tmbId) === String(chat.tmbId)) return { uid: outLinkUid };
 
     return Promise.reject(ChatErrEnum.unAuthChat);
   })();
 
-  if (!chat) return { isOutLink, uid, responseDetail };
+  if (!chat) return { isOutLink, uid };
 
   return {
     chat,
     isOutLink,
-    uid,
-    responseDetail
+    uid
   };
 }