diff --git a/apps/tools/migrations/internal_tool.sql b/apps/tools/migrations/internal_tool.sql index 5e93dfa0000..21fc91cb7e0 100644 --- a/apps/tools/migrations/internal_tool.sql +++ b/apps/tools/migrations/internal_tool.sql @@ -62,7 +62,7 @@ def langsearch(query, apikey): raise Exception(f"API请求失败: {response.status_code}, 错误信息: {response.text}") return (response.text)', '[{"name": "query", "type": "string", "source": "reference", "is_required": true}]', '[{"attrs": {"type": "password", "maxlength": 200, "minlength": 1, "show-password": true, "show-word-limit": true}, "field": "apikey", "label": "API Key", "required": true, "input_type": "PasswordInput", "props_info": {"rules": [{"message": "API Key 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "API Key 长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}]', './tool/langsearch/icon.png', true, 'INTERNAL', 'INTERNAL', null, 'None', '', 'f0dd8f71-e4ee-11ee-8c84-a8a1595801ab', 'default'); INSERT INTO tool (create_time, update_time, id, name, label, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-03-17 08:16:32.626245 +00:00', '2025-03-17 08:16:32.626308 +00:00', '22c21b76-0308-11f0-9694-5618c4394482', 'MySQL 查询','database_search', '一个连接MySQL数据库执行SQL查询的工具', e' -def query_mysql(host,port, user, password, database, sql): +def query_mysql(host, port, user, password, database, sql: str, to_json_str: boolean): import pymysql import json from pymysql.cursors import DictCursor @@ -76,6 +76,7 @@ def query_mysql(host,port, user, password, database, sql): return float(obj) # 将 Decimal 转换为 float raise TypeError(f"Type {type(obj)} not serializable") + db = None try: # 创建连接 db = pymysql.connect( @@ -102,16 +103,20 @@ def query_mysql(host,port, user, password, database, sql): if isinstance(value, bytes): row[key] = value.decode("utf-8") # 转换为字符串 - # 将数据序列化为 JSON - json_data = json.dumps(data, default=default_serializer, ensure_ascii=False) - return json_data - - # 关闭数据库连接 - db.close() + if to_json_str is None or to_json_str is True: + # 将数据序列化为 JSON + return json.dumps(data, default=default_serializer, ensure_ascii=False) + else: + # 直接输出数组（list）对象 + return data except Exception as e: print(f"Error while connecting to MySQL: {e}") - raise e', '[{"name": "sql", "type": "string", "source": "reference", "is_required": true}]', '[{"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "host", "label": "host", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "host 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "host长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}, {"attrs": {"maxlength": 20, "minlength": 1, "show-word-limit": true}, "field": "port", "label": "port", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "port 为必填属性", "required": true}, {"max": 20, "min": 1, "message": "port长度在 1 到 20 个字符", "trigger": "blur"}]}, "default_value": "3306", "show_default_value": false}, {"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "user", "label": "user", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "user 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "user长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "root", "show_default_value": false}, {"attrs": {"type": "password", "maxlength": 200, "minlength": 1, "show-password": true, "show-word-limit": true}, "field": "password", "label": "password", "required": true, "input_type": "PasswordInput", "props_info": {"rules": [{"message": "password 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "password长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}, {"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "database", "label": "database", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "database 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "database长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}]', './tool/mysql/icon.png', true, 'INTERNAL', 'INTERNAL', null, 'None', null, 'f0dd8f71-e4ee-11ee-8c84-a8a1595801ab', 'default'); + raise e + + finally: + if db: + db.close()', '[{"name": "sql", "type": "string", "source": "reference", "is_required": true}, {"name": "to_json_str", "desc": "结果是否转换为JSON字符串：1=是 | 0=否", "type": "boolean", "source": "custom", "is_required": false, "default_value": "1"}]', '[{"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "host", "label": "host", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "host 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "host长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}, {"attrs": {"maxlength": 20, "minlength": 1, "show-word-limit": true}, "field": "port", "label": "port", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "port 为必填属性", "required": true}, {"max": 20, "min": 1, "message": "port长度在 1 到 20 个字符", "trigger": "blur"}]}, "default_value": "3306", "show_default_value": true}, {"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "user", "label": "user", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "user 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "user长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "root", "show_default_value": true}, {"attrs": {"type": "password", "maxlength": 200, "minlength": 1, "show-password": true, "show-word-limit": true}, "field": "password", "label": "password", "required": true, "input_type": "PasswordInput", "props_info": {"rules": [{"message": "password 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "password长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}, {"attrs": {"maxlength": 200, "minlength": 1, "show-word-limit": true}, "field": "database", "label": "database", "required": true, "input_type": "TextInput", "props_info": {"rules": [{"message": "database 为必填属性", "required": true}, {"max": 200, "min": 1, "message": "database长度在 1 到 200 个字符", "trigger": "blur"}]}, "default_value": "x", "show_default_value": false}]', './tool/mysql/icon.png', true, 'INTERNAL', 'INTERNAL', null, 'None', null, 'f0dd8f71-e4ee-11ee-8c84-a8a1595801ab', 'default'); INSERT INTO tool (create_time, update_time, id, name, label, "desc", code, input_field_list, init_field_list, icon, is_active, scope, tool_type, template_id, workspace_id, init_params, user_id, folder_id) VALUES ('2025-03-17 07:37:54.620836 +00:00', '2025-03-17 07:37:54.620887 +00:00', 'bd1e8b88-0302-11f0-87bb-5618c4394482', 'PostgreSQL 查询','database_search', '一个连接PostgreSQL数据库执行SQL查询的工具', e' def queryPgSQL(database, user, password, host, port, query): import psycopg2 diff --git a/ui/src/components/workflow-dropdown-menu/application/index.vue b/ui/src/components/workflow-dropdown-menu/application/index.vue index bcc5b7617f0..f29688e6126 100644 --- a/ui/src/components/workflow-dropdown-menu/application/index.vue +++ b/ui/src/components/workflow-dropdown-menu/application/index.vue @@ -213,7 +213,7 @@ function clickNodes(item: any, data?: any, type?: string) { tool_lib_id: data.id, input_field_list: data.input_field_list.map((field: any) => ({ ...field, - value: field.source == 'reference' ? [] : '', + value: field.source === 'reference' ? [] : (field.default_value || ''), })), } } @@ -239,7 +239,7 @@ function onmousedown(item: any, data?: any, type?: string) { tool_lib_id: data.id, input_field_list: data.input_field_list.map((field: any) => ({ ...field, - value: field.source == 'reference' ? [] : '', + value: field.source === 'reference' ? [] : (field.default_value || ''), })), } } diff --git a/ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue b/ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue index 8564dacd7fc..d260b2900db 100644 --- a/ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue +++ b/ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue @@ -181,7 +181,7 @@ function clickNodes(item: any, data?: any) { tool_lib_id: data.id, input_field_list: data.input_field_list.map((field: any) => ({ ...field, - value: field.source == 'reference' ? [] : '', + value: field.source === 'reference' ? [] : (field.default_value || ''), })), } } @@ -203,7 +203,7 @@ function onmousedown(item: any, data?: any) { tool_lib_id: data.id, input_field_list: data.input_field_list.map((field: any) => ({ ...field, - value: field.source == 'reference' ? [] : '', + value: field.source === 'reference' ? [] : (field.default_value || ''), })), } } diff --git a/ui/src/components/workflow-dropdown-menu/knowledge/index.vue b/ui/src/components/workflow-dropdown-menu/knowledge/index.vue index 088f501daa5..96455aaa7c4 100644 --- a/ui/src/components/workflow-dropdown-menu/knowledge/index.vue +++ b/ui/src/components/workflow-dropdown-menu/knowledge/index.vue @@ -204,7 +204,7 @@ function clickNodes(item: any, data?: any) { tool_lib_id: data.id, input_field_list: data.input_field_list.map((field: any) => ({ ...field, - value: field.source == 'reference' ? [] : '', + value: field.source === 'reference' ? [] : (field.default_value || ''), })), } } @@ -224,7 +224,7 @@ function onmousedown(item: any, data?: any) { tool_lib_id: data.id, input_field_list: data.input_field_list.map((field: any) => ({ ...field, - value: field.source == 'reference' ? [] : '', + value: field.source === 'reference' ? [] : (field.default_value || ''), })), } } diff --git a/ui/src/components/workflow-dropdown-menu/tool/index.vue b/ui/src/components/workflow-dropdown-menu/tool/index.vue index c000b05dce4..1761db3f10c 100644 --- a/ui/src/components/workflow-dropdown-menu/tool/index.vue +++ b/ui/src/components/workflow-dropdown-menu/tool/index.vue @@ -180,7 +180,7 @@ function clickNodes(item: any, data?: any) { tool_lib_id: data.id, input_field_list: data.input_field_list.map((field: any) => ({ ...field, - value: field.source == 'reference' ? [] : '', + value: field.source === 'reference' ? [] : (field.default_value || ''), })), } } @@ -202,7 +202,7 @@ function onmousedown(item: any, data?: any) { tool_lib_id: data.id, input_field_list: data.input_field_list.map((field: any) => ({ ...field, - value: field.source == 'reference' ? [] : '', + value: field.source === 'reference' ? [] : (field.default_value || ''), })), } } diff --git a/ui/src/locales/lang/en-US/dynamics-form.ts b/ui/src/locales/lang/en-US/dynamics-form.ts index 3979da874c6..a7f476194d0 100644 --- a/ui/src/locales/lang/en-US/dynamics-form.ts +++ b/ui/src/locales/lang/en-US/dynamics-form.ts @@ -55,6 +55,10 @@ export default { label: 'description', placeholder: 'Please enter a description', }, + default_value: { + label: 'Default Value', + placeholder: 'Please enter a default value', + }, }, TreeSelect: { label: 'Tree Select', diff --git a/ui/src/locales/lang/zh-CN/dynamics-form.ts b/ui/src/locales/lang/zh-CN/dynamics-form.ts index 5ac1974cec3..8ba8804ea7f 100644 --- a/ui/src/locales/lang/zh-CN/dynamics-form.ts +++ b/ui/src/locales/lang/zh-CN/dynamics-form.ts @@ -56,6 +56,10 @@ export default { label: '描述', placeholder: '请输入描述', }, + default_value: { + label: '默认值', + placeholder: '请输入默认值', + }, }, TreeSelect: { label: '树形选择器', diff --git a/ui/src/locales/lang/zh-Hant/dynamics-form.ts b/ui/src/locales/lang/zh-Hant/dynamics-form.ts index 9f642b1ec06..f1539c3c7dc 100644 --- a/ui/src/locales/lang/zh-Hant/dynamics-form.ts +++ b/ui/src/locales/lang/zh-Hant/dynamics-form.ts @@ -55,6 +55,10 @@ export default { label: '描述', placeholder: '請輸入描述', }, + default_value: { + label: '默認值', + placeholder: '請輸入默認值', + }, }, TreeSelect: { label: '樹狀選擇器', diff --git a/ui/src/views/tool/ToolDebugDrawer.vue b/ui/src/views/tool/ToolDebugDrawer.vue index aed5afc7e06..0fe373ea920 100644 --- a/ui/src/views/tool/ToolDebugDrawer.vue +++ b/ui/src/views/tool/ToolDebugDrawer.vue @@ -61,6 +61,17 @@
{{ item.name }} + + + + * {{ item.type }} @@ -182,7 +193,7 @@ const open = (data: any) => { if (data.input_field_list.length > 0) { data.input_field_list.forEach((item: any) => { form.value.debug_field_list.push({ - value: '', + value: (item.default_value || ''), ...item, }) }) diff --git a/ui/src/views/tool/component/FieldFormDialog.vue b/ui/src/views/tool/component/FieldFormDialog.vue index f174898d484..a2205c5f6c2 100644 --- a/ui/src/views/tool/component/FieldFormDialog.vue +++ b/ui/src/views/tool/component/FieldFormDialog.vue @@ -43,6 +43,15 @@ + + + @@ -97,6 +106,7 @@ watch(dialogVisible, (bool) => { type: typeOptions[0], desc: '', source: 'reference', + default_value: '', is_required: true, } isEdit.value = false diff --git a/ui/src/workflow/nodes/tool-lib-node/index.vue b/ui/src/workflow/nodes/tool-lib-node/index.vue index 23a668d2498..6ce81b473b7 100644 --- a/ui/src/workflow/nodes/tool-lib-node/index.vue +++ b/ui/src/workflow/nodes/tool-lib-node/index.vue @@ -169,7 +169,7 @@ const update_field = () => { if (find_field && find_field.source == item.source) { return { ...item, value: JSON.parse(JSON.stringify(find_field.value)) } } - return { ...item, value: item.source == 'reference' ? [] : '' } + return { ...item, value: item.source === 'reference' ? [] : (item.default_value || '') } }) set(props.nodeModel.properties.node_data, 'input_field_list', merge_input_field_list) set(props.nodeModel.properties, 'status', ok.data.is_active ? 200 : 500) diff --git a/ui/src/workflow/nodes/tool-node/index.vue b/ui/src/workflow/nodes/tool-node/index.vue index 3758324ae92..410da117fe2 100644 --- a/ui/src/workflow/nodes/tool-node/index.vue +++ b/ui/src/workflow/nodes/tool-node/index.vue @@ -206,7 +206,7 @@ function refreshFieldList(data: any) { const list = cloneDeep(props.nodeModel.properties.node_data.input_field_list) const obj = { ...data, - value: data.source === 'reference' ? [] : '', + value: data.source === 'reference' ? [] : (data.default_value || ''), } if (currentIndex.value !== null) { list.splice(currentIndex.value, 1, obj)