persidict 0.32.2__tar.gz → 0.32.3__tar.gz

{persidict-0.32.2 → persidict-0.32.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: persidict
-Version: 0.32.2
+Version: 0.32.3
 Summary: Simple persistent key-value store for Python. Values are stored as files on a disk or as S3 objects on AWS cloud.
 Keywords: persistence,dicts,distributed,parallel
 Author: Vlad (Volodymyr) Pavlov

{persidict-0.32.2 → persidict-0.32.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "persidict"
-version = "0.32.2"
+version = "0.32.3"
 description = "Simple persistent key-value store for Python. Values are stored as files on a disk or as S3 objects on AWS cloud."
 readme = "README.md"
 requires-python = ">=3.10"

{persidict-0.32.2 → persidict-0.32.3}/src/persidict/s3_dict.py

@@ -253,16 +253,18 @@ class S3Dict(PersiDict):
         num_files = 0
         suffix = "." + self.file_type
 
-        paginator = self.s3_client.get_paginator("list_objects")
+        paginator = self.s3_client.get_paginator("list_objects_v2")
         page_iterator = paginator.paginate(
             Bucket=self.bucket_name, Prefix = self.root_prefix)
 
         for page in page_iterator:
-            if "Contents" in page:
-                for key in page["Contents"]:
-                    obj_name = key["Key"]
-                    if obj_name.endswith(suffix):
-                        num_files += 1
+            contents = page.get("Contents")
+            if not contents:
+                continue
+            for key in contents:
+                obj_name = key["Key"]
+                if obj_name.endswith(suffix):
+                    num_files += 1
 
         return num_files
 
@@ -280,25 +282,27 @@ class S3Dict(PersiDict):
             return SafeStrTuple(result)
 
         def step():
-            paginator = self.s3_client.get_paginator("list_objects")
+            paginator = self.s3_client.get_paginator("list_objects_v2")
             page_iterator = paginator.paginate(
                 Bucket=self.bucket_name, Prefix = self.root_prefix)
 
             for page in page_iterator:
-                if "Contents" in page:
-                    for key in page["Contents"]:
-                        obj_name = key["Key"]
-                        if not obj_name.endswith(suffix):
-                            continue
-                        obj_key = splitter(obj_name)
-                        if iter_type == "keys":
-                            yield unsign_safe_str_tuple(
-                                obj_key, self.digest_len)
-                        elif iter_type == "values":
-                            yield self[obj_key]
-                        else:
-                            yield (unsign_safe_str_tuple(
-                                obj_key, self.digest_len), self[obj_key])
+                contents = page.get("Contents")
+                if not contents:
+                    continue
+                for key in contents:
+                    obj_name = key["Key"]
+                    if not obj_name.endswith(suffix):
+                        continue
+                    obj_key = splitter(obj_name)
+                    if iter_type == "keys":
+                        yield unsign_safe_str_tuple(
+                            obj_key, self.digest_len)
+                    elif iter_type == "values":
+                        yield self[obj_key]
+                    else:
+                        yield (unsign_safe_str_tuple(
+                            obj_key, self.digest_len), self[obj_key])
 
         return step()