Merge pull request #12 from z275748353/main

fix bug

Author: ganisback

data_celery/job/tasks.py

@@ -151,8 +151,14 @@ def run_pipline_job_task(config,job,session,user_id, user_name, user_token):
     with tempfile.NamedTemporaryFile(mode='w', delete=False) as tmpfile:
         tmpfile.write(yaml_content)
         temp_dir_str = tmpfile.name
-    cfg = init_configs(['--config', temp_dir_str, '--user_id', user_id,
-                        '--user_name', user_name, '--user_token', user_token],redirect=False)
+
+    try:
+        cfg = init_configs(['--config', temp_dir_str, '--user_id', user_id,
+                            '--user_name', user_name, '--user_token', user_token], redirect=False)
+    except:
+        insert_pipline_job_run_task_log_error(job.uuid, f"{job.uuid} :Config initialization failed")
+        raise
+
     # return
     temp_filename = os.path.basename(temp_dir_str)
 
@@ -164,8 +170,10 @@ def run_pipline_job_task(config,job,session,user_id, user_name, user_token):
         os.remove(temp_work_file)
     except FileNotFoundError:
         insert_pipline_job_run_task_log_error(job.uuid, f"{job.uuid} :not exists yaml config - {temp_work_file}")
+        raise
     except PermissionError:
         insert_pipline_job_run_task_log_error(job.uuid, f"{job.uuid} :Permission denied. You cannot remove - {temp_work_file}")
+        raise
 
     with open(config_file, mode='w') as file:
         file.write(config.yaml())

data_engine/config/config.py

@@ -631,12 +631,15 @@ def update_op_process(cfg, parser):
         action.dest for action in parser._actions
         if hasattr(action, 'dest') and isinstance(action, ActionTypeHint)
     ])
-
-    temp_args = namespace_to_arg_list(temp_cfg,
-                                      includes=recognized_args,
-                                      excludes=['config'])
-    temp_args = ['--config', temp_cfg.config[0].absolute] + temp_args
-    temp_parser.parse_args(temp_args)
+    try:
+        temp_args = namespace_to_arg_list(temp_cfg,
+                                          includes=recognized_args,
+                                          excludes=['config'])
+        temp_args = ['--config', temp_cfg.config[0].absolute] + temp_args
+        temp_parser.parse_args(temp_args)
+    except:
+        logger.error('Config initialization failed')
+        raise "Config initialization failed"
     return cfg
 
 

data_engine/core/data.py

@@ -204,7 +204,7 @@ def process(self,
         except:  # noqa: E722
             logger.error(f'An error occurred during Op [{op._name}].')
             traceback.print_exc()
-            exit(1)
+            # exit(1)
         finally:
             if checkpointer and dataset is not self:
                 logger.info('Writing checkpoint of dataset processed by '

data_engine/core/executor_tools.py

@@ -40,6 +40,7 @@ def __init__(self, *, tool_def: Tool_def, params: ExecutedParams):
                     redirect=self.tool_def.executor_type == 'default')
 
     def run(self):
+
         """
         Running the dataset process pipeline.
 
@@ -48,7 +49,9 @@ def run(self):
         """
         # 1. setup tool
         logger.info('Preparing tool...')
+
         tool_obj: TOOL = load_tool(self.tool_def, self.executed_params)
+
         with TRACE_HELPER_TOOL.trace_block(
             "start"
         ):

data_server/algo_templates/utils/parse_algo_dslText.py

@@ -76,6 +76,37 @@ def convert_raw_to_processed(raw_yaml: str) -> str:
                 except Exception as e:
                     print(f"查询operator_config_select_options失败: {e}")
                     pass
+            # handle_string_array_format_like_"['1','2']"_or_"[''1'', ''2'']"
+            elif param_value and isinstance(param_value, str) and param_value.startswith('[') and param_value.endswith(']'):
+                try:
+                    import ast
+                    # try_to_parse_the_string_array
+                    # First, handle the double single quote escape format [" 1 ", "2"] -> [" 1 ", "2"]
+                    normalized_value = param_value.replace("''", "'")
+                    parsed_list = ast.literal_eval(normalized_value)
+                    if isinstance(parsed_list, list):
+                        from data_server.operator.mapper.operator_mapper import get_operator_config_select_option_by_id
+                        from data_server.database.session import get_sync_session
+                        converted_list = []
+                        for item in parsed_list:
+                            if isinstance(item, str) and item.isdigit():
+                                try:
+                                    db = get_sync_session()
+                                    option_record = get_operator_config_select_option_by_id(db, int(item))
+                                    if option_record and hasattr(option_record, 'name'):
+                                        converted_list.append(option_record.name)
+                                    else:
+                                        converted_list.append(item)
+                                    db.close()
+                                except Exception as e:
+                                    print(f"查询operator_config_select_options失败: {e}")
+                                    converted_list.append(item)
+                            else:
+                                converted_list.append(item)
+                        param_value = converted_list
+                except (ValueError, SyntaxError) as e:
+                    print(f"解析字符串数组失败: {e}")
+                    pass
             # handle_the_numeric_id_of_list_type
             elif param_value and isinstance(param_value, list):
                 from data_server.operator.mapper.operator_mapper import get_operator_config_select_option_by_id
@@ -135,8 +166,13 @@ def convert_string_list_to_yaml(match):
         return f"{param_name}: {list_content}"
 
     # regular_expressions_match_lists_in_string_format
-    pattern = r"(\s+\w+):\s*'(\[.*?\])'"
-    yaml_str = re.sub(pattern, convert_string_list_to_yaml, yaml_str)
+    # 匹配单引号包裹的字符串数组：'[...]'
+    pattern1 = r"(\s+\w+):\s*'(\[.*?\])'"
+    yaml_str = re.sub(pattern1, convert_string_list_to_yaml, yaml_str)
+    
+    # 匹配双引号包裹的字符串数组："[...]"
+    pattern2 = r'(\s+\w+):\s*"(\[.*?\])"'
+    yaml_str = re.sub(pattern2, convert_string_list_to_yaml, yaml_str)
 
     yaml_str = yaml_str.replace(": {}", ":")
 
@@ -207,7 +243,7 @@ def convert_string_list_to_yaml(match):
         default_value: '18'
         is_required: false
         is_spinner: false
-        final_value: '18'
+        final_value: '[''41'', ''42'', ''43'', ''44'', ''45'']'
         display_name: 模型名称
 edges: []
 

data_server/api/endpoints/operator_permission.py

@@ -141,7 +141,9 @@ def read_permissions_by_operator_api(operator_id: int, db: Session = Depends(get
 def read_permissions_by_user_api(uuid: str, db: Session = Depends(get_sync_session)):
 
     try:
+
         permissions = get_permissions_by_user(db, uuid)
+
         return response_success(data=permissions, msg="获取用户权限成功")
     except Exception as e:
         return response_fail(msg=f"获取用户权限失败: {str(e)}")