faet: PickleFiles, JsonFiles

dol/__init__.py

@@ -74,6 +74,8 @@ def ihead(store, n=1):
     resolve_dir,  # to get a full path (resolve ~ and .) and ensure it is a directory
     DirReader,  # recursive read-only access to directories,
     temp_dir,  # make a temporary directory
+    PickleFiles,  # CRUD access to pickled files
+    JsonFiles,  # CRUD access to jsob files
 )
 
 from dol.util import (

dol/filesys.py

@@ -223,7 +223,10 @@ def is_valid_key(self, k):
         return bool(self._key_pattern.match(k))
 
     def validate_key(
-        self, k, err_msg_format=_dflt_not_valid_error_msg, err_type=KeyValidationError,
+        self,
+        k,
+        err_msg_format=_dflt_not_valid_error_msg,
+        err_type=KeyValidationError,
     ):
         if not self.is_valid_key(k):
             raise err_type(err_msg_format.format(k))
@@ -423,22 +426,28 @@ class TextFiles(FileStringPersister):
 RelPathFileStringPersister = TextFiles
 
 
-# ------------------------------------ misc ---------------------------------------------
-import pickle
-
-pickle_bytes_wrap = wrap_kvs(obj_of_data=pickle.loads, data_of_obj=pickle.dumps)
+# ------------------------------------ misc --------------------------------------------
+from dol.kv_codecs import ValueCodecs
 
 
-@pickle_bytes_wrap
-class PickleStore(RelPathFileBytesPersister):
+@ValueCodecs.pickle
+class PickleFiles(Files):
     """A store of pickles"""
 
 
+@ValueCodecs.json
+class JsonFiles(Files):
+    """A store of json"""
+
+
+PickleStore = PickleFiles  # backcompatibility alias
+
+
 # @wrap_kvs(key_of_id=lambda x: x[:-1], id_of_key=lambda x: x + path_sep)
 @mk_relative_path_store(prefix_attr='rootdir')
 class PickleStores(DirCollection):
     def __getitem__(self, k):
-        return PickleStore(k)
+        return PickleFiles(k)
 
     def __repr__(self):
         return f"{type(self).__name__}('{self.rootdir}', ...)"

dol/kv_codecs.py

@@ -5,7 +5,7 @@
 from typing import TypeVar, Generic, Callable, Iterable, Any, Optional
 
 from dol.trans import wrap_kvs
-from dol.util import Pipe, decorate_callables
+from dol.util import Pipe
 from dol.signatures import Sig
 
 # For the codecs: