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

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

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

@@ -13,7 +13,7 @@ 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 Any, TypeVar
 
 from asynctools import async_zip, ensure_async, ensure_aiter
 
@@ -167,31 +167,13 @@ def cut_iter(
         yield stop, stop - start
 
 
-@overload
-def run_gen_step(
-    gen_step: Generator[Callable, Any, T] | Callable[[], Generator[Callable, Any, T]], 
-    *, 
-    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]:
+) -> T:
     if callable(gen_step):
         gen = gen_step()
         close = gen.close
@@ -223,25 +205,29 @@ def run_gen_step(
                         else:
                             func = send(ret)
             except StopIteration as e:
-                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
+                return e.value
             finally:
                 if close is not None:
                     if threaded:
                         await to_thread(close)
                     else:
                         close()
-        return process()
+        result = process()
+        if as_iter:
+            async def wrap(result):
+                it = await result
+                try:
+                    it = aiter(it)
+                except TypeError:
+                    for val in iter(it):
+                        if isawaitable(val):
+                            val = await val
+                        yield val
+                else:
+                    async for val in it:
+                        yield val
+            result = wrap(result)
+        return result
     else:
         try:
             func = send(None)

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

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