Added bnf when adding a new concept + Started logging filtering

sdp/readme.md

@@ -9,6 +9,9 @@
 - E : events
 - O : object (with history management)
 - P : pickle 
+- S : state 
+- C : concept
+- D : concept definitions 
 
 ## How concepts are serialized ?
 - get the id of the concept

sdp/sheerkaDataProvider.py

@@ -10,7 +10,7 @@ from sdp.sheerkaSerializer import Serializer, SerializerContext
 import logging
 
 log = logging.getLogger(__name__)
-
+init_log = logging.getLogger(__name__ + ".init")
 
 def json_default_converter(o):
     """
@@ -278,7 +278,7 @@ class SheerkaDataProvider:
     REF_PREFIX = "##REF##:"
 
     def __init__(self, root=None):
-        log.debug("Initializing sdp.")
+        init_log.debug("Initializing sdp.")
 
         self.io = SheerkaDataProviderIO.get(root)
         self.first_time = self.io.first_time
@@ -312,6 +312,20 @@ class SheerkaDataProvider:
             else obj.get_digest() if hasattr(obj, "get_digest") \
             else None
 
+    @staticmethod
+    def get_obj_origin(obj):
+        """
+        Get the digest used to save obj if set
+        """
+        if isinstance(obj, dict) and Serializer.ORIGIN in obj:
+            return obj[Serializer.ORIGIN]
+
+        if hasattr(obj, Serializer.ORIGIN):
+            return getattr(obj, Serializer.ORIGIN)
+
+        return None
+
+
     @staticmethod
     def get_stream_digest(stream):
         sha256_hash = hashlib.sha256()
@@ -460,10 +474,10 @@ class SheerkaDataProvider:
         obj_key = self.get_obj_key(obj) or key
 
         if isinstance(state.data[entry][key], list):
-            if not hasattr(obj, Serializer.ORIGIN):
+            obj_origin = self.get_obj_origin(obj)
+            if obj_origin is None:
                 raise (SheerkaDataProviderError(f"Multiple entries under '{entry}.{key}'", obj))
 
-            obj_origin = getattr(obj, Serializer.ORIGIN)
             state.modify_in_list(entry, key, obj, obj_key, obj_origin, self.load_ref_if_needed, self.save_ref_if_needed)
 
         else:
@@ -674,7 +688,9 @@ class SheerkaDataProvider:
             obj = self.serializer.deserialize(f, SerializerContext(origin=digest))
 
         # set the origin of the object
-        if not isinstance(obj, str):
+        if isinstance(obj, dict):
+            obj[Serializer.ORIGIN] = digest
+        elif not isinstance(obj, str):
             setattr(obj, Serializer.ORIGIN, digest)
         return obj
 

sdp/sheerkaDataProviderIO.py

@@ -46,9 +46,9 @@ class SheerkaDataProviderIO:
 
 
 class SheerkaDataProviderFileIO(SheerkaDataProviderIO):
-    log = logging.getLogger("FileIO")
 
     def __init__(self, root):
+        self.log = logging.getLogger(self.__class__.__name__ + ".init")
         root = path.abspath(path.join(path.expanduser("~"), ".sheerka")) \
             if root is None \
             else path.abspath(root)
@@ -180,10 +180,13 @@ def on_close(dictionary_io, file_path, stream):
     :param stream:
     :return:
     """
+
     def decorator(func):
         def wrapper(*args, **kwargs):
             stream.seek(0)
             dictionary_io.cache[file_path] = stream.read()
             func(*args, **kwargs)
+
         return wrapper
+
     return decorator

sdp/sheerkaSerializer.py

@@ -12,6 +12,7 @@ import core.utils
 from core.concept import Concept
 
 log = logging.getLogger(__name__)
+init_log = logging.getLogger(__name__ + ".init")
 
 
 def json_default_converter(o):
@@ -40,17 +41,18 @@ class Serializer:
     USERNAME = "user_name"  # key to store user that as committed the snapshot
     MODIFICATION_DATE = "modification_date"  #
     PARENTS = "parents"
-    ORIGIN = "origin"
+    ORIGIN = "##origin##"
     HISTORY = "##history##"
 
     def __init__(self):
-        log.debug("Initializing serializers")
+        init_log.debug("Initializing serializers")
         self._cache = []
 
         # add builtin serializers
         self.register(EventSerializer())
         self.register(StateSerializer())
         self.register(ConceptSerializer())
+        self.register(DictionarySerializer())
 
     def register(self, serializer):
         """
@@ -58,7 +60,7 @@ class Serializer:
         :param serializer:
         :return:
         """
-        log.debug(f"Adding serializer {serializer}")
+        init_log.debug(f"Adding serializer {serializer}")
         self._cache.append(serializer)
 
     def serialize(self, obj, context):
@@ -212,8 +214,11 @@ class PickleSerializer(BaseSerializer):
 
 class StateSerializer(PickleSerializer):
     def __init__(self, ):
-        PickleSerializer.__init__(self, lambda obj: core.utils.get_full_qualified_name(
-            obj) == "sdp.sheerkaDataProvider.State", "S", 1)
+        PickleSerializer.__init__(
+            self,
+            lambda obj: core.utils.get_full_qualified_name(obj) == "sdp.sheerkaDataProvider.State",
+            "S",
+            1)
 
 
 class ConceptSerializer(ObjectSerializer):
@@ -223,6 +228,15 @@ class ConceptSerializer(ObjectSerializer):
     def matches(self, obj):
         return isinstance(obj, Concept)
 
+
+class DictionarySerializer(PickleSerializer):
+    def __init__(self, ):
+        PickleSerializer.__init__(
+            self,
+            lambda obj: isinstance(obj, dict),
+            "D",
+            1)
+
 #
 # class SheerkaSerializer(ObjectSerializer):
 #     def __init__(self):