python-iterutils 0.2.5.2__py3-none-any.whl → 0.2.5.4__py3-none-any.whl

iterutils/__init__.py

@@ -6,7 +6,7 @@ __version__ = (0, 2, 5)
 __all__ = [
     "Yield", "YieldFrom", "iterable", "async_iterable", 
     "run_gen_step", "run_gen_step_iter", "as_gen_step", 
-    "as_gen_step_iter", "split_cm, ""with_iter_next", 
+    "as_gen_step_iter", "split_cm", "with_iter_next", 
     "map", "filter", "reduce", "zip", "chain", 
     "chain_from_iterable", "chunked", "foreach", 
     "async_foreach", "through", "async_through", 
@@ -32,7 +32,7 @@ from contextlib import (
 from copy import copy
 from dataclasses import dataclass
 from itertools import batched, chain as _chain, pairwise
-from inspect import isawaitable, iscoroutinefunction, signature
+from inspect import iscoroutinefunction, signature
 from sys import _getframe, exc_info
 from _thread import start_new_thread
 from time import sleep, time
@@ -63,16 +63,9 @@ class YieldFrom:
     value: Any
 
 
-def iterable(obj, /) -> bool:
-    """判断对象是不是 Iterable
-    """
-    return isinstance(obj, Iterable)
-
-
-def async_iterable(obj, /) -> bool:
-    """判断对象是不是 AsyncIterable
-    """
-    return isinstance(obj, AsyncIterable)
+iterable = Iterable.__instancecheck__
+async_iterable = AsyncIterable.__instancecheck__
+isawaitable = Awaitable.__instancecheck__
 
 
 def _coalesce(vals, default=None):
@@ -114,14 +107,17 @@ async def _run_gen_step_async(gen: Generator, /):
     send  = gen.send
     throw = gen.throw
     try:
-        ret: Awaitable = send(None)
+        ret: Any = send(None)
         while True:
-            try:
-                value: Any = await ret
-            except BaseException as e:
-                ret = throw(e)
+            if isawaitable(ret):
+                try:
+                    value: Any = (await ret)
+                except BaseException as e:
+                    ret = throw(e)
+                else:
+                    ret = send(value)
             else:
-                ret = send(value)
+                ret = send(ret)
     except StopIteration as e:
         if isawaitable(e.value):
             return await e.value
@@ -178,10 +174,10 @@ async def _run_gen_step_async_iter(gen: Generator, /) -> AsyncIterator:
     send  = gen.send
     throw = gen.throw
     try:
-        ret: Awaitable | Yield | YieldFrom = send(None)
+        ret: Any = send(None)
         while True:
             try:
-                if isinstance(ret, Awaitable):
+                if isawaitable(ret):
                     value: Any = await ret
                 else:
                     value = ret.value
@@ -484,9 +480,12 @@ def zip(
 ):
     """
     """
-    if threaded or isinstance(iterable, AsyncIterable) or any(isinstance(i, AsyncIterable) for i in iterables):
-        return async_zip(iterable, *iterables, threaded=threaded)
-    return _zip(iterable, *iterables)
+    if (not threaded and 
+        isinstance(iterable, Iterable) and 
+        all(isinstance(it, Iterable) for it in iterables)
+    ):
+        return _zip(iterable, *iterables)
+    return async_zip(iterable, *iterables, threaded=threaded)
 
 
 @overload
@@ -511,9 +510,12 @@ def chain[T](
     *iterables: Iterable[T] | AsyncIterable[T], 
     threaded: bool = False, 
 ) -> Iterator[T] | AsyncIterator[T]:
-    if threaded or not isinstance(iterable, Iterable):
-        return async_chain(iterable, *iterables, threaded=threaded)
-    return _chain(iterable, *iterables) # type: ignore
+    if (not threaded and 
+        isinstance(iterable, Iterable) and 
+        all(isinstance(it, Iterable) for it in iterables)
+    ):
+        return _chain(iterable, *iterables) # type: ignore
+    return async_chain(iterable, *iterables, threaded=threaded)
 
 
 @overload
@@ -593,14 +595,17 @@ def foreach(
 ):
     """
     """
-    if threaded or not (isinstance(iterable, Iterable) and all(isinstance(it, Iterable) for it in iterables)):
-        return async_foreach(value, iterable, *iterables, threaded=threaded)
-    if iterables:
-        for args in _zip(iterable, *iterables):
-            value(*args)
-    else:
-        for arg in iterable:
-            value(arg)
+    if (not threaded and 
+        isinstance(iterable, Iterable) and 
+        all(isinstance(it, Iterable) for it in iterables)
+    ):
+        if iterables:
+            for args in _zip(iterable, *iterables):
+                value(*args)
+        else:
+            for arg in iterable:
+                value(arg)
+    return async_foreach(value, iterable, *iterables, threaded=threaded)
 
 
 async def async_foreach(
@@ -1124,7 +1129,7 @@ def context[T](
                             add_arg(enter(ctx))
                     ret = func(*args)
                     if isawaitable(ret):
-                        ret = await ret
+                        ret = await cast(Awaitable, ret)
                     return ret
         return call()
     else:

{python_iterutils-0.2.5.2.dist-info → python_iterutils-0.2.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-iterutils
-Version: 0.2.5.2
+Version: 0.2.5.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.2.5.4.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+iterutils/__init__.py,sha256=RdMUsfkgNEg9_5Lf4YNfCP8oB_PXJSdd_EHxeitP0Bk,33740
+iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_iterutils-0.2.5.4.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_iterutils-0.2.5.4.dist-info/METADATA,sha256=fpaQOW9phx56FoA1NE19KlnqaJgYBrwhQGxeZHfxazs,1429
+python_iterutils-0.2.5.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+python_iterutils-0.2.5.4.dist-info/RECORD,,

python_iterutils-0.2.5.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-iterutils/__init__.py,sha256=PCXCgTYvEOJ5GCXeZEILDFYfCk9O5elECgTLJXWYpxw,33637
-iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_iterutils-0.2.5.2.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_iterutils-0.2.5.2.dist-info/METADATA,sha256=JM7iFXIRu01IwlLEMQsJq6NZeW56MNPHH3kl8WseTas,1429
-python_iterutils-0.2.5.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-python_iterutils-0.2.5.2.dist-info/RECORD,,