Refactored services to inherit from BaseService

src/core/sheerka/services/SheerkaEvaluateConcept.py

@@ -1,6 +1,7 @@
 from core.builtin_concepts import BuiltinConcepts
 from core.builtin_helpers import expect_one, only_successful
 from core.concept import Concept, DoNotResolve, ConceptParts, InfiniteRecursionResolved
+from core.sheerka.services.sheerka_service import BaseService
 
 CONCEPT_EVALUATION_STEPS = [
     BuiltinConcepts.BEFORE_EVALUATION,
@@ -8,10 +9,14 @@ CONCEPT_EVALUATION_STEPS = [
     BuiltinConcepts.AFTER_EVALUATION]
 
 
-class SheerkaEvaluateConcept:
+class SheerkaEvaluateConcept(BaseService):
+    NAME = "EvaluateConcept"
+
     def __init__(self, sheerka):
-        self.sheerka = sheerka
-        self.logger_name = "EvaluateConcept"
+        super().__init__(sheerka)
+        
+    def initialize(self):
+        self.sheerka.bind_service_method(self, SheerkaEvaluateConcept.evaluate_concept)
 
     @staticmethod
     def infinite_recursion_detected(context, concept):
@@ -51,14 +56,14 @@ class SheerkaEvaluateConcept:
             if parent.who == context.who and parent.desc == context.desc:
                 body = parent.obj.metadata.body
                 try:
-                    return self.sheerka.ret(self.logger_name, True, InfiniteRecursionResolved(eval(body)))
+                    return self.sheerka.ret(self.NAME, True, InfiniteRecursionResolved(eval(body)))
                 except Exception:
                     pass
                 concepts_found.add(parent.obj)
             parent = parent.get_parent()
 
         return self.sheerka.ret(
-            self.logger_name,
+            self.NAME,
             False,
             self.sheerka.new(BuiltinConcepts.CHICKEN_AND_EGG, body=concepts_found))
 
@@ -71,10 +76,11 @@ class SheerkaEvaluateConcept:
         :param logger:
         :return:
         """
+
         def is_only_successful(r):
-#            return False
+            #            return False
             return context.sheerka.isinstance(r, BuiltinConcepts.RETURN_VALUE) and \
-            context.sheerka.isinstance(r.body, BuiltinConcepts.ONLY_SUCCESSFUL)
+                   context.sheerka.isinstance(r.body, BuiltinConcepts.ONLY_SUCCESSFUL)
 
         steps = [BuiltinConcepts.BEFORE_PARSING, BuiltinConcepts.PARSING, BuiltinConcepts.AFTER_PARSING]
         for part_key in ConceptParts:
@@ -134,7 +140,7 @@ class SheerkaEvaluateConcept:
                 return ret_val.body
 
         desc = f"Evaluating {current_prop} (concept={current_concept})"
-        context.log(desc, self.logger_name)
+        context.log(desc, self.NAME)
         with context.push(desc=desc, obj=current_concept) as sub_context:
 
             if force_evaluation: