python-iterutils 0.0.4.5__tar.gz → 0.0.6__tar.gz

{python_iterutils-0.0.4.5 → python_iterutils-0.0.6}/PKG-INFO

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

@@ -2,18 +2,20 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 4)
+__version__ = (0, 0, 6)
 __all__ = [
     "iterable", "async_iterable", "foreach", "async_foreach", "through", "async_through", 
-    "wrap_iter", "wrap_aiter", "acc_step", "cut_iter", "run_gen_step", 
+    "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 Any, TypeVar
+from typing import overload, Any, Literal, NamedTuple, TypeVar
 
 from asynctools import async_zip, ensure_async, ensure_aiter
 
@@ -21,6 +23,25 @@ from asynctools import async_zip, ensure_async, ensure_aiter
 T = TypeVar("T")
 
 
+class YieldBase(ABC, Iterable):
+    __slots__ = "value", "identity"
+    @property
+    @abstractmethod
+    def yield_type(self, /) -> int:
+        ...
+
+
+@YieldBase.register
+class Yield(NamedTuple):
+    value: Any
+    identity: bool = False
+    yield_type = 1 # type: ignore
+
+
+class YieldFrom(Yield):
+    yield_type = 2
+
+
 def iterable(it, /) -> bool:
     try:
         return isinstance(iter(it), Iterable)
@@ -35,23 +56,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, /):
@@ -186,29 +207,27 @@ 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
+                        elif callable(ret):
+                            ret = ret()
                             if isawaitable(ret):
                                 ret = await ret
-                        else:
-                            ret = func
                     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:
@@ -235,14 +254,15 @@ def run_gen_step(
         return result
     else:
         try:
-            func = send(None)
+            ret = send(None)
             while True:
                 try:
-                    ret = func() if callable(func) else ret
+                    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:
@@ -252,3 +272,112 @@ def run_gen_step(
             if close is not None:
                 close()
 
+
+@overload
+def run_gen_step_iter(
+    gen_step: Generator | Callable[[], Generator], 
+    threaded: bool = False, 
+    *, 
+    async_: Literal[False] = False, 
+) -> Iterator:
+    ...
+@overload
+def run_gen_step_iter(
+    gen_step: Generator | Callable[[], Generator], 
+    threaded: bool = False, 
+    *, 
+    async_: Literal[True], 
+) -> AsyncIterator:
+    ...
+def run_gen_step_iter(
+    gen_step: Generator | Callable[[], Generator], 
+    threaded: bool = False, 
+    *, 
+    async_: bool = False, 
+) -> Iterator | AsyncIterator:
+    if callable(gen_step):
+        gen = gen_step()
+        close = gen.close
+    else:
+        gen = gen_step
+        close = None
+    send = gen.send
+    throw = gen.throw
+    if async_:
+        async def process():
+            try:
+                if threaded:
+                    ret = await to_thread(send, None)
+                else:
+                    ret = send(None)
+                while True:
+                    yield_type = 0
+                    identity = False
+                    if isinstance(ret, YieldBase):
+                        yield_type = ret.yield_type
+                        ret, identity = ret
+                    try:
+                        if not identity:
+                            if isawaitable(ret):
+                                ret = await ret
+                            elif callable(ret):
+                                ret = ret()
+                                if isawaitable(ret):
+                                    ret = await ret
+                            else:
+                                ret = ret
+                    except BaseException as e:
+                        if threaded:
+                            ret = await to_thread(throw, e)
+                        else:
+                            ret = throw(e)
+                    else:
+                        match yield_type:
+                            case 1:
+                                yield ret
+                            case 2:
+                                async for val in ensure_aiter(ret, threaded=threaded):
+                                    yield val
+                        if threaded:
+                            ret = await to_thread(send, ret)
+                        else:
+                            ret = send(ret)
+            except (StopIteration, GeneratorExit):
+                pass
+            finally:
+                if close is not None:
+                    if threaded:
+                        await to_thread(close)
+                    else:
+                        close()
+    else:
+        def process():
+            try:
+                ret = send(None)
+                while True:
+                    yield_type = 0
+                    identity = False
+                    if isinstance(ret, YieldBase):
+                        yield_type = ret.yield_type
+                        ret, identity = ret
+                    try:
+                        if not identity:
+                            ret = ret() if callable(ret) else ret
+                    except BaseException as e:
+                        ret = throw(e)
+                    else:
+                        match yield_type:
+                            case 1:
+                                yield ret
+                            case 2:
+                                yield from ret
+                        ret = send(ret)
+            except StopIteration as e:
+                return e.value
+            except GeneratorExit:
+                pass
+            finally:
+                if close is not None:
+                    close()
+    return process()
+

{python_iterutils-0.0.4.5 → python_iterutils-0.0.6}/pyproject.toml

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