miniopy-async 1.19__tar.gz → 1.20__tar.gz

{miniopy-async-1.19 → miniopy_async-1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: miniopy-async
-Version: 1.19
+Version: 1.20
 Summary: Asynchronous MinIO Client SDK for Python
 Home-page: https://github.com/hlf20010508/miniopy-async
 Author: L-ING

{miniopy-async-1.19 → miniopy_async-1.20}/miniopy_async/__init__.py

@@ -45,7 +45,7 @@ miniopy-async - Asynchronous MinIO Client SDK for Python
 
 __title__ = "miniopy-async"
 __author__ = "L-ING."
-__version__ = "1.19"
+__version__ = "1.20"
 __license__ = "Apache 2.0"
 __copyright__ = "(C) 2022 L-ING <hlf01@icloud.com>"
 

{miniopy-async-1.19 → miniopy_async-1.20}/miniopy_async/api.py

@@ -60,6 +60,7 @@ from .datatypes import (
     PostPolicy,
     parse_copy_object,
     parse_list_objects,
+    ListObjects,
 )
 from .deleteobjects import DeleteError, DeleteRequest, DeleteResult
 from .error import InvalidResponseError, S3Error, ServerError
@@ -264,11 +265,7 @@ class Minio:  # pylint: disable=too-many-public-methods
             session = aiohttp.ClientSession()
 
         response = await session.request(
-            method,
-            urlunsplit(url),
-            data=body,
-            headers=headers,
-            ssl=self._ssl
+            method, urlunsplit(url), data=body, headers=headers, ssl=self._ssl
         )
 
         if response.status in [200, 204, 206]:
@@ -317,18 +314,22 @@ class Minio:  # pylint: disable=too-many-public-methods
             404: lambda: (
                 ("NoSuchKey", "Object does not exist")
                 if object_name
-                else ("NoSuchBucket", "Bucket does not exist")
-                if bucket_name
-                else ("ResourceNotFound", "Request resource not found")
+                else (
+                    ("NoSuchBucket", "Bucket does not exist")
+                    if bucket_name
+                    else ("ResourceNotFound", "Request resource not found")
+                )
             ),
             405: lambda: (
                 "MethodNotAllowed",
                 "The specified method is not allowed against this resource",
             ),
             409: lambda: (
-                ("NoSuchBucket", "Bucket does not exist")
-                if bucket_name
-                else ("ResourceConflict", "Request resource conflicts"),
+                (
+                    ("NoSuchBucket", "Bucket does not exist")
+                    if bucket_name
+                    else ("ResourceConflict", "Request resource conflicts")
+                ),
             ),
             501: lambda: (
                 "MethodNotAllowed",
@@ -2414,7 +2415,7 @@ class Minio:  # pylint: disable=too-many-public-methods
                 )
             raise exc
 
-    async def list_objects(
+    def list_objects(
         self,
         bucket_name,
         prefix=None,
@@ -2459,6 +2460,9 @@ class Minio:  # pylint: disable=too-many-public-methods
                 for obj in objects:
                     print('obj:',obj)
 
+                async for obj in client.list_objects("my-bucket"):
+                    print('obj:',obj)
+
                 # List objects information whose names starts with "my/prefix/".
                 print('example two')
                 objects = await client.list_objects("my-bucket",
@@ -2495,15 +2499,16 @@ class Minio:  # pylint: disable=too-many-public-methods
             loop.run_until_complete(main())
             loop.close()
         """
-        return await self._list_objects(
-            bucket_name,
-            delimiter=None if recursive else "/",
-            include_user_meta=include_user_meta,
+        return ListObjects(
+            client=self,
+            bucket_name=bucket_name,
             prefix=prefix,
+            recursive=recursive,
             start_after=start_after,
-            use_api_v1=use_api_v1,
+            include_user_meta=include_user_meta,
             include_version=include_version,
-            encoding_type="url" if use_url_encoding_type else None,
+            use_api_v1=use_api_v1,
+            use_url_encoding_type=use_url_encoding_type,
         )
 
     async def stat_object(
@@ -4173,6 +4178,7 @@ class Minio:  # pylint: disable=too-many-public-methods
             include_version = True
 
         is_truncated = True
+
         while is_truncated:
             query = {}
             if include_version:
@@ -4214,13 +4220,13 @@ class Minio:  # pylint: disable=too-many-public-methods
                     version_id_marker,
                 ) = await parse_list_objects(response)
 
+                yield objects
+
             if not include_version:
                 version_id_marker = None
                 if not use_api_v1:
                     continuation_token = start_after
 
-            return objects
-
     async def _list_multipart_uploads(
         self,
         bucket_name,

{miniopy-async-1.19 → miniopy_async-1.20}/miniopy_async/datatypes.py

@@ -276,9 +276,11 @@ async def parse_list_objects(response, bucket_name=None):
     objects += [
         Object(
             bucket_name,
-            unquote_plus(findtext(tag, "Prefix", True))
-            if encoding_type == "url"
-            else findtext(tag, "Prefix", True),
+            (
+                unquote_plus(findtext(tag, "Prefix", True))
+                if encoding_type == "url"
+                else findtext(tag, "Prefix", True)
+            ),
         )
         for tag in elements
     ]
@@ -849,3 +851,71 @@ class AsyncEventIterable:
 
     async def __aexit__(self, exc_type, value, traceback):
         self._response.close()
+
+
+class ListObjects:
+    def __init__(
+        self,
+        client,
+        bucket_name,
+        prefix=None,
+        recursive=False,
+        start_after=None,
+        include_user_meta=False,
+        include_version=False,
+        use_api_v1=False,
+        use_url_encoding_type=True,
+    ):
+        self.client = client
+        self.bucket_name = bucket_name
+        self.prefix = prefix
+        self.recursive = recursive
+        self.start_after = start_after
+        self.include_user_meta = include_user_meta
+        self.include_version = include_version
+        self.use_api_v1 = use_api_v1
+        self.use_url_encoding_type = use_url_encoding_type
+        self.objects = []
+        self.buffer = []
+        self.iterator = None
+        self.is_awaited = False
+
+    def gen_iterator(self):
+        return self.client._list_objects(
+            self.bucket_name,
+            delimiter=None if self.recursive else "/",
+            include_user_meta=self.include_user_meta,
+            prefix=self.prefix,
+            start_after=self.start_after,
+            use_api_v1=self.use_api_v1,
+            include_version=self.include_version,
+            encoding_type="url" if self.use_url_encoding_type else None,
+        )
+
+    def __aiter__(self):
+        self.iterator = self.gen_iterator()
+        return self
+
+    async def __anext__(self):
+        if self.iterator is None:
+            self.gen_iterator()
+
+        if not self.buffer:
+            try:
+                self.buffer = await self.iterator.__anext__()
+                self.objects.extend(self.buffer)
+            except StopAsyncIteration:
+                raise StopAsyncIteration
+
+        return self.buffer.pop(0)
+
+    def __await__(self):
+        return self._collect_objects().__await__()
+
+    async def _collect_objects(self):
+        if self.iterator is None:
+            self.gen_iterator()
+
+        async for partial_objects in self:
+            pass
+        return self.objects

{miniopy-async-1.19 → miniopy_async-1.20}/miniopy_async.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: miniopy-async
-Version: 1.19
+Version: 1.20
 Summary: Asynchronous MinIO Client SDK for Python
 Home-page: https://github.com/hlf20010508/miniopy-async
 Author: L-ING