python-iterutils 0.2.6__tar.gz → 0.2.8__tar.gz

{python_iterutils-0.2.6 → python_iterutils-0.2.8}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: python-iterutils
-Version: 0.2.6
+Version: 0.2.8
 Summary: Python another itertools.
-Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-iterutils
+Home-page: https://github.com/ChenyangGao/python-modules/tree/main/python-iterutils
 License: MIT
 Keywords: iterable,iterutils
 Author: ChenyangGao
@@ -23,7 +23,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: python-asynctools (>=0.1.3.4)
 Requires-Dist: python-texttools (>=0.0.3)
 Requires-Dist: python-undefined (>=0.0.3)
-Project-URL: Repository, https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-iterutils
+Project-URL: Repository, https://github.com/ChenyangGao/python-modules/tree/main/python-iterutils
 Description-Content-Type: text/markdown
 
 # Python another itertools.

{python_iterutils-0.2.6 → python_iterutils-0.2.8}/iterutils/__init__.py

@@ -2,14 +2,13 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 2, 6)
+__version__ = (0, 2, 8)
 __all__ = [
-    "Yield", "YieldFrom", "GenStep", "iterable", "async_iterable", 
-    "run_gen_step", "run_gen_step_iter", "as_gen_step", 
-    "as_gen_step_iter", "split_cm", "with_iter_next", 
-    "map", "filter", "reduce", "zip", "chain", 
-    "chain_from_iterable", "chunked", "foreach", 
-    "async_foreach", "through", "async_through", 
+    "Yield", "YieldFrom", "GenStep", "GenStepIter", "iterable", 
+    "async_iterable", "run_gen_step", "run_gen_step_iter", 
+    "as_gen_step", "as_gen_step_iter", "split_cm", "with_iter_next", 
+    "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", 
     "async_iter_unique", "wrap_iter", "wrap_aiter", "acc_step", 
@@ -68,7 +67,15 @@ class GenStep:
     """专供 `run_gen_step` 和 `run_gen_step_iter`，说明值需要进一步提取
     """
     value: Generator
-    max_depth: int = -1
+    max_depth: int = 0
+
+
+@dataclass(slots=True, frozen=True, unsafe_hash=True)
+class GenStepIter:
+    """专供 `run_gen_step_iter`，说明值需要进一步提取
+    """
+    value: Generator
+    max_depth: int = 0
 
 
 iterable = Iterable.__instancecheck__
@@ -204,14 +211,17 @@ def _run_gen_step_iter(
                 val_type = type(value)
                 if issubclass(val_type, (Yield, YieldFrom)):
                     value = value.value
-                if isinstance(value, GenStep):
-                    value = _run_gen_step(value.value, value.max_depth)
-                elif drive_generator and isinstance(value, Generator):
-                    value = _run_gen_step(value, dgen)
-                if val_type is Yield:
-                    yield value
-                elif val_type is YieldFrom:
-                    yield from value
+                if isinstance(value, GenStepIter):
+                    yield from _run_gen_step_iter(value.value, value.max_depth)
+                else:
+                    if isinstance(value, GenStep):
+                        value = _run_gen_step(value.value, value.max_depth)
+                    elif drive_generator and isinstance(value, Generator):
+                        value = _run_gen_step(value, dgen)
+                    if val_type is Yield:
+                        yield value
+                    elif val_type is YieldFrom:
+                        yield from value
             except BaseException as e:
                 value = throw(e)
             else:
@@ -221,7 +231,9 @@ def _run_gen_step_iter(
         val_type = type(value)
         if issubclass(val_type, (Yield, YieldFrom)):
             value = value.value
-        if isinstance(value, GenStep):
+        elif isinstance(value, GenStepIter):
+            yield from _run_gen_step_iter(value.value, value.max_depth)
+        elif isinstance(value, GenStep):
             value = _run_gen_step(value.value, value.max_depth)
         elif drive_generator and isinstance(value, Generator):
             value = _run_gen_step(value, dgen)
@@ -250,6 +262,9 @@ async def _run_gen_step_async_iter(
                     value = value.value
                 if isawaitable(value):
                     value = await value
+                elif isinstance(value, GenStepIter):
+                    async for el in _run_gen_step_async_iter(value.value, value.max_depth):
+                        yield el
                 elif isinstance(value, GenStep):
                     value = await _run_gen_step_async(value.value, value.max_depth)
                 elif drive_generator and isinstance(value, Generator):
@@ -274,19 +289,23 @@ async def _run_gen_step_async_iter(
             value = value.value
         if isawaitable(value):
             value = await value
-        elif isinstance(value, GenStep):
-            value = await _run_gen_step_async(value.value, value.max_depth)
-        elif drive_generator and isinstance(value, Generator):
-            value = await _run_gen_step_async(value, dgen)
-        if val_type is Yield:
-            yield value
-        elif val_type is YieldFrom:
-            if isinstance(value, AsyncIterable):
-                async for el in value:
-                    yield el
-            else:
-                for el in value:
-                    yield el
+        if isinstance(value, GenStepIter):
+            async for el in _run_gen_step_async_iter(value.value, value.max_depth):
+                yield el
+        else:
+            if isinstance(value, GenStep):
+                value = await _run_gen_step_async(value.value, value.max_depth)
+            elif drive_generator and isinstance(value, Generator):
+                value = await _run_gen_step_async(value, dgen)
+            if val_type is Yield:
+                yield value
+            elif val_type is YieldFrom:
+                if isinstance(value, AsyncIterable):
+                    async for el in value:
+                        yield el
+                else:
+                    for el in value:
+                        yield el
     finally:
         gen.close()
 

{python_iterutils-0.2.6 → python_iterutils-0.2.8}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "python-iterutils"
-version = "0.2.6"
+version = "0.2.8"
 description = "Python another itertools."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
 readme = "readme.md"
-homepage = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-iterutils"
-repository = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-iterutils"
+homepage = "https://github.com/ChenyangGao/python-modules/tree/main/python-iterutils"
+repository = "https://github.com/ChenyangGao/python-modules/tree/main/python-iterutils"
 keywords = ["iterable", "iterutils"]
 classifiers = [
     "License :: OSI Approved :: MIT License",