python-filewrap 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

filewrap/__init__.py

@@ -2,12 +2,13 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 1, 1)
+__version__ = (0, 1, 3)
 __all__ = [
     "Buffer", "SupportsRead", "SupportsReadinto", 
     "SupportsWrite", "SupportsSeek", 
     "bio_chunk_iter", "bio_chunk_async_iter", 
     "bio_skip_iter", "bio_skip_async_iter", 
+    "bytes_iter", "bytes_async_iter", 
     "bytes_iter_skip", "bytes_async_iter_skip", 
     "bytes_iter_to_reader", "bytes_iter_to_async_reader", 
     "bytes_to_chunk_iter", "bytes_to_chunk_async_iter", 
@@ -22,7 +23,7 @@ from inspect import isawaitable, iscoroutinefunction, isasyncgen, isgenerator
 from itertools import chain
 from shutil import COPY_BUFSIZE # type: ignore
 from threading import Lock
-from typing import runtime_checkable, Any, ParamSpec, Protocol, TypeVar
+from typing import cast, runtime_checkable, Any, ParamSpec, Protocol, TypeVar
 
 try:
     from collections.abc import Buffer # type: ignore
@@ -350,6 +351,67 @@ async def bio_skip_async_iter(
         yield length
 
 
+def bytes_iter(
+    it: Iterable[Buffer], 
+    /, 
+    size: int = -1, 
+    callback: None | Callable[[int], Any] = None, 
+) -> Iterator[Buffer]:
+    it = iter(it)
+    if size < 0:
+        yield from it
+        return
+    elif size == 0:
+        return
+    for b in it:
+        l = len(b)
+        if l <= size:
+            yield b
+            if callback is not None:
+                callback(l)
+            if l < size:
+                size -= l
+            else:
+                break
+        else:
+            yield memoryview(b)[:size]
+            if callback is not None:
+                callback(size)
+            break
+
+
+async def bytes_async_iter(
+    it: Iterable[Buffer] | AsyncIterable[Buffer], 
+    /, 
+    size: int = -1, 
+    callback: None | Callable[[int], Any] = None, 
+    threaded: bool = False, 
+) -> AsyncIterator[Buffer]:
+    it = aiter(ensure_aiter(it, threaded=threaded))
+    if size < 0:
+        async for chunk in it:
+            yield chunk
+        return
+    elif size == 0:
+        return
+    callback = ensure_async(callback) if callable(callback) else None
+    async for b in it:
+        l = len(b)
+        if l <= size:
+            yield b
+            if callback is not None:
+                await callback(l)
+            if l < size:
+                size -= l
+            else:
+                break
+        else:
+            yield memoryview(b)[:size]
+            if callback is not None:
+                await callback(size)
+            break
+
+
 def bytes_iter_skip(
     it: Iterable[Buffer], 
     /, 
@@ -379,8 +441,9 @@ async def bytes_async_iter_skip(
     /, 
     size: int = -1, 
     callback: None | Callable[[int], Any] = None, 
+    threaded: bool = False, 
 ) -> AsyncIterator[Buffer]:
-    it = aiter(ensure_aiter(it))
+    it = aiter(ensure_aiter(it, threaded=threaded))
     if size == 0:
         return it
     callback = ensure_async(callback) if callable(callback) else None
@@ -658,7 +721,7 @@ async def bytes_ensure_part_async_iter(
 
 
 def progress_bytes_iter(
-    it: Iterable[Buffer], 
+    it: Iterable[Buffer] | Callable[[], Buffer], 
     make_progress: None | Callable[Args, Any] = None, 
     /, 
     *args: Args.args, 
@@ -666,6 +729,8 @@ def progress_bytes_iter(
 ) -> Iterator[Buffer]:
     update_progress: None | Callable = None
     close_progress: None | Callable = None
+    if callable(it):
+        it = iter(it, b"")
     if callable(make_progress):
         progress = make_progress(*args, **kwds)
         if isgenerator(progress):
@@ -689,7 +754,7 @@ def progress_bytes_iter(
 
 
 async def progress_bytes_async_iter(
-    it: Iterable[Buffer] | AsyncIterable[Buffer], 
+    it: Iterable[Buffer] | AsyncIterable[Buffer] | Callable[[], Buffer] | Callable[[], Awaitable[Buffer]], 
     make_progress: None | Callable[Args, Any] = None, 
     /, 
     *args: Args.args, 
@@ -697,6 +762,16 @@ async def progress_bytes_async_iter(
 ) -> AsyncIterator[Buffer]:
     update_progress: None | Callable = None
     close_progress: None | Callable = None
+    if callable(it):
+        async def wrapiter(it) -> Buffer:
+            while True:
+                chunk = it()
+                if isawaitable(chunk):
+                    chunk = await chunk
+                if not chunk:
+                    break
+                yield chunk
+        it = cast(AsyncIterable[Buffer], wrapiter(it))
     if callable(make_progress):
         progress = make_progress(*args, **kwds)
         if isgenerator(progress):

{python_filewrap-0.1.1.dist-info → python_filewrap-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-filewrap
-Version: 0.1.1
+Version: 0.1.3
 Summary: Python file wrappers.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-filewrap
 License: MIT

python_filewrap-0.1.3.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+filewrap/__init__.py,sha256=P5kKImPSlq6p7MfsNNAf26RWf5MHBTuZZJ5Mt39EDiM,24102
+filewrap/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_filewrap-0.1.3.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_filewrap-0.1.3.dist-info/METADATA,sha256=cVhvl8TSDHjqLYD37JE4a5a46GDiG7j68qoxhDlLZzs,1362
+python_filewrap-0.1.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+python_filewrap-0.1.3.dist-info/RECORD,,

python_filewrap-0.1.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-filewrap/__init__.py,sha256=reWapSDxv-DZT5S2r8YqWcs6-hYSuR7zNbIjesDcD00,22066
-filewrap/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_filewrap-0.1.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_filewrap-0.1.1.dist-info/METADATA,sha256=q7nHkF41UImZ2V-59k8upeUVpYacjBHXt-21oaTuUzo,1362
-python_filewrap-0.1.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_filewrap-0.1.1.dist-info/RECORD,,