Added ModifyConcept function, and fixed 'isa' not working

src/core/sheerka/Services/SheerkaCreateNewConcept.py

@@ -1,6 +1,6 @@
 from core.builtin_concepts import BuiltinConcepts, ErrorConcept
 from core.concept import Concept
-from sdp.sheerkaDataProvider import SheerkaDataProviderDuplicateKeyError
+from sdp.sheerkaDataProvider import SheerkaDataProviderDuplicateKeyError, SheerkaDataProviderRef
 
 CONCEPT_LEXER_PARSER_CLASS = "parsers.ConceptLexerParser.ConceptLexerParser"
 
@@ -30,7 +30,7 @@ class SheerkaCreateNewConcept:
         # checks for duplicate concepts
         # TODO checks if it exists in cache first
 
-        if self.sheerka.sdp.exists(self.sheerka.CONCEPTS_ENTRY, concept.key, concept.get_digest()):
+        if self.sheerka.sdp.exists(self.sheerka.CONCEPTS_BY_HASH_ENTRY, concept.get_definition_hash()):
             error = SheerkaDataProviderDuplicateKeyError(self.sheerka.CONCEPTS_ENTRY + "." + concept.key, concept)
             return self.sheerka.ret(
                 self.logger_name,
@@ -55,22 +55,35 @@ class SheerkaCreateNewConcept:
                 if not init_ret_value.status:
                     return self.sheerka.ret(self.logger_name, False, ErrorConcept(init_ret_value.value))
 
+        concept.freeze_definition_hash()
+
         # save the new concept in sdp
-        concept.metadata.full_serialization = True
         try:
             # TODO : needs to make these calls atomic (or at least one single call)
             # save the new concept
-            self.sheerka.sdp.add(
+            concept.metadata.full_serialization = True
+            result = self.sheerka.sdp.add(
                 context.event.get_digest(),
                 self.sheerka.CONCEPTS_ENTRY,
                 concept,
                 use_ref=True)
+            concept.metadata.full_serialization = False
+
+            # update the concept (I hope that it's enough)
+            concept.set_origin(result.digest)
+
             # save it by id
             self.sheerka.sdp.add(
                 context.event.get_digest(),
                 self.sheerka.CONCEPTS_BY_ID_ENTRY,
-                {concept.id: concept.get_digest()},
-                is_ref=True)
+                SheerkaDataProviderRef(concept.id, result.digest))
+
+            # records the hash
+            self.sheerka.sdp.add(
+                context.event.get_digest(),
+                self.sheerka.CONCEPTS_BY_HASH_ENTRY,
+                SheerkaDataProviderRef(concept.get_definition_hash(), result.digest))
+
             # update the definition table
             if concepts_definitions is not None:
                 self.sheerka.sdp.set(
@@ -88,7 +101,7 @@ class SheerkaCreateNewConcept:
                 error.args[0])
 
         # Updates the caches
-        concept.metadata.full_serialization = False
+
         self.sheerka.cache_by_key[concept.key] = self.sheerka.sdp.get_safe(self.sheerka.CONCEPTS_ENTRY, concept.key)
         self.sheerka.cache_by_id[concept.id] = concept
         if init_ret_value is not None and init_ret_value.status:

src/core/sheerka/Services/SheerkaDump.py

@@ -63,7 +63,7 @@ class SheerkaDump:
                 else:
                     self.sheerka.log.info("No property")
 
-                self.sheerka.log.info(f"digest : {c.get_digest()}")
+                self.sheerka.log.info(f"digest : {c.get_origin()}")
 
                 if self.sheerka.isaset(context, c):
                     items = self.sheerka.get_set_elements(context, c)

src/core/sheerka/Services/SheerkaModifyConcept.py

@@ -1,4 +1,5 @@
 from core.builtin_concepts import BuiltinConcepts
+from sdp.sheerkaDataProvider import SheerkaDataProviderRef
 
 
 class SheerkaModifyConcept:
@@ -8,7 +9,41 @@ class SheerkaModifyConcept:
 
     def modify_concept(self, context, concept):
 
-        self.sheerka.sdp.modify(context.event.get_digest(), self.sheerka.CONCEPTS_ENTRY, concept.key, concept)
+        try:
+            # modify the entry
+            concept.metadata.full_serialization = True
+            result = self.sheerka.sdp.modify(
+                context.event.get_digest(),
+                self.sheerka.CONCEPTS_ENTRY,
+                concept.key,
+                concept)
+            concept.metadata.full_serialization = False
+
+            # update its reference
+            self.sheerka.sdp.modify(
+                context.event.get_digest(),
+                self.sheerka.CONCEPTS_BY_ID_ENTRY,
+                concept.id,
+                SheerkaDataProviderRef(concept.id, result.digest, concept.get_origin()))
+
+            # update the hash entry
+            self.sheerka.sdp.modify(
+                context.event.get_digest(),
+                self.sheerka.CONCEPTS_BY_HASH_ENTRY,
+                concept.get_original_definition_hash(),
+                SheerkaDataProviderRef(concept.get_definition_hash(), result.digest, concept.get_origin()))
+
+        except IndexError as error:
+            context.log_error(f"Failed to update concept '{concept}'.", who=self.logger_name)
+            return self.sheerka.ret(
+                self.logger_name,
+                False,
+                self.sheerka.new(BuiltinConcepts.UNKNOWN_CONCEPT, body=concept),
+                error.args[0])
+
+        # update cache
+        self.sheerka.cache_by_key[concept.key] = self.sheerka.sdp.get_safe(self.sheerka.CONCEPTS_ENTRY, concept.key)
+        self.sheerka.cache_by_id[concept.id] = concept
 
         ret = self.sheerka.ret(self.logger_name, True, self.sheerka.new(BuiltinConcepts.NEW_CONCEPT, body=concept))
         return ret

src/core/sheerka/Services/SheerkaSetsManager.py

@@ -48,8 +48,8 @@ class SheerkaSetsManager:
         assert concept_set.id
 
         try:
-            ret = self.sheerka.sdp.add_unique(context.event.get_digest(), GROUP_PREFIX + concept_set.id, concept.id)
-            if ret == (None, None):  # concept already in set
+            result = self.sheerka.sdp.add_unique(context.event.get_digest(), GROUP_PREFIX + concept_set.id, concept.id)
+            if result.already_exists:  # concept already in set
                 return self.sheerka.ret(
                     self.logger_name,
                     False,