improve: extract method for safe loading yaml file and avoid using PyYaml's FullLoader (#4031)
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
import logging
|
||||
import os
|
||||
from collections import OrderedDict
|
||||
from collections.abc import Callable
|
||||
from typing import Any, AnyStr
|
||||
|
||||
import yaml
|
||||
from core.tools.utils.yaml_utils import load_yaml_file
|
||||
|
||||
|
||||
def get_position_map(
|
||||
@@ -17,21 +16,15 @@ def get_position_map(
|
||||
:param file_name: the YAML file name, default to '_position.yaml'
|
||||
:return: a dict with name as key and index as value
|
||||
"""
|
||||
try:
|
||||
position_file_name = os.path.join(folder_path, file_name)
|
||||
if not os.path.exists(position_file_name):
|
||||
return {}
|
||||
|
||||
with open(position_file_name, encoding='utf-8') as f:
|
||||
positions = yaml.safe_load(f)
|
||||
position_map = {}
|
||||
for index, name in enumerate(positions):
|
||||
if name and isinstance(name, str):
|
||||
position_map[name.strip()] = index
|
||||
return position_map
|
||||
except:
|
||||
logging.warning(f'Failed to load the YAML position file {folder_path}/{file_name}.')
|
||||
return {}
|
||||
position_file_name = os.path.join(folder_path, file_name)
|
||||
positions = load_yaml_file(position_file_name, ignore_error=True)
|
||||
position_map = {}
|
||||
index = 0
|
||||
for _, name in enumerate(positions):
|
||||
if name and isinstance(name, str):
|
||||
position_map[name.strip()] = index
|
||||
index += 1
|
||||
return position_map
|
||||
|
||||
|
||||
def sort_by_position_map(
|
||||
|
Reference in New Issue
Block a user