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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-iterutils
-Version: 0.0.5
+Version: 0.0.7
 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.5 → python_iterutils-0.0.7}/iterutils/__init__.py

@@ -2,19 +2,20 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 5)
+__version__ = (0, 0, 7)
 __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", 
     "Yield", "YieldFrom", 
 ]
 
+from abc import ABC, abstractmethod
 from asyncio import to_thread
 from collections.abc import (
     AsyncIterable, AsyncIterator, Awaitable, Callable, Generator, Iterable, Iterator, 
 )
 from inspect import isawaitable
-from typing import overload, Any, Literal, TypeVar
+from typing import overload, Any, Literal, NamedTuple, TypeVar
 
 from asynctools import async_zip, ensure_async, ensure_aiter
 
@@ -22,16 +23,24 @@ from asynctools import async_zip, ensure_async, ensure_aiter
 T = TypeVar("T")
 
 
-class Yield:
+class YieldBase(ABC, Iterable):
+    __slots__ = "value", "identity", "try_call_me"
+    @property
+    @abstractmethod
+    def yield_type(self, /) -> int:
+        ...
 
-    def __init__(self, value, /):
-        self.value = value
 
+@YieldBase.register
+class Yield(NamedTuple):
+    value: Any
+    identity: bool = False
+    try_call_me: bool = True
+    yield_type = 1 # type: ignore
 
-class YieldFrom:
 
-    def __init__(self, value, /):
-        self.value = value
+class YieldFrom(Yield):
+    yield_type = 2
 
 
 def iterable(it, /) -> bool:
@@ -48,23 +57,23 @@ def async_iterable(it, /) -> bool:
         return False
 
 
-def foreach(func: Callable, iterable, /, *iterables):
+def foreach(ret: Callable, iterable, /, *iterables):
     if iterables:
         for args in zip(iterable, *iterables):
-            func(*args)
+            ret(*args)
     else:
         for arg in iterable:
-            func(arg)
+            ret(arg)
 
 
-async def async_foreach(func: Callable, iterable, /, *iterables, threaded: bool = True):
-    func = ensure_async(func, threaded=threaded)
+async def async_foreach(ret: Callable, iterable, /, *iterables, threaded: bool = True):
+    ret = ensure_async(ret, threaded=threaded)
     if iterables:
         async for args in async_zip(iterable, *iterables, threaded=threaded):
-            await func(*args)
+            await ret(*args)
     else:
         async for arg in ensure_aiter(iterable, threaded=threaded):
-            await func(arg)
+            await ret(arg)
 
 
 def through(it: Iterable, /):
@@ -199,29 +208,25 @@ def run_gen_step(
         async def process():
             try:
                 if threaded:
-                    func = await to_thread(send, None)
+                    ret = await to_thread(send, None)
                 else:
-                    func = send(None)
+                    ret = send(None)
                 while True:
                     try:
-                        if isawaitable(func):
-                            ret = await func
-                        elif callable(func):
-                            ret = func()
-                            if isawaitable(ret):
-                                ret = await ret
-                        else:
-                            ret = func
+                        if callable(ret):
+                            ret = ret()
+                        if isawaitable(ret):
+                            ret = await ret
                     except BaseException as e:
                         if threaded:
-                            func = await to_thread(throw, e)
+                            ret = await to_thread(throw, e)
                         else:
-                            func = throw(e)
+                            ret = throw(e)
                     else:
                         if threaded:
-                            func = await to_thread(send, ret)
+                            ret = await to_thread(send, ret)
                         else:
-                            func = send(ret)
+                            ret = send(ret)
             except StopIteration as e:
                 return e.value
             finally:
@@ -248,14 +253,15 @@ def run_gen_step(
         return result
     else:
         try:
-            func = send(None)
+            ret = send(None)
             while True:
                 try:
-                    ret = func() if callable(func) else func
+                    if callable(ret):
+                        ret = ret()
                 except BaseException as e:
-                    func = throw(e)
+                    ret = throw(e)
                 else:
-                    func = send(ret)
+                    ret = send(ret)
         except StopIteration as e:
             result = e.value
             if as_iter:
@@ -298,45 +304,53 @@ def run_gen_step_iter(
     throw = gen.throw
     if async_:
         async def process():
+            async def extract(ret):
+                yield_type = 0
+                identity = False
+                try_call_me = True
+                if isinstance(ret, YieldBase):
+                    yield_type = ret.yield_type
+                    ret, identity, try_call_me = ret
+                if not identity:
+                    if try_call_me and callable(ret):
+                        ret = ret()
+                    if isawaitable(ret):
+                        ret = await ret
+                return yield_type, ret
             try:
                 if threaded:
-                    func = await to_thread(send, None)
+                    ret = await to_thread(send, None)
                 else:
-                    func = send(None)
+                    ret = send(None)
                 while True:
-                    yield_type = 0
-                    if isinstance(func, Yield):
-                        yield_type = 1
-                    elif isinstance(func, YieldFrom):
-                        yield_type = 2
-                    if yield_type:
-                        func = func.value
                     try:
-                        if isawaitable(func):
-                            ret = await func
-                        elif callable(func):
-                            ret = func()
-                            if isawaitable(ret):
-                                ret = await ret
-                        else:
-                            ret = func
+                        yield_type, ret = await extract(ret)
+                        match yield_type:
+                            case 1:
+                                yield ret
+                            case 2:
+                                async for val in ensure_aiter(ret, threaded=threaded):
+                                    yield val
                     except BaseException as e:
                         if threaded:
-                            func = await to_thread(throw, e)
+                            ret = await to_thread(throw, e)
                         else:
-                            func = throw(e)
+                            ret = throw(e)
                     else:
-                        if yield_type == 1:
+                        if threaded:
+                            ret = await to_thread(send, ret)
+                        else:
+                            ret = send(ret)
+            except StopIteration as e:
+                ret = e.value
+                if isinstance(ret, YieldBase):
+                    yield_type, ret = await extract(ret)
+                    match yield_type:
+                        case 1:
                             yield ret
-                        elif yield_type == 2:
+                        case 2:
                             async for val in ensure_aiter(ret, threaded=threaded):
                                 yield val
-                        if threaded:
-                            func = await to_thread(send, ret)
-                        else:
-                            func = send(ret)
-            except (StopIteration, GeneratorExit):
-                pass
             finally:
                 if close is not None:
                     if threaded:
@@ -345,30 +359,39 @@ def run_gen_step_iter(
                         close()
     else:
         def process():
+            def extract(ret):
+                yield_type = 0
+                identity = False
+                try_call_me = True
+                if isinstance(ret, YieldBase):
+                    yield_type = ret.yield_type
+                    ret, identity, try_call_me = ret
+                if not identity and try_call_me and callable(ret):
+                    ret = ret()
+                return yield_type, ret
             try:
-                func = send(None)
+                ret = send(None)
                 while True:
-                    yield_type = 0
-                    if isinstance(func, Yield):
-                        yield_type = 1
-                    elif isinstance(func, YieldFrom):
-                        yield_type = 2
-                    if yield_type:
-                        func = func.value
                     try:
-                        ret = func() if callable(func) else func
+                        yield_type, ret = extract(ret)
+                        match yield_type:
+                            case 1:
+                                yield ret
+                            case 2:
+                                yield from ret
                     except BaseException as e:
-                        func = throw(e)
+                        ret = throw(e)
                     else:
-                        if yield_type == 1:
+                        ret = send(ret)
+            except StopIteration as e:
+                ret = e.value
+                if isinstance(ret, YieldBase):
+                    yield_type, ret = extract(ret)
+                    match yield_type:
+                        case 1:
                             yield ret
-                        elif yield_type == 2:
+                        case 2:
                             yield from ret
-                        func = send(ret)
-            except StopIteration as e:
-                return e.value
-            except GeneratorExit:
-                pass
             finally:
                 if close is not None:
                     close()

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

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