python-iterutils 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

iterutils/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 2, 1)
+__version__ = (0, 2, 3)
 __all__ = [
     "Return", "Yield", "YieldFrom", "iterable", "async_iterable", 
     "foreach", "async_foreach", "through", "async_through", "flatten", 
@@ -10,7 +10,8 @@ __all__ = [
     "async_group_collect", "map", "filter", "reduce", "zip", "chunked", 
     "iter_unique", "async_iter_unique", "wrap_iter", "wrap_aiter", 
     "acc_step", "cut_iter", "iter_gen_step", "iter_gen_step_async", 
-    "run_gen_step", "run_gen_step_iter", "as_gen_step", "bfs_gen", 
+    "run_gen_step", "run_gen_step_sync_iter", "run_gen_step_async_iter", 
+    "run_gen_step_iter", "as_gen_step", "as_gen_step_iter", "bfs_gen", 
     "with_iter_next", "backgroud_loop", 
 ]
 
@@ -656,7 +657,7 @@ def _get_async(back: int = 2) -> bool:
     f_locals  = f.f_locals
     if f_locals is f_globals:
         return f_locals.get("async_") or False
-    while f_locals is not f_globals:
+    while f_locals is not None and f_locals is not f_globals:
         if "async_" in f_locals:
             return f_locals["async_"] or False
         f = f.f_back
@@ -812,6 +813,7 @@ async def iter_gen_step_async(
         await close()
 
 
+@overload
 def run_gen_step(
     gen_step: Generator | Callable[[], Generator], 
     may_await: bool | Literal[1] = True, 
@@ -819,7 +821,39 @@ def run_gen_step(
     threaded: bool = False, 
     running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
     *, 
-    async_: None | bool = None, 
+    async_: None = None, 
+):
+    ...
+@overload
+def run_gen_step(
+    gen_step: Generator | Callable[[], Generator], 
+    may_await: bool | Literal[1] = True, 
+    may_call: bool | Literal[1] = True, 
+    threaded: bool = False, 
+    running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
+    *, 
+    async_: Literal[False], 
+):
+    ...
+@overload
+def run_gen_step(
+    gen_step: Generator | Callable[[], Generator], 
+    may_await: bool | Literal[1] = True, 
+    may_call: bool | Literal[1] = True, 
+    threaded: bool = False, 
+    running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
+    *, 
+    async_: Literal[True], 
+) -> Coroutine:
+    ...
+def run_gen_step(
+    gen_step: Generator | Callable[[], Generator], 
+    may_await: bool | Literal[1] = True, 
+    may_call: bool | Literal[1] = True, 
+    threaded: bool = False, 
+    running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
+    *, 
+    async_: None | Literal[False, True] = None, 
 ):
     """
     """
@@ -881,12 +915,138 @@ def run_gen_step(
             raise
 
 
+def run_gen_step_sync_iter(
+    gen_step: Generator | Callable[[], Generator], 
+    may_call: bool | Literal[1] = True, 
+) -> Iterator:
+    """
+    """
+    if callable(gen_step):
+        gen_step = gen_step()
+    send:  Callable = gen_step.send
+    throw: Callable = gen_step.throw
+    close: Callable = gen_step.close
+    def extract(value, may_call=may_call, /):
+        yield_type = -1
+        if isinstance(value, YieldBase):
+            yield_type = value.yield_type
+            maybe_callable = value.may_call
+            if maybe_callable is not None:
+                may_call = maybe_callable
+            value      = value.value
+        if may_call is 1 or may_call and callable(value):
+            value = value()
+        return yield_type, value
+    try:
+        value = send(None)
+        while True:
+            try:
+                yield_type, value = extract(value)
+                match yield_type:
+                    case 0:
+                        return value
+                    case 1:
+                        yield value
+                    case 2:
+                        yield from value
+            except BaseException as e:
+                value = throw(e)
+            else:
+                value = send(value)
+    except StopIteration as e:
+        try:
+            yield_type, value = extract(e.value)
+            match yield_type:
+                case 1:
+                    yield value
+                case 2:
+                    yield from value
+                case _:
+                    return value
+        except BaseException as e:
+            throw(e)
+    finally:
+        close()
+
+
+async def run_gen_step_async_iter(
+    gen_step: Generator | Callable[[], Generator], 
+    may_await: bool | Literal[1] = True, 
+    may_call: bool | Literal[1] = True, 
+    threaded: bool = False, 
+) -> AsyncIterator:
+    """
+    """
+    if callable(gen_step):
+        gen_step = gen_step()
+    send:  Callable = call_as_async(gen_step.send, threaded=threaded)
+    throw: Callable = call_as_async(gen_step.throw, threaded=threaded)
+    close: Callable = call_as_async(gen_step.close, threaded=threaded)
+    async def extract(value, may_await=may_await, may_call=may_call, /):
+        yield_type = -1
+        if isinstance(value, YieldBase):
+            yield_type = value.yield_type
+            maybe_awaitable = value.may_await
+            if maybe_awaitable is not None:
+                may_await = maybe_awaitable
+            maybe_callable = value.may_call
+            if maybe_callable is not None:
+                may_call = maybe_callable
+            value = value.value
+        if may_call is 1 or may_call and callable(value):
+            value = await call_as_async(
+                value, may_await=may_await, threaded=threaded)()
+        elif may_await is 1 or may_await and isawaitable(value):
+            value = await value
+        return yield_type, value
+    try:
+        value = await send(None)
+        while True:
+            try:
+                yield_type, value = await extract(value)
+                match yield_type:
+                    case 0:
+                        return
+                    case 1:
+                        yield value
+                    case 2:
+                        async for val in ensure_aiter(value, threaded=threaded):
+                            yield val
+            except BaseException as e:
+                if isinstance(e, Reraised):
+                    e = e.exception
+                value = await throw(e)
+            else:
+                value = await send(value)
+    except BaseException as e:
+        if isinstance(e, Reraised):
+            e = e.exception
+        if isinstance(e, StopIteration):
+            try:
+                yield_type, value = await extract(e.value)
+                match yield_type:
+                    case 1:
+                        yield value
+                    case 2:
+                        async for val in ensure_aiter(value, threaded=threaded):
+                            yield val
+            except BaseException as e:
+                if isinstance(e, Reraised):
+                    e = e.exception
+                await throw(e)
+        else:
+            raise
+    finally:
+        await close()
+
+
 @overload
 def run_gen_step_iter(
     gen_step: Generator | Callable[[], Generator], 
     may_await: bool | Literal[1] = True, 
     may_call: bool | Literal[1] = True, 
     threaded: bool = False, 
+    running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
     *, 
     async_: None = None, 
 ) -> Iterator | AsyncIterator:
@@ -897,6 +1057,7 @@ def run_gen_step_iter(
     may_await: bool | Literal[1] = True, 
     may_call: bool | Literal[1] = True, 
     threaded: bool = False, 
+    running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
     *, 
     async_: Literal[False], 
 ) -> Iterator:
@@ -907,6 +1068,7 @@ def run_gen_step_iter(
     may_await: bool | Literal[1] = True, 
     may_call: bool | Literal[1] = True, 
     threaded: bool = False, 
+    running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
     *, 
     async_: Literal[True], 
 ) -> AsyncIterator:
@@ -916,162 +1078,62 @@ def run_gen_step_iter(
     may_await: bool | Literal[1] = True, 
     may_call: bool | Literal[1] = True, 
     threaded: bool = False, 
+    running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
     *, 
-    async_: None | bool = None, 
+    async_: None | Literal[False, True] = None, 
 ) -> Iterator | AsyncIterator:
     """
     """
     if async_ is None:
         async_ = _get_async()
-    gen = gen_step() if callable(gen_step) else gen_step
-    send:  Callable = gen.send
-    throw: Callable = gen.throw
-    close: Callable = gen.close
-    default_may_await = may_await
-    default_may_call  = may_call
     if async_:
-        send  = call_as_async(send, threaded=threaded)
-        throw = call_as_async(throw, threaded=threaded)
-        close = call_as_async(close, threaded=threaded)
-        async def aextract(value, /):
-            yield_type = -1
-            may_await  = default_may_await
-            may_call   = default_may_call
-            if isinstance(value, YieldBase):
-                yield_type = value.yield_type
-                maybe_awaitable = value.may_await
-                if maybe_awaitable is not None:
-                    may_await = maybe_awaitable
-                maybe_callable = value.may_call
-                if maybe_callable is not None:
-                    may_call = maybe_callable
-                value = value.value
-            if may_call is 1 or may_call and callable(value):
-                value = await call_as_async(
-                    value, may_await=may_await, threaded=threaded)()
-            elif may_await is 1 or may_await and isawaitable(value):
-                value = await value
-            return yield_type, value
-        async def aprocess():
-            try:
-                value = await send(None)
-                while True:
-                    try:
-                        yield_type, value = await aextract(value)
-                        match yield_type:
-                            case 0:
-                                return
-                            case 1:
-                                yield value
-                            case 2:
-                                async for val in ensure_aiter(value, threaded=threaded):
-                                    yield val
-                    except BaseException as e:
-                        if isinstance(e, Reraised):
-                            e = e.exception
-                        value = await throw(e)
-                    else:
-                        value = await send(value)
-            except BaseException as e:
-                if isinstance(e, Reraised):
-                    e = e.exception
-                if isinstance(e, StopIteration):
-                    try:
-                        yield_type, value = await aextract(e.value)
-                        match yield_type:
-                            case 1:
-                                yield value
-                            case 2:
-                                async for val in ensure_aiter(value, threaded=threaded):
-                                    yield val
-                    except BaseException as e:
-                        if isinstance(e, Reraised):
-                            e = e.exception
-                        await throw(e)
-                else:
-                    raise
-            finally:
-                await close()
-        return aprocess()
+        return run_gen_step_async_iter(
+            gen_step, 
+            may_await=may_await, 
+            may_call=may_call, 
+            threaded=threaded, 
+        )
     else:
-        def extract(value, /):
-            yield_type = -1
-            may_call   = default_may_call
-            if isinstance(value, YieldBase):
-                yield_type = value.yield_type
-                maybe_callable = value.may_call
-                if maybe_callable is not None:
-                    may_call = maybe_callable
-                value      = value.value
-            if may_call is 1 or may_call and callable(value):
-                value = value()
-            return yield_type, value
-        def process():
-            try:
-                value = send(None)
-                while True:
-                    try:
-                        yield_type, value = extract(value)
-                        match yield_type:
-                            case 0:
-                                return value
-                            case 1:
-                                yield value
-                            case 2:
-                                yield from value
-                    except BaseException as e:
-                        value = throw(e)
-                    else:
-                        value = send(value)
-            except StopIteration as e:
-                try:
-                    yield_type, value = extract(e.value)
-                    match yield_type:
-                        case 1:
-                            yield value
-                        case 2:
-                            yield from value
-                        case _:
-                            return value
-                except BaseException as e:
-                    throw(e)
-            finally:
-                close()
-        return process()
+        return run_gen_step_sync_iter(gen_step, may_call=may_call)
 
 
 @optional
 def as_gen_step(
-    func: Callable, 
+    func: Callable[..., Generator], 
     /, 
+    *deco_args, 
     iter: bool = False, 
-    may_await: bool | Literal[1] = True, 
-    may_call: bool | Literal[1] = True, 
-    threaded: bool = False, 
-    running_flag: None | SupportsBool | Callable[[], SupportsBool] | Callable[[], Awaitable[SupportsBool]] = None, 
-    *, 
-    async_: None | bool = None, 
+    **deco_kwds, 
 ) -> Callable:
-    """装饰器，构建一个 gen_step 函数
-    """
-    def wrapper(*args, **kwds):
-        if iter:
-            return run_gen_step_iter(
-                func(*args, **kwds), 
-                may_await=may_await, 
-                may_call=may_call, 
-                threaded=threaded, 
-                async_=async_, # type: ignore
-            )
-        else:
-            return run_gen_step(
-                func(*args, **kwds), 
-                may_await=may_await, 
-                may_call=may_call, 
-                threaded=threaded, 
-                running_flag=running_flag, 
-                async_=async_, 
-            )
+    """装饰器，把生成器封装成 gen_step 函数
+    """
+    call = run_gen_step_iter if iter else run_gen_step
+    def wrapper(*args, async_: Literal[False, True] = False, **kwds):
+        return call(
+            func(*args, async_=async_, **kwds), 
+            *deco_args, 
+            async_=async_, 
+            **deco_kwds, 
+        )
+    return wrapper
+
+
+@optional
+def as_gen_step_iter(
+    func: Callable[..., Generator], 
+    /, 
+    *deco_args, 
+    **deco_kwds, 
+) -> Callable:
+    """装饰器，把生成器封装成 gen_step 函数
+    """
+    def wrapper(*args, async_: Literal[False, True] = False, **kwds):
+        return run_gen_step_iter(
+            func(*args, async_=async_, **kwds), 
+            *deco_args, 
+            async_=async_, 
+            **deco_kwds, 
+        )
     return wrapper
 
 
@@ -1121,31 +1183,36 @@ def bfs_gen[T](
 def with_iter_next[T](
     iterable: Iterable[T], 
     /, 
-    async_: Literal[False] = False, 
+    async_: Literal[False], 
 ) -> ContextManager[Callable[[], T]]:
     ...
 @overload
 def with_iter_next[T](
-    iterable: AsyncIterable[T], 
+    iterable: Iterable[T] | AsyncIterable[T], 
     /, 
-    async_: Literal[False] = False, 
+    async_: Literal[True], 
 ) -> ContextManager[Callable[[], Awaitable[T]]]:
     ...
 @overload
 def with_iter_next[T](
     iterable: Iterable[T] | AsyncIterable[T], 
     /, 
-    async_: Literal[True], 
-) -> ContextManager[Callable[[], Awaitable[T]]]:
+    async_: None = None, 
+) -> ContextManager[Callable[[], T]] | ContextManager[Callable[[], Awaitable[T]]]:
     ...
 @contextmanager
 def with_iter_next[T](
     iterable: Iterable[T] | AsyncIterable[T], 
     /, 
-    async_: Literal[False, True] = False, 
+    async_: None | Literal[False, True] = None, 
 ):
     """
     """
+    if async_ is None:
+        if not isinstance(iterable, Iterable):
+            async_ = True
+        else:
+            async_ = _get_async()
     if async_:
         get_next: Callable[[], T] | Callable[[], Awaitable[T]] = ensure_aiter(iterable).__anext__
     elif isinstance(iterable, Iterable):
@@ -1169,7 +1236,7 @@ def with_iter_next[T](
 def context[T](
     func: Callable[..., T], 
     *ctxs: ContextManager, 
-    async_: Literal[False] = False, 
+    async_: Literal[False], 
 ) -> T:
     ...
 @overload
@@ -1179,13 +1246,25 @@ def context[T](
     async_: Literal[True], 
 ) -> Coroutine[Any, Any, T]:
     ...
+@overload
 def context[T](
     func: Callable[..., T] | Callable[..., Awaitable[T]], 
     *ctxs: ContextManager | AsyncContextManager, 
-    async_: Literal[False, True] = False, 
+    async_: None = None, 
+) -> T | Coroutine[Any, Any, T]:
+    ...
+def context[T](
+    func: Callable[..., T] | Callable[..., Awaitable[T]], 
+    *ctxs: ContextManager | AsyncContextManager, 
+    async_: None | Literal[False, True] = None, 
 ) -> T | Coroutine[Any, Any, T]:
     """
     """
+    if async_ is None:
+        if iscoroutinefunction(func):
+            async_ = True
+        else:
+            async_ = _get_async()
     if async_:
         async def call():
             args: list = []
@@ -1215,7 +1294,7 @@ def backgroud_loop(
     /, 
     interval: int | float = 0.05, 
     *, 
-    async_: Literal[False] = False, 
+    async_: Literal[False], 
 ) -> ContextManager:
     ...
 @overload
@@ -1227,15 +1306,29 @@ def backgroud_loop(
     async_: Literal[True], 
 ) -> AsyncContextManager:
     ...
+@overload
 def backgroud_loop(
     call: None | Callable = None, 
     /, 
     interval: int | float = 0.05, 
     *, 
-    async_: Literal[False, True] = False, 
+    async_: None = None, 
+) -> ContextManager | AsyncContextManager:
+    ...
+def backgroud_loop(
+    call: None | Callable = None, 
+    /, 
+    interval: int | float = 0.05, 
+    *, 
+    async_: None | Literal[False, True] = None, 
 ) -> ContextManager | AsyncContextManager:
     """
     """
+    if async_ is None:
+        if iscoroutinefunction(call):
+            async_ = True
+        else:
+            async_ = _get_async()
     use_default_call = not callable(call)
     if use_default_call:
         start = time()
@@ -1254,6 +1347,7 @@ def backgroud_loop(
                     sleep(interval)
     running = True
     if async_:
+        @asynccontextmanager
         async def actx():
             nonlocal running
             try:
@@ -1264,8 +1358,9 @@ def backgroud_loop(
                 task.cancel()
                 if use_default_call:
                     print("\r\x1b[K", end="")
-        return asynccontextmanager(actx)()
+        return actx()
     else:
+        @contextmanager
         def ctx():
             nonlocal running
             try:
@@ -1274,5 +1369,5 @@ def backgroud_loop(
                 running = False
                 if use_default_call:
                     print("\r\x1b[K", end="")
-        return contextmanager(ctx)()
+        return ctx()
 

{python_iterutils-0.2.1.dist-info → python_iterutils-0.2.3.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+iterutils/__init__.py,sha256=egZxWU804STaONEuyAjvI2R-nUbTXx1wU4AECgYu0jg,39456
+iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_iterutils-0.2.3.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_iterutils-0.2.3.dist-info/METADATA,sha256=ZdhvscMtLIfrgiGyeXC30ZTSXg2v0J98cLu9YpVt7uo,1467
+python_iterutils-0.2.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+python_iterutils-0.2.3.dist-info/RECORD,,

python_iterutils-0.2.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-iterutils/__init__.py,sha256=_veJbrFYJld_cVSYbBnR37dSbGi2aSDAkNmLUEvuiXE,37134
-iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_iterutils-0.2.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_iterutils-0.2.1.dist-info/METADATA,sha256=C55LpIsT807qqeehnsAZ7ZS-za5Gb03eltgrdYiN5vM,1467
-python_iterutils-0.2.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-python_iterutils-0.2.1.dist-info/RECORD,,