python-iterutils 0.2.5.1__tar.gz → 0.2.5.3__tar.gz

{python_iterutils-0.2.5.1 → python_iterutils-0.2.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-iterutils
-Version: 0.2.5.1
+Version: 0.2.5.3
 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.1 → python_iterutils-0.2.5.3}/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,36 +63,32 @@ class YieldFrom:
     value: Any
 
 
-def iterable(obj, /) -> bool:
-    """判断对象是不是 Iterable
-    """
-    return isinstance(obj, Iterable)
+iterable = Iterable.__instancecheck__
+async_iterable = AsyncIterable.__instancecheck__
+isawaitable = Awaitable.__instancecheck__
 
 
-def async_iterable(obj, /) -> bool:
-    """判断对象是不是 AsyncIterable
-    """
-    return isinstance(obj, AsyncIterable)
+def _coalesce(vals, default=None):
+    for val in vals:
+        if val is not None:
+            return val
+    return default
 
 
-def _get_async(back: int = 2, /) -> bool:
+@overload
+def _get_async(back: int = 2, /, *, default: Literal[False] = False) -> bool:
+    ...
+@overload
+def _get_async[T](back: int = 2, /, *, default: T) -> bool | T:
+    ...
+def _get_async[T](back: int = 2, /, *, default: Literal[False] | T = False) -> bool | T:
     """往上查找，从最近的调用栈的命名空间中获取 `async_` 的值
     """
-    f: None | FrameType
-    f = _getframe(back)
-    f_globals = f.f_globals
-    f_locals  = f.f_locals
-    if f_locals is f_globals:
-        return f_locals.get("async_") or False
-    while f_locals is not None and f_locals is not f_globals:
-        if "async_" in f_locals:
-            if f_locals["async_"] is not None:
-                return f_locals["async_"]
-        f = f.f_back
-        if f is None:
-            break
-        f_locals = f.f_locals
-    return False
+    def iter_frams(f: None | FrameType = _getframe(back)):
+        while f:
+            yield f.f_locals.get("async_")
+            f = f.f_back
+    return _coalesce(iter_frams(), default)
 
 
 def _run_gen_step(gen: Generator, /):
@@ -111,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
@@ -175,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
@@ -271,10 +270,14 @@ def as_gen_step[**Args](
     gen_step: Callable[Args, Generator], 
     /, 
 ) -> Callable[Args, Any]:
+    default_async = _get_async(default=None)
     def wrapper(*args: Args.args, **kwds: Args.kwargs):
         return run_gen_step(
             gen_step, 
-            cast(None | Literal[False, True], kwds.pop("async_", None)), 
+            _coalesce((
+                kwds.pop("async_", None), 
+                _get_async(default=default_async), 
+            )), 
             *args, 
             **kwds, 
         )
@@ -285,10 +288,14 @@ def as_gen_step_iter[**Args](
     gen_step: Callable[Args, Generator], 
     /, 
 ) -> Callable[Args, Iterable | AsyncIterable]:
+    default_async = _get_async(default=None)
     def wrapper(*args: Args.args, **kwds: Args.kwargs):
         return run_gen_step_iter(
             gen_step, 
-            cast(None | Literal[False, True], kwds.pop("async_", None)), 
+            _coalesce((
+                kwds.pop("async_", None), 
+                _get_async(default=default_async), 
+            )), 
             *args, 
             **kwds, 
         )
@@ -1113,7 +1120,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.1 → python_iterutils-0.2.5.3}/pyproject.toml

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