fix http toolset (#5753)

* fix http toolset

* fix

Author: newfish-cmyk

packages/global/core/app/jsonschema.ts

@@ -5,6 +5,7 @@ import SwaggerParser from '@apidevtools/swagger-parser';
 import yaml from 'js-yaml';
 import type { OpenAPIV3 } from 'openapi-types';
 import type { OpenApiJsonSchema } from './httpTools/type';
+import { i18nT } from '../../../web/i18n/utils';
 
 type SchemaInputValueType = 'string' | 'number' | 'integer' | 'boolean' | 'array' | 'object';
 export type JsonSchemaPropertiesItemType = {
@@ -180,7 +181,7 @@ export const str2OpenApiSchema = async (yamlStr = ''): Promise<OpenApiJsonSchema
       .filter(Boolean) as OpenApiJsonSchema['pathData'];
     return { pathData, serverPath };
   } catch (err) {
-    throw new Error('Invalid Schema');
+    return Promise.reject(i18nT('common:plugin.Invalid Schema'));
   }
 };
 export const getSchemaValueType = (schema: { type: string; items?: { type: string } }) => {

packages/service/core/app/http.ts

@@ -5,6 +5,7 @@ import { getErrText } from '@fastgpt/global/common/error/utils';
 import type { RequireOnlyOne } from '@fastgpt/global/common/type/utils';
 import type { HttpToolConfigType } from '@fastgpt/global/core/app/type';
 import { contentTypeMap, ContentTypes } from '@fastgpt/global/core/workflow/constants';
+import { replaceEditorVariable } from '@fastgpt/global/core/workflow/runtime/utils';
 
 export type RunHTTPToolParams = {
   baseUrl: string;
@@ -32,40 +33,49 @@ const buildHttpRequest = ({
   staticHeaders,
   staticBody
 }: Omit<RunHTTPToolParams, 'baseUrl' | 'toolPath'>) => {
+  const replaceVariables = (text: string) => {
+    return replaceEditorVariable({
+      text,
+      nodes: [],
+      variables: params
+    });
+  };
+
   const body = (() => {
     if (!staticBody || staticBody.type === ContentTypes.none) {
-      return ['POST', 'PUT', 'PATCH'].includes(method.toUpperCase()) ? params : undefined;
+      return ['POST', 'PUT', 'PATCH'].includes(method.toUpperCase()) ? {} : undefined;
     }
 
     if (staticBody.type === ContentTypes.json) {
-      const staticContent = staticBody.content ? JSON.parse(staticBody.content) : {};
-      return { ...staticContent, ...params };
+      const contentWithReplacedVars = staticBody.content
+        ? replaceVariables(staticBody.content)
+        : '{}';
+      const staticContent = JSON.parse(contentWithReplacedVars);
+      return { ...staticContent };
     }
 
     if (staticBody.type === ContentTypes.formData) {
       const formData = new (require('form-data'))();
       staticBody.formData?.forEach(({ key, value }) => {
-        formData.append(key, value);
-      });
-      Object.entries(params).forEach(([key, value]) => {
-        formData.append(key, value);
+        const replacedKey = replaceVariables(key);
+        const replacedValue = replaceVariables(value);
+        formData.append(replacedKey, replacedValue);
       });
       return formData;
     }
 
     if (staticBody.type === ContentTypes.xWwwFormUrlencoded) {
       const urlencoded = new URLSearchParams();
       staticBody.formData?.forEach(({ key, value }) => {
-        urlencoded.append(key, value);
-      });
-      Object.entries(params).forEach(([key, value]) => {
-        urlencoded.append(key, String(value));
+        const replacedKey = replaceVariables(key);
+        const replacedValue = replaceVariables(value);
+        urlencoded.append(replacedKey, replacedValue);
       });
       return urlencoded.toString();
     }
 
     if (staticBody.type === ContentTypes.xml || staticBody.type === ContentTypes.raw) {
-      return staticBody.content || '';
+      return replaceVariables(staticBody.content || '');
     }
 
     return undefined;
@@ -78,7 +88,9 @@ const buildHttpRequest = ({
     ...(headerSecret ? getSecretValue({ storeSecret: headerSecret }) : {}),
     ...(staticHeaders?.reduce(
       (acc, { key, value }) => {
-        acc[key] = value;
+        const replacedKey = replaceVariables(key);
+        const replacedValue = replaceVariables(value);
+        acc[replacedKey] = replacedValue;
         return acc;
       },
       {} as Record<string, string>
@@ -89,7 +101,9 @@ const buildHttpRequest = ({
     const staticParamsObj =
       staticParams?.reduce(
         (acc, { key, value }) => {
-          acc[key] = value;
+          const replacedKey = replaceVariables(key);
+          const replacedValue = replaceVariables(value);
+          acc[replacedKey] = replacedValue;
           return acc;
         },
         {} as Record<string, any>

packages/web/i18n/en/app.json

@@ -2,7 +2,7 @@
   "Add_tool": "Add tool",
   "AutoOptimize": "Automatic optimization",
   "Click_to_delete_this_field": "Click to delete this field",
-  "Custom_params": "Custom parameters",
+  "Custom_params": "input parameters",
   "Edit_tool": "Edit tool",
   "Filed_is_deprecated": "This field is deprecated",
   "HTTPTools_Create_Type": "Create Type",
@@ -95,6 +95,7 @@
   "document_upload": "Document Upload",
   "edit_app": "Application details",
   "edit_info": "Edit",
+  "empty_tool_tips": "Please add tools on the left side",
   "execute_time": "Execution Time",
   "export_config_successful": "Configuration copied, some sensitive information automatically filtered. Please check for any remaining sensitive data.",
   "export_configs": "Export",
@@ -105,12 +106,15 @@
   "file_upload_tip": "Once enabled, documents/images can be uploaded. Documents are retained for 7 days, images for 15 days. Using this feature may incur additional costs. To ensure a good experience, please choose an AI model with a larger context length when using this feature.",
   "go_to_chat": "Go to Conversation",
   "go_to_run": "Go to Execution",
+  "http_toolset_add_tips": "Click the \"Add\" button to add tools",
+  "http_toolset_config_tips": "Click \"Start Configuration\" to add tools",
   "image_upload": "Image Upload",
   "image_upload_tip": "How to activate model image recognition capabilities",
   "import_configs": "Import",
   "import_configs_failed": "Import configuration failed, please ensure the configuration is correct!",
   "import_configs_success": "Import Successful",
   "initial_form": "initial state",
+  "input_params_tips": "Tool input parameters will not be passed directly to the request URL; they can be referenced on the right side using \"/\".",
   "interval.12_hours": "Every 12 Hours",
   "interval.2_hours": "Every 2 Hours",
   "interval.3_hours": "Every 3 Hours",

packages/web/i18n/zh-CN/app.json

@@ -2,7 +2,7 @@
   "Add_tool": "添加工具",
   "AutoOptimize": "自动优化",
   "Click_to_delete_this_field": "点击删除该字段",
-  "Custom_params": "自定义参数",
+  "Custom_params": "输入参数",
   "Edit_tool": "编辑工具",
   "Filed_is_deprecated": "该字段已弃用",
   "HTTPTools_Create_Type": "创建方式",
@@ -98,6 +98,7 @@
   "edit_app": "应用详情",
   "edit_info": "编辑信息",
   "edit_param": "编辑参数",
+  "empty_tool_tips": "请在左侧添加工具",
   "execute_time": "执行时间",
   "export_config_successful": "已复制配置，自动过滤部分敏感信息，请注意检查是否仍有敏感数据",
   "export_configs": "导出配置",
@@ -108,12 +109,15 @@
   "file_upload_tip": "开启后，可以上传文档/图片。文档保留7天，图片保留15天。使用该功能可能产生较多额外费用。为保证使用体验，使用该功能时，请选择上下文长度较大的AI模型。",
   "go_to_chat": "去对话",
   "go_to_run": "去运行",
+  "http_toolset_add_tips": "点击添加按钮来添加工具",
+  "http_toolset_config_tips": "点击开始配置来添加工具",
   "image_upload": "图片上传",
   "image_upload_tip": "如何启动模型图片识别能力",
   "import_configs": "导入配置",
   "import_configs_failed": "导入配置失败，请确保配置正常！",
   "import_configs_success": "导入成功",
   "initial_form": "初始状态",
+  "input_params_tips": "工具的输入参数，不会直接传递到请求地址，可在右侧通过 \"/\" 来引用变量",
   "interval.12_hours": "每12小时",
   "interval.2_hours": "每2小时",
   "interval.3_hours": "每3小时",

packages/web/i18n/zh-Hant/app.json

@@ -2,7 +2,7 @@
   "Add_tool": "添加工具",
   "AutoOptimize": "自動優化",
   "Click_to_delete_this_field": "點擊刪除該字段",
-  "Custom_params": "自定義參數",
+  "Custom_params": "輸入參數",
   "Filed_is_deprecated": "該字段已棄用",
   "HTTPTools_Create_Type": "創建方式",
   "HTTPTools_Create_Type_Tip": "選擇後不支持修改",
@@ -95,6 +95,7 @@
   "document_upload": "文件上傳",
   "edit_app": "應用詳情",
   "edit_info": "編輯資訊",
+  "empty_tool_tips": "請在左側添加工具",
   "execute_time": "執行時間",
   "export_config_successful": "已複製設定，自動過濾部分敏感資訊，請注意檢查是否仍有敏感資料",
   "export_configs": "匯出設定",
@@ -105,12 +106,15 @@
   "file_upload_tip": "開啟後，可以上傳文件／圖片。文件保留 7 天，圖片保留 15 天。使用這個功能可能產生較多額外費用。為了確保使用體驗，使用這個功能時，請選擇上下文長度較大的 AI 模型。",
   "go_to_chat": "前往對話",
   "go_to_run": "前往執行",
+  "http_toolset_add_tips": "點擊添加按鈕來添加工具",
+  "http_toolset_config_tips": "點擊開始配置來添加工具",
   "image_upload": "圖片上傳",
   "image_upload_tip": "如何啟用模型圖片辨識功能",
   "import_configs": "匯入設定",
   "import_configs_failed": "匯入設定失敗，請確認設定是否正常！",
   "import_configs_success": "匯入成功",
   "initial_form": "初始狀態",
+  "input_params_tips": "工具的輸入參數，不會直接傳遞到請求地址，可在右側通過 \"/\" 來引用變數",
   "interval.12_hours": "每 12 小時",
   "interval.2_hours": "每 2 小時",
   "interval.3_hours": "每 3 小時",