python-iterutils 0.0.7__tar.gz → 0.0.8__tar.gz

{python_iterutils-0.0.7 → python_iterutils-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-iterutils
-Version: 0.0.7
+Version: 0.0.8
 Summary: Python another itertools.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-iterutils
 License: MIT

{python_iterutils-0.0.7 → python_iterutils-0.0.8}/iterutils/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 7)
+__version__ = (0, 0, 8)
 __all__ = [
     "iterable", "async_iterable", "foreach", "async_foreach", "through", "async_through", 
     "wrap_iter", "wrap_aiter", "acc_step", "cut_iter", "run_gen_step", "run_gen_step_iter", 
@@ -12,34 +12,35 @@ __all__ = [
 from abc import ABC, abstractmethod
 from asyncio import to_thread
 from collections.abc import (
-    AsyncIterable, AsyncIterator, Awaitable, Callable, Generator, Iterable, Iterator, 
+    AsyncIterable, AsyncIterator, Callable, Generator, Iterable, Iterator, 
 )
+from dataclasses import dataclass
 from inspect import isawaitable
-from typing import overload, Any, Literal, NamedTuple, TypeVar
+from typing import overload, Any, Literal, TypeVar
 
-from asynctools import async_zip, ensure_async, ensure_aiter
+from asynctools import async_map, async_zip, ensure_async, ensure_aiter
 
 
 T = TypeVar("T")
 
 
-class YieldBase(ABC, Iterable):
-    __slots__ = "value", "identity", "try_call_me"
+@dataclass(slots=True, frozen=True)
+class YieldBase(ABC):
+    value: Any
+    identity: bool = False
+    try_call_me: bool = True
+
     @property
     @abstractmethod
     def yield_type(self, /) -> int:
         ...
 
 
-@YieldBase.register
-class Yield(NamedTuple):
-    value: Any
-    identity: bool = False
-    try_call_me: bool = True
-    yield_type = 1 # type: ignore
+class Yield(YieldBase):
+    yield_type = 1
 
 
-class YieldFrom(Yield):
+class YieldFrom(YieldBase):
     yield_type = 2
 
 
@@ -76,18 +77,30 @@ async def async_foreach(ret: Callable, iterable, /, *iterables, threaded: bool =
             await ret(arg)
 
 
-def through(it: Iterable, /):
-    for _ in it:
-        pass
+def through(it: Iterable, /, take_while: None | Callable = None):
+    if take_while is None:
+        for _ in it:
+            pass
+    else:
+        for v in map(take_while, it):
+            if not v:
+                break
 
 
 async def async_through(
     it: Iterable | AsyncIterable, 
     /, 
+    take_while: None | Callable = None, 
     threaded: bool = True, 
 ):
-    async for _ in ensure_aiter(it, threaded=threaded):
-        pass
+    it = ensure_aiter(it, threaded=threaded)
+    if take_while is None:
+        async for _ in it:
+            pass
+    else:
+        async for v in async_map(take_while, it):
+            if not v:
+                break
 
 
 def wrap_iter(
@@ -309,8 +322,10 @@ def run_gen_step_iter(
                 identity = False
                 try_call_me = True
                 if isinstance(ret, YieldBase):
+                    identity = ret.identity
+                    try_call_me = ret.try_call_me
                     yield_type = ret.yield_type
-                    ret, identity, try_call_me = ret
+                    ret = ret.value
                 if not identity:
                     if try_call_me and callable(ret):
                         ret = ret()
@@ -364,8 +379,10 @@ def run_gen_step_iter(
                 identity = False
                 try_call_me = True
                 if isinstance(ret, YieldBase):
+                    identity = ret.identity
+                    try_call_me = ret.try_call_me
                     yield_type = ret.yield_type
-                    ret, identity, try_call_me = ret
+                    ret = ret.value
                 if not identity and try_call_me and callable(ret):
                     ret = ret()
                 return yield_type, ret

{python_iterutils-0.0.7 → python_iterutils-0.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-iterutils"
-version = "0.0.7"
+version = "0.0.8"
 description = "Python another itertools."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"