jinja highlighting

Author: machow

pythonwhat/State.py

@@ -10,6 +10,7 @@
 from pythonwhat.converters import get_manual_converters
 from collections.abc import Mapping
 from itertools import chain
+from jinja2 import Template
 
 class Context(Mapping):
     def __init__(self, context=None, prev=None):
@@ -140,14 +141,17 @@ def build_message(self, tail="", fmt_kwargs=None):
         msgs = self.messages[:] + [{'msg': tail or "", 'kwargs':fmt_kwargs}]
         # format messages in list, by iterating over previous, current, and next message
         for prev_d, d, next_d in zip([{}, *msgs[:-1]], msgs, [*msgs[1:], {}]):
+            tmp_kwargs = {'parent': prev_d.get('kwargs'), 
+                          'child': next_d.get('kwargs'), 
+                          'this': d['kwargs'], 
+                          **d['kwargs']}
             if d['msg'].startswith('FMT:'):
-                out = d['msg'].replace('FMT:', "").format(
-                        parent = prev_d.get('kwargs'),
-                        child = next_d.get('kwargs'),
-                        this = d['kwargs'],
-                        **d['kwargs'])
+                out = d['msg'].replace('FMT:', "").format(**tmp_kwargs)
+            elif d['msg'].startswith('__JINJA__:'):
+                out = Template(d['msg'].replace('__JINJA__:', "")).render(**tmp_kwargs)
             else:
                 out = d['msg']
+
             out_list.append(out)
 
         return "".join(out_list)

pythonwhat/check_funcs.py

