Auto-create appropriate scheduled runs on creation (#170)

* auto create extension run on extension creation

* fix formatting

* fix

* datastructs

* ?

* prevent extensions from crashing

* add print

* get run config at ext creation time

* add warning

* also create the scheduled run for a new assignment

* store default run ID in the assignment

* try this

* fix

* load the final grading run config when creating an extension

* require grading time config to create an assignment

* help

* icon

* update words

* support

* help

* save start

* hold defaults

* Revert "hold defaults"

This reverts commit f536823.

* test

* fix

* help

* reorder

* default to

* ?

* Revert "?"

This reverts commit 3ef6f83.

* help

* help

* delete extension run when deleting an extension

* fix

* fix 3

* reload on closing extensions page

* use jquery

* fix

* fix 3?

* sigh

* remove print statements

Author: devksingh4

src/common.py

@@ -3,7 +3,16 @@
 from pytz import utc
 
 from config import TZ
-from src import db, util
+from src import db, sched_api, util
+
+def wrap_delete_scheduled_run(cid, aid, run_id):
+    sched_run = db.get_scheduled_run(cid, aid, run_id)
+    if sched_run is None:
+        raise Exception("Cannot find scheduled run")
+    sched_api.delete_scheduled_run(sched_run["scheduled_run_id"])
+    if not db.delete_scheduled_run(cid, aid, run_id):
+        raise Exception("Failed to delete scheduled run.")
+    return True
 
 def in_grading_period(assignment, now=None):
 	if now is None:

src/db.py

@@ -2,6 +2,7 @@
 from bson.objectid import ObjectId
 from bson.errors import InvalidId
 from src import util
+from src.common import wrap_delete_scheduled_run
 from src.sched_api import ScheduledRunStatus
 
 mongo = PyMongo()
@@ -63,6 +64,10 @@ def get_course(cid):
 def add_staff_to_course(cid, new_staff_id):
 	return mongo.db.courses.update({"_id": cid}, {"$set" : {f"staff.{new_staff_id}": {"is_admin": False}}})
 
+
+def set_templates_for_course(cid, assignment_config: str, grading_config: str):
+	return mongo.db.courses.update({"_id": cid}, {"$set" : {"default_assignment_config": assignment_config, "default_grading_config": grading_config}})
+
 def remove_staff_from_course(cid, staff_id):
 	return mongo.db.courses.update({"_id": cid},{"$unset" : {f"staff.{staff_id}": 1}})
 
@@ -131,7 +136,6 @@ def get_assignments_for_course(cid, visible_only=False):
 def get_assignment(cid, aid):
 	return mongo.db.assignments.find_one({"course_id": cid, "assignment_id": aid})
 
-
 def add_assignment(cid, aid, max_runs, quota, start, end, visibility):
 	"""
 	Add a new assignment.
@@ -235,10 +239,26 @@ def get_extensions(cid, aid, netid=None):
 		return mongo.db.extensions.find({"course_id": cid, "assignment_id": aid, "netid": netid})
 
 
-def add_extension(cid, aid, netid, max_runs, start, end):
-	return mongo.db.extensions.insert_one({"course_id": cid, "assignment_id": aid, "netid": netid, "max_runs": max_runs, "remaining_runs": max_runs, "start": start, "end": end})
+def pair_assignment_final_grading_run(cid: str, aid: str, scheduled_run_id: ObjectId):
+	return mongo.db.assignments.update(
+		{"course_id": cid, "assignment_id": aid},
+		{"$set": {"final_grading_run_id": str(scheduled_run_id)}}
+	)
+	
+def add_extension(cid, aid, netid, max_runs, start, end, scheduled_run_id: ObjectId = None):
+	return mongo.db.extensions.insert_one({"course_id": cid, "assignment_id": aid, "netid": netid, "max_runs": max_runs, "remaining_runs": max_runs, "start": start, "end": end, "run_id": None or str(scheduled_run_id)})
 
-def delete_extension(extension_id):
+def delete_extension(cid, aid, extension_id):
+	document = mongo.db.extensions.find_one({"_id": ObjectId(extension_id)})
+	if not document:
+		return None
+	run_id = document.get("run_id", None)
+	if run_id:
+		try:
+			wrap_delete_scheduled_run(cid, aid, run_id)
+		except Exception as e:
+			print(f"Failed to delete scheduled run for extension id {extension_id} run id {run_id}: ", str(e), flush=True)
+			pass
 	try:
 		return mongo.db.extensions.delete_one({"_id": ObjectId(extension_id)})
 	except InvalidId:

src/routes_admin.py

@@ -1,14 +1,14 @@
 import csv
-from xxlimited import new
+from datetime import timedelta
 from flask import render_template, abort, request, jsonify
 from http import HTTPStatus
-import json, re
-
+import json
 from src import db, util, auth, bw_api, sched_api
+from src.common import wrap_delete_scheduled_run
 from src.common import verify_staff, verify_admin, verify_student
 
 MIN_PREDEADLINE_RUNS = 1  # Minimum pre-deadline runs for every assignment
-
+        
 class AdminRoutes:
     def __init__(self, blueprint):
         def none_modified(result):
@@ -33,7 +33,7 @@ def get_course_staff_roster(netid, cid):
 
             staff = course["staff"]
             # get all admin_ids by filtering out all non-admins
-            admin = dict(filter(lambda x : x[1].get("is_admin") == True, staff.items()))
+            admin = dict(filter(lambda x : x[1].get("is_admin"), staff.items()))
             admin = list(admin.keys())
             # get the entire staff
             total_staff = list(staff.keys())
@@ -144,12 +144,38 @@ def upload_roster_file(netid, cid):
                 return util.error("The new roster is the same as the current one.")
             return util.success("Successfully updated roster.")
 
+        @blueprint.route("/staff/course/<cid>/set_template_configs/", methods=["POST"])
+        @auth.require_auth
+        @auth.require_admin_status
+        def set_template_values(netid, cid):
+            if not db.get_course(cid):
+                return abort(HTTPStatus.NOT_FOUND)
+
+            missing = util.check_missing_fields(request.form,
+                                                *["config", "grading_config"])
+            if missing:
+                return util.error(f"Missing fields ({', '.join(missing)}).")
+            try:
+                json.loads(request.form["config"])
+            except Exception:
+                return util.error("Failed to decode student job JSON.")
+            try:
+                json.loads(request.form["grading_config"])
+            except Exception:
+                return util.error("Failed to decode grading job JSON.")
+            try:
+                db.set_templates_for_course(cid, request.form['config'], request.form['grading_config'])
+            except Exception:
+                return util.error("Failed to save template to database.")
+            return util.success("")
+
+
         @blueprint.route("/staff/course/<cid>/add_assignment/", methods=["POST"])
         @auth.require_auth
         @auth.require_admin_status
         def add_assignment(netid, cid):
             missing = util.check_missing_fields(request.form,
-                                                *["aid", "max_runs", "quota", "start", "end", "config", "visibility"])
+                                                *["aid", "max_runs", "quota", "start", "end", "config", "visibility", "grading_config"])
             if missing:
                 return util.error(f"Missing fields ({', '.join(missing)}).")
 
@@ -174,6 +200,9 @@ def add_assignment(netid, cid):
 
             start = util.parse_form_datetime(request.form["start"]).timestamp()
             end = util.parse_form_datetime(request.form["end"]).timestamp()
+            run_start_str = (util.parse_form_datetime(request.form["end"]) + timedelta(minutes=5)).strftime("%Y-%m-%dT%H:%M")
+            end_str = util.parse_form_datetime(request.form["end"]).strftime("%Y-%m-%dT%H:%M")
+            run_id = db.generate_new_id()
             if start is None or end is None:
                 return util.error("Missing or invalid Start or End.")
             if start >= end:
@@ -191,6 +220,9 @@ def add_assignment(netid, cid):
             visibility = request.form["visibility"]
 
             db.add_assignment(cid, aid, max_runs, quota, start, end, visibility)
+            # Schedule Final Grading Run 
+            add_or_edit_scheduled_run(cid, aid, run_id, {"run_time": run_start_str, "due_time": end_str, "name": "Final Grading Run", "config": request.form['grading_config']}, None)
+            db.pair_assignment_final_grading_run(cid, aid, str(run_id))
             return util.success("")
 
         @blueprint.route("/staff/course/<cid>/<aid>/edit/", methods=["POST"])
@@ -288,15 +320,20 @@ def staff_add_extension(netid, cid, aid):
                 return util.error("Start must be before End.")
 
             for student_netid in student_netids:
-                db.add_extension(cid, aid, student_netid, max_runs, start, end)
+                end_str = util.parse_form_datetime(request.form["end"]).strftime("%Y-%m-%dT%H:%M")
+                # avoid that weird race condition - start run 5 min after, but with a container due date of the original time
+                ext_end = (util.parse_form_datetime(request.form["end"]) + timedelta(minutes=5)).strftime("%Y-%m-%dT%H:%M")
+                run_id = db.generate_new_id()
+                add_or_edit_scheduled_run(cid, aid, run_id, {"run_time": ext_end, "due_time": end_str, "name": f"Extension Run - {student_netid}", "config": request.form['config'], "roster": student_netid}, None)
+                db.add_extension(cid, aid, student_netid, max_runs, start, end, run_id)
             return util.success("")
 
         @blueprint.route("/staff/course/<cid>/<aid>/extensions/", methods=["DELETE"])
         @auth.require_auth
         @auth.require_admin_status
         def staff_delete_extension(netid, cid, aid):
             extension_id = request.form["_id"]
-            delete_result = db.delete_extension(extension_id)
+            delete_result = db.delete_extension(cid, aid, extension_id)
 
             if delete_result is None:
                 return util.error("Invalid extension, please refresh the page.")
@@ -313,26 +350,26 @@ def add_or_edit_scheduled_run(cid, aid, run_id, form, scheduled_run_id):
                 return abort(HTTPStatus.NOT_FOUND)
 
             # form validation
-            missing = util.check_missing_fields(request.form, "run_time", "due_time", "name", "config")
+            missing = util.check_missing_fields(form, "run_time", "due_time", "name", "config")
             if missing:
                 return util.error(f"Missing fields ({', '.join(missing)}).")
-            run_time = util.parse_form_datetime(request.form["run_time"]).timestamp()
+            run_time = util.parse_form_datetime(form["run_time"]).timestamp()
             if run_time is None:
                 return util.error("Missing or invalid run time.")
             if run_time <= util.now_timestamp():
                 return util.error("Run time must be in the future.")
-            due_time = util.parse_form_datetime(request.form["due_time"]).timestamp()
+            due_time = util.parse_form_datetime(form["due_time"]).timestamp()
             if due_time is None:
                 return util.error("Missing or invalid due time.")
-            if "roster" not in request.form or not request.form["roster"]:
+            if "roster" not in form or not form["roster"]:
                 roster = None
             else:
-                roster = request.form["roster"].replace(" ", "").lower().split(",")
+                roster = form["roster"].replace(" ", "").lower().split(",")
                 for student_netid in roster:
                     if not util.valid_id(student_netid) or not verify_student(student_netid, cid):
                         return util.error(f"Invalid or non-existent student NetID: {student_netid}")
             try:
-                config = json.loads(request.form["config"])
+                config = json.loads(form["config"])
                 msg = bw_api.set_assignment_config(cid, f"{aid}_{run_id}", config)
                 if msg:
                     return util.error(f"Failed to upload config to Broadway: {msg}")
@@ -351,7 +388,7 @@ def add_or_edit_scheduled_run(cid, aid, run_id, form, scheduled_run_id):
 
             assert scheduled_run_id is not None
 
-            if not db.add_or_update_scheduled_run(run_id, cid, aid, run_time, due_time, roster, request.form["name"], scheduled_run_id):
+            if not db.add_or_update_scheduled_run(run_id, cid, aid, run_time, due_time, roster, form["name"], scheduled_run_id):
                 return util.error("Failed to save the changes, please try again.")
             return util.success("")
 
@@ -389,13 +426,8 @@ def staff_get_scheduled_run(netid, cid, aid, run_id):
         @auth.require_auth
         @auth.require_admin_status
         def staff_delete_scheduled_run(netid, cid, aid, run_id):
-            sched_run = db.get_scheduled_run(cid, aid, run_id)
-            if sched_run is None:
-                return util.error("Cannot find scheduled run")
-            sched_api.delete_scheduled_run(sched_run["scheduled_run_id"])
-            if not db.delete_scheduled_run(cid, aid, run_id):
-                return util.error("Failed to delete scheduled run. Please try again")
-            return util.success("")
-
-        
-        
+            try:
+                wrap_delete_scheduled_run(cid, aid, run_id)
+                return util.success("")
+            except Exception as e:
+                return util.error(str(e))

src/routes_staff.py

@@ -69,7 +69,7 @@ def staff_get_assignment(netid, cid, aid):
             student_runs = list(db.get_assignment_runs(cid, aid))
             scheduled_runs = list(db.get_scheduled_runs(cid, aid))
             is_admin = verify_admin(netid, cid)
-
+            assignment['end_plus_one_minute'] = assignment['end'] + 60
             return render_template("staff/assignment.html", netid=netid, course=course,
                                    assignment=assignment, student_runs=student_runs,
                                    scheduled_runs=scheduled_runs, sched_run_status=sched_api.ScheduledRunStatus,

src/sched_api.py

@@ -39,7 +39,6 @@ def update_scheduled_run(scheduled_run_id, time):
     data = {
         "time": util.timestamp_to_iso(time),
     }
-    print(util.timestamp_to_iso(time))
     resp = requests.post(url=url, data=data)
     is_success = resp.status_code == HTTPStatus.OK
     if not is_success:

src/static/modify_assignment.1.0.1.js

@@ -40,6 +40,69 @@ function modifyAssignment(formName, postUrl, errorSelector, saveBtn, saveBtnIcon
             },
             visibility: "required",
             config: "required",
+            grading_config: "required",
+        },
+        errorPlacement: function(error, element) {
+            if (element.attr("type") == "radio") {
+                // radio are grouped by divs, so insert at the end of one level above
+                let parent = element.parent().parent();
+                parent.append("<br/>");
+                parent.append(error);
+            } else {
+                // normally insert right after input element
+                error.insertAfter(element);
+            }
+        },
+        submitHandler: function(form, event) {
+            event.preventDefault();
+            // raw data has the form: [{name: "name of input field", value: "input value"}, ...]
+            let rawData = $(form).serializeArray();
+            let formData = {};
+            for (let i = 0; i < rawData.length; i++) {
+                let fieldName = rawData[i].name;
+                let fieldVal = rawData[i].value;
+                // Convert date string to special format
+                if (fieldName == "start" || fieldName == "end") {
+                    fieldVal = moment(fieldVal).format("YYYY-MM-DDTHH:mm");
+                }
+                formData[fieldName] = fieldVal;
+            }
+            $.ajax({
+                type: "POST",
+                url: postUrl,
+                data: formData,
+                beforeSend: function () {
+                    $(errorSelector).html('').fadeOut();
+                    $(saveBtnIcon).addClass("fa-spin");
+                    $(saveBtn).prop('disabled', true);
+                },
+                success: function () {
+                    $(modalSelector).modal('hide');
+                    location.reload();
+                },
+                error: function (xhr) {
+                    if (!xhr.responseText) {
+                        $(errorSelector).html("Save failed. Please try again.").fadeIn();
+                    } else {
+                        $(errorSelector).html(xhr.responseText).fadeIn();
+                    }
+                }
+            }).always(() => {
+                $(saveBtnIcon).removeClass("fa-spin");
+                $(saveBtn).prop('disabled', false);
+            });
+        }
+    });
+}
+
+function modifyTemplates(formName, postUrl, errorSelector, saveBtn, saveBtnIcon, modalSelector) {
+    // form validation
+    $(`form[name="${formName}"]`).validate({
+        errorClass: "text-danger",
+        errorElement: "small",
+        rules: {
+            config: "required",
+            grading_config: "required",
         },
         errorPlacement: function(error, element) {
             if (element.attr("type") == "radio") {