[Merged] fix: Fix the wrong result of not_contain_compare when source_value is a list

apps/application/flow/compare/not_contain_compare.py

@@ -20,7 +20,7 @@ def support(self, node_id, fields: List[str], source_value, compare, target_valu
     def compare(self, source_value, compare, target_value):
         if isinstance(source_value, str):
             return str(target_value) not in source_value
-        elif isinstance(self, list):
+        elif isinstance(source_value, list):
             return not any([str(item) == str(target_value) for item in source_value])
         else:
             return str(target_value) not in str(source_value)

apps/application/flow/step_node/application_node/impl/base_application_node.py

@@ -141,7 +141,7 @@ def reset_application_node_dict(application_node_dict, runtime_node_id, node_dat
                                  '${value}', content)
                     application_node['content'] = res.replace('${value}', value)
     except Exception as e:
-        pass
+        maxkb_logger.warning(f'reset_application_node_dict error: {e}', exc_info=True)
 
 
 class BaseApplicationNode(IApplicationNode):

apps/application/flow/step_node/tool_lib_node/impl/base_tool_lib_node.py

@@ -110,7 +110,8 @@ def convert_value(name: str, value, _type, is_required, source, node):
         if _type == 'int':
             return int(value)
         if _type == 'boolean':
-            value = 0 if ['0', '[]'].__contains__(value) else value
+            if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+                return False
             return bool(value)
         if _type == 'float':
             return float(value)

apps/application/flow/step_node/tool_node/impl/base_tool_node.py

@@ -85,7 +85,8 @@ def convert_value(name: str, value, _type, is_required, source, node):
         if _type == 'int':
             return int(value)
         if _type == 'boolean':
-            value = 0 if ['0', '[]'].__contains__(value) else value
+            if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+                return False
             return bool(value)
         if _type == 'float':
             return float(value)

apps/common/handle/impl/text/pdf_split_handle.py

@@ -49,8 +49,9 @@ def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_bu
             # 获取临时文件的路径
             temp_file_path = temp_file.name
 
-        pdf_document = fitz.open(temp_file_path)
+        pdf_document = None
         try:
+            pdf_document = fitz.open(temp_file_path)
             if type(limit) is str:
                 limit = int(limit)
             if type(with_filter) is str:
@@ -79,7 +80,8 @@ def handle(self, file, pattern_list: List, with_filter: bool, limit: int, get_bu
                 'content': []
             }
         finally:
-            pdf_document.close()
+            if pdf_document is not None:
+                pdf_document.close()
             # 处理完后可以删除临时文件
             os.remove(temp_file_path)
 
@@ -331,9 +333,15 @@ def get_content(self, file, save_image):
             # 获取临时文件的路径
             temp_file_path = temp_file.name
 
-        pdf_document = fitz.open(temp_file_path)
+        pdf_document = None
         try:
+            pdf_document = fitz.open(temp_file_path)
             return self.handle_pdf_content(file, pdf_document)
         except BaseException as e:
             traceback.print_exception(e)
             return f'{e}'
+        finally:
+            if pdf_document is not None:
+                pdf_document.close()
+            # 处理完后可以删除临时文件
+            os.remove(temp_file_path)

apps/common/utils/tool_code.py

@@ -73,7 +73,7 @@ def init_sandbox_dir():
             local_ip = socket.gethostbyname(hostname)
             banned_hosts = f"{banned_hosts},{local_ip}"
             banned_hosts = ",".join(s.strip() for s in banned_hosts.split(",") if s.strip() and s.strip().lower() != hostname.lower())
-        with open(sandbox_conf_file_path, "w") as f:
+        with open(sandbox_conf_file_path, "w", encoding='utf-8') as f:
             f.write(f"SANDBOX_PYTHON_BANNED_HOSTS={banned_hosts}\n")
             f.write(f"SANDBOX_PYTHON_ALLOW_DL_PATHS={','.join(sorted(set(filter(None, sys.path + _sandbox_python_sys_path + allow_dl_paths.split(',')))))}\n")
             f.write(f"SANDBOX_PYTHON_ALLOW_DL_OPEN={allow_dl_open}\n")

apps/knowledge/views/paragraph.py

@@ -64,7 +64,6 @@ def get(self, request: Request, workspace_id: str, knowledge_id: str, document_i
     @log(
         menu='Paragraph', operate='Create Paragraph',
         get_operation_object=lambda r, keywords: get_knowledge_document_operation_object(
-            get_knowledge_operation_object(keywords.get('knowledge_id')),
             get_knowledge_operation_object(keywords.get('knowledge_id')),
             get_document_operation_object(keywords.get('document_id'))
         ),

apps/tools/serializers/tool.py

@@ -536,7 +536,8 @@ def convert_value(name: str, value: str, _type: str, is_required: bool):
                 if _type == 'int':
                     return int(value)
                 if _type == 'boolean':
-                    value = 0 if ['0', '[]'].__contains__(value) else value
+                    if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+                        return False
                     return bool(value)
                 if _type == 'float':
                     return float(value)

apps/trigger/handler/impl/task/application_task.py

@@ -51,6 +51,8 @@ def valid_value_type(value, _type):
         return isinstance(value, int)
     if _type == 'boolean':
         return isinstance(value, bool)
+    if _type == 'any':
+        return True
     return isinstance(value, str)
 
 

apps/trigger/handler/impl/task/tool_task/base_tool_task.py

@@ -50,7 +50,8 @@ def _convert_value(_type, value):
     if _type == 'int':
         return int(value)
     if _type == 'boolean':
-        value = 0 if ['0', '[]'].__contains__(value) else value
+        if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+            return False
         return bool(value)
     if _type == 'float':
         return float(value)

apps/trigger/handler/impl/task/tool_task/workflow_tool_task.py

@@ -52,7 +52,8 @@ def _convert_value(_type, value):
     if _type == 'int':
         return int(value)
     if _type == 'boolean':
-        value = 0 if ['0', '[]'].__contains__(value) else value
+        if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+            return False
         return bool(value)
     if _type == 'float':
         return float(value)

apps/trigger/handler/impl/trigger/scheduled_trigger.py

@@ -243,11 +243,11 @@ def execute(trigger, **kwargs):
         if source_type == "APPLICATION":
             from trigger.handler.impl.task.application_task import ApplicationTask
 
-            ApplicationTask.execute(trigger_task, **kwargs)
+            ApplicationTask().execute(trigger_task, **kwargs)
         elif source_type == "TOOL":
             from trigger.handler.impl.task.tool_task import ToolTask
 
-            ToolTask.execute(trigger_task, **kwargs)
+            ToolTask().execute(trigger_task, **kwargs)
         else:
             maxkb_logger.warning(f"unsupported source_type={source_type}, task_id={trigger_task['id']}")
 

apps/trigger/handler/simple_tools.py

@@ -53,5 +53,6 @@ def undeploy(trigger, **kwargs):
     @return:
     """
     for simple_trigger_handler in simple_trigger_handlers:
-        return simple_trigger_handler.undeploy(trigger, **kwargs)
+        if simple_trigger_handler.support(trigger, **kwargs):
+            return simple_trigger_handler.undeploy(trigger, **kwargs)
     raise Exception("不支持的触发器类型")

ui/src/workflow/common/NodeSearch.vue

@@ -217,7 +217,6 @@ const handleSearch = (kw: string) => {
   }
 }
 const reSearch = () => {
-  console.log('ss')
   handleSearch(searchText.value)
 }
 // 生命周期