fix: whisper checker;fix: img read (#3813)

* fix: img read * fix: whisper checker * perf: dev doc * perf: dev doc * remove invalid code

fix: whisper checker;fix: img read (#3813)
* fix: img read * fix: whisper checker * perf: dev doc * perf: dev doc * remove invalid code
b14674cc · Archer · GitHub · 4d20274a · b14674cc · b14674cc
Commit b14674cc authored Feb 18, 2025 by Archer Committed by GitHub Feb 18, 2025
15 changed files
--- a/docSite/content/zh-cn/docs/development/intro.md
+++ b/docSite/content/zh-cn/docs/development/intro.md
@@ -15,8 +15,8 @@ weight: 705

 - [Git](http://git-scm.com/)
 - [Docker](https://www.docker.com/)（构建镜像）
- [Node.js v18.17 / v20.x](http://nodejs.org)（版本尽量一样，可以使用nvm管理node版本）
- [pnpm](https://pnpm.io/) 版本 8.6.0 (目前官方的开发环境)
+- [Node.js v20.14.0](http://nodejs.org)（版本尽量一样，可以使用nvm管理node版本）
+- [pnpm](https://pnpm.io/) 推荐版本 9.4.0 (目前官方的开发环境)
 - make命令: 根据不同平台，百度安装 (官方是GNU Make 4.3)

 ## 开始本地开发
@@ -77,8 +77,6 @@ Mongo 数据库需要注意，需要注意在连接地址中增加 `directConnec
 可参考项目根目录下的 `dev.md`，第一次编译运行可能会有点慢，需要点耐心哦

 ```bash
-# 给自动化脚本代码执行权限(非 linux 系统, 可以手动执行里面的 postinstall.sh 文件内容)
-chmod -R +x ./scripts/
 # 代码根目录下执行，会安装根 package、projects 和 packages 内所有依赖
 # 如果提示 isolate-vm 安装失败，可以参考：https://github.com/laverdet/isolated-vm?tab=readme-ov-file#requirements
 pnpm i

--- a/docSite/content/zh-cn/docs/development/upgrading/490.md
+++ b/docSite/content/zh-cn/docs/development/upgrading/490.md
 ---
-title: 'V4.9.0(进行中)'
-description: 'FastGPT V4.9.0 更新说明'
+title: 'V4.8.22(进行中)'
+description: 'FastGPT V4.8.22 更新说明'
 icon: 'upgrade'
 draft: false
 toc: true
-weight: 803
+weight: 802
 ---


 ## 完整更新内容

 1. 新增 - AI 对话节点解析 <think></think> 标签内容，便于各类模型进行思考链输出。
-2. 修复 - 思考链流输出时，有时与正文顺序偏差。
\ No newline at end of file
+2. 修复 - 思考链流输出时，有时与正文顺序偏差。
+3. 修复 - API 调用工作流，如果传递的图片不支持 Head 检测时，图片会被过滤。已增加该类错误检测，避免被错误过滤。
+4. 修复 - 模板市场部分模板错误。
+5. 修复 - 免登录窗口无法正常判断语言识别是否开启。
\ No newline at end of file
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
    "format-code": "prettier --config \"./.prettierrc.js\" --write \"./**/src/**/*.{ts,tsx,scss}\"",
    "format-doc": "zhlint --dir ./docSite *.md --fix",
    "gen:theme-typings": "chakra-cli tokens packages/web/styles/theme.ts --out node_modules/.pnpm/node_modules/@chakra-ui/styled-system/dist/theming.types.d.ts",
-    "postinstall": "sh ./scripts/postinstall.sh",
+    "postinstall": "pnpm gen:theme-typings",
    "initIcon": "node ./scripts/icon/init.js",
    "previewIcon": "node ./scripts/icon/index.js",
    "api:gen": "tsc ./scripts/openapi/index.ts && node ./scripts/openapi/index.js && npx @redocly/cli build-docs ./scripts/openapi/openapi.json -o ./projects/app/public/openapi/index.html",

--- a/packages/global/common/file/tools.ts
+++ b/packages/global/common/file/tools.ts
 import { detect } from 'jschardet';
-import { documentFileType, imageFileType } from './constants';
+import { documentFileType } from './constants';
 import { ChatFileTypeEnum } from '../../core/chat/constants';
 import { UserChatItemValueItemType } from '../../core/chat/type';
 import * as fs from 'fs';
@@ -25,6 +25,7 @@ export const detectFileEncodingByPath = async (path: string) => {
  const fd = await fs.promises.open(path, 'r');
  try {
    // Read file head
+    // @ts-ignore
    const { bytesRead } = await fd.read(buffer, 0, MAX_BYTES, 0);
    const actualBuffer = buffer.slice(0, bytesRead);

@@ -37,40 +38,49 @@ export const detectFileEncodingByPath = async (path: string) => {
 // Url => user upload file type
 export const parseUrlToFileType = (url: string): UserChatItemValueItemType['file'] | undefined => {
  if (typeof url !== 'string') return;
-  const parseUrl = new URL(url, 'https://locaohost:3000');

-  const filename = (() => {
-    // Check base64 image
-    if (url.startsWith('data:image/')) {
-      const mime = url.split(',')[0].split(':')[1].split(';')[0];
-      return `image.${mime.split('/')[1]}`;
-    }
-    // Old version file url: https://xxx.com/file/read?filename=xxx.pdf
-    const filenameQuery = parseUrl.searchParams.get('filename');
-    if (filenameQuery) return filenameQuery;
+  // Handle base64 image
+  if (url.startsWith('data:')) {
+    const matches = url.match(/^data:([^;]+);base64,/);
+    if (!matches) return;

-    // Common file： https://xxx.com/xxx.pdf?xxxx=xxx
-    const pathname = parseUrl.pathname;
-    if (pathname) return pathname.split('/').pop();
-  })();
+    const mimeType = matches[1].toLowerCase();
+    if (!mimeType.startsWith('image/')) return;

-  if (!filename) return;
+    const extension = mimeType.split('/')[1];
+    return {
+      type: ChatFileTypeEnum.image,
+      name: `image.${extension}`,
+      url
+    };
+  }

-  const extension = filename.split('.').pop()?.toLowerCase() || '';
+  try {
+    const parseUrl = new URL(url, 'https://localhost:3000');
+
+    // Get filename from URL
+    const filename = parseUrl.searchParams.get('filename') || parseUrl.pathname.split('/').pop();
+    const extension = filename?.split('.').pop()?.toLowerCase() || '';

-  if (!extension) return;
+    // If it's a document type, return as file, otherwise treat as image
+    if (extension && documentFileType.includes(extension)) {
+      return {
+        type: ChatFileTypeEnum.file,
+        name: filename || 'null',
+        url
+      };
+    }

-  if (documentFileType.includes(extension)) {
+    // Default to image type for non-document files
    return {
-      type: ChatFileTypeEnum.file,
-      name: filename,
+      type: ChatFileTypeEnum.image,
+      name: filename || 'null.png',
      url
    };
-  }
-  if (imageFileType.includes(extension)) {
+  } catch (error) {
    return {
      type: ChatFileTypeEnum.image,
-      name: filename,
+      name: 'invalid.png',
      url
    };
  }

--- a/packages/global/core/chat/adapt.ts
+++ b/packages/global/core/chat/adapt.ts
@@ -349,7 +349,7 @@ export const chatValue2RuntimePrompt = (value: ChatItemValueItemType[]): Runtime
  };
  value.forEach((item) => {
    if (item.type === 'file' && item.file) {
-      prompt.files?.push(item.file);
+      prompt.files.push(item.file);
    } else if (item.text) {
      prompt.text += item.text.content;
    }

--- a/packages/service/core/chat/utils.ts
+++ b/packages/service/core/chat/utils.ts
@@ -197,7 +197,11 @@ export const loadRequestMessages = async ({
                addLog.info(`Filter invalid image: ${imgUrl}`);
                return;
              }
-            } catch (error) {
+            } catch (error: any) {
+              if (error?.response?.status === 405) {
+                return item;
+              }
+              addLog.warn(`Filter invalid image: ${imgUrl}`, { error });
              return;
            }
          }

--- a/packages/service/core/workflow/dispatch/agent/runTool/index.ts
+++ b/packages/service/core/workflow/dispatch/agent/runTool/index.ts
@@ -334,7 +334,7 @@ const getMultiInput = async ({

  return {
    documentQuoteText: text,
-    userFiles: fileLinks.map((url) => parseUrlToFileType(url))
+    userFiles: fileLinks.map((url) => parseUrlToFileType(url)).filter(Boolean)
  };
 };


--- a/packages/service/core/workflow/dispatch/chat/oneapi.ts
+++ b/packages/service/core/workflow/dispatch/chat/oneapi.ts
@@ -407,7 +407,7 @@ async function getMultiInput({

  return {
    documentQuoteText: text,
-    userFiles: fileLinks.map((url) => parseUrlToFileType(url))
+    userFiles: fileLinks.map((url) => parseUrlToFileType(url)).filter(Boolean)
  };
 }


--- a/packages/service/core/workflow/dispatch/plugin/runApp.ts
+++ b/packages/service/core/workflow/dispatch/plugin/runApp.ts
@@ -53,7 +53,7 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {

  const userInputFiles = (() => {
    if (fileUrlList) {
-      return fileUrlList.map((url) => parseUrlToFileType(url));
+      return fileUrlList.map((url) => parseUrlToFileType(url)).filter(Boolean);
    }
    // Adapt version 4.8.13 upgrade
    return files;

--- a/packages/service/core/workflow/dispatch/tools/http468.ts
+++ b/packages/service/core/workflow/dispatch/tools/http468.ts
@@ -398,41 +398,6 @@ async function fetchData({
  };
 }

-// function replaceVariable(text: string, obj: Record<string, any>) {
-//   for (const [key, value] of Object.entries(obj)) {
-//     if (value === undefined) {
-//       text = text.replace(new RegExp(`{{(${key})}}`, 'g'), UNDEFINED_SIGN);
-//     } else {
-//       const replacement = JSON.stringify(value);
-//       const unquotedReplacement =
-//         replacement.startsWith('"') && replacement.endsWith('"')
-//           ? replacement.slice(1, -1)
-//           : replacement;
-//       text = text.replace(new RegExp(`{{(${key})}}`, 'g'), () => unquotedReplacement);
-//     }
-//   }
-//   return text || '';
-// }
-// function removeUndefinedSign(obj: Record<string, any>) {
-//   for (const key in obj) {
-//     if (obj[key] === UNDEFINED_SIGN) {
-//       obj[key] = undefined;
-//     } else if (Array.isArray(obj[key])) {
-//       obj[key] = obj[key].map((item: any) => {
-//         if (item === UNDEFINED_SIGN) {
-//           return undefined;
-//         } else if (typeof item === 'object') {
-//           removeUndefinedSign(item);
-//         }
-//         return item;
-//       });
-//     } else if (typeof obj[key] === 'object') {
-//       removeUndefinedSign(obj[key]);
-//     }
-//   }
-//   return obj;
-// }
-
 // Replace some special response from system plugin
 async function replaceSystemPluginResponse({
  response,

--- a/packages/web/i18n/en/common.json
+++ b/packages/web/i18n/en/common.json
@@ -369,7 +369,7 @@
  "core.app.tip.Add a intro to app": "Give the app an introduction",
  "core.app.tip.chatNodeSystemPromptTip": "Enter a prompt here",
  "core.app.tip.systemPromptTip": "Fixed guide words for the model. By adjusting this content, you can guide the model's chat direction. This content will be fixed at the beginning of the context. You can use / to insert variables.\nIf a Dataset is associated, you can also guide the model when to call the Dataset search by appropriate description. For example:\nYou are an assistant for the movie 'Interstellar'. When users ask about content related to 'Interstellar', please search the Dataset and answer based on the search results.",
-  "core.app.tip.variableTip": "Before the conversation starts, you can ask the user to fill in some content as specific variables for this round of conversation. This module is located after the opening guide.\nVariables can be injected into other modules' string type inputs in the form of {{variable key}}, such as prompts, delimiters, etc.",
+  "core.app.tip.variableTip": "Before the conversation begins, users can be asked to fill in some content as specific variables for this round of conversation. \nThis module is located after the opening boot.\n\nIn the input box, you can select variables through / activation, such as: prompt words, qualifiers, etc.",
  "core.app.tip.welcomeTextTip": "Before each conversation starts, send an initial content. Supports standard Markdown syntax. Additional tags that can be used:\n[Quick Key]: Users can directly send the question by clicking",
  "core.app.tool_label.doc": "Documentation",
  "core.app.tool_label.github": "GitHub Address",
@@ -941,9 +941,9 @@
  "model_moka": "Moka-AI",
  "model_moonshot": "Moonshot",
  "model_other": "Other",
+  "model_ppio": "PPIO",
  "model_qwen": "Qwen",
  "model_siliconflow": "Siliconflow",
-  "model_ppio": "PPIO",
  "model_sparkdesk": "SprkDesk",
  "model_stepfun": "StepFun",
  "model_yi": "Yi",

--- a/packages/web/i18n/zh-CN/common.json
+++ b/packages/web/i18n/zh-CN/common.json
@@ -372,7 +372,7 @@
  "core.app.tip.Add a intro to app": "快来给应用一个介绍~",
  "core.app.tip.chatNodeSystemPromptTip": "在此输入提示词",
  "core.app.tip.systemPromptTip": "模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可通过输入 / 插入选择变量\n如果关联了知识库，你还可以通过适当的描述，来引导模型何时去调用知识库搜索。例如：\n你是电影《星际穿越》的助手，当用户询问与《星际穿越》相关的内容时，请搜索知识库并结合搜索结果进行回答。",
-  "core.app.tip.variableTip": "可以在对话开始前，要求用户填写一些内容作为本轮对话的特定变量。该模块位于开场引导之后。\n变量可以通过 {{变量key}} 的形式注入到其他模块 string 类型的输入中，例如：提示词、限定词等",
+  "core.app.tip.variableTip": "可以在对话开始前，要求用户填写一些内容作为本轮对话的特定变量。该模块位于开场引导之后。\n输入框中，可通过 / 激活变量选择，例如：提示词、限定词等",
  "core.app.tip.welcomeTextTip": "每次对话开始前，发送一个初始内容。支持标准 Markdown 语法，可使用的额外标记：\n[快捷按键]：用户点击后可以直接发送该问题",
  "core.app.tool_label.doc": "使用文档",
  "core.app.tool_label.github": "GitHub地址",

--- a/packages/web/i18n/zh-Hant/common.json
+++ b/packages/web/i18n/zh-Hant/common.json
@@ -368,7 +368,7 @@
  "core.app.tip.Add a intro to app": "快來為應用程式寫一個介紹",
  "core.app.tip.chatNodeSystemPromptTip": "在此輸入提示詞",
  "core.app.tip.systemPromptTip": "模型固定的引導詞，透過調整此內容，可以引導模型對話方向。此內容會固定在上下文的開頭。可透過輸入 / 插入變數。\n如果關聯了知識庫，您還可以透過適當的描述，引導模型何時去呼叫知識庫搜尋。例如：\n您是電影《星際效應》的助手，當使用者詢問與《星際效應》相關的內容時，請搜尋知識庫並根據搜尋結果回答。",
-  "core.app.tip.variableTip": "可以在對話開始前，要求使用者填寫一些內容作為本輪對話的特定變數。此模組位於開場引導之後。\n變數可以透過 {{變數 key}} 的形式注入到其他模組的字串類型輸入中，例如：提示詞、分隔符等",
+  "core.app.tip.variableTip": "可以在對話開始前，要求用戶填寫一些內容作為本輪對話的特定變量。\n該模塊位於開場引導之後。\n\n輸入框中，可通過 / 激活變量選擇，例如：提示詞、限定詞等",
  "core.app.tip.welcomeTextTip": "每次對話開始前，傳送一段初始內容。支援標準 Markdown 語法。可使用的額外標記：\n[快速按鍵]：使用者點選後可以直接傳送該問題",
  "core.app.tool_label.doc": "使用文件",
  "core.app.tool_label.github": "GitHub 網址",
@@ -940,9 +940,9 @@
  "model_moka": "Moka-AI",
  "model_moonshot": "月之暗面",
  "model_other": "其他",
+  "model_ppio": "PPIO 派歐雲",
  "model_qwen": "阿里千問",
  "model_siliconflow": "矽基流動",
-  "model_ppio": "PPIO 派歐雲",
  "model_sparkdesk": "訊飛星火",
  "model_stepfun": "階躍星辰",
  "model_yi": "零一萬物",

--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx
@@ -107,7 +107,6 @@ const ChatInput = ({
  );

  /* whisper init */
-  const { sttModelList } = useSystemStore();
  const canvasRef = useRef<HTMLCanvasElement>(null);
  const {
    isSpeaking,
@@ -293,7 +292,7 @@ const ChatInput = ({
        />
        <Flex alignItems={'center'} position={'absolute'} right={[2, 4]} bottom={['10px', '12px']}>
          {/* voice-input */}
-          {whisperConfig.open && !inputValue && !isChatting && sttModelList.length > 0 && (
+          {whisperConfig?.open && !inputValue && !isChatting && (
            <>
              <canvas
                ref={canvasRef}
@@ -430,8 +429,7 @@ const ChatInput = ({
      speakingTimeString,
      stopSpeak,
      t,
-      whisperConfig.open,
-      sttModelList
+      whisperConfig?.open
    ]
  );


--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderOutput/index.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/render/RenderOutput/index.tsx
@@ -58,6 +58,7 @@ const RenderOutput = ({
        }
      });
    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [copyOutputs, nodeId, inputs, llmModelList]);

  const [editField, setEditField] = useState<FlowNodeOutputItemType>();
@@ -154,6 +155,7 @@ const RenderOutput = ({
      (item) =>
        item.type !== FlowNodeOutputTypeEnum.dynamic && item.type !== FlowNodeOutputTypeEnum.hidden
    );
+
    return (
      <>
        {renderOutputs.map((output, i) => {
@@ -163,7 +165,7 @@ const RenderOutput = ({
              required={output.required}
              position={'relative'}
              _notLast={{
-                mb: 4
+                mb: i !== renderOutputs.length - 1 ? 4 : 0
              }}
            >
              <OutputLabel nodeId={nodeId} output={output} />