persidict 0.37.0__py3-none-any.whl → 0.37.1__py3-none-any.whl

persidict/file_dir_dict.py

@@ -27,8 +27,7 @@ from .jokers import KEEP_CURRENT, DELETE_CURRENT, Joker
 from .safe_chars import replace_unsafe_chars
 from .safe_str_tuple import SafeStrTuple
 from .safe_str_tuple_signing import sign_safe_str_tuple, unsign_safe_str_tuple
-from .persi_dict import PersiDict, PersiDictKey
-
+from .persi_dict import PersiDict, PersiDictKey, non_empty_persidict_key
 
 jsonpickle_numpy.register_handlers()
 jsonpickle_pandas.register_handlers()
@@ -457,7 +456,7 @@ class FileDirDict(PersiDict):
         Returns:
             bool: True if a file for the key exists; False otherwise.
         """
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         filename = self._build_full_path(key)
         return os.path.isfile(filename)
 
@@ -479,7 +478,7 @@ class FileDirDict(PersiDict):
             TypeError: If the deserialized value does not match base_class_for_values
                 when it is set.
         """
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         filename = self._build_full_path(key)
         if not os.path.isfile(filename):
             raise KeyError(f"File {filename} does not exist")
@@ -510,7 +509,7 @@ class FileDirDict(PersiDict):
                 base_class_for_values when it is set.
         """
 
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         PersiDict.__setitem__(self, key, value)
         if isinstance(value, Joker):
             # processed by base class
@@ -529,8 +528,7 @@ class FileDirDict(PersiDict):
         Raises:
             KeyError: If immutable_items is True or if the key does not exist.
         """
-        key = SafeStrTuple(key)
-        PersiDict.__delitem__(self, key)
+        key = non_empty_persidict_key(key)
         filename = self._build_full_path(key)
         if not os.path.isfile(filename):
             raise KeyError(f"File {filename} does not exist")
@@ -627,7 +625,7 @@ class FileDirDict(PersiDict):
         Raises:
             FileNotFoundError: If the key does not exist.
         """
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         filename = self._build_full_path(key)
         return os.path.getmtime(filename)
 

persidict/persi_dict.py

@@ -36,6 +36,24 @@ If a string (or a sequence of strings) is passed to a PersiDict as a key,
 it will be automatically converted into SafeStrTuple.
 """
 
+
+def non_empty_persidict_key(*args) -> SafeStrTuple:
+    """Create a non-empty SafeStrTuple from the given arguments.
+    This is a convenience function that ensures the resulting SafeStrTuple is
+    not empty, raising a KeyError if it is.
+    Args:
+        *args: Arguments to pass to SafeStrTuple constructor.
+    Returns:
+        SafeStrTuple: A non-empty SafeStrTuple instance.
+    Raises:
+        KeyError: If the resulting SafeStrTuple is empty.
+    """
+    result = SafeStrTuple(*args)
+    if len(result) == 0:
+        raise KeyError("Key cannot be empty")
+    return result
+
+
 class PersiDict(MutableMapping, ParameterizableClass):
     """Abstract dict-like interface for durable key-value stores.
 
@@ -209,8 +227,12 @@ class PersiDict(MutableMapping, ParameterizableClass):
         elif self.immutable_items:
             if key in self:
                 raise KeyError("Can't modify an immutable key-value pair")
-        elif value is DELETE_CURRENT:
+
+        key = non_empty_persidict_key(key)
+
+        if value is DELETE_CURRENT:
             self.delete_if_exists(key)
+            return
 
         if self.base_class_for_values is not None:
             if not isinstance(value, self.base_class_for_values):
@@ -237,7 +259,9 @@ class PersiDict(MutableMapping, ParameterizableClass):
         if type(self) is PersiDict:
             raise NotImplementedError("PersiDict is an abstract base class"
                                       " and cannot delete items directly")
-        key = SafeStrTuple(key)
+
+        key = non_empty_persidict_key(key)
+
         if key not in self:
             raise KeyError(f"Key {key} not found")
 
@@ -457,7 +481,7 @@ class PersiDict(MutableMapping, ParameterizableClass):
         if self.immutable_items:
             raise KeyError("Can't delete an immutable key-value pair")
 
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
 
         if key in self:
             try:

persidict/s3_dict.py

@@ -16,7 +16,7 @@ from .safe_str_tuple import SafeStrTuple
 from .safe_str_tuple_signing import sign_safe_str_tuple, unsign_safe_str_tuple
 from .persi_dict import PersiDict
 from .jokers import KEEP_CURRENT, DELETE_CURRENT, Joker
-from .file_dir_dict import FileDirDict, PersiDictKey
+from .file_dir_dict import FileDirDict, PersiDictKey, non_empty_persidict_key
 from .overlapping_multi_dict import OverlappingMultiDict
 
 S3DICT_DEFAULT_BASE_DIR = "__s3_dict__"
@@ -199,7 +199,7 @@ class S3Dict(PersiDict):
             str: The complete S3 object key including root_prefix and file_type
             extension, with digest-based collision prevention applied if enabled.
         """
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         key = sign_safe_str_tuple(key, self.digest_len)
         objectname = self.root_prefix +  "/".join(key)+ "." + self.file_type
         return objectname
@@ -218,7 +218,7 @@ class S3Dict(PersiDict):
             bool: True if the key exists in S3 (or local cache for immutable
             items), False otherwise.
         """
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         if self.immutable_items and key in self.main_cache:
                 return True
         try:
@@ -251,7 +251,7 @@ class S3Dict(PersiDict):
             KeyError: If the key does not exist in S3.
         """
 
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
 
         if self.immutable_items and key in self.main_cache:
             return self.main_cache[key]
@@ -317,7 +317,7 @@ class S3Dict(PersiDict):
                 the required base_class_for_values when specified.
         """
 
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         PersiDict.__setitem__(self, key, value)
         if isinstance(value, Joker):
             # Joker values (KEEP_CURRENT, DELETE_CURRENT) are handled by base class
@@ -351,7 +351,7 @@ class S3Dict(PersiDict):
         Raises:
             KeyError: If immutable_items is True, or if the key does not exist.
         """
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         PersiDict.__delitem__(self, key)
         obj_name = self._build_full_objectname(key)
         self.s3_client.delete_object(Bucket = self.bucket_name, Key = obj_name)
@@ -537,7 +537,7 @@ class S3Dict(PersiDict):
         Raises:
             KeyError: If the key does not exist in S3.
         """
-        key = SafeStrTuple(key)
+        key = non_empty_persidict_key(key)
         obj_name = self._build_full_objectname(key)
         response = self.s3_client.head_object(Bucket=self.bucket_name, Key=obj_name)
         return response["LastModified"].timestamp()

persidict/safe_str_tuple.py

@@ -98,8 +98,6 @@ class SafeStrTuple(Sequence, Hashable):
                     candidate_strings.extend(SafeStrTuple(*a).strings)
             else:
                 raise TypeError(f"Invalid argument type: {type(a)}")
-        if len(candidate_strings) == 0:
-            raise ValueError("At least one non-empty valid string is required")
         self.strings = tuple(candidate_strings)
 
     @property

{persidict-0.37.0.dist-info → persidict-0.37.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: persidict
-Version: 0.37.0
+Version: 0.37.1
 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.37.0.dist-info → persidict-0.37.1.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=_ZGEQXmU5Sg4-PJOO4bYKhL0z6yYryVmce9lpML5OxQ,24766
+persidict/file_dir_dict.py,sha256=2McFaDdr03g-PXlCIiG3fPb7h59LXW_3hDo0xLA17DE,24804
 persidict/jokers.py,sha256=gTu7g2l2MIgBc3-hjvUrcwcgWs6tcbLyxB0u57M3bfU,3012
 persidict/overlapping_multi_dict.py,sha256=UFyPEG2GbMmMHY48UmcaLHpsaxMqRH3bc_UA8S90yJo,5947
-persidict/persi_dict.py,sha256=q0Xvq5PO5Lmx3Nwe-fbU3Klgyx39T8PMKcXYR7xduzg,22506
-persidict/s3_dict.py,sha256=dYUTvGNqxIk3PpArn9uYbSv-4zzlRiPPYinYpTcJzSc,21363
+persidict/persi_dict.py,sha256=CKVHy8YELLRVgLWgo0Akbd8RznCVxqt8JHszIjqA_sI,23176
+persidict/s3_dict.py,sha256=F5N7DlpZBkEEUsDk7OQXiqACY-mJ2SOMNrh3AlHC9qo,21454
 persidict/safe_chars.py,sha256=H-cL9waCmDtwaRR5Y4b4oTzcBx09nc8wn8u61SVZDY0,1728
-persidict/safe_str_tuple.py,sha256=oibohVs0xah3mSVl5aN0pQWiQeaz4jjWtEdoBSn-jac,7322
+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.37.0.dist-info/WHEEL,sha256=Pi5uDq5Fdo_Rr-HD5h9BiPn9Et29Y9Sh8NhcJNnFU1c,79
-persidict-0.37.0.dist-info/METADATA,sha256=vCPprij19SxfnU6qWI9MNz78n6iT9bTUpMZsUT901mY,12387
-persidict-0.37.0.dist-info/RECORD,,
+persidict-0.37.1.dist-info/WHEEL,sha256=Pi5uDq5Fdo_Rr-HD5h9BiPn9Et29Y9Sh8NhcJNnFU1c,79
+persidict-0.37.1.dist-info/METADATA,sha256=M2EVewTSqdjfqdMi-7VHkSUKHqlL-ohlXYrcVRj7ViA,12387
+persidict-0.37.1.dist-info/RECORD,,