Refactored services to inherit from BaseService

src/core/sheerka/services/SheerkaSetsManager.py

@@ -1,15 +1,30 @@
 import core.builtin_helpers
+from cache.SetCache import SetCache
 from core.ast.nodes import python_to_concept
 from core.builtin_concepts import BuiltinConcepts
 from core.concept import Concept, ConceptParts
+from core.sheerka.services.sheerka_service import BaseService
 
 GROUP_PREFIX = 'All_'
 
 
-class SheerkaSetsManager:
+class SheerkaSetsManager(BaseService):
+    NAME = "SetsManager"
+    CONCEPTS_GROUPS_ENTRY = "Concepts_Groups"
+
     def __init__(self, sheerka):
-        self.sheerka = sheerka
-        self.logger_name = "SetsManager"
+        super().__init__(sheerka)
+
+    def initialize(self):
+        self.sheerka.bind_service_method(self, SheerkaSetsManager.set_isa)
+        self.sheerka.bind_service_method(self, SheerkaSetsManager.get_set_elements)
+        self.sheerka.bind_service_method(self, SheerkaSetsManager.add_concept_to_set)
+        self.sheerka.bind_service_method(self, SheerkaSetsManager.isinset)
+        self.sheerka.bind_service_method(self, SheerkaSetsManager.isa)
+        self.sheerka.bind_service_method(self, SheerkaSetsManager.isaset)
+
+        cache = SetCache(default=lambda k: self.sheerka.sdp.get(self.CONCEPTS_GROUPS_ENTRY, k))
+        self.sheerka.cache_manager.register_cache(self.CONCEPTS_GROUPS_ENTRY, cache)
 
     def set_isa(self, context, concept, concept_set):
         """
@@ -20,11 +35,11 @@ class SheerkaSetsManager:
         :return:
         """
 
-        context.log(f"Setting concept {concept} is a {concept_set}", who=self.logger_name)
+        context.log(f"Setting concept {concept} is a {concept_set}", who=self.NAME)
 
         if BuiltinConcepts.ISA in concept.metadata.props and concept_set in concept.metadata.props[BuiltinConcepts.ISA]:
             return self.sheerka.ret(
-                self.logger_name,
+                self.NAME,
                 False,
                 self.sheerka.new(BuiltinConcepts.CONCEPT_ALREADY_IN_SET, body=concept, concept_set=concept_set))
 
@@ -45,25 +60,25 @@ class SheerkaSetsManager:
         :return:
         """
 
-        context.log(f"Adding concept {concept} to set {concept_set}", who=self.logger_name)
+        context.log(f"Adding concept {concept} to set {concept_set}", who=self.NAME)
 
         assert concept.id
         assert concept_set.id
 
-        set_elements = self.sheerka.cache_manager.get(self.sheerka.CONCEPTS_GROUPS_ENTRY, concept_set.id)
+        set_elements = self.sheerka.cache_manager.get(self.CONCEPTS_GROUPS_ENTRY, concept_set.id)
         if set_elements and concept.id in set_elements:
             return self.sheerka.ret(
-                self.logger_name,
+                self.NAME,
                 False,
                 self.sheerka.new(BuiltinConcepts.CONCEPT_ALREADY_IN_SET, body=concept, concept_set=concept_set))
 
-        self.sheerka.cache_manager.put(self.sheerka.CONCEPTS_GROUPS_ENTRY, concept_set.id, concept.id)
-        return self.sheerka.ret(self.logger_name, True, self.sheerka.new(BuiltinConcepts.SUCCESS))
+        self.sheerka.cache_manager.put(self.CONCEPTS_GROUPS_ENTRY, concept_set.id, concept.id)
+        return self.sheerka.ret(self.NAME, True, self.sheerka.new(BuiltinConcepts.SUCCESS))
 
     def add_concepts_to_set(self, context, concepts, concept_set):
         """Adding multiple concepts at the same time"""
 
-        context.log(f"Adding concepts {concepts} to set {concept_set}", who=self.logger_name)
+        context.log(f"Adding concepts {concepts} to set {concept_set}", who=self.NAME)
         already_in_set = []
         for concept in concepts:
             res = self.add_concept_to_set(context, concept, concept_set)
@@ -77,7 +92,7 @@ class SheerkaSetsManager:
         else:
             body = self.sheerka.new(BuiltinConcepts.SUCCESS)
 
-        return self.sheerka.ret(self.logger_name, len(already_in_set) != len(concepts), body)
+        return self.sheerka.ret(self.NAME, len(already_in_set) != len(concepts), body)
 
     def get_set_elements(self, context, concept):
         """
@@ -93,7 +108,7 @@ class SheerkaSetsManager:
                 return self.sheerka.new(BuiltinConcepts.NOT_A_SET, body=concept)
 
             # first, try to see if sub_context has it's own group entry
-            ids = self.sheerka.cache_manager.get(self.sheerka.CONCEPTS_GROUPS_ENTRY, sub_concept.id)
+            ids = self.sheerka.cache_manager.get(self.CONCEPTS_GROUPS_ENTRY, sub_concept.id)
             concepts = self._get_concepts(context, ids, True)
 
             # aggregate with en entries from its body
@@ -143,7 +158,7 @@ class SheerkaSetsManager:
         if not (a.id and b.id):
             return False
 
-        group_elements = self.sheerka.cache_manager.get(self.sheerka.CONCEPTS_GROUPS_ENTRY, b.id)
+        group_elements = self.sheerka.cache_manager.get(self.CONCEPTS_GROUPS_ENTRY, b.id)
         return group_elements and a.id in group_elements
 
     def isa(self, a, b):
@@ -173,7 +188,7 @@ class SheerkaSetsManager:
 
         # check if it has a group
         # TODO: use cache instead of directly requesting sdp
-        if self.sheerka.cache_manager.get(self.sheerka.CONCEPTS_GROUPS_ENTRY, concept.id):
+        if self.sheerka.cache_manager.get(self.CONCEPTS_GROUPS_ENTRY, concept.id):
             return True
 
         # it may be a concept that references a set