Fix some issue by ponytailer · Pull Request #996 · ormar-orm/ormar
Expand Up
@@ -12,6 +12,7 @@
Type,
Union,
)
from functools import lru_cache
if TYPE_CHECKING: # pragma no cover from ormar import Model, BaseField Expand Down Expand Up @@ -59,28 +60,32 @@ def translate_list_to_dict( # noqa: CCR001 :return: converted to dictionary input list :rtype: Dict """ new_dict: Dict = dict() for path in list_to_trans: current_level = new_dict parts = path.split("__") def_val: Any = ... if is_order: if parts[0][0] == "-": def_val = "desc" parts[0] = parts[0][1:] else: def_val = "asc"
for ind, part in enumerate(parts): is_last = ind == len(parts) - 1 if check_node_not_dict_or_not_last_node( part=part, is_last=is_last, current_level=current_level ): current_level[part] = dict() elif part not in current_level: current_level[part] = def_val current_level = current_level[part] return new_dict @lru_cache(maxsize=128) def _translate(translate_set: str) -> Dict: new_dict: Dict = dict() for path in translate_set.split(":"): current_level = new_dict parts = path.split("__") def_val: Any = ... if is_order: if parts[0][0] == "-": def_val = "desc" parts[0] = parts[0][1:] else: def_val = "asc"
for ind, part in enumerate(parts): is_last = ind == len(parts) - 1 if check_node_not_dict_or_not_last_node( part=part, is_last=is_last, current_level=current_level ): current_level[part] = dict() elif part not in current_level: current_level[part] = def_val current_level = current_level[part] return new_dict
return dict() if not list_to_trans else _translate(":".join(sorted(list_to_trans)))
def convert_set_to_required_dict(set_to_convert: set) -> Dict: Expand Down
if TYPE_CHECKING: # pragma no cover from ormar import Model, BaseField Expand Down Expand Up @@ -59,28 +60,32 @@ def translate_list_to_dict( # noqa: CCR001 :return: converted to dictionary input list :rtype: Dict """ new_dict: Dict = dict() for path in list_to_trans: current_level = new_dict parts = path.split("__") def_val: Any = ... if is_order: if parts[0][0] == "-": def_val = "desc" parts[0] = parts[0][1:] else: def_val = "asc"
for ind, part in enumerate(parts): is_last = ind == len(parts) - 1 if check_node_not_dict_or_not_last_node( part=part, is_last=is_last, current_level=current_level ): current_level[part] = dict() elif part not in current_level: current_level[part] = def_val current_level = current_level[part] return new_dict @lru_cache(maxsize=128) def _translate(translate_set: str) -> Dict: new_dict: Dict = dict() for path in translate_set.split(":"): current_level = new_dict parts = path.split("__") def_val: Any = ... if is_order: if parts[0][0] == "-": def_val = "desc" parts[0] = parts[0][1:] else: def_val = "asc"
for ind, part in enumerate(parts): is_last = ind == len(parts) - 1 if check_node_not_dict_or_not_last_node( part=part, is_last=is_last, current_level=current_level ): current_level[part] = dict() elif part not in current_level: current_level[part] = def_val current_level = current_level[part] return new_dict
return dict() if not list_to_trans else _translate(":".join(sorted(list_to_trans)))
def convert_set_to_required_dict(set_to_convert: set) -> Dict: Expand Down