Added concepts with the same key handling

core/builtin_concepts.py

@@ -24,12 +24,13 @@ class BuiltinConcepts(Enum):
     BEFORE_PARSING = 15  # activated before evaluation by the parsers
     PARSING = 16  # activated during the parsing. It contains the text to parse
     AFTER_PARSING = 17  # after parsing
-    BEFORE_EVALUATION = 18  # before evalution
+    BEFORE_EVALUATION = 18  # before evaluation
     EVALUATION = 19  # activated when the parsing process seems to be finished
     AFTER_EVALUATION = 20  # activated when the parsing process seems to be finished
     CONCEPT_ALREADY_DEFINED = 21  # when you try to add the same concept twice
     NOP = 22  # no operation concept. Does nothing
-    PROPERTY_EVAL_ERROR = 23
+    PROPERTY_EVAL_ERROR = 23  # cannot evaluate a property of a concept
+    ENUMERATION = 24  # represents a list or a set
 
 
 """

core/concept.py

@@ -24,8 +24,8 @@ class Concept:
     A concept is a the base object of our universe
     Everything is a concept
     """
-    props_to_serialize = ("id", "is_builtin", "key", "name", "where", "pre", "post", "body", "desc", "obj")
-    props_for_digest = ("is_builtin", "key", "name", "where", "pre", "post", "body", "desc")
+    props_for_digest = ("is_builtin", "is_unique", "key", "name", "where", "pre", "post", "body", "desc")
+    props_to_serialize = ("id", "is_builtin", "is_unique", "key", "name", "where", "pre", "post", "body", "desc")
     concept_parts = set(item.value for item in ConceptParts)
 
     PROPERTY_PREFIX = "__var__"

core/sheerka.py

@@ -46,6 +46,9 @@ class Sheerka(Concept):
         self.parsers = []
         self.evaluators = []
 
+        self.evaluators_prefix = None
+        self.parsers_prefix = None
+
         self.debug = debug
 
     def initialize(self, root_folder=None):
@@ -327,7 +330,7 @@ class Sheerka(Concept):
             return self.ret(self.create_new_concept.__name__, False, ErrorConcept(error), error.args[0])
 
         # add in cache for quick further reference
-        self.concepts_cache[concept.key] = concept
+        self.concepts_cache[concept.key] = self.sdp.get_safe(self.CONCEPTS_ENTRY, concept.key)
 
         # process the return in needed
         ret = self.ret(self.create_new_concept.__name__, True, self.new(BuiltinConcepts.NEW_CONCEPT, body=concept))
@@ -415,25 +418,12 @@ class Sheerka(Concept):
             concept_key != BuiltinConcepts.UNKNOWN_CONCEPT:
             return template
 
-        # manage singleton
-        if template.is_unique:
-            return template
+        if not isinstance(template, list):
+            return self._new_from_template(template, concept_key, **kwargs)
 
-        # otherwise, create another instance
-        concept = self.builtin_cache[concept_key]() if concept_key in self.builtin_cache else Concept()
-        concept.update_from(template)
-
-        # update the properties
-        for k, v in kwargs.items():
-            if k in concept.props:
-                concept.set_prop(k, v)
-            elif hasattr(concept, k):
-                setattr(concept, k, v)
-            else:
-                return self.new(BuiltinConcepts.UNKNOWN_PROPERTY, body=k, concept=concept)
-
-        # TODO : add the concept to the list of known concepts (self.instances)
-        return concept
+        # if template is a list, it means that there a multiple concepts under the same key
+        concepts = [self._new_from_template(t, concept_key, **kwargs) for t in template]
+        return self.new(BuiltinConcepts.ENUMERATION, body=concepts)
 
     def ret(self, who, status, value, message=None, parents=None):
         """
@@ -473,6 +463,52 @@ class Sheerka(Concept):
         # for example, if a is a color, it will be found the entry 'All_Colors'
         return a.key == b_key
 
+    def get_evaluator_name(self, name):
+        if self.evaluators_prefix is None:
+            base_evaluator_class = core.utils.get_class("evaluators.BaseEvaluator.BaseEvaluator")
+            self.evaluators_prefix = base_evaluator_class.PREFIX
+
+        return self.evaluators_prefix + name
+
+    def get_parser_name(self, name):
+        if self.parsers_prefix is None:
+            base_parser_class = core.utils.get_class("parsers.BaseParser.BaseParser")
+            self.parsers_prefix = base_parser_class.PREFIX
+
+        return self.parsers_prefix + name
+
+    def concepts(self):
+        res = []
+        lst = self.sdp.list(self.CONCEPTS_ENTRY)
+        for item in lst:
+            if isinstance(item, list):
+                res.extend(item)
+            else:
+                res.append(item)
+
+        return sorted(res, key=lambda i: i.key)
+
+    def _new_from_template(self, template, concept_key, **kwargs):
+        # manage singleton
+        if template.is_unique:
+            return template
+
+        # otherwise, create another instance
+        concept = self.builtin_cache[concept_key]() if concept_key in self.builtin_cache else Concept()
+        concept.update_from(template)
+
+        # update the properties
+        for k, v in kwargs.items():
+            if k in concept.props:
+                concept.set_prop(k, v)
+            elif hasattr(concept, k):
+                setattr(concept, k, v)
+            else:
+                return self.new(BuiltinConcepts.UNKNOWN_PROPERTY, body=k, concept=concept)
+
+        # TODO : add the concept to the list of known concepts (self.instances)
+        return concept
+
     @staticmethod
     def get_builtins_classes_as_dict():
         res = {}
@@ -505,11 +541,11 @@ class ExecutionContext:
     """
     To keep track of the execution of a request
     """
-    who: object             # who is asking
-    event_digest: str       # what was the (original) trigger
-    sheerka: Sheerka        # sheerka
-    desc: str = None        # human description of what is going on
-    obj: Concept = None     # what is the subject of the execution context (if known)
+    who: object  # who is asking
+    event_digest: str  # what was the (original) trigger
+    sheerka: Sheerka  # sheerka
+    desc: str = None  # human description of what is going on
+    obj: Concept = None  # what is the subject of the execution context (if known)
 
     def push(self, who, desc=None, obj=None):
         return ExecutionContext(who, self.event_digest, self.sheerka, desc=desc, obj=obj)

core/utils.py

@@ -132,3 +132,5 @@ def remove_from_list(lst, to_remove):
         lst.remove(item)
 
     return lst
+
+