python-iterutils 0.0.2.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

iterutils/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 2)
+__version__ = (0, 0, 3)
 __all__ = [
     "iterable", "async_iterable", "foreach", "async_foreach", "through", "async_through", 
     "wrap_iter", "wrap_aiter", "acc_step", "cut_iter", 
@@ -68,35 +68,72 @@ def wrap_iter(
     it: Iterable[T], 
     /, 
     callprev: None | Callable[[T], Any] = None, 
-    callnext: None | Callable[[T], Any] = None,  
+    callnext: None | Callable[[T], Any] = None, 
+    callenter: None | Callable[[Iterable[T]], Any] = None, 
+    callexit: None | Callable[[Iterable[T], None | BaseException], Any] = None, 
 ) -> Iterator[T]:
     if not callable(callprev):
         callprev = None
     if not callable(callnext):
         callnext = None
-    for e in it:
-        if callprev:
-            callprev(e)
-        yield e
-        if callnext:
-            callnext(e)
+    try:
+        if callable(callenter):
+            callenter(it)
+        for e in it:
+            if callprev:
+                try:
+                    callprev(e)
+                except (StopIteration, GeneratorExit):
+                    break
+            yield e
+            if callnext:
+                try:
+                    callnext(e)
+                except (StopIteration, GeneratorExit):
+                    break
+    except BaseException as e:
+        if callable(callexit):
+            callexit(it, e)
+        else:
+            raise
+    finally:
+        if callable(callexit):
+            callexit(it, None)
 
 
 async def wrap_aiter(
     it: Iterable[T] | AsyncIterable[T], 
     /, 
     callprev: None | Callable[[T], Any] = None, 
-    callnext: None | Callable[[T], Any] = None,  
+    callnext: None | Callable[[T], Any] = None, 
+    callenter: None | Callable[[Iterable[T] | AsyncIterable[T]], Any] = None, 
+    callexit: None | Callable[[Iterable[T] | AsyncIterable[T], None | BaseException], Any] = None, 
     threaded: bool = True, 
 ) -> AsyncIterator[T]:
-    callprev = ensure_async(callprev) if callable(callprev) else None
-    callnext = ensure_async(callnext) if callable(callnext) else None
-    async for e in ensure_aiter(it, threaded=threaded):
-        if callprev:
-            await callprev(e)
-        yield e
-        if callnext:
-            await callnext(e)
+    callprev = ensure_async(callprev, threaded=threaded) if callable(callprev) else None
+    callnext = ensure_async(callnext, threaded=threaded) if callable(callnext) else None
+    try:
+        async for e in ensure_aiter(it, threaded=threaded):
+            if callprev:
+                try:
+                    await callprev(e)
+                except (StopAsyncIteration, GeneratorExit):
+                    break
+            yield e
+            if callnext:
+                try:
+                    await callnext(e)
+                except (StopAsyncIteration, GeneratorExit):
+                    break
+    except BaseException as e:
+        if callable(callexit):
+            if not await ensure_async(callexit, threaded=threaded)(it, e):
+                raise
+        else:
+            raise
+    finally:
+        if callable(callexit):
+            await ensure_async(callexit, threaded=threaded)(it, None)
 
 
 def acc_step(

{python_iterutils-0.0.2.2.dist-info → python_iterutils-0.0.3.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+iterutils/__init__.py,sha256=OgXsu7O6TGsuz0Gwje-zNs7x_e_gd7_i3kbnCQSk_Tg,4535
+iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_iterutils-0.0.3.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_iterutils-0.0.3.dist-info/METADATA,sha256=zoTHrnVp4rEPFIglB0w9wXnPWFiClAa9njBGsOGvRAk,1382
+python_iterutils-0.0.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+python_iterutils-0.0.3.dist-info/RECORD,,

python_iterutils-0.0.2.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-iterutils/__init__.py,sha256=z5sIhwNu0U7YrxxF2WSxGtZjJu3kU2d6f2LXLwTJqH8,3119
-iterutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_iterutils-0.0.2.2.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_iterutils-0.0.2.2.dist-info/METADATA,sha256=pl-dTESGVeFhCx4uvb67K8NAtwXR7Fe5vU5tLuRQ5s4,1384
-python_iterutils-0.0.2.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_iterutils-0.0.2.2.dist-info/RECORD,,