python-iterutils 0.0.4__tar.gz → 0.0.4.2__tar.gz

{python_iterutils-0.0.4 → python_iterutils-0.0.4.2}/PKG-INFO

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

@@ -9,9 +9,11 @@ __all__ = [
 ]
 
 from asyncio import to_thread
-from collections.abc import AsyncIterable, AsyncIterator, Callable, Generator, Iterable, Iterator
+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, TypeVar
 
 from asynctools import async_zip, ensure_async, ensure_aiter
 
@@ -165,12 +167,31 @@ def cut_iter(
         yield stop, stop - start
 
 
+@overload
 def run_gen_step(
     gen_step: Generator[Callable, Any, T] | Callable[[], Generator[Callable, Any, T]], 
     *, 
-    async_: bool = False, 
+    async_: Literal[False] = False, 
     threaded: bool = False, 
+    as_iter: bool = False, 
 ) -> T:
+    ...
+@overload
+def run_gen_step(
+    gen_step: Generator[Callable, Any, T] | Callable[[], Generator[Callable, Any, T]], 
+    *, 
+    async_: Literal[True], 
+    threaded: bool = False, 
+    as_iter: bool = False, 
+) -> Awaitable[T]:
+    ...
+def run_gen_step(
+    gen_step: Generator[Callable, Any, T] | Callable[[], Generator[Callable, Any, T]], 
+    *, 
+    async_: bool = False, 
+    threaded: bool = False, 
+    as_iter: bool = False, 
+) -> T | Awaitable[T]:
     if callable(gen_step):
         gen = gen_step()
         close = gen.close
@@ -178,6 +199,7 @@ def run_gen_step(
         gen = gen_step
         close = None
     send = gen.send
+    throw = gen.throw
     if async_:
         async def process():
             try:
@@ -186,15 +208,33 @@ def run_gen_step(
                 else:
                     func = send(None)
                 while True:
-                    ret = func()
-                    if isawaitable(ret):
-                        ret = await ret
-                    if threaded:
-                        func = await to_thread(send, ret)
+                    try:
+                        ret = func()
+                        if isawaitable(ret):
+                            ret = await ret
+                    except BaseException as e:
+                        if threaded:
+                            func = await to_thread(throw, e)
+                        else:
+                            func = throw(e)
                     else:
-                        func = send(ret)
+                        if threaded:
+                            func = await to_thread(send, ret)
+                        else:
+                            func = send(ret)
             except StopIteration as e:
-                return e.value
+                result = e.value
+                if as_iter:
+                    if isawaitable(result):
+                        result = await result
+                    try:
+                        result = aiter(result)
+                    except TypeError:
+                        async def wrap(it):
+                            for val in iter(it):
+                                yield val
+                        result = wrap(result)
+                return result
             finally:
                 if close is not None:
                     if threaded:
@@ -206,9 +246,17 @@ def run_gen_step(
         try:
             func = send(None)
             while True:
-                func = send(func())
+                try:
+                    ret = func()
+                except BaseException as e:
+                    func = throw(e)
+                else:
+                    func = send(ret)
         except StopIteration as e:
-            return e.value
+            result = e.value
+            if as_iter:
+                result = iter(result)
+            return result
         finally:
             if close is not None:
                 close()

{python_iterutils-0.0.4 → python_iterutils-0.0.4.2}/pyproject.toml

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