@@ -63,7 +63,7 @@ def check_part_index(name, index, part_msg,
     return part_to_child(stu_part, sol_part, append_message, state)
 
 MSG_MISSING = "FMT:The system wants to check the {ordinal} {typestr} you defined but hasn't found it."
-MSG_PREPEND = "FMT:Check your code in the {child[part]} of the {ordinal} {typestr}. "
+MSG_PREPEND = "__JINJA__:Check your code for the {{child['part']+ ' of the' if child['part']}} {typestr}. "
 def check_node(name, index, typestr, missing_msg=MSG_MISSING, expand_msg=MSG_PREPEND, state=None):
     rep = Reporter.active_reporter
     stu_out = getattr(state, 'student_'+name)
@@ -299,11 +299,14 @@ def call(args,
     eval_sol, str_sol = run_call(args, state.solution_parts['node'], state.solution_process, get_func, **kwargs)
 
     if (test == 'error') ^ isinstance(str_sol, Exception):
-        _msg_prefix = "Calling %s for arguments %s " % (argstr, args)
-        raise ValueError(_msg_prefix + call_warnings[test])
+        _msg = state.build_message("Calling for arguments {args} resulted in an error (or not an error if testing for one).",
+                                   dict(args=args))
+        raise ValueError(_msg)
 
     if isinstance(eval_sol, ReprFail):
-        raise ValueError("Can't get the result of calling %s for arguments %s: %s" % (argstr, args, eval_sol.info))
+        _msg = state.build_message("Can't get the result of calling it for arguments {args}: {eval_sol.info}",
+                                   dict(args = args, eval_sol=eval_sol))
+        raise ValueError(_msg)
 
     # Run for Submission ------------------------------------------------------
     eval_stu, str_stu = run_call(args, state.student_parts['node'], state.student_process, get_func, **kwargs)
@@ -325,7 +328,7 @@ def call(args,
 from pythonwhat.tasks import ReprFail, UndefinedValue
 from pythonwhat.Test import EqualTest
 from pythonwhat import utils
-def has_expr(incorrect_msg,
+def has_expr(incorrect_msg="Unexpected expression {test}: expected `{sol_eval}`, got `{stu_eval}` with values{extra_env}.",
              error_msg="Running an expression in the student process caused an issue",
              undefined_msg="FMT:Have you defined `{name}` without errors?",
              extra_env=None,
@@ -368,7 +371,9 @@ def has_expr(incorrect_msg,
                                  context = state.student_context)
 
     # kwargs ---
-    fmt_kwargs = {'stu_part': state.student_parts, 'sol_part': state.solution_parts, 'name': name}
+    fmt_kwargs = {'stu_part': state.student_parts, 'sol_part': state.solution_parts, 
+                  'name': name, 'test': test,
+                  'extra_env': " "+str(extra_env or ""), 'context_vals': context_vals}
     fmt_kwargs['stu_eval'] = utils.shorten_str(str(eval_stu))
     fmt_kwargs['sol_eval'] = utils.shorten_str(str(eval_sol))
 

pythonwhat/check_wrappers.py

@@ -1,7 +1,8 @@
-from pythonwhat.check_funcs import check_part, check_part_index, check_node
+from pythonwhat.check_funcs import check_part, check_part_index, check_node, has_equal_part
 from pythonwhat import check_funcs
 from functools import partial
 import inspect
+#from jinja2 import Template
 
 __PART_WRAPPERS__ = {
         'iter': 'iterable part',
@@ -15,9 +16,9 @@
         }
 
 __PART_INDEX_WRAPPERS__ = {
-        'ifs': 'if',
-        'handlers': 'exception handler',
-        'context': 'context'
+        'ifs': '{ordinal} if',
+        'handlers': '{index} `except` block',
+        'context': '{ordinal} context'
         }
 
 __NODE_WRAPPERS__ = {
@@ -36,6 +37,11 @@
 
 scts = {}
 
+# make has_equal_part wrappers
+
+scts['has_equal_name'] = partial(has_equal_part, 'name', msg='Make sure to use the correct {name}, was expecting {sol_part[name]}, instead got {stu_part[name]}.')
+scts['is_default'] = partial(has_equal_part, 'is_default', msg="__JINJA__:Make sure it {{ 'has' if sol_part.is_default else 'does not have'}} a default argument.")
+
 for k, v in __PART_WRAPPERS__.items():
     scts['check_'+k] = partial(check_part, k, v)
 
@@ -53,4 +59,3 @@
           'check_arg',
           'has_equal_part']:
     scts[k] = getattr(check_funcs, k)
-

tests/test_test_function_definition.py

@@ -738,13 +738,13 @@ def my_fun(x, y = 4, z = ('a', 'b'), *args, **kwargs):
 
     def when_code_is_sol(self):
         self.data['DC_CODE'] = self.data['DC_SOLUTION']
-        sct_payload = helper.run(self.data)
-        return sct_payload['correct']
+        self.sct_payload = helper.run(self.data)
+        return self.sct_payload['correct']
 
     def when_replace(self, orig, new):
         self.data['DC_CODE'] = self.data['DC_SOLUTION'].replace(orig, new)
-        sct_payload = helper.run(self.data)
-        return sct_payload['correct']
+        self.sct_payload = helper.run(self.data)
+        return self.sct_payload['correct']
 
     def test_pass_kw(self):
         self.data['DC_SCT'] = self.SCT_KW
@@ -763,13 +763,17 @@ def test_fail_pos(self):
         self.assertFalse(self.when_replace('x', 'x2'))
 
     def test_fail_pos_is_default(self):
-        self.data['DC_SCT'] = self.SCT_CHECK_ONE + ".has_equal_part('is_default', 'baddefault')"
+        self.data['DC_SCT'] = self.SCT_CHECK_ONE + ".is_default()"
         self.assertFalse(self.when_replace('y = 4', 'y'))
 
     def test_fail_kw_is_default(self):
-        self.data['DC_SCT'] = self.SCT_CHECK_Y + ".has_equal_part('is_default', 'baddefault')"
+        self.data['DC_SCT'] = self.SCT_CHECK_Y + ".is_default()"
         self.assertFalse(self.when_replace('y = 4', 'y'))
 
+    def test_fail_kw_not_default(self):
+        self.data['DC_SCT'] = self.SCT_CHECK_X + ".is_default()"
+        self.assertFalse(self.when_replace('x, y = 4', 'x = 2, y = 4'))
+
     def test_pass_equal_value(self):
         self.data['DC_SCT'] = self.SCT_CHECK_Y + ".has_equal_value('unequal values')"
         self.assertTrue(self.when_code_is_sol())