Improved PythonEvaluator when dealing with concept class

tests/evaluators/test_PythonEvaluator.py

@@ -1,14 +1,14 @@
 import pytest
 
 from core.builtin_concepts import ReturnValueConcept, ParserResultConcept, BuiltinConcepts
-from core.concept import Concept
+from core.concept import Concept, DEFINITION_TYPE_DEF
 from evaluators.PythonEvaluator import PythonEvaluator
 from parsers.PythonParser import PythonNode, PythonParser
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 
 
-def get_context_name(context):
-    return context.name
+def get_concept_name(concept):
+    return concept.name
 
 
 class TestPythonEvaluator(TestUsingMemoryBasedSheerka):
@@ -118,23 +118,38 @@ class TestPythonEvaluator(TestUsingMemoryBasedSheerka):
         context = self.get_context()
         context.sheerka.add_in_cache(Concept("foo", body="2"))
 
-        parsed = PythonParser().parse(context, "get_context_name(c:foo:)")
+        parsed = PythonParser().parse(context, "get_concept_name(c:foo:)")
         python_evaluator = PythonEvaluator()
-        python_evaluator.locals["get_context_name"] = get_context_name
+        python_evaluator.locals["get_concept_name"] = get_concept_name
         evaluated = python_evaluator.eval(context, parsed)
 
         assert evaluated.status
         assert evaluated.value == "foo"
 
         # sanity, does not work otherwise
-        parsed = PythonParser().parse(context, "get_context_name(foo)")
+        parsed = PythonParser().parse(context, "get_concept_name(foo)")
         python_evaluator = PythonEvaluator()
-        python_evaluator.locals["get_context_name"] = get_context_name
+        python_evaluator.locals["get_concept_name"] = get_concept_name
         evaluated = python_evaluator.eval(context, parsed)
 
         assert not evaluated.status
         assert evaluated.body.body.args[0] == "'int' object has no attribute 'name'"
 
+    def test_i_can_call_function_with_complex_concepts(self):
+        sheerka, context, plus, mult = self.init_concepts(
+            self.def_concept("plus", "a plus b", ["a", "b"]),
+            self.def_concept("mult", "a mult b", ["a", "b"]),
+        )
+
+        parsed = PythonParser().parse(context, "is_greater_than(BuiltinConcepts.PRECEDENCE, mult, plus)")
+        python_evaluator = PythonEvaluator()
+
+        evaluated = python_evaluator.eval(context, parsed)
+
+        assert evaluated.status
+        assert sheerka.get_concepts_weights(BuiltinConcepts.PRECEDENCE) == {'1001': 1, '1002': 2}
+
+
     # @pytest.mark.parametrize("text, concept_key, concept_id, use_concept", [
     #     ("__C__key__C__", "key", None, False),
     #     ("__C__key__id__C__", "key", "id", False),