Merge remote-tracking branch 'upstream/v2' into PR/fix-1

Author: wangliang181230

.github/workflows/build-and-push.yml

@@ -7,7 +7,7 @@ on:
     inputs:
       dockerImageTag:
         description: 'Image Tag'
-        default: 'v2.9.0-dev'
+        default: 'v2.10.0-dev'
         required: true
       dockerImageTagWithLatest:
         description: '是否发布latest tag（正式发版时选择，测试版本切勿选择）'

apps/application/flow/step_node/ai_chat_step_node/impl/base_chat_node.py

@@ -383,7 +383,7 @@ def get_history_message(history_chat_record, dialogue_number, dialogue_type, run
             range(start_index if start_index > 0 else 0, len(history_chat_record))], [])
         for message in history_message:
             if isinstance(message.content, str):
-                message.content = re.sub('<form_rander>[\d\D]*?<\/form_rander>', '', message.content)
+                message.content = re.sub(r'<form_rander>.*?<\/form_rander>', '', message.content, flags=re.DOTALL)
         return history_message
 
     def generate_prompt_question(self, prompt):

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

@@ -132,15 +132,14 @@ def reset_application_node_dict(application_node_dict, runtime_node_id, node_dat
             application_node = application_node_dict[key]
             if application_node.get('runtime_node_id') == runtime_node_id:
                 content: str = application_node.get('content')
-                match = re.search('<form_rander>.*?</form_rander>', content)
+                match = re.search(r'<form_rander>.*?<\/form_rander>', content, flags=re.DOTALL)
                 if match:
                     form_setting_str = match.group().replace('<form_rander>', '').replace('</form_rander>', '')
                     form_setting = json.loads(form_setting_str)
                     form_setting['is_submit'] = True
                     form_setting['form_data'] = node_data
                     value = f'<form_rander>{json.dumps(form_setting)}</form_rander>'
-                    res = re.sub('<form_rander>.*?</form_rander>',
-                                 '${value}', content)
+                    res = re.sub(r'<form_rander>.*?<\/form_rander>', '${value}', content, flags=re.DOTALL)
                     application_node['content'] = res.replace('${value}', value)
     except Exception as e:
         maxkb_logger.warning(f'reset_application_node_dict error: {e}', exc_info=True)

apps/application/flow/step_node/intent_node/impl/base_intent_node.py

@@ -133,7 +133,7 @@ def get_history_message(history_chat_record, dialogue_number):
 
         for message in history_message:
             if isinstance(message.content, str):
-                message.content = re.sub('<form_rander>[\d\D]*?<\/form_rander>', '', message.content)
+                message.content = re.sub(r'<form_rander>.*?<\/form_rander>', '', message.content, flags=re.DOTALL)
         return history_message
 
     def build_system_prompt(self) -> str:

apps/application/flow/step_node/loop_node/impl/base_loop_node.py

@@ -216,10 +216,10 @@ def loop(workflow_manage_new_instance, node: INode, generate_loop):
 def get_tokens(loop_node_data):
     message_tokens = 0
     answer_tokens = 0
-    for details in loop_node_data:
-        message_tokens += sum([row.get('message_tokens') for row in details.values() if
+    for details in (loop_node_data or {}):
+        message_tokens += sum([row.get('message_tokens') or 0 for row in details.values() if
                                'message_tokens' in row and row.get('message_tokens') is not None])
-        answer_tokens += sum([row.get('answer_tokens') for row in details.values() if
+        answer_tokens += sum([row.get('answer_tokens') or 0 for row in details.values() if
                               'answer_tokens' in row and row.get('answer_tokens') is not None])
     return {'message_tokens': message_tokens, 'answer_tokens': answer_tokens}
 

apps/application/flow/step_node/parameter_extraction_node/impl/base_parameter_extraction_node.py

@@ -62,24 +62,24 @@ def generate_content(input_variable, variable_list):
     return value
 
 
-def json_loads(response, expected_fields):
+def json_loads(response, variable_list):
     if not response or not isinstance(response, str):
-        return {field: None for field in expected_fields}
+        return generate_example(variable_list)
 
     cleaned = response.strip()
 
     extraction_strategies = [
         lambda: json.loads(cleaned),
         lambda: json.loads(re.search(r'```(?:json)?\s*(\{.*?\})\s*```', cleaned, re.DOTALL).group(1)),
-        lambda: json.loads(re.search(r'(\{[\s\S]*\})', cleaned).group(1)),
+        lambda: json.loads(re.search(r'(\{.*\})', cleaned, flags=re.DOTALL).group(1)),
     ]
     for strategy in extraction_strategies:
         try:
             result = strategy()
             return result
         except:
             continue
-    return generate_example(expected_fields)
+    return generate_example(variable_list)
 
 
 class BaseParameterExtractionNode(IParameterExtractionNode):

apps/application/flow/step_node/question_node/impl/base_question_node.py

@@ -130,7 +130,7 @@ def get_history_message(history_chat_record, dialogue_number):
             range(start_index if start_index > 0 else 0, len(history_chat_record))], [])
         for message in history_message:
             if isinstance(message.content, str):
-                message.content = re.sub('<form_rander>[\d\D]*?<\/form_rander>', '', message.content)
+                message.content = re.sub(r'<form_rander>.*?<\/form_rander>', '', message.content, flags=re.DOTALL)
         return history_message
 
     def generate_prompt_question(self, prompt):

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

@@ -58,26 +58,24 @@ def get_field_value(debug_field_list, name, is_required):
 
 
 def valid_reference_value(_type, value, name):
-    try:
-        if _type == 'int':
-            instance_type = int | float
-        elif _type == 'boolean':
-            instance_type = bool
-        elif _type == 'float':
-            instance_type = float | int
-        elif _type == 'dict':
-            value = json.loads(value) if isinstance(value, str) else value
-            instance_type = dict
-        elif _type == 'array':
-            value = json.loads(value) if isinstance(value, str) else value
-            instance_type = list
-        elif _type == 'string':
-            instance_type = str
-        else:
-            raise Exception(_(
-                'Field: {name} Type: {_type} Value: {value} Unsupported types'
-            ).format(name=name, _type=_type, value=value))
-    except:
+    if _type == 'int':
+        instance_type = int | float
+    elif _type == 'boolean':
+        instance_type = bool
+    elif _type == 'float':
+        instance_type = float | int
+    elif _type == 'dict':
+        value = json.loads(value) if isinstance(value, str) else value
+        instance_type = dict
+    elif _type == 'array':
+        value = json.loads(value) if isinstance(value, str) else value
+        instance_type = list
+    elif _type == 'string':
+        instance_type = str
+    else:
+        maxkb_logger.error(_(
+            'Field: {name} Type: {_type} Value: {value} Unsupported this type'
+        ).format(name=name, _type=_type, value=value))
         return value
     if not isinstance(value, instance_type):
         raise Exception(_(

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

@@ -15,6 +15,7 @@
 from application.flow.i_step_node import NodeResult
 from application.flow.step_node.tool_node.i_tool_node import IToolNode
 from common.utils.common import common_convert_value
+from common.utils.logger import maxkb_logger
 from common.utils.tool_code import ToolExecutor
 from maxkb.const import CONFIG
 
@@ -33,26 +34,24 @@ def write_context(step_variable: Dict, global_variable: Dict, node, workflow):
 
 
 def valid_reference_value(_type, value, name):
-    try:
-        if _type == 'int':
-            instance_type = int | float
-        elif _type == 'boolean':
-            instance_type = bool
-        elif _type == 'float':
-            instance_type = float | int
-        elif _type == 'dict':
-            value = json.loads(value) if isinstance(value, str) else value
-            instance_type = dict
-        elif _type == 'array':
-            value = json.loads(value) if isinstance(value, str) else value
-            instance_type = list
-        elif _type == 'string':
-            instance_type = str
-        else:
-            raise Exception(_(
-                'Field: {name} Type: {_type} Value: {value} Unsupported types'
-            ).format(name=name, _type=_type, value=value))
-    except:
+    if _type == 'int':
+        instance_type = int | float
+    elif _type == 'boolean':
+        instance_type = bool
+    elif _type == 'float':
+        instance_type = float | int
+    elif _type == 'dict':
+        value = json.loads(value) if isinstance(value, str) else value
+        instance_type = dict
+    elif _type == 'array':
+        value = json.loads(value) if isinstance(value, str) else value
+        instance_type = list
+    elif _type == 'string':
+        instance_type = str
+    else:
+        maxkb_logger.error(_(
+            'Field: {name} Type: {_type} Value: {value} Unsupported this type'
+        ).format(name=name, _type=_type, value=value))
         return value
     if not isinstance(value, instance_type):
         raise Exception(_(

apps/application/flow/workflow_manage.py

@@ -236,6 +236,7 @@ def run_block(self, language='zh'):
         @return: 结果
         """
         try:
+            self.params['stream'] = True
             self.run_chain_async(None, None, language)
             while self.is_run():
                 pass