Refactored services to inherit from BaseService

src/core/sheerka/services/SheerkaExecute.py

@@ -1,18 +1,24 @@
 import core.utils
 from core.builtin_concepts import BuiltinConcepts, ReturnValueConcept
+from core.sheerka.services.sheerka_service import BaseService
 
 NO_MATCH = "** No Match **"
 
 
-class SheerkaExecute:
+class SheerkaExecute(BaseService):
     """
     Manage the execution of a process flow
     """
 
-    def __init__(self, sheerka):
-        self.sheerka = sheerka
+    NAME = "Execute"
 
-    def call_parsers(self, execution_context, return_values):
+    def __init__(self, sheerka):
+        super().__init__(sheerka)
+        
+    def initialize(self):
+        self.sheerka.bind_service_method(self, SheerkaExecute.execute)
+
+    def call_parsers(self, context, return_values):
 
         # return_values must be a list
         if not isinstance(return_values, list):
@@ -35,7 +41,7 @@ class SheerkaExecute:
 
         # group the parsers by priorities
         instantiated_parsers = [parser(sheerka=self.sheerka) for parser in self.sheerka.parsers.values()]
-        instantiated_parsers = self.preprocess(execution_context, instantiated_parsers)
+        instantiated_parsers = self.preprocess(context, instantiated_parsers)
 
         grouped_parsers = {}
         for parser in [p for p in instantiated_parsers if p.enabled]:
@@ -57,10 +63,10 @@ class SheerkaExecute:
                     # if self.sheerka.log.isEnabledFor(logging.DEBUG):
                     #     debug_text = "'" + to_parse + "'" if isinstance(to_parse, str) \
                     #         else "'" + BaseParser.get_text_from_tokens(to_parse) + "' as tokens"
-                    #     execution_context.log(f"Parsing {debug_text}")
+                    #     context.log(f"Parsing {debug_text}")
 
-                    with execution_context.push(desc=f"Parsing using {parser.name}",
-                                                logger=parser.verbose_log) as sub_context:
+                    with context.push(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)
                         if res is not None:
@@ -94,7 +100,7 @@ class SheerkaExecute:
         result = core.utils.remove_list_from_list(result, user_inputs)
         return result
 
-    def call_evaluators(self, execution_context, return_values, process_step):
+    def call_evaluators(self, context, return_values, process_step):
 
         # return_values must be a list
         if not isinstance(return_values, list):
@@ -106,7 +112,7 @@ class SheerkaExecute:
         instantiated_evaluators = [e_class() for e_class in self.sheerka.evaluators]
 
         # pre-process evaluators if needed
-        instantiated_evaluators = self.preprocess(execution_context, instantiated_evaluators)
+        instantiated_evaluators = self.preprocess(context, instantiated_evaluators)
 
         for evaluator in [e for e in instantiated_evaluators if e.enabled and process_step in e.steps]:
             grouped_evaluators.setdefault(evaluator.priority, []).append(evaluator)
@@ -117,7 +123,7 @@ class SheerkaExecute:
         # process
         iteration = 0
         while True:
-            with execution_context.push(desc=f"iteration #{iteration}", iteration=iteration) as iteration_context:
+            with context.push(desc=f"iteration #{iteration}", iteration=iteration) as iteration_context:
                 simple_digest = return_values[:]
                 iteration_context.add_inputs(return_values=simple_digest)
 
@@ -127,7 +133,7 @@ class SheerkaExecute:
                     evaluated_items = []
                     to_delete = []
                     for evaluator in grouped_evaluators[priority]:
-                        evaluator = self.preprocess(execution_context, evaluator.__class__())  # fresh copy
+                        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:
@@ -194,10 +200,10 @@ class SheerkaExecute:
 
         return return_values
 
-    def execute(self, execution_context, return_values, execution_steps):
+    def execute(self, context, return_values, execution_steps):
         """
         Executes process for all initial contexts
-        :param execution_context:
+        :param context:
         :param return_values:
         :param execution_steps:
         :return:
@@ -205,7 +211,7 @@ class SheerkaExecute:
 
         for step in execution_steps:
             copy = return_values[:] if hasattr(return_values, "__iter__") else [return_values]
-            with execution_context.push(step=step, iteration=0, desc=f"{step=}") as sub_context:
+            with context.push(step=step, iteration=0, desc=f"{step=}") as sub_context:
 
                 if step == BuiltinConcepts.PARSING:
                     return_values = self.call_parsers(sub_context, return_values)