python-iterutils 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

iterutils/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 3, 0)
+__version__ = (0, 3, 1)
 
 from .dynamic import *
 from .gen_step import *

iterutils/dynamic.py

@@ -3,58 +3,25 @@
 
 __all__ = ["dynamic_async", "dynamic_async_iter"]
 
-from asyncio import run as asyncio_run, to_thread
-from collections.abc import (
-    AsyncIterable, AsyncIterator, Awaitable, Callable, Iterable, Iterator, 
-)
+from asyncio import AbstractEventLoop
+from collections.abc import AsyncIterable, Callable, Iterable
 from inspect import isawaitable
 
 from argtools import has_keyword_arg
-from asynctools import ensure_async, in_async
+from asynctools import (
+    ensure_async, in_async, iter_async, run_async, to_coroutine, 
+    to_aiter, 
+)
 from decotools import optional
 
 
-async def _as_async[T](v: T, /) -> T:
-    return v
-
-
-async def _as_async_iter[T](
-    it: Iterable[T], 
-    /, 
-    threaded: bool = False, 
-) -> AsyncIterator[T]:
-    if threaded:
-        call = iter(it).__next__
-        try:
-            while True:
-                yield await to_thread(call)
-        except StopIteration:
-            pass
-    else:
-        for e in it:
-            yield e
-
-
-def _as_iter[T](
-    it: AsyncIterable[T], 
-    /, 
-    run: Callable = asyncio_run, 
-) -> Iterator[T]:
-    try:
-        call = aiter(it).__anext__
-        while True:
-            yield run(call())
-    except StopAsyncIteration:
-        pass
-
-
 @optional
-def dynamic_async[T](
+def dynamic_async(
     func: Callable, 
     /, 
-    run: Callable = asyncio_run, 
     threaded: bool = False, 
     async_: None | bool = None, 
+    loop: None | AbstractEventLoop = None, 
 ):
     has_async_arg = has_keyword_arg(func, "async_")
     def wrapper(*args, async_: None | bool = async_, **kwds):
@@ -68,22 +35,22 @@ def dynamic_async[T](
             else:
                 r = func(*args, **kwds)
                 if not isawaitable(r):
-                    r = _as_async(r)
+                    r = to_coroutine(r)
         else:
             r = func(*args, **kwds)
             if isawaitable(r):
-                r = run(r)
+                r = run_async(r, loop)
         return r
     return wrapper
 
 
 @optional
-def dynamic_async_iter[T](
+def dynamic_async_iter(
     func: Callable[..., Iterable] | Callable[..., AsyncIterable], 
     /, 
-    run: Callable = asyncio_run, 
     threaded: bool = False, 
     async_: None | bool = None, 
+    loop: None | AbstractEventLoop = None, 
 ):
     has_async_arg = has_keyword_arg(func, "async_")
     def wrapper(*args, async_: None | bool = async_, **kwds):
@@ -94,9 +61,9 @@ def dynamic_async_iter[T](
         it = func(*args, **kwds)
         if async_:
             if not isinstance(it, AsyncIterable):
-                it = _as_async_iter(it, threaded=threaded)
+                it = to_aiter(it, threaded=threaded)
         elif isinstance(it, AsyncIterable):
-            it = _as_iter(it, run)
+            it = iter_async(it, loop)
         return it
     return wrapper
 

iterutils/gen_step.py

@@ -3,7 +3,8 @@
 
 __all__ = [
     "iter_gen_step", "run_gen_step", "run_gen_step_iter", 
-    "as_gen_step", "with_iter_next", "Yield", "YieldFrom", 
+    "as_gen_step", "with_iter_next", "with_lock", "split_cm", 
+    "Yield", "YieldFrom", 
 ]
 
 from asyncio import CancelledError as AsyncCancelledError
@@ -171,7 +172,7 @@ def run_gen_step[T](
     /, 
     async_: Literal[True], 
     running: SupportsBool = True, 
-) -> Awaitable[T]:
+) -> Coroutine[Any, Any, T]:
     ...
 def run_gen_step(
     gen, 
@@ -358,6 +359,38 @@ def with_iter_next[T](
             pass
 
 
+@contextmanager
+def with_lock[T](lock, /):
+    """包装锁，以供 `run_gen_step` 和 `run_gen_step_iter` 使用
+
+    .. code:: python
+
+        if async_:
+            async def process():
+                async with lock:
+                    ...
+            return process()
+        else:
+            with lock:
+                ...
+
+    大概相当于
+
+    .. code:: python
+
+        def gen_step():
+            with with_lock(lock) as r:
+                yield r
+                ...
+
+        run_gen_step(gen_step, async_)
+    """
+    try:
+        yield lock.acquire()
+    finally:
+        lock.release()
+
+
 @overload
 def split_cm[T](
     cm: AbstractContextManager[T], 

iterutils/misc.py

@@ -2,10 +2,9 @@
 # encoding: utf-8
 
 __all__ = [
-    "iterable", "async_iterable", "map", "filter", "reduce", "zip", 
-    "chain", "chain_from_iterable", "chunked", "foreach", "async_foreach", 
-    "through", "async_through", "flatten", "async_flatten", "collect", 
-    "async_collect", "group_collect", "async_group_collect", "iter_unique", 
+    "iterable", "map", "filter", "reduce", "zip", 
+    "chain", "chain_from_iterable", "chunked", "foreach", "through", 
+    "flatten", "collect", "async_group_collect", "iter_unique", 
     "async_iter_unique", "wrap_iter", "wrap_aiter", "peek_iter", "peek_aiter", 
     "acc_step", "cut_iter", "context", "backgroud_loop", "gen_startup", 
     "async_gen_startup", "do_iter", "do_aiter", "bfs_iter", "bfs_gen", 
@@ -24,7 +23,7 @@ from contextlib import asynccontextmanager, contextmanager, ExitStack, AsyncExit
 from copy import copy
 from functools import update_wrapper
 from itertools import batched, chain as _chain, pairwise
-from inspect import iscoroutinefunction
+from inspect import isawaitable, iscoroutinefunction
 from sys import _getframe
 from _thread import start_new_thread
 from time import sleep, time
@@ -35,17 +34,13 @@ from typing import (
 
 from asynctools import (
     async_filter, async_map, async_reduce, async_zip, async_batched, 
-    ensure_async, ensure_aiter, async_chain, collect as async_collect, 
+    ensure_async, ensure_aiter, async_chain, async_chain_from_iterable, 
+    async_collect, async_foreach, async_through, 
 )
 from texttools import format_time
 from undefined import undefined
 
 
-iterable = Iterable.__instancecheck__
-async_iterable = AsyncIterable.__instancecheck__
-isawaitable = Awaitable.__instancecheck__
-
-
 def _coalesce(vals, default=None):
     for val in vals:
         if val is not None:
@@ -232,11 +227,8 @@ def chain_from_iterable[T](
     *, 
     async_: Literal[False, True] = False, 
 ) -> Iterator[T] | AsyncIterator[T]:
-    if async_ or not isinstance(iterables, Iterable):
-        if isinstance(iterables, Iterable):
-            return async_chain.from_iterable(iterables, threaded=threaded)
-        else:
-            return async_chain.from_iterable(iterables, threaded=threaded)
+    if async_ or threaded:
+        return async_chain_from_iterable(iterables, threaded=threaded)
     return _chain.from_iterable(iterables) # type: ignore
 
 setattr(chain, "from_iterable", chain_from_iterable)
@@ -291,85 +283,45 @@ def chunked[T](
 
 
 def foreach(
-    value: Callable, 
+    function: Callable, 
     iterable: Iterable | AsyncIterable, 
     /, 
     *iterables: Iterable | AsyncIterable, 
+    default = None, 
     threaded: bool = False, 
 ):
-    """
-    """
-    if (not threaded and 
-        isinstance(iterable, Iterable) and 
-        all(isinstance(it, Iterable) for it in iterables)
+    if (threaded or 
+        isinstance(iterable, AsyncIterable) or 
+        any(isinstance(it, AsyncIterable) for it in iterables)
     ):
-        if iterables:
-            for args in _zip(iterable, *iterables):
-                value(*args)
-        else:
-            for arg in iterable:
-                value(arg)
-    else:
-        return async_foreach(value, iterable, *iterables, threaded=threaded)
-
-
-async def async_foreach(
-    value: Callable, 
-    iterable: Iterable | AsyncIterable, 
-    /, 
-    *iterables: Iterable | AsyncIterable, 
-    threaded: bool = False, 
-):
-    """
-    """
-    value = ensure_async(value, threaded=threaded)
+        return async_foreach(
+            function, 
+            iterable, 
+            *iterables, 
+            default=default, 
+            threaded=threaded, 
+        )
+    r = default
     if iterables:
-        async for args in async_zip(iterable, *iterables, threaded=threaded):
-            await value(*args)
+        for args in _zip(iterable, *iterables):
+            r = function(*args)
     else:
-        async for arg in ensure_aiter(iterable, threaded=threaded):
-            await value(arg)
+        for arg in iterable:
+            r = function(arg)
+    return r
 
 
 def through(
     iterable: Iterable | AsyncIterable, 
     /, 
-    take_while: None | Callable = None, 
     threaded: bool = False, 
 ):
     """
     """
-    if threaded or not isinstance(iterable, Iterable):
-        return async_through(iterable, take_while, threaded=threaded)
-    elif take_while is None:
-        for _ in iterable:
-            pass
-    else:
-        for v in _map(take_while, iterable):
-            if not v:
-                break
-
-
-async def async_through(
-    iterable: Iterable | AsyncIterable, 
-    /, 
-    take_while: None | Callable = None, 
-    threaded: bool = False, 
-):
-    """
-    """
-    iterable = ensure_aiter(iterable, threaded=threaded)
-    if take_while is None:
-        async for _ in iterable:
-            pass
-    elif take_while is bool:
-        async for v in iterable:
-            if not v:
-                break
-    else:
-        async for v in async_map(take_while, iterable):
-            if not v:
-                break
+    if threaded or isinstance(iterable, AsyncIterable):
+        return async_through(iterable, threaded=threaded)
+    for _ in iterable:
+        pass
 
 
 @overload

{python_iterutils-0.3.0.dist-info → python_iterutils-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-iterutils
-Version: 0.3.0
+Version: 0.3.1
 Summary: Python another itertools.
 License: MIT
 License-File: LICENSE
@@ -21,7 +21,8 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: python-asynctools (>=0.1.4)
+Requires-Dist: python-argtools (>=0.0.4)
+Requires-Dist: python-asynctools (>=0.2.1)
 Requires-Dist: python-texttools (>=0.0.6)
 Requires-Dist: python-undefined (>=0.0.4)
 Project-URL: Homepage, https://github.com/ChenyangGao/python-modules/tree/main/python-iterutils

python_iterutils-0.3.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+iterutils/__init__.py,sha256=e3TnEvFCdzg6jotU3JB95qHwcA2DrkRJjrTMLF1rYWs,193
+iterutils/dynamic.py,sha256=AxvY1H61BUxMWkTLK6lQDzfKeFQXmRbPadQSf3LJ3gs,1946
+iterutils/gen_step.py,sha256=66QInXz4VxANWHNgmSQ3x6U5I6_pUfCtTRgjftdgeQE,11078
+iterutils/misc.py,sha256=43ViCCJLc2MJGiisTCTbVhOHH5Akfc3ZW7kQlI7pm5c,27823
+iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_iterutils-0.3.1.dist-info/METADATA,sha256=0cMSV_WHhomz5qnES44vCKzPYQWApzE_oVw_4zDkat8,1521
+python_iterutils-0.3.1.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
+python_iterutils-0.3.1.dist-info/licenses/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_iterutils-0.3.1.dist-info/RECORD,,

python_iterutils-0.3.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-iterutils/__init__.py,sha256=Dxp6LiS0vgtgwo1QZJa1Q4Krxa50dFOai3SJK67tXnY,193
-iterutils/dynamic.py,sha256=qYDPlg5JaF637kxo8e2V3OWtzAn3JKLrMGXjH5z4fvw,2555
-iterutils/gen_step.py,sha256=Bi5KQO1FkcpTJ9gf1m5AZzsPoHUVQ0pLUiqnFdmKgBQ,10430
-iterutils/misc.py,sha256=TTVOs6qSNBN5sQHpCzfmv3LaY8k5H7PFp6RdcsXRdtM,29222
-iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_iterutils-0.3.0.dist-info/METADATA,sha256=NnIt3TLSSAM4ss3bwEx3EU8Ss87Va3TIAI4GU4yWcrc,1480
-python_iterutils-0.3.0.dist-info/WHEEL,sha256=EGEvSphFYqXKs23-kQBeyNoJP1nrT8ZJKQoi5p5DYL8,88
-python_iterutils-0.3.0.dist-info/licenses/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_iterutils-0.3.0.dist-info/RECORD,,