EvalEvaluator is called only if in root context. Added action and action_context to ExecutionContext

src/core/sheerka/services/SheerkaAdmin.py

@@ -1,6 +1,8 @@
 from core.builtin_concepts import BuiltinConcepts
 from core.sheerka.services.sheerka_service import BaseService
 
+CONCEPTS_FILE = "_concepts.txt"
+
 
 class SheerkaAdmin(BaseService):
     NAME = "Admin"
@@ -11,6 +13,7 @@ class SheerkaAdmin(BaseService):
     def initialize(self):
         self.sheerka.bind_service_method(self.caches_names)
         self.sheerka.bind_service_method(self.cache)
+        self.sheerka.bind_service_method(self.restore)
 
     def caches_names(self):
         """
@@ -29,3 +32,23 @@ class SheerkaAdmin(BaseService):
             return self.sheerka.new(BuiltinConcepts.NOT_FOUND, body={"cache": name})
 
         return self.sheerka.cache_manager.caches[name].cache.copy()
+
+    def restore(self):
+        """
+        Restore the state with all previous valid concept definitions
+        :return:
+        """
+        try:
+            self.sheerka.during_restore = True
+            with open(CONCEPTS_FILE, "r") as f:
+                for line in f.readlines():
+                    line = line.strip()
+                    if line == "" or line.startswith("#"):
+                        continue
+                    self.sheerka.log.info(line)
+                    res = self.sheerka.evaluate_user_input(line)
+                    if len(res) > 1 or not res[0].status:
+                        self.sheerka.log.error("Error detected !")
+            self.sheerka.during_restore = False
+        except IOError:
+            pass

src/core/sheerka/services/SheerkaDump.py

@@ -38,7 +38,7 @@ class SheerkaDump(BaseService):
     def dump_desc(self, *concept_names, eval=False):
         first = True
         event = Event(f"Dumping description", "")
-        context = ExecutionContext("dump_desc", event, self.sheerka)
+        context = ExecutionContext("dump_desc", event, self.sheerka, BuiltinConcepts.RENDERING, concept_names)
         for concept_name in concept_names:
             if isinstance(concept_name, Concept):
                 concepts = concept_name

src/core/sheerka/services/SheerkaEvaluateConcept.py

@@ -104,7 +104,9 @@ class SheerkaEvaluateConcept(BaseService):
                     context.log(f"Recognized concept '{concept_found}'", self.NAME)
                     concept.compiled[part_key] = concept_found
                 else:
-                    with context.push(desc=f"Initializing *compiled* for {part_key}") as sub_context:
+                    with context.push(BuiltinConcepts.INIT_COMPILED,
+                                      {"part": part_key, "source": source},
+                                      desc=f"Initializing *compiled* for {part_key}") as sub_context:
                         sub_context.add_inputs(source=source)
                         to_parse = self.sheerka.ret(context.who, True,
                                                     self.sheerka.new(BuiltinConcepts.USER_INPUT, body=source))
@@ -128,7 +130,9 @@ class SheerkaEvaluateConcept(BaseService):
                     context.log(f"Recognized concept '{concept_found}'", self.NAME)
                     concept.compiled[var_name] = concept_found
                 else:
-                    with context.push(desc=f"Initializing *compiled* for property {var_name}") as sub_context:
+                    with context.push(BuiltinConcepts.INIT_COMPILED,
+                                      {"property": var_name, "source": default_value},
+                                      desc=f"Initializing *compiled* for property {var_name}") as sub_context:
                         sub_context.add_inputs(source=default_value)
                         to_parse = self.sheerka.ret(context.who, True,
                                                     self.sheerka.new(BuiltinConcepts.USER_INPUT, body=default_value))
@@ -148,7 +152,10 @@ class SheerkaEvaluateConcept(BaseService):
 
         # manage infinite loop
         if self.infinite_recursion_detected(context, current_concept):
-            with context.push(desc="Infinite recursion detected", obj=current_concept) as sub_context:
+            with context.push(BuiltinConcepts.MANAGE_INFINITE_RECURSION,
+                              current_concept,
+                              desc="Infinite recursion detected",
+                              obj=current_concept) as sub_context:
                 # I create a sub context in order to log what happened
                 ret_val = self.manage_infinite_recursion(context)
                 sub_context.add_values(return_values=ret_val)
@@ -156,7 +163,10 @@ class SheerkaEvaluateConcept(BaseService):
 
         desc = f"Evaluating {current_prop} (concept={current_concept})"
         context.log(desc, self.NAME)
-        with context.push(desc=desc, obj=current_concept) as sub_context:
+        with context.push(BuiltinConcepts.EVALUATING_CONCEPT,
+                          current_prop,
+                          desc=desc,
+                          obj=current_concept) as sub_context:
 
             if force_evaluation:
                 sub_context.local_hints.add(BuiltinConcepts.EVAL_BODY_REQUESTED)

src/core/sheerka/services/SheerkaExecute.py

@@ -219,7 +219,9 @@ class SheerkaExecute(BaseService):
                     #         else "'" + BaseParser.get_text_from_tokens(to_parse) + "' as tokens"
                     #     context.log(f"Parsing {debug_text}")
 
-                    with context.push(desc=f"Parsing using {parser.name}",
+                    with context.push(BuiltinConcepts.PARSING,
+                                      {"parser": parser.name},
+                                      desc=f"Parsing using {parser.name}",
                                       logger=parser.verbose_log) as sub_context:
                         sub_context.add_inputs(to_parse=to_parse)
                         res = parser.parse(sub_context, to_parse)
@@ -277,7 +279,10 @@ class SheerkaExecute(BaseService):
         # process
         iteration = 0
         while True:
-            with context.push(desc=f"iteration #{iteration}", iteration=iteration) as iteration_context:
+            with context.push(process_step,
+                              {"iteration": iteration},
+                              desc=f"iteration #{iteration}",
+                              iteration=iteration) as iteration_context:
                 simple_digest = return_values[:]
                 iteration_context.add_inputs(return_values=simple_digest)
 
@@ -290,7 +295,10 @@ class SheerkaExecute(BaseService):
                         evaluator = self.preprocess(context, evaluator.__class__())  # fresh copy
 
                         sub_context_desc = f"Evaluating using {evaluator.name} ({priority=})"
-                        with iteration_context.push(desc=sub_context_desc, logger=evaluator.verbose_log) as sub_context:
+                        with iteration_context.push(process_step,
+                                                    {"iteration": iteration, "evaluator": evaluator.name},
+                                                    desc=sub_context_desc,
+                                                    logger=evaluator.verbose_log) as sub_context:
                             sub_context.add_inputs(return_values=original_items)
 
                             # process evaluators that work on one simple return value at the time
@@ -375,7 +383,9 @@ class SheerkaExecute(BaseService):
 
         for step in execution_steps:
             copy = return_values[:] if hasattr(return_values, "__iter__") else [return_values]
-            with context.push(step=step, iteration=0, desc=f"{step=}") as sub_context:
+            with context.push(BuiltinConcepts.PROCESSING,
+                              {"step": step},
+                              step=step, iteration=0, desc=f"{step=}") as sub_context:
 
                 if step == BuiltinConcepts.PARSING:
                     return_values = self.call_parsers(sub_context, return_values)

src/core/sheerka/services/SheerkaSetsManager.py

@@ -235,7 +235,9 @@ for x in xx__concepts__xx:
             return [self.sheerka.get_by_id(element_id) for element_id in ids]
 
         result = []
-        with context.push(desc=f"Evaluating concepts of a set") as sub_context:
+        with context.push(BuiltinConcepts.EVALUATE_CONCEPT,
+                          {"ids": ids},
+                          desc=f"Evaluating concepts of a set") as sub_context:
             sub_context.add_inputs(ids=ids)
             sub_context.local_hints.add(BuiltinConcepts.EVAL_BODY_REQUESTED)
             for element_id in ids: