Added SyaNodeParser (finally, after one month)

tests/core/test_SheerkaCreateNewConcept.py

@@ -3,6 +3,7 @@ from core.concept import PROPERTIES_TO_SERIALIZE, Concept, DEFINITION_TYPE_DEF
 from core.sheerka.Sheerka import Sheerka
 from sdp.sheerkaDataProvider import SheerkaDataProvider
 
+from tests.TestUsingFileBasedSheerka import TestUsingFileBasedSheerka
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 
 
@@ -32,6 +33,7 @@ class TestSheerkaCreateNewConcept(TestUsingMemoryBasedSheerka):
         assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_ID_ENTRY, concept.id)
         assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_NAME_ENTRY, concept.name)
         assert sheerka.sdp.exists(Sheerka.CONCEPTS_ENTRY, concept.key)
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_FIRST_KEYWORD_ENTRY, "+")
 
     def test_i_can_add_a_concept_when_name_differs_from_the_key(self):
         sheerka = self.get_sheerka()
@@ -229,3 +231,29 @@ class TestSheerkaCreateNewConcept(TestUsingMemoryBasedSheerka):
         assert res.status
 
 
+class TestSheerkaCreateNewConceptFileBased(TestUsingFileBasedSheerka):
+    def test_i_can_add_several_concepts(self):
+        sheerka, context, hello, greeting = self.init_concepts(
+            Concept("Hello world a").def_prop("a"),
+            Concept("Greeting a").def_prop("a"),
+            use_dict=False
+        )
+
+        res = sheerka.create_new_concept(self.get_context(sheerka), hello)
+        assert res.status
+
+        sheerka = self.get_sheerka(use_dict=False)
+        res = sheerka.create_new_concept(self.get_context(sheerka), greeting)
+        assert res.status
+
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_ENTRY, hello.key)
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_ENTRY, greeting.key)
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_ID_ENTRY, hello.id)
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_ID_ENTRY, greeting.id)
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_NAME_ENTRY, "Hello world a")
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_NAME_ENTRY, "Greeting a")
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_FIRST_KEYWORD_ENTRY, "Hello")
+        assert sheerka.sdp.exists(Sheerka.CONCEPTS_BY_FIRST_KEYWORD_ENTRY, "Greeting")
+
+
+

tests/core/test_SheerkaHistoryManager.py

@@ -4,7 +4,7 @@ from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 
 class TestSheerkaHistoryManager(TestUsingMemoryBasedSheerka):
     def test_i_can_retrieve_history(self):
-        sheerka = self.get_sheerka(skip_builtins_in_db=False)
+        sheerka = self.get_sheerka(skip_builtins_in_db=False, singleton=False)
 
         sheerka.evaluate_user_input("def concept one as 1")
         sheerka.evaluate_user_input("one")

tests/core/test_sheerka.py

@@ -244,7 +244,7 @@ class TestSheerka(TestUsingFileBasedSheerka):
         assert not sheerka.is_success(sheerka.new(BuiltinConcepts.TOO_MANY_SUCCESS))
 
     def test_cache_is_updated_after_get(self):
-        sheerka = self.get_sheerka()
+        sheerka = self.get_sheerka(skip_builtins_in_db=False)
 
         # updated when by_key returns one element
         sheerka.create_new_concept(self.get_context(sheerka), Concept("foo", body="1"))

tests/core/test_sheerka_call_parsers.py

@@ -171,22 +171,22 @@ class TestSheerkaExecuteParsers(TestUsingMemoryBasedSheerka):
             'name=Enabled50True, priority=50, status=True, source=Enabled80False:Enabled90False:hello world',
         ]
 
-    def test_parsing_stop_at_the_first_success(self):
-        sheerka = self.get_sheerka()
-        sheerka.parsers = {
-            "Enabled80False": Enabled80FalseParser,
-            "Enabled50bisTrue": Enabled50bisTrueParser,
-            "Enabled10True": Enabled10TrueParser,
-        }
-
-        user_input = [get_ret_val("hello world")]
-        BaseTestParser.debug_out = []
-        sheerka.execute(self.get_context(sheerka), user_input, [BuiltinConcepts.PARSING])
-
-        assert BaseTestParser.debug_out == [
-            'name=Enabled80False, priority=80, status=False, source=hello world',
-            'name=Enabled50BisTrue, priority=50, status=True, source=hello world',
-        ]
+    # def test_parsing_stop_at_the_first_success(self):
+    #     sheerka = self.get_sheerka()
+    #     sheerka.parsers = {
+    #         "Enabled80False": Enabled80FalseParser,
+    #         "Enabled50bisTrue": Enabled50bisTrueParser,
+    #         "Enabled10True": Enabled10TrueParser,
+    #     }
+    #
+    #     user_input = [get_ret_val("hello world")]
+    #     BaseTestParser.debug_out = []
+    #     sheerka.execute(self.get_context(sheerka), user_input, [BuiltinConcepts.PARSING])
+    #
+    #     assert BaseTestParser.debug_out == [
+    #         'name=Enabled80False, priority=80, status=False, source=hello world',
+    #         'name=Enabled50BisTrue, priority=50, status=True, source=hello world',
+    #     ]
 
     def test_parsing_stop_at_the_first_success_2(self):
         """
@@ -243,10 +243,13 @@ class TestSheerkaExecuteParsers(TestUsingMemoryBasedSheerka):
             'name=Enabled50True, priority=50, status=False, source=Enabled80False:hello world',
             'name=Enabled50True, priority=50, status=True, source=Enabled80False:Enabled90False:hello world',
             'name=Enabled50BisTrue, priority=50, status=True, source=hello world',
+            'name=Enabled50BisTrue, priority=50, status=True, source=Enabled90False:hello world',
+            'name=Enabled50BisTrue, priority=50, status=True, source=Enabled80False:hello world',
+            'name=Enabled50BisTrue, priority=50, status=True, source=Enabled80False:Enabled90False:hello world',
             'name=Enabled50False, priority=50, status=False, source=hello world',
             'name=Enabled50False, priority=50, status=False, source=Enabled90False:hello world',
             'name=Enabled50False, priority=50, status=False, source=Enabled80False:hello world',
-            'name=Enabled50False, priority=50, status=False, source=Enabled80False:Enabled90False:hello world',
+            'name=Enabled50False, priority=50, status=False, source=Enabled80False:Enabled90False:hello world'
         ]
 
     def test_a_parser_has_access_to_the_output_of_its_predecessors(self):

tests/core/test_utils.py

@@ -69,7 +69,7 @@ def test_i_can_get_sub_classes():
     default_parser = core.utils.get_class("parsers.DefaultParser.DefaultParser")
     exact_concept_parser = core.utils.get_class("parsers.ExactConceptParser.ExactConceptParser")
     python_parser = core.utils.get_class("parsers.PythonParser.PythonParser")
-    concept_lexer_parser = core.utils.get_class("parsers.ConceptLexerParser.ConceptLexerParser")
+    concept_lexer_parser = core.utils.get_class("parsers.BnfNodeParser.BnfNodeParser")
 
     assert base_parser not in sub_classes
     assert default_parser in sub_classes