Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics

common/lib/capa/capa/inputtypes.py

@@ -655,9 +655,9 @@ class MatlabInput(CodeInput):
         # Check if problem has been queued
         self.queuename = 'matlab'
         self.queue_msg = ''
-        if 'queue_msg' in self.input_state and self.status in ['queued','incomplete', 'unsubmitted']:
+        if 'queue_msg' in self.input_state and self.status in ['queued', 'incomplete', 'unsubmitted']:
             self.queue_msg = self.input_state['queue_msg']
-        if 'queued' in self.input_state and self.input_state['queuestate'] is not None:
+        if 'queuestate' in self.input_state and self.input_state['queuestate'] == 'queued':
             self.status = 'queued'
             self.queue_len = 1
             self.msg = self.plot_submitted_msg
@@ -702,7 +702,7 @@ class MatlabInput(CodeInput):
     def _extra_context(self):
         ''' Set up additional context variables'''
         extra_context = {
-                'queue_len': self.queue_len,
+                'queue_len': str(self.queue_len),
                 'queue_msg': self.queue_msg
                 }
         return extra_context

common/lib/capa/capa/tests/test_inputtypes.py

@@ -361,7 +361,6 @@ class MatlabTest(unittest.TestCase):
                  'feedback': {'message': '3'}, }
         elt = etree.fromstring(self.xml)
 
-        input_class = lookup_tag('matlabinput')
         the_input = self.input_class(test_system, elt, state)
         context = the_input._get_render_context()
 
@@ -381,6 +380,31 @@ class MatlabTest(unittest.TestCase):
 
         self.assertEqual(context, expected)
 
+    def test_rendering_while_queued(self):
+        state = {'value': 'print "good evening"',
+                 'status': 'incomplete',
+                 'input_state': {'queuestate': 'queued'},
+                 }
+        elt = etree.fromstring(self.xml)
+
+        the_input = self.input_class(test_system, elt, state)
+        context = the_input._get_render_context()
+        expected = {'id': 'prob_1_2',
+                    'value': 'print "good evening"',
+                   'status': 'queued',
+                   'msg': self.input_class.plot_submitted_msg,
+                   'mode': self.mode,
+                   'rows': self.rows,
+                   'cols': self.cols,
+                   'queue_msg': '',
+                   'linenumbers': 'true',
+                   'hidden': '',
+                   'tabsize': int(self.tabsize),
+                   'queue_len': '1',
+                   }
+
+        self.assertEqual(context, expected)
+
     def test_plot_data(self):
         get = {'submission': 'x = 1234;'}
         response = self.the_input.handle_ajax("plot", get)
@@ -391,6 +415,43 @@ class MatlabTest(unittest.TestCase):
         self.assertTrue(self.the_input.input_state['queuekey'] is not None)
         self.assertEqual(self.the_input.input_state['queuestate'], 'queued')
 
+    def test_ungraded_response_success(self):
+        queuekey = 'abcd'
+        input_state = {'queuekey': queuekey, 'queuestate': 'queued'}
+        state = {'value': 'print "good evening"',
+                 'status': 'incomplete',
+                 'input_state': input_state,
+                 'feedback': {'message': '3'}, }
+        elt = etree.fromstring(self.xml)
+
+        the_input = self.input_class(test_system, elt, state)
+        inner_msg = 'hello!'
+        queue_msg = json.dumps({'msg': inner_msg})
+
+        the_input.ungraded_response(queue_msg, queuekey)
+        self.assertTrue(input_state['queuekey'] is None)
+        self.assertTrue(input_state['queuestate'] is None)
+        self.assertEqual(input_state['queue_msg'], inner_msg)
+
+    def test_ungraded_response_key_mismatch(self):
+        queuekey = 'abcd'
+        input_state = {'queuekey': queuekey, 'queuestate': 'queued'}
+        state = {'value': 'print "good evening"',
+                 'status': 'incomplete',
+                 'input_state': input_state,
+                 'feedback': {'message': '3'}, }
+        elt = etree.fromstring(self.xml)
+
+        the_input = self.input_class(test_system, elt, state)
+        inner_msg = 'hello!'
+        queue_msg = json.dumps({'msg': inner_msg})
+
+        the_input.ungraded_response(queue_msg, 'abc')
+        self.assertEqual(input_state['queuekey'], queuekey)
+        self.assertEqual(input_state['queuestate'], 'queued')
+        self.assertFalse('queue_msg' in input_state)
+
+
 
 
 

common/lib/xmodule/xmodule/capa_module.py

@@ -108,7 +108,6 @@ class CapaModule(CapaFields, XModule):
     '''
     icon_class = 'problem'
 
-
     js = {'coffee': [resource_string(__name__, 'js/src/capa/display.coffee'),
                      resource_string(__name__, 'js/src/collapsible.coffee'),
                      resource_string(__name__, 'js/src/javascript_loader.coffee'),
@@ -388,7 +387,6 @@ class CapaModule(CapaFields, XModule):
 
         return html
 
-
     def get_problem_html(self, encapsulate=True):
         '''Return html for the problem.  Adds check, reset, save buttons
         as necessary based on the problem config and state.'''
@@ -401,7 +399,6 @@ class CapaModule(CapaFields, XModule):
         except Exception, err:
             html = self.handle_problem_html_error(err)
 
-
         # The convention is to pass the name of the check button
         # if we want to show a check button, and False otherwise
         # This works because non-empty strings evaluate to True
@@ -535,7 +532,6 @@ class CapaModule(CapaFields, XModule):
 
         return False
 
-
     def update_score(self, get):
         """
         Delivers grading response (e.g. from asynchronous code checking) to
@@ -590,7 +586,6 @@ class CapaModule(CapaFields, XModule):
         self.set_state_from_lcp()
         return response
 
-
     def get_answer(self, get):
         '''
         For the "show answer" button.
@@ -700,7 +695,6 @@ class CapaModule(CapaFields, XModule):
             'max_value': score['total'],
         })
 
-
     def check_problem(self, get):
         ''' Checks whether answers to a problem are correct, and
             returns a map of correct/incorrect answers:
@@ -783,7 +777,7 @@ class CapaModule(CapaFields, XModule):
         self.system.track_function('save_problem_check', event_info)
 
         if hasattr(self.system, 'psychometrics_handler'):  # update PsychometricsData using callback
-            self.system.psychometrics_handler(self.get_instance_state())
+            self.system.psychometrics_handler(self.get_state_for_lcp())
 
         # render problem into HTML
         html = self.get_problem_html(encapsulate=False)

lms/djangoapps/courseware/management/commands/remove_input_state.py

@@ -76,6 +76,11 @@ class Command(BaseCommand):
             for hist_module in hist_modules:
                 self.remove_studentmodulehistory_input_state(hist_module, save_changes)
 
+            if self.num_visited % 1000 == 0:
+                LOG.info(" Progress: updated {0} of {1} student modules".format(self.num_changed, self.num_visited))
+                LOG.info(" Progress: updated {0} of {1} student history modules".format(self.num_hist_changed,
+                                                                                        self.num_hist_visited))
+
     @transaction.autocommit
     def remove_studentmodule_input_state(self, module, save_changes):
         ''' Fix the grade assigned to a StudentModule'''

lms/djangoapps/psychometrics/psychoanalyze.py

@@ -15,7 +15,6 @@ from scipy.optimize import curve_fit
 from django.conf import settings
 from django.db.models import Sum, Max
 from psychometrics.models import *
-from xmodule.modulestore import Location
 
 log = logging.getLogger("mitx.psychometrics")
 
@@ -246,6 +245,7 @@ def generate_plots_for_problem(problem):
         yset['ydat'] = ydat
 
         if len(ydat) > 3:         # try to fit to logistic function if enough data points
+            try:
                 cfp = curve_fit(func_2pl, xdat, ydat, [1.0, max_attempts / 2.0])
                 yset['fitparam'] = cfp
                 yset['fitpts'] = func_2pl(np.array(xdat), *cfp[0])
@@ -253,6 +253,8 @@ def generate_plots_for_problem(problem):
                 fitx = np.linspace(xdat[0], xdat[-1], 100)
                 yset['fitx'] = fitx
                 yset['fity'] = func_2pl(np.array(fitx), *cfp[0])
+            except Exception as err:
+                log.debug('Error in psychoanalyze curve fitting: %s' % err)
 
         dataset['grade_%d' % grade] = yset
 
@@ -302,7 +304,7 @@ def make_psychometrics_data_update_handler(course_id, user, module_state_key):
     Construct and return a procedure which may be called to update
     the PsychometricsData instance for the given StudentModule instance.
     """
-    sm = studentmodule.objects.get_or_create(
+    sm, status = StudentModule.objects.get_or_create(
                        course_id=course_id,
                        student=user,
                        module_state_key=module_state_key,
@@ -329,7 +331,11 @@ def make_psychometrics_data_update_handler(course_id, user, module_state_key):
             return
 
         pmd.done = done
-        pmd.attempts = state['attempts']
+        try:
+            pmd.attempts = state.get('attempts', 0)
+        except:
+            log.exception("no attempts for %s (state=%s)" % (sm, sm.state))
+
         try:
             checktimes = eval(pmd.checktimes)                   # update log of attempt timestamps
         except: