python-iterutils 0.2.6__py3-none-any.whl → 0.2.7__py3-none-any.whl

iterutils/__init__.py

@@ -2,14 +2,13 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 2, 6)
+__version__ = (0, 2, 7)
 __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,7 +211,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)
@@ -221,7 +230,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 +261,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,6 +288,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):

{python_iterutils-0.2.6.dist-info → python_iterutils-0.2.7.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+iterutils/__init__.py,sha256=44RZPpEkjbhfDwb9cmUcStPJTPfyixaoMifj9iHme2s,37665
+iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_iterutils-0.2.7.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_iterutils-0.2.7.dist-info/METADATA,sha256=VjYnPSbvmJBEe8CV8Ba2C5NN3La6vqrrAqLsJeb3q8Q,1427
+python_iterutils-0.2.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+python_iterutils-0.2.7.dist-info/RECORD,,

python_iterutils-0.2.6.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-iterutils/__init__.py,sha256=gfuQk9Qp4hVpjCciZIyeS-0dRNIFsrO6HkWEZK4UgUo,36876
-iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_iterutils-0.2.6.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_iterutils-0.2.6.dist-info/METADATA,sha256=Bd-gpNnYlks584NbnAndkac7XDznJNBDeeR-xoiKUdY,1427
-python_iterutils-0.2.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-python_iterutils-0.2.6.dist-info/RECORD,,