persidict 0.36.9__py3-none-any.whl → 0.36.11__py3-none-any.whl

persidict/file_dir_dict.py

@@ -190,7 +190,12 @@ class FileDirDict(PersiDict):
                     os.remove(os.path.join(subdir_name, f))
             if (subdir_name != self._base_dir) and (
                     len(os.listdir(subdir_name)) == 0 ):
-                os.rmdir(subdir_name)
+                try:
+                    os.rmdir(subdir_name)
+                except OSError:
+                    # Directory is not empty, likely due to a race condition.
+                    # Continue without raising an error.
+                    pass
 
 
     def _build_full_path(self

persidict/s3_dict.py

@@ -103,9 +103,28 @@ class S3Dict(PersiDict):
             self.s3_client = boto3.client('s3', region_name=region)
 
         try:
-            self.s3_client.create_bucket(Bucket=bucket_name)
-        except:
-            pass
+            self.s3_client.head_bucket(Bucket=bucket_name)
+        except ClientError as e:
+            error_code = e.response['Error']['Code']
+            if error_code == '404' or error_code == 'NotFound':
+                # The bucket does not exist, so attempt to create it.
+                try:
+                    self.s3_client.create_bucket(Bucket=bucket_name)
+                except ClientError as create_e:
+                    create_error_code = create_e.response['Error']['Code']
+                    # Handles the race condition and the bucket-is-taken error
+                    if ( create_error_code == 'BucketAlreadyOwnedByYou'
+                        or create_error_code == 'BucketAlreadyExists'):
+                        pass
+                    else:
+                        raise create_e  # Re-raise other unexpected creation errors.
+            elif error_code == '403' or error_code == 'Forbidden':
+                # The bucket exists, but access is forbidden.
+                # This is likely a cross-account bucket with a policy that grants
+                # access to you. Subsequent calls will fail if permissions are not granted.
+                pass
+            else:
+                raise e  # Re-raise other unexpected ClientErrors on head_bucket.
 
         self.bucket_name = bucket_name
 
@@ -246,7 +265,6 @@ class S3Dict(PersiDict):
             self.etag_cache[key] = s3_etag
 
         except ClientError as e:
-            error_code = e.response.get("Error", {}).get("Code")
             if e.response['ResponseMetadata']['HTTPStatusCode'] == 304:
                 # 304 Not Modified: our cached version is up-to-date.
                 # The value will be read from cache at the end of the function.
@@ -336,6 +354,9 @@ class S3Dict(PersiDict):
         if self.immutable_items:
             raise KeyError("Can't delete an immutable item")
 
+        if key not in self:
+            raise KeyError(f"Key {key} not found in S3 bucket {self.bucket_name}")
+
         obj_name = self._build_full_objectname(key)
         
         self.s3_client.delete_object(Bucket = self.bucket_name, Key = obj_name)

{persidict-0.36.9.dist-info → persidict-0.36.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: persidict
-Version: 0.36.9
+Version: 0.36.11
 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.36.9.dist-info → persidict-0.36.11.dist-info}/RECORD

@@ -1,14 +1,14 @@
 persidict/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 persidict/__init__.py,sha256=CDOSJGgCnyRTkGUTzaeg3Cqsxwx0-0EFieOtldXwAls,1380
-persidict/file_dir_dict.py,sha256=JJ5oEyaqwTm9g_tUrVfut0IYI7bd5B2lhxrLzadTohA,25541
+persidict/file_dir_dict.py,sha256=mWMgLN_uj-IlqIbyVdbABLVxiB-t2wh2rbv98sUWyrY,25758
 persidict/jokers.py,sha256=7ibh0ccfkEm3EvKIOhH9ShfZ0_MBKYMvKa1rwqHg1hk,3010
 persidict/overlapping_multi_dict.py,sha256=UFyPEG2GbMmMHY48UmcaLHpsaxMqRH3bc_UA8S90yJo,5947
 persidict/persi_dict.py,sha256=Q7fGs9LFPxSLtC0jJwDOP1AVD9_t01SnwdN4RVBMZtg,20660
-persidict/s3_dict.py,sha256=GOFTpSwFESoGxEykS7TVjkw0VRIxRon-xXytrnwAuTY,19905
+persidict/s3_dict.py,sha256=0o2RslAkdE75N9zDuqQMyiSbO0uzdQmiNmZSfHZzfxw,21137
 persidict/safe_chars.py,sha256=H-cL9waCmDtwaRR5Y4b4oTzcBx09nc8wn8u61SVZDY0,1728
 persidict/safe_str_tuple.py,sha256=YBTcYjUKIffznOawXb9xKjz4HaKdklrgyVtegJFmr5w,7202
 persidict/safe_str_tuple_signing.py,sha256=mpOfx_xyprc0_c60XPB_EihI3vR1gOn6T03iCx1HwwQ,7494
 persidict/write_once_dict.py,sha256=nv5vx9uh6VZ5Qh3HJcBgUHLnDX9KY843FbHndcy-63E,11677
-persidict-0.36.9.dist-info/WHEEL,sha256=Pi5uDq5Fdo_Rr-HD5h9BiPn9Et29Y9Sh8NhcJNnFU1c,79
-persidict-0.36.9.dist-info/METADATA,sha256=h4j6Waop0pzsEVTRDj-Sx2NMa-GZfs2AGnbrh7gxeC8,12387
-persidict-0.36.9.dist-info/RECORD,,
+persidict-0.36.11.dist-info/WHEEL,sha256=Pi5uDq5Fdo_Rr-HD5h9BiPn9Et29Y9Sh8NhcJNnFU1c,79
+persidict-0.36.11.dist-info/METADATA,sha256=T3NKQWLF_OlBZTx4wg3x16RUiTlcYignxP9UVrNrVPc,12388
+persidict-0.36.11.dist-info/RECORD,,