Fixed some bugs

src/core/sheerka/Sheerka.py

@@ -32,7 +32,7 @@ class Sheerka(Concept):
     CONCEPTS_BY_NAME_ENTRY = "Concepts_By_Name"
     CONCEPTS_BY_HASH_ENTRY = "Concepts_By_Hash"  # store hash of concepts definitions (not values)
 
-    CONCEPTS_REFERENCES = "Concepts_References"  # tracks references between concepts
+    CONCEPTS_REFERENCES_ENTRY = "Concepts_References"  # tracks references between concepts
 
     CONCEPTS_BY_FIRST_KEYWORD_ENTRY = "Concepts_By_First_Keyword"
     RESOLVED_CONCEPTS_BY_FIRST_KEYWORD_ENTRY = "Resolved_Concepts_By_First_Keyword"
@@ -45,6 +45,8 @@ class Sheerka(Concept):
     BUILTIN_CONCEPTS_KEYS = "Builtins_Concepts"  # sequential key for builtin concepts
     USER_CONCEPTS_KEYS = "User_Concepts"  # sequential key for user defined concepts
 
+    MAX_EXECUTION_HISTORY = 100
+
     def __init__(self, cache_only=False, debug=False, loggers=None):
         self.init_logging(debug, loggers)
         self.loggers = loggers
@@ -91,6 +93,8 @@ class Sheerka(Concept):
 
         self.locals = {}
 
+        self.last_executions = []
+
     @property
     def resolved_concepts_by_first_keyword(self):
         """
@@ -218,8 +222,8 @@ class Sheerka(Concept):
         cache = ListIfNeededCache(**params(self.CONCEPTS_BY_HASH_ENTRY))
         register_concept_cache(self.CONCEPTS_BY_HASH_ENTRY, cache, lambda c: c.get_definition_hash(), True)
 
-        cache = SetCache(default=lambda k: self.sdp.get(self.CONCEPTS_REFERENCES, k))
-        self.cache_manager.register_cache(self.CONCEPTS_REFERENCES, cache)
+        cache = SetCache(default=lambda k: self.sdp.get(self.CONCEPTS_REFERENCES_ENTRY, k))
+        self.cache_manager.register_cache(self.CONCEPTS_REFERENCES_ENTRY, cache)
 
         cache = DictionaryCache(default=lambda k: self.sdp.get(self.CONCEPTS_BY_FIRST_KEYWORD_ENTRY, k))
         self.cache_manager.register_cache(self.CONCEPTS_BY_FIRST_KEYWORD_ENTRY, cache)
@@ -299,7 +303,7 @@ class Sheerka(Concept):
         Init the parsers
         :return:
         """
-        core.utils.init_package_import("parsers")
+        core.utils.import_module_and_sub_module("parsers")
         base_class = core.utils.get_class("parsers.BaseParser.BaseParser")
         modules_to_skip = ["parsers.BaseNodeParser"]
 
@@ -332,7 +336,7 @@ class Sheerka(Concept):
         Init the evaluators
         :return:
         """
-        core.utils.init_package_import("evaluators")
+        core.utils.import_module_and_sub_module("evaluators")
         for evaluator in core.utils.get_sub_classes("evaluators", "evaluators.BaseEvaluator.OneReturnValueEvaluator"):
             self.init_log.debug(f"Adding builtin evaluator '{evaluator.__name__}'")
             self.evaluators.append(evaluator)
@@ -412,6 +416,10 @@ class Sheerka(Concept):
         #             f.write(text + "\n")
 
         self._last_execution = execution_context
+        if len(self.last_executions) == self.MAX_EXECUTION_HISTORY:
+            del self.last_executions[0]
+        self.last_executions.append(execution_context)
+
         return ret
 
     def print(self, result, instructions=None):

src/core/sheerka/services/SheerkaAdmin.py

@@ -16,6 +16,8 @@ class SheerkaAdmin(BaseService):
         self.sheerka.bind_service_method(self.caches_names)
         self.sheerka.bind_service_method(self.cache)
         self.sheerka.bind_service_method(self.restore)
+        self.sheerka.bind_service_method(self.concepts)
+        self.sheerka.bind_service_method(self.last_created_concept)
 
     def caches_names(self):
         """
@@ -61,3 +63,19 @@ class SheerkaAdmin(BaseService):
             print(f"Execution time: {elapsed}")
         except IOError:
             pass
+
+    def concepts(self):
+        return self.sheerka.sdp.list(self.sheerka.CONCEPTS_BY_ID_ENTRY)
+
+    def last_created_concept(self, use_history=False):
+        for exec_result in reversed(self.sheerka.last_executions):
+            return_values = exec_result.values["return_values"]
+            for ret in return_values:
+                if ret.status and self.sheerka.isinstance(ret.value, BuiltinConcepts.NEW_CONCEPT):
+                    return ret.value.body
+
+        if use_history:
+            return self.sheerka.new(BuiltinConcepts.ERROR, body="Not yet implement")
+
+        return self.sheerka.new(BuiltinConcepts.NOT_FOUND)
+

src/core/sheerka/services/SheerkaCreateNewConcept.py

@@ -75,7 +75,7 @@ class SheerkaCreateNewConcept(BaseService):
 
         # update references
         for ref in self.compute_references(concept):
-            cache_manager.put(sheerka.CONCEPTS_REFERENCES, ref, concept.id)
+            cache_manager.put(sheerka.CONCEPTS_REFERENCES_ENTRY, ref, concept.id)
 
         # TODO : this line seems to be useless
         # The grammar is never reset

src/core/sheerka/services/SheerkaDump.py

@@ -15,26 +15,15 @@ def get_pp():
 
 
 class SheerkaDump(BaseService):
-
     NAME = "Dump"
 
     def __init__(self, sheerka):
         super().__init__(sheerka)
-        
+
     def initialize(self):
-        self.sheerka.bind_service_method(self.dump_concepts, "concepts")
         self.sheerka.bind_service_method(self.dump_desc, "desc")
         self.sheerka.bind_service_method(self.dump_state, "state")
 
-    def dump_concepts(self):
-        lst = self.sheerka.sdp.list(self.sheerka.CONCEPTS_BY_ID_ENTRY)
-        for item in lst:
-            if hasattr(item, "__iter__"):
-                for i in item:
-                    self.sheerka.log.info(i)
-            else:
-                self.sheerka.log.info(item)
-
     def dump_desc(self, *concept_names, eval=False):
         first = True
         event = Event(f"Dumping description", "")

src/core/sheerka/services/SheerkaModifyConcept.py

@@ -37,7 +37,7 @@ class SheerkaModifyConcept(BaseService):
                     BuiltinConcepts.CONCEPT_ALREADY_DEFINED,
                     body=concept))
 
-        old_references = self.sheerka.cache_manager.get(self.sheerka.CONCEPTS_REFERENCES, concept.id)
+        old_references = self.sheerka.cache_manager.get(self.sheerka.CONCEPTS_REFERENCES_ENTRY, concept.id)
         if old_references:
             old_references = old_references.copy()
 
@@ -59,7 +59,7 @@ class SheerkaModifyConcept(BaseService):
         :return:
         """
 
-        refs = self.sheerka.cache_manager.get(self.sheerka.CONCEPTS_REFERENCES, concept.id)
+        refs = self.sheerka.cache_manager.get(self.sheerka.CONCEPTS_REFERENCES_ENTRY, concept.id)
         if not refs:
             return