Section override fix

rudaux/course.py

@@ -385,7 +385,7 @@ def create_grader_folders(self, a):
                 print('Assignment already generated')
 
             # if solution not generated yet, generate it
-            local_path = os.path.join('source', a.name, a.name + '.ipynb')
+            local_path = os.path.join(config.source_path, a.name, a.name + '.ipynb')
             soln_name = a.name + '_solution.html' 
             print('Checking if solution generated...')
             if not os.path.exists(os.path.join(repo_path, soln_name)):

rudaux/course_api.py

@@ -92,6 +92,7 @@ def _canvas_get_people_by_type(config, course_id, typ):
     return [ { 'id' : str(p['user']['id']),
                'name' : p['user']['name'],
                'sortable_name' : p['user']['sortable_name'],
+               'course_section_id' : str(p['course_section_id']),
                'school_id' : str(p['user']['sis_user_id']),
                'reg_date' : plm.parse(p['created_at']) if (plm.parse(p['created_at']) is not None) else plm.parse(p['updated_at']),
                'status' : p['enrollment_state']
@@ -102,7 +103,13 @@ def _canvas_get_overrides(config, course_id, assignment):
     overs = _canvas_get(config, course_id, 'assignments/'+assignment['id']+'/overrides')
     for over in overs:
         over['id'] = str(over['id'])
-        over['student_ids'] = list(map(str, over['student_ids']))
+
+        # If 'student_ids' does not exist, then it's a course section override.
+        if 'student_ids' in over:
+            over['student_ids'] = list(map(str, over['student_ids']))
+        else:
+            over['course_section_id'] = str(over['course_section_id'])
+
         for key in ['due_at', 'lock_at', 'unlock_at']:
             if over.get(key) is not None:
                 over[key] = plm.parse(over[key])
@@ -222,6 +229,7 @@ def get_assignments(config, course_id, assignment_names):
                'lock_at' : None if a['lock_at'] is None else plm.parse(a['lock_at']),
                'unlock_at' : None if a['unlock_at'] is None else plm.parse(a['unlock_at']),
                'has_overrides' : a['has_overrides'],
+               'only_visible_to_overrides' : a['only_visible_to_overrides'],
                'overrides' : [],
                'published' : a['published']
              } for a in asgns if a['name'] in assignment_names]

rudaux/flows.py

@@ -403,7 +403,7 @@ def list_course_info(args):
     print()
     print('Students')
     print()
-    print('\n'.join([f"{c[0] : <16}{c[1]['name'] : <32}{c[1]['id'] : <16}{str(c[1]['reg_date'].in_timezone(config.notify_timezone)) : <32}{c[1]['status'] : <16}" for c in studs]))
+    print('\n'.join([f"{c[0] : <16}{c[1]['name'] : <32}{c[1]['id'] : <16}{str(c[1]['reg_date'].in_timezone(config.notify_timezone)) : <32}{c[1]['status'] : <16}{c[1]['course_section_id'] : <16}" for c in studs]))
 
     print()
     print('Teaching Assistants')

rudaux/grader.py

@@ -49,10 +49,34 @@ def build_grading_team(config, course_group, subm_set):
         if course_name == '__name__':
             continue
         assignment = subm_set[course_name]['assignment']
-
-        # skip the assignment if it isn't due yet
-        if assignment['due_at'] > plm.now():
-            raise signals.SKIP(f"Assignment {assignment['name']} ({assignment['id']}) due date {assignment['due_at']} is in the future. Skipping.")
+
+        # Dict for storing course_section_id and unlock_at date key/value pairs.
+        date_dict = {}
+        date_dict['everyone'] = {'unlock_at' : assignment['unlock_at'], 'due_at' : assignment['due_at'], 'lock_at' : assignment['lock_at']}
+
+        # Process per course section unlock, due, lock dates and add to date_dict
+        section_overrides=[]
+        for over in assignment['overrides']:
+            if 'course_section_id' in over:
+                section_overrides.append(over)
+
+        #if there was at least one, get the override dates
+        for over in section_overrides:
+            over_dict = {}
+            over_dict['unlock_at'] = over['unlock_at']
+            over_dict['due_at'] = over['due_at']
+            over_dict['lock_at'] = over['lock_at']
+            date_dict[over['course_section_id']] = over_dict
+
+        # Get the latest due date
+        latest_due = None
+        for section in date_dict.values():
+            if latest_due == None or section['due_at'] > latest_due:
+                latest_due = section['due_at']
+
+        # skip the assignment if the latest due date hasn't passed yet
+        if latest_due > plm.now():
+            raise signals.SKIP(f"Assignment {assignment['name']} ({assignment['id']}) due date {latest_due} is in the future. Skipping.")
 
     # check whether all grades have been posted (assignment is done). If so, skip
     all_posted = True
@@ -89,14 +113,14 @@ def build_grading_team(config, course_group, subm_set):
         grader['unix_quota'] = config.user_quota
         grader['folder'] = os.path.join(config.user_root, grader['name']).rstrip('/')
         grader['local_source_path'] = os.path.join('source', asgn_name, asgn_name+'.ipynb')
-        grader['submissions_folder'] = os.path.join(grader['folder'], config.submissions_folder)
-        grader['autograded_folder'] = os.path.join(grader['folder'], config.autograded_folder)
-        grader['feedback_folder'] = os.path.join(grader['folder'], config.feedback_folder)
+        grader['submissions_folder'] = os.path.join(grader['folder'], config.nbgrader_path, config.submissions_folder)
+        grader['autograded_folder'] = os.path.join(grader['folder'], config.nbgrader_path, config.autograded_folder)
+        grader['feedback_folder'] = os.path.join(grader['folder'], config.nbgrader_path, config.feedback_folder)
         grader['workload'] = 0
         if os.path.exists(grader['submissions_folder']):
             grader['workload'] = len([f for f in os.listdir(grader['submissions_folder']) if os.path.isdir(f)])
         grader['soln_name'] = asgn_name + '_solution.html'
-        grader['soln_path'] = os.path.join(grader['folder'], grader['soln_name'])
+        grader['soln_path'] = os.path.join(grader['folder'], config.nbgrader_path, grader['soln_name'])
         graders.append(grader)
 
     return graders
@@ -134,6 +158,12 @@ def initialize_volumes(config, graders):
             logger.info(f"{grader['folder']} is not a valid course repo. Cloning course repository from {config.instructor_repo_url}")
             git.Repo.clone_from(config.instructor_repo_url, grader['folder'])
             logger.info("Cloned!")
+
+        # Create nbgrader config file to point it to the right course directory
+        if config.nbgrader_path != "":
+            f = open(os.path.join(grader['folder'], "nbgrader_config.py"), "w")
+            f.writelines(["c = get_config()\n", f"c.CourseDirectory.root = \"{config.nbgrader_path}\""])
+            f.close()
 
         # create the submissions folder
         if not os.path.exists(grader['submissions_folder']):
@@ -146,24 +176,31 @@ def initialize_volumes(config, graders):
 
         # if the assignment hasn't been generated yet, generate it
         # TODO error handling if the container fails
-        generated_asgns = run_container(config, 'nbgrader db assignment list', grader['folder'])
+
+        # Construct path to nbgrader dir
+        if config.nbgrader_path != "":
+            nbgrader_root = os.path.join(grader['folder'], config.nbgrader_path)
+        else:
+            nbgrader_root = grader['folder']
+
+        generated_asgns = run_container(config, 'nbgrader db assignment list', nbgrader_root)
         if aname not in generated_asgns['log']:
             logger.info(f"Assignment {aname} not yet generated for grader {grader['name']}")
-            output = run_container(config, 'nbgrader generate_assignment --force '+aname, grader['folder'])
+            output = run_container(config, 'nbgrader generate_assignment --force '+aname, nbgrader_root)
             logger.info(output['log'])
             if 'ERROR' in output['log']:
-                msg = f"Error generating assignment {aname} for grader {grader['name']} at path {grader['folder']}"
+                msg = f"Error generating assignment {aname} for grader {grader['name']} at path {nbgrader_root}"
                 sig = signals.FAIL(msg)
                 sig.msg = msg
                 raise sig
 
         # if the solution hasn't been generated yet, generate it
         if not os.path.exists(grader['soln_path']):
             logger.info(f"Solution for {aname} not yet generated for grader {grader['name']}")
-            output = run_container(config, 'jupyter nbconvert ' + grader['local_source_path'] + ' --output=' + grader['soln_name'] + ' --output-dir=.' + ' --to html', grader['folder'])
+            output = run_container(config, 'jupyter nbconvert ' + grader['local_source_path'] + ' --output=' + grader['soln_name'] + ' --output-dir=.' + ' --to html', nbgrader_root)
             logger.info(output['log'])
             if 'ERROR' in output['log']:
-                msg = f"Error generating solution for {aname} for grader {grader['name']} at path {grader['folder']}"
+                msg = f"Error generating solution for {aname} for grader {grader['name']} at path {nbgrader_root}"
                 sig = signals.FAIL(msg)
                 sig.msg = msg
                 raise sig

rudaux/snapshot.py

@@ -138,14 +138,26 @@ def _get_snap_name(course_name, assignment, override):
 def get_all_snapshots(config, course_id, assignments):
     snaps = []
     for asgn in assignments:
-        snaps.append( {'due_at' : asgn['due_at'],
-                       'name' : _get_snap_name(config.course_names[course_id], asgn, None),
-                       'student_id' : None})
+        if asgn['due_at'] is not None:
+            snaps.append( {'due_at' : asgn['due_at'],
+                           'name' : _get_snap_name(config.course_names[course_id], asgn, None),
+                           'student_id' : None})
         for override in asgn['overrides']:
-            for student_id in override['student_ids']:
-                snaps.append({'due_at': override['due_at'],
-                              'name' : _get_snap_name(config.course_names[course_id], asgn, override),
-                              'student_id' : student_id})
+            if 'course_section_id' in override:
+                snaps.append( {'due_at' : override['due_at'],
+                               'name' : _get_snap_name(config.course_names[course_id], asgn, override),
+                               'student_id' : None})
+            else:
+                for student_id in override['student_ids']:
+                    snaps.append({'due_at': override['due_at'],
+                                  'name' : _get_snap_name(config.course_names[course_id], asgn, override),
+                                  'student_id' : student_id})
+        if asgn['due_at'] is None and len(asgn['overrides']) == 0:
+            msg = f"Assignment {asgn['name']} has no due date and no overrides."
+            sig = signals.FAIL(msg)
+            sig.msg = msg
+            raise sig
+
     return snaps
 
 @task(checkpoint=False)