Fixed #3: Added sheerka.resolve_rule()

Fixed #5: Refactored SheerkaComparisonManager
Fixed #6: Sya parser no longer works after restart

tests/core/test_SheerkaRuleManager.py

@@ -1,9 +1,10 @@
 import ast
 
 import pytest
+
 from core.builtin_concepts import BuiltinConcepts
 from core.concept import Concept, CMV
-from core.global_symbols import RULE_COMPARISON_CONTEXT, NotFound
+from core.global_symbols import RULE_COMPARISON_CONTEXT
 from core.rule import Rule, ACTION_TYPE_PRINT, ACTION_TYPE_EXEC
 from core.sheerka.services.SheerkaRuleManager import SheerkaRuleManager, FormatRuleParser, \
     FormatAstRawText, FormatAstVariable, FormatAstSequence, FormatAstFunction, \
@@ -11,7 +12,6 @@ from core.sheerka.services.SheerkaRuleManager import SheerkaRuleManager, FormatR
 from core.tokenizer import Token, TokenKind
 from parsers.BaseNodeParser import SourceCodeWithConceptNode, SourceCodeNode
 from parsers.PythonParser import PythonNode
-
 from tests.TestUsingFileBasedSheerka import TestUsingFileBasedSheerka
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 
@@ -335,6 +335,41 @@ class TestSheerkaRuleManager(TestUsingMemoryBasedSheerka):
         assert sheerka.get_rule_by_id(rule_true.id) == rule_true
         assert not sheerka.is_known(sheerka.get_rule_by_id(rule_false.id))
 
+    def test_i_can_resolve_rule(self):
+        sheerka, context, rule = self.init_test().with_rules(("my rule", "True", "True")).unpack()
+        context.add_to_short_term_memory("x", rule.id)
+
+        # direct access by id
+        assert sheerka.resolve_rule(context, rule.id) == rule
+
+        # direct access by token
+        assert sheerka.resolve_rule(context, Token(TokenKind.RULE, ("i_do_not_care", rule.id), -1, -1, -1)) == rule
+
+        # indirect access by token
+        assert sheerka.resolve_rule(context, Token(TokenKind.RULE, ("i_do_not_care", "x"), -1, -1, -1)) == rule
+
+        # Simple returns the rule if id is resolved
+        assert sheerka.resolve_rule(context, rule) == rule
+
+        # look for the correct rule when id is unresolved
+        unresolved = Rule(rule_id="x")
+        unresolved.metadata.id_is_unresolved = True
+        assert sheerka.resolve_rule(context, unresolved) == rule
+
+        # look for the correct rule when id is unresolved
+        unresolved = Rule(rule_id="y")
+        unresolved.metadata.id_is_unresolved = True
+        assert sheerka.resolve_rule(context, unresolved) is None  # no error raised
+
+        # I still can get the value when the indirection has the wrong type
+        context.add_to_short_term_memory("z", int(rule.id))
+
+        assert sheerka.resolve_rule(context, Token(TokenKind.RULE, ("i_do_not_care", "z"), -1, -1, -1)) == rule
+
+        unresolved = Rule(rule_id="z")
+        unresolved.metadata.id_is_unresolved = True
+        assert sheerka.resolve_rule(context, unresolved) == rule
+
     # @pytest.mark.skip
     # @pytest.mark.parametrize("text, expected", [
     #     ("cat is an animal", set()),