temporary commit

Author: machow

pythonwhat/check_funcs.py

@@ -74,7 +74,8 @@ def check_node(name, index, typestr, missing_msg=MSG_MISSING, expand_msg=MSG_PRE
 
     # check if there are enough nodes for index
     fmt_kwargs = {'ordinal': get_ord(index+1) if isinstance(index, int) else "",
-                  'index': index}
+                  'index': index,
+                  'name': name}
     fmt_kwargs['typestr'] = typestr.format(**fmt_kwargs)
 
     # test if node can be indexed succesfully

pythonwhat/check_function.py

@@ -1,39 +1,45 @@
-from pythonwhat.check_funcs import check_node
-from pythonwhat.test_funcs.test_function import mapped_name
+from pythonwhat.Reporter import Reporter
+from pythonwhat.check_funcs import check_node, check_part_index
+from pythonwhat.test_funcs.test_function import bind_args
 from pythonwhat.tasks import getSignatureInProcess
 from functools import partial
 
 def check_function(name, index=0, 
-                   missing_msg = "Did you define {sol_part[name]}?", 
+                   missing_msg = "Did you define {typestr}?", 
                    expand_msg  = "In your definition of {sol_part[name]}, ", 
+                   params_not_matched_msg = "Something went wrong in figuring out how you specified the "
+                                            "arguments for `{sol_part[name]}`; have another look at your code and its output.",
                    state=None):
     rep = Reporter.active_reporter
     stu_out = state.student_function_calls
     sol_out = state.solution_function_calls
 
-    # test if function exists
-    stud_name = get_mapped_name(name, state.student_mappings)
-    
-    func_list = check_node('function_calls', name, 'function call', missing_msg, expand_msg, state)
+    import pdb; pdb.set_trace()
     # get function state
-    if index is None: 
-        return func_list
-    else:
-        # TODO make has_part more robust
-        # grab specific function call
-        child_func = check_part(index, "FUNCTION MSG", func_list, "not enough func calls")
-        stu_parts, sol_parts = child_func.student_parts, child_func.solution_parts
-        # Signatures
-        get_sig = partial(getSignatureInProcess, name=name, signature=signature,
-                                                 manual_sigs = state.get_manual_sigs())
+    func_list = check_node('function_calls', name, '{ordinal} function call to {name}', missing_msg, expand_msg, state)
+    # grab specific function call
+    # TODO NoneType not subscriptable, alter parsing so func part is dict
+    child_func = check_part_index(None, index, "", func_list, state=func_list)
+    stu_parts, sol_parts = child_func.student_parts, child_func.solution_parts
+    # Signatures
+    get_sig = partial(getSignatureInProcess, name=name, signature=signature,
+                                             manual_sigs = state.get_manual_sigs())
 
-        # TODO if can't parse, raise warnings
+    try:
         sol_sig = get_sig(mapped_name=sol_parts['name'], process=solution_process)
-        sol_parts['args'], _ = bind_ards(sol_sig, sol_parts['pos_args'], sol_parts['keywords'])
+        sol_parts['args'], _ = bind_args(sol_sig, sol_parts['pos_args'], sol_parts['keywords'])
+    except:
+        raise ValueError("Something went wrong in matching call index {index} of {name} to its signature. "
+                         "You might have to manually specify or correct the signature."
+                                .format(index=index, name=name))
 
-        # TODO if can't parse sig, send failed test msg
-        stu_sig = get_sig(mapped_name=stu_parts['name'], process=student_process)
-        stu_parts['args'], _ = bind_ards(stu_sig, stu_parts['pos_args'], stu_parts['keywords'])
+    # TODO if can't parse sig, send failed test msg
+    try:
+        stu_sig = get_sig(mapped_name=stu_parts['name'], process=child_func.student_process)
+        stu_parts['args'], _ = bind_args(stu_sig, stu_parts['pos_args'], stu_parts['keywords'])
+    except:
+        _msg = state.build_message(params_not_matched_msg)
+        rep.do_test(Test(Feedback(_msg, state.highlight)))
 
-        # three types of parts: pos_args, keywords, args (e.g. these are bound to sig)
-        return child_func
+    # three types of parts: pos_args, keywords, args (e.g. these are bound to sig)
+    return child_func

pythonwhat/check_wrappers.py

@@ -1,5 +1,6 @@
 from pythonwhat.check_funcs import check_part, check_part_index, check_node, has_equal_part
 from pythonwhat import check_funcs, check_object
+from pythonwhat.check_function import check_function
 from pythonwhat.test_funcs.test_data_frame import check_df
 from pythonwhat.test_funcs.test_dictionary import check_dict
 from pythonwhat import test_funcs
@@ -53,6 +54,7 @@
 
 for k, v in __NODE_WRAPPERS__.items():
     scts['check_'+k] = partial(check_node, k+'s', typestr=v)
+scts['check_function'] = check_function
 
 for k in ['set_context', 
           'has_equal_value', 'has_equal_output', 'has_equal_error', 'call',

tests/test_test_function_v2.py

@@ -669,20 +669,34 @@ def setUp(self):
             '''
         }
 
+        self.SPEC2_SCT = """
+Ex().check_function('pandas.DataFrame', missing_msg = "notcalledmsg")\
+        .check_args('data', missing_msg='paramsnotmatchedmsg')
+"""
+
     def test_step1(self):
         self.data["DC_CODE"] = ""
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
         self.assertEqual('notcalledmsg', sct_payload['message'])
         helper.test_absent_lines(self, sct_payload)
 
+    def test_step1_spec2(self):
+        self.data["DC_SCT"] = self.SPEC2_SCT
+        self.test_step1()
+
     def test_step2(self):
         self.data["DC_CODE"] = "df = pd.DataFrame(x=[1, 2, 3])"
         sct_payload = helper.run(self.data)
         self.assertFalse(sct_payload['correct'])
         self.assertEqual('paramsnotmatchedmsg', sct_payload['message'])
         helper.test_lines(self, sct_payload, 1, 1, 6, 30)
 
+    def test_step2_spec2(self):
+        self.data["DC_SCT"] = self.SPEC2_SCT
+        self.test_step2()
+
+
     def test_step3(self):
         self.data["DC_CODE"] = "df = pd.DataFrame(data=[1, 2, 3])"
         sct_payload = helper.run(self.data)