Implemented SheerkaOntology

src/core/sheerka/services/SheerkaMemory.py

@@ -4,7 +4,7 @@ from cache.FastCache import FastCache
 from cache.ListIfNeededCache import ListIfNeededCache
 from core.builtin_concepts import BuiltinConcepts
 from core.concept import Concept
-from core.global_symbols import EVENT_CONTEXT_DISPOSED
+from core.global_symbols import EVENT_CONTEXT_DISPOSED, NotFound
 from core.sheerka.services.sheerka_service import BaseService, ServiceObj
 
 
@@ -17,13 +17,11 @@ class SheerkaMemory(BaseService):
     NAME = "Memory"
     GLOBAL = "global"
 
-    SHORT_TERM_OBJECTS_ENTRY = "Memory:ShortTermMemoryObjects"
     OBJECTS_ENTRY = "Memory:Objects"
 
     def __init__(self, sheerka):
         super().__init__(sheerka)
         self.short_term_objects = FastCache()
-        self.memory_objects = ListIfNeededCache(default=lambda k: self.sheerka.sdp.get(self.OBJECTS_ENTRY, k))
         self.registration = {}
 
     def initialize(self):
@@ -35,15 +33,20 @@ class SheerkaMemory(BaseService):
         self.sheerka.bind_service_method(self.get_from_memory, False)
         self.sheerka.bind_service_method(self.register_object, True, visible=False)
         self.sheerka.bind_service_method(self.unregister_object, True, visible=False)
-        self.sheerka.bind_service_method(self.add_registered_objects, True, visible=False)
+        self.sheerka.bind_service_method(self.commit_registered_objects, True, visible=False)
         self.sheerka.bind_service_method(self.memory, False)
         self.sheerka.bind_service_method(self.mem, False)
 
-        self.sheerka.cache_manager.register_cache(self.OBJECTS_ENTRY, self.memory_objects, persist=True, use_ref=True)
+        cache = ListIfNeededCache().auto_configure(self.OBJECTS_ENTRY)
+        self.sheerka.om.register_cache(self.OBJECTS_ENTRY, cache, persist=True, use_ref=True)
 
     def reset(self):
         self.short_term_objects.clear()
-        self.memory_objects.clear()
+        self.sheerka.om.clear(self.OBJECTS_ENTRY)
+
+    def reset_state(self):
+        self.short_term_objects.clear()
+        self.registration.clear()
 
     def initialize_deferred(self, context, is_first_time):
         self.sheerka.subscribe(EVENT_CONTEXT_DISPOSED, self.remove_context)
@@ -55,7 +58,7 @@ class SheerkaMemory(BaseService):
                 return self.short_term_objects.cache[id_to_use][key]
             except KeyError:
                 if context is None:
-                    return None
+                    return NotFound
 
                 context = context.get_parent()
 
@@ -92,12 +95,12 @@ class SheerkaMemory(BaseService):
         :param concept:
         :return:
         """
-        self.memory_objects.put(key, MemoryObject(context.event.get_digest(), concept))
+        self.sheerka.om.put(SheerkaMemory.OBJECTS_ENTRY, key, MemoryObject(context.event.get_digest(), concept))
 
     def get_from_memory(self, context, key):
         """"
         """
-        return self.memory_objects.get(key)
+        return self.sheerka.om.get(SheerkaMemory.OBJECTS_ENTRY, key)
 
     def register_object(self, context, key, concept):
         """
@@ -126,7 +129,7 @@ class SheerkaMemory(BaseService):
         except KeyError:
             pass
 
-    def add_registered_objects(self, context):
+    def commit_registered_objects(self, context):
         """
         Adds all registered memory_objects
         :param context:
@@ -147,7 +150,7 @@ class SheerkaMemory(BaseService):
             name_to_use = name.name if isinstance(name, Concept) else name
             self.unregister_object(context, name_to_use)
             obj = self.get_from_memory(context, name_to_use)
-            if obj is None:
+            if obj is NotFound:
                 return self.sheerka.new(BuiltinConcepts.NOT_FOUND, body={"#name": name})
 
             if isinstance(obj, list):
@@ -156,8 +159,7 @@ class SheerkaMemory(BaseService):
             return obj.obj
 
         res = {}
-        for k in self.memory_objects:
-            obj = self.memory_objects.get(k)
+        for k, obj in self.sheerka.om.get_all(SheerkaMemory.OBJECTS_ENTRY).items():
             if isinstance(obj, list):
                 obj = obj[-1]
             res[k] = obj.obj
@@ -165,5 +167,5 @@ class SheerkaMemory(BaseService):
         return res
 
     def mem(self):
-        keys = sorted([k for k in self.memory_objects])
+        keys = sorted([k for k in self.sheerka.om.list(SheerkaMemory.OBJECTS_ENTRY)])
         return {"keys": keys, "len": len(keys)}