Refactored cpl-query Iterable & Enumerable #129
This commit is contained in:
@@ -23,8 +23,6 @@ from collections import namedtuple
|
||||
# imports:
|
||||
from .iterable_abc import IterableABC
|
||||
from .iterable import Iterable
|
||||
from .ordered_iterable_abc import OrderedIterableABC
|
||||
from .ordered_iterable import OrderedIterable
|
||||
|
||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
|
||||
version_info = VersionInfo(major='2022', minor='10', micro='0.post2')
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
from typing import Callable, Optional, Union, Iterable as IterableType
|
||||
from typing import Iterable as IterableType
|
||||
|
||||
from cpl_query._helper import is_number
|
||||
from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument, InvalidTypeException, IndexOutOfRangeException
|
||||
from cpl_query.iterable.iterable_abc import IterableABC
|
||||
from cpl_query.iterable.ordered_iterable_abc import OrderedIterableABC
|
||||
|
||||
|
||||
def _default_lambda(x: object):
|
||||
@@ -14,251 +11,3 @@ class Iterable(IterableABC):
|
||||
|
||||
def __init__(self, t: type = None, values: IterableType = None):
|
||||
IterableABC.__init__(self, t, values)
|
||||
|
||||
def all(self, _func: Callable = None) -> bool:
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
return self.where(_func).count() == self.count()
|
||||
|
||||
def any(self, _func: Callable = None) -> bool:
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
return self.where(_func).count() > 0
|
||||
|
||||
def average(self, _func: Callable = None) -> Union[int, float, complex]:
|
||||
if _func is None and not is_number(self.type):
|
||||
raise InvalidTypeException()
|
||||
|
||||
return self.sum(_func) / self.count()
|
||||
|
||||
def contains(self, _value: object) -> bool:
|
||||
if _value is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.value)
|
||||
|
||||
return self.where(lambda x: x == _value).count() > 0
|
||||
|
||||
def count(self, _func: Callable = None) -> int:
|
||||
if _func is None:
|
||||
return self.__len__()
|
||||
|
||||
return self.where(_func).__len__()
|
||||
|
||||
def distinct(self, _func: Callable = None) -> 'Iterable':
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
result = Iterable()
|
||||
known_values = []
|
||||
for element in self:
|
||||
value = _func(element)
|
||||
if value in known_values:
|
||||
continue
|
||||
|
||||
known_values.append(value)
|
||||
result.append(element)
|
||||
|
||||
return result
|
||||
|
||||
def element_at(self, _index: int) -> any:
|
||||
if _index is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.index)
|
||||
|
||||
return self[_index]
|
||||
|
||||
def element_at_or_default(self, _index: int) -> any:
|
||||
if _index is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.index)
|
||||
|
||||
try:
|
||||
return self[_index]
|
||||
except IndexError:
|
||||
return None
|
||||
|
||||
def first(self) -> any:
|
||||
if len(self) == 0:
|
||||
raise IndexOutOfRangeException()
|
||||
|
||||
return self[0]
|
||||
|
||||
def first_or_default(self) -> Optional[any]:
|
||||
if len(self) == 0:
|
||||
return None
|
||||
|
||||
return self[0]
|
||||
|
||||
def group_by(self, _func: Callable = None) -> 'Iterable':
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
groups = {}
|
||||
|
||||
for v in self:
|
||||
value = _func(v)
|
||||
if v not in groups:
|
||||
groups[value] = Iterable(type(v))
|
||||
|
||||
groups[value].append(v)
|
||||
|
||||
return Iterable(Iterable).extend(groups.values())
|
||||
|
||||
def last(self) -> any:
|
||||
if len(self) == 0:
|
||||
raise IndexOutOfRangeException()
|
||||
|
||||
return self[len(self) - 1]
|
||||
|
||||
def last_or_default(self) -> Optional[any]:
|
||||
if len(self) == 0:
|
||||
return None
|
||||
|
||||
return self[len(self) - 1]
|
||||
|
||||
def for_each(self, _func: Callable = None) -> 'Iterable':
|
||||
if _func is not None:
|
||||
for element in self:
|
||||
_func(element)
|
||||
|
||||
return self
|
||||
|
||||
def max(self, _func: Callable = None) -> Union[int, float, complex]:
|
||||
if _func is None and not is_number(self.type):
|
||||
raise InvalidTypeException()
|
||||
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
return _func(max(self, key=_func))
|
||||
|
||||
def median(self, _func=None) -> Union[int, float]:
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
result = self.order_by(_func).select(_func).to_list()
|
||||
length = len(result)
|
||||
i = int(length / 2)
|
||||
return (
|
||||
result[i]
|
||||
if length % 2 == 1
|
||||
else (float(result[i - 1]) + float(result[i])) / float(2)
|
||||
)
|
||||
|
||||
def min(self, _func: Callable = None) -> Union[int, float, complex]:
|
||||
if _func is None and not is_number(self.type):
|
||||
raise InvalidTypeException()
|
||||
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
return _func(min(self, key=_func))
|
||||
|
||||
def order_by(self, _func: Callable = None) -> OrderedIterableABC:
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
from cpl_query.iterable.ordered_iterable import OrderedIterable
|
||||
return OrderedIterable(self.type, _func, sorted(self, key=_func))
|
||||
|
||||
def order_by_descending(self, _func: Callable = None) -> OrderedIterableABC:
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
from cpl_query.iterable.ordered_iterable import OrderedIterable
|
||||
return OrderedIterable(self.type, _func, sorted(self, key=_func, reverse=True))
|
||||
|
||||
def reverse(self) -> 'Iterable':
|
||||
return Iterable().extend(reversed(self))
|
||||
|
||||
def select(self, _func: Callable = None) -> 'Iterable':
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
result = Iterable()
|
||||
result.extend(_func(_o) for _o in self)
|
||||
return result
|
||||
|
||||
def select_many(self, _func: Callable = None) -> 'Iterable':
|
||||
result = Iterable()
|
||||
# The line below is pain. I don't understand anything of it...
|
||||
# written on 09.11.2022 by Sven Heidemann
|
||||
elements = [_a for _o in self for _a in _func(_o)]
|
||||
|
||||
result.extend(elements)
|
||||
return result
|
||||
|
||||
def single(self) -> any:
|
||||
if len(self) > 1:
|
||||
raise Exception('Found more than one element')
|
||||
elif len(self) == 0:
|
||||
raise Exception('Found no element')
|
||||
|
||||
return self[0]
|
||||
|
||||
def single_or_default(self) -> Optional[any]:
|
||||
if len(self) > 1:
|
||||
raise Exception('Index out of range')
|
||||
elif len(self) == 0:
|
||||
return None
|
||||
|
||||
return self[0]
|
||||
|
||||
def skip(self, _index: int) -> 'Iterable':
|
||||
if _index is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.index)
|
||||
|
||||
return Iterable(self.type, values=self[_index:])
|
||||
|
||||
def skip_last(self, _index: int) -> 'Iterable':
|
||||
if _index is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.index)
|
||||
|
||||
index = len(self) - _index
|
||||
|
||||
result = Iterable()
|
||||
result.extend(self[:index])
|
||||
return result
|
||||
|
||||
def sum(self, _func: Callable = None) -> Union[int, float, complex]:
|
||||
if _func is None and not is_number(self.type):
|
||||
raise InvalidTypeException()
|
||||
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
result = 0
|
||||
for x in self:
|
||||
result += _func(x)
|
||||
|
||||
return result
|
||||
|
||||
def take(self, _index: int) -> 'Iterable':
|
||||
if _index is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.index)
|
||||
|
||||
result = Iterable()
|
||||
result.extend(self[:_index])
|
||||
return result
|
||||
|
||||
def take_last(self, _index: int) -> 'Iterable':
|
||||
index = len(self) - _index
|
||||
|
||||
if index >= len(self) or index < 0:
|
||||
raise IndexOutOfRangeException()
|
||||
|
||||
result = Iterable()
|
||||
result.extend(self[index:])
|
||||
return result
|
||||
|
||||
def where(self, _func: Callable = None) -> 'Iterable':
|
||||
if _func is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.func)
|
||||
|
||||
if _func is None:
|
||||
_func = _default_lambda
|
||||
|
||||
result = Iterable(self.type)
|
||||
for element in self:
|
||||
if _func(element):
|
||||
result.append(element)
|
||||
|
||||
return result
|
||||
|
||||
@@ -4,54 +4,45 @@ from typing import Iterable
|
||||
from cpl_query.base.queryable_abc import QueryableABC
|
||||
|
||||
|
||||
class IterableABC(list, QueryableABC):
|
||||
class IterableABC(QueryableABC):
|
||||
r"""ABC to define functions on list
|
||||
"""
|
||||
|
||||
@abstractmethod
|
||||
def __init__(self, t: type = None, values: Iterable = None):
|
||||
values = [] if values is None else values
|
||||
list.__init__(self, values)
|
||||
QueryableABC.__init__(self, t, values)
|
||||
|
||||
if t is None and len(values) > 0:
|
||||
t = type(values[0])
|
||||
def __setitem__(self, i, val):
|
||||
self._check_type(val)
|
||||
values = [*self._values]
|
||||
values[i] = val
|
||||
self._set_values(values)
|
||||
|
||||
self._type = t
|
||||
|
||||
def __repr__(self):
|
||||
return f'<{type(self).__name__} {list(self).__repr__()}>'
|
||||
def __delitem__(self, i):
|
||||
values = [*self._values]
|
||||
del values[i]
|
||||
self._set_values(values)
|
||||
|
||||
@property
|
||||
def type(self) -> type:
|
||||
return self._type
|
||||
|
||||
def to_list(self) -> list:
|
||||
r"""Converts :class: `cpl_query.base.sequence_abc.SequenceABC` to :class: `list`
|
||||
|
||||
Returns
|
||||
-------
|
||||
:class: `list`
|
||||
"""
|
||||
return [x for x in self]
|
||||
|
||||
def __str__(self):
|
||||
return str(self.to_list())
|
||||
|
||||
def append(self, __object: object) -> None:
|
||||
def append(self, _object: object):
|
||||
self.add(_object)
|
||||
|
||||
def add(self, _object: object):
|
||||
r"""Adds element to list
|
||||
Parameter
|
||||
---------
|
||||
__object: :class:`object`
|
||||
_object: :class:`object`
|
||||
value
|
||||
"""
|
||||
if self._type is not None and type(__object) != self._type and not isinstance(type(__object), self._type) and not issubclass(type(__object), self._type):
|
||||
raise Exception(f'Unexpected type: {type(__object)}\nExpected type: {self._type}')
|
||||
|
||||
if len(self) == 0 and self._type is None:
|
||||
self._type = type(__object)
|
||||
|
||||
# self._values = SequenceValues([*self._values, __object], self._type)
|
||||
super().append(__object)
|
||||
self._check_type(_object)
|
||||
values = [*self._values, _object]
|
||||
self._set_values(values)
|
||||
|
||||
def extend(self, __iterable: Iterable) -> 'IterableABC':
|
||||
r"""Adds elements of given list to list
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
from collections.abc import Callable
|
||||
|
||||
from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
|
||||
from cpl_query.iterable.iterable import Iterable
|
||||
from cpl_query.iterable.ordered_iterable_abc import OrderedIterableABC
|
||||
|
||||
|
||||
class OrderedIterable(Iterable, OrderedIterableABC):
|
||||
r"""Implementation of :class: `cpl_query.extension.Iterable` `cpl_query.extension.OrderedIterableABC`
|
||||
"""
|
||||
|
||||
def __init__(self, _t: type, _func: Callable = None, _values: Iterable = None):
|
||||
Iterable.__init__(self, _t)
|
||||
OrderedIterableABC.__init__(self, _t, _func, _values)
|
||||
|
||||
def then_by(self: OrderedIterableABC, _func: Callable) -> OrderedIterableABC:
|
||||
if self is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.list)
|
||||
|
||||
if _func is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.func)
|
||||
|
||||
self._funcs.append(_func)
|
||||
|
||||
return OrderedIterable(self.type, _func, sorted(self, key=lambda *args: [f(*args) for f in self._funcs]))
|
||||
|
||||
def then_by_descending(self: OrderedIterableABC, _func: Callable) -> OrderedIterableABC:
|
||||
if self is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.list)
|
||||
|
||||
if _func is None:
|
||||
raise ArgumentNoneException(ExceptionArgument.func)
|
||||
|
||||
self._funcs.append(_func)
|
||||
return OrderedIterable(self.type, _func, sorted(self, key=lambda *args: [f(*args) for f in self._funcs], reverse=True))
|
||||
@@ -1,43 +0,0 @@
|
||||
from abc import abstractmethod
|
||||
from collections.abc import Callable
|
||||
from typing import Iterable
|
||||
|
||||
from cpl_query.iterable.iterable_abc import IterableABC
|
||||
|
||||
|
||||
class OrderedIterableABC(IterableABC):
|
||||
|
||||
@abstractmethod
|
||||
def __init__(self, _t: type, _func: Callable = None, _values: Iterable = None):
|
||||
IterableABC.__init__(self, _t, _values)
|
||||
self._funcs: list[Callable] = []
|
||||
if _func is not None:
|
||||
self._funcs.append(_func)
|
||||
|
||||
@abstractmethod
|
||||
def then_by(self, func: Callable) -> 'OrderedIterableABC':
|
||||
r"""Sorts OrderedList in ascending order by function
|
||||
|
||||
Parameter
|
||||
---------
|
||||
func: :class:`Callable`
|
||||
|
||||
Returns
|
||||
-------
|
||||
list of :class:`cpl_query.iterable.ordered_iterable_abc.OrderedIterableABC`
|
||||
"""
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def then_by_descending(self, func: Callable) -> 'OrderedIterableABC':
|
||||
r"""Sorts OrderedList in descending order by function
|
||||
|
||||
Parameter
|
||||
---------
|
||||
func: :class:`Callable`
|
||||
|
||||
Returns
|
||||
-------
|
||||
list of :class:`cpl_query.iterable.ordered_iterable_abc.OrderedIterableABC`
|
||||
"""
|
||||
pass
|
||||
Reference in New Issue
Block a user