Refactored ExecutionContext serialization (added sheerkapickle) and added History management

src/core/sheerka/Sheerka.py

@@ -2,11 +2,12 @@ from core.builtin_concepts import BuiltinConcepts, ErrorConcept, ReturnValueConc
     UnknownConcept
 from core.concept import Concept, ConceptParts, PROPERTIES_FOR_NEW
 from core.sheerka.ExecutionContext import ExecutionContext
-from core.sheerka.SheerkaCreateNewConcept import SheerkaCreateNewConcept
-from core.sheerka.SheerkaDump import SheerkaDump
-from core.sheerka.SheerkaEvaluateConcept import SheerkaEvaluateConcept
-from core.sheerka.SheerkaExecute import SheerkaExecute
-from core.sheerka.SheerkaSetsManager import SheerkaSetsManager
+from core.sheerka.Services.SheerkaCreateNewConcept import SheerkaCreateNewConcept
+from core.sheerka.Services.SheerkaDump import SheerkaDump
+from core.sheerka.Services.SheerkaEvaluateConcept import SheerkaEvaluateConcept
+from core.sheerka.Services.SheerkaExecute import SheerkaExecute
+from core.sheerka.Services.SheerkaHistoryManager import SheerkaHistoryManager
+from core.sheerka.Services.SheerkaSetsManager import SheerkaSetsManager
 from sdp.sheerkaDataProvider import SheerkaDataProvider, Event
 import core.utils
 import core.builtin_helpers
@@ -21,7 +22,7 @@ import logging
 #     BuiltinConcepts.AFTER_EVALUATION]
 
 CONCEPT_LEXER_PARSER_CLASS = "parsers.ConceptLexerParser.ConceptLexerParser"
-
+CONCEPTS_FILE = "_concepts.txt"
 
 class Sheerka(Concept):
     """
@@ -81,6 +82,7 @@ class Sheerka(Concept):
         self.dump_handler = SheerkaDump(self)
         self.sets_handler = SheerkaSetsManager(self)
         self.evaluate_concept_handler = SheerkaEvaluateConcept(self)
+        self.history_handler = SheerkaHistoryManager(self)
 
     def initialize(self, root_folder: str = None):
         """
@@ -92,6 +94,9 @@ class Sheerka(Concept):
         """
 
         try:
+            from sheerkapickle.sheerka_handlers import initialize_pickle_handlers
+            initialize_pickle_handlers()
+
             self.sdp = SheerkaDataProvider(root_folder)
             if self.sdp.first_time:
                 self.sdp.set_key(self.USER_CONCEPTS_KEYS, 1000)
@@ -104,11 +109,16 @@ class Sheerka(Concept):
             self.initialize_builtin_parsers()
             self.initialize_builtin_evaluators()
             self.initialize_concepts_definitions(exec_context)
+            res = ReturnValueConcept(self, True, self)
+
+            exec_context.add_values(return_values=res)
+            if not self.skip_builtins_in_db:
+                self.sdp.save_result(self, exec_context)
 
         except IOError as e:
-            return ReturnValueConcept(self, False, self.get(BuiltinConcepts.ERROR), e)
+            res = ReturnValueConcept(self, False, self.get(BuiltinConcepts.ERROR), e)
 
-        return ReturnValueConcept(self, True, self)
+        return res
 
     def initialize_builtin_concepts(self):
         """
@@ -232,7 +242,12 @@ class Sheerka(Concept):
             execution_context.add_values(return_values=ret)
 
             if not self.skip_builtins_in_db:
-                self.sdp.save_result(execution_context)
+                self.sdp.save_result(self, execution_context)
+
+            #hack to save valid concept definition
+            if len(ret) == 1 and ret[0].status and self.isinstance(ret[0].value, BuiltinConcepts.NEW_CONCEPT):
+                with open(CONCEPTS_FILE, "a") as f:
+                    f.write(text + "\n")
         return ret
 
     def execute(self, execution_context, return_values, execution_steps, logger=None):
@@ -549,8 +564,19 @@ class Sheerka(Concept):
 
     def history(self, page=10, start=0):
         """Gets the history of all commands"""
-        return self.sdp.load_events(page, start)
+        return self.history_handler.history(page, start)
 
+    def restore(self):
+        """
+        Restore the state with all previous valid concept definitions
+        :return:
+        """
+        try:
+            with open(CONCEPTS_FILE, "r") as f:
+                for line in f.readlines():
+                    self.evaluate_user_input(line)
+        except IOError:
+            pass
 
     def test(self):
         return f"I have access to Sheerka !"