fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

my.core.query: handle additional unsortable case

Browse source
This commit is contained in:
Sean Breckenridge 2021-03-27 18:16:45 -07:00
parent d6f32ce787
commit 9730951185
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
my/core/query.py
View file

@ -70,7 +70,8 @@ def _generate_order_by_func(
obj_res: Res[T], obj_res: Res[T],
key: Optional[str] = None, key: Optional[str] = None,
where_function: Optional[Where] = None, where_function: Optional[Where] = None,
default: Optional[U] = None default: Optional[U] = None,
force_unsortable: bool = False,
) -> Optional[OrderFunc]: ) -> Optional[OrderFunc]:
""" """
Accepts an object Res[T] (Instance of some class or Exception) Accepts an object Res[T] (Instance of some class or Exception)
@ -84,6 +85,10 @@ def _generate_order_by_func(
If a 'default' is provided, it is used for Exceptions and if an If a 'default' is provided, it is used for Exceptions and if an
OrderFunc function could not be determined for this type OrderFunc function could not be determined for this type
If 'force_unsortable' is True, that means this returns an OrderFunc
which returns None for any input -- which would wrap items of this
type in an Unsortable object
If a key is given (the user specified which attribute), the function If a key is given (the user specified which attribute), the function
returns that key from the object returns that key from the object
tries to find that key on the object tries to find that key on the object
@ -156,7 +161,11 @@ pass 'drop_exceptions' to ignore exceptions""")
# warn here? it seems like you typically wouldn't want to just set the order by to # warn here? it seems like you typically wouldn't want to just set the order by to
# the same value everywhere, but maybe you did this on purpose? # the same value everywhere, but maybe you did this on purpose?
return lambda _o: default return lambda _o: default
elif force_unsortable:
# generate a dummy function which returns None
# this causes this type of object to be classified as an unsortable item
return lambda _o: None
else:
return None # couldn't compute a OrderFunc for this class/instance return None # couldn't compute a OrderFunc for this class/instance
@ -393,9 +402,9 @@ Your 'src' may have been empty of the 'where' clause filtered the iterable to no
for obj_res in itr1: for obj_res in itr1:
key: Any = _determine_order_by_value_key(obj_res) key: Any = _determine_order_by_value_key(obj_res)
if key not in order_by_lookup: if key not in order_by_lookup:
keyfunc: Optional[OrderFunc] = _generate_order_by_func(obj_res, where_function=order_value, default=default) keyfunc: Optional[OrderFunc] = _generate_order_by_func(obj_res, where_function=order_value, default=default, force_unsortable=True)
if keyfunc is None: # should never be none, as we have force_unsortable=True
raise QueryException(f"Error while ordering: could not determine how to order {obj_res}") assert keyfunc is not None
order_by_lookup[key] = keyfunc order_by_lookup[key] = keyfunc
# set the 'itr' (iterator in higher scope) # set the 'itr' (iterator in higher scope)
@ -542,10 +551,10 @@ def test_order_key_multi_type() -> None:
def test_couldnt_determine_order() -> None: def test_couldnt_determine_order() -> None:
import pytest
with pytest.raises(QueryException, match=r"could not determine how to order"):
res = list(select(iter([object()]), order_value=lambda o: isinstance(o, datetime))) res = list(select(iter([object()]), order_value=lambda o: isinstance(o, datetime)))
assert len(res) == 1
assert isinstance(res[0], Unsortable)
assert type(res[0].obj) == object
# same value type, different keys, with clashing keys # same value type, different keys, with clashing keys