course config: nbgrader

Author: williamstein

src/packages/frontend/course/configuration/actions.ts

@@ -29,6 +29,12 @@ import {
 } from "./customize-student-project-functionality";
 import type { PurchaseInfo } from "@cocalc/util/licenses/purchase/types";
 import { delay } from "awaiting";
+import {
+  NBGRADER_CELL_TIMEOUT_MS,
+  NBGRADER_MAX_OUTPUT,
+  NBGRADER_MAX_OUTPUT_PER_CELL,
+  NBGRADER_TIMEOUT_MS,
+} from "../assignments/consts";
 
 interface ConfigurationTarget {
   project_id: string;
@@ -123,10 +129,6 @@ export class ConfigurationActions {
   set_student_project_functionality = async (
     student_project_functionality: StudentProjectFunctionality,
   ): Promise<void> => {
-    console.log(
-      "set_student_project_functionalit",
-      student_project_functionality,
-    );
     this.set({ student_project_functionality, table: "settings" });
     await this.course_actions.student_projects.configure_all_projects();
   };
@@ -310,7 +312,9 @@ export class ConfigurationActions {
   };
 
   // project_id is a uuid *or* empty string.
-  set_nbgrader_grade_project = async (project_id: string): Promise<void> => {
+  set_nbgrader_grade_project = async (
+    project_id: string = "",
+  ): Promise<void> => {
     this.set({
       nbgrader_grade_project: project_id,
       table: "settings",
@@ -322,29 +326,35 @@ export class ConfigurationActions {
     }
   };
 
-  set_nbgrader_cell_timeout_ms = (nbgrader_cell_timeout_ms: number): void => {
+  set_nbgrader_cell_timeout_ms = (
+    nbgrader_cell_timeout_ms: number = NBGRADER_CELL_TIMEOUT_MS,
+  ): void => {
     this.set({
       nbgrader_cell_timeout_ms,
       table: "settings",
     });
   };
 
-  set_nbgrader_timeout_ms = (nbgrader_timeout_ms: number): void => {
+  set_nbgrader_timeout_ms = (
+    nbgrader_timeout_ms: number = NBGRADER_TIMEOUT_MS,
+  ): void => {
     this.set({
       nbgrader_timeout_ms,
       table: "settings",
     });
   };
 
-  set_nbgrader_max_output = (nbgrader_max_output: number): void => {
+  set_nbgrader_max_output = (
+    nbgrader_max_output: number = NBGRADER_MAX_OUTPUT,
+  ): void => {
     this.set({
       nbgrader_max_output,
       table: "settings",
     });
   };
 
   set_nbgrader_max_output_per_cell = (
-    nbgrader_max_output_per_cell: number,
+    nbgrader_max_output_per_cell: number = NBGRADER_MAX_OUTPUT_PER_CELL,
   ): void => {
     this.set({
       nbgrader_max_output_per_cell,
@@ -382,7 +392,7 @@ export class ConfigurationActions {
     this.set_compute_image(image);
   };
 
-  set_nbgrader_parallel = (nbgrader_parallel: number): void => {
+  set_nbgrader_parallel = (nbgrader_parallel: number=PARALLEL_DEFAULT): void => {
     this.set({
       nbgrader_parallel,
       table: "settings",
@@ -498,7 +508,6 @@ async function configureGroup({
   settings: CourseSettingsRecord;
   actions: CourseActions;
 }) {
-  console.log("configureGroup:", group);
   switch (group) {
     case "collaborator-policy":
       const allow_colabs = !!settings.get("allow_collabs");
@@ -517,6 +526,31 @@ async function configureGroup({
         ),
       );
       return;
+    case "nbgrader":
+      await actions.configuration.set_nbgrader_grade_project(
+        settings.get("nbgrader_grade_project"),
+      );
+      await actions.configuration.set_nbgrader_cell_timeout_ms(
+        settings.get("nbgrader_cell_timeout_ms"),
+      );
+      await actions.configuration.set_nbgrader_timeout_ms(
+        settings.get("nbgrader_timeout_ms"),
+      );
+      await actions.configuration.set_nbgrader_max_output(
+        settings.get("nbgrader_max_output"),
+      );
+      await actions.configuration.set_nbgrader_max_output_per_cell(
+        settings.get("nbgrader_max_output_per_cell"),
+      );
+      await actions.configuration.set_nbgrader_include_hidden_tests(
+        !!settings.get("nbgrader_include_hidden_tests"),
+      );
+      return;
+
+    case "network-file-systems":
+    case "env-variables":
+    case "upgrades":
+    case "software-environment":
     default:
       throw Error(`configuring group ${group} not implemented`);
   }

src/packages/frontend/course/configuration/nbgrader.tsx

@@ -10,7 +10,8 @@ import {
   useActions,
   useRedux,
 } from "@cocalc/frontend/app-framework";
-import { A, Icon, NumberInput } from "@cocalc/frontend/components";
+import { A, Icon } from "@cocalc/frontend/components";
+import { InputNumber } from "antd";
 import { SelectProject } from "@cocalc/frontend/projects/select-project";
 import { Card, Radio } from "antd";
 import { CourseActions } from "../actions";
@@ -166,27 +167,29 @@ export function Nbgrader({ name }: Props) {
         <i>Grading timeout in seconds:</i> if grading a student notebook takes
         longer than <i>{timeout} seconds</i>, then it is terminated with a
         timeout error.
-        <NumberInput
-          on_change={(n) =>
-            actions.configuration.set_nbgrader_timeout_ms(n * 1000)
+        <InputNumber
+          onChange={(n) =>
+            actions.configuration.set_nbgrader_timeout_ms(
+              n ? n * 1000 : undefined,
+            )
           }
           min={30}
           max={3600}
-          number={timeout}
+          value={timeout}
         />
         <br />
         <i>Cell grading timeout in seconds:</i> if grading a cell in a student
         notebook takes longer than <i>{cell_timeout} seconds</i>, then that cell
         is terminated with a timeout error.
-        <NumberInput
-          on_change={(n) =>
+        <InputNumber
+          onChange={(n) =>
             actions.configuration.set_nbgrader_cell_timeout_ms(
-              Math.min(n * 1000, timeout * 1000),
+              n ? Math.min(n * 1000, timeout * 1000) : undefined,
             )
           }
           min={5}
           max={3600}
-          number={cell_timeout}
+          value={cell_timeout}
         />
       </div>
     );
@@ -213,25 +216,29 @@ export function Nbgrader({ name }: Props) {
         <h6>Nbgrader output limits: {Math.round(max_output / 1000)} KB</h6>
         <i>Max output:</i> if total output from all cells exceeds{" "}
         {Math.round(max_output / 1000)} KB, then further output is truncated.
-        <NumberInput
-          on_change={(n) =>
-            actions.configuration.set_nbgrader_max_output(n * 1000)
+        <InputNumber
+          onChange={(n) =>
+            actions.configuration.set_nbgrader_max_output(
+              n ? n * 1000 : undefined,
+            )
           }
           min={1}
           max={10000}
-          number={Math.round(max_output / 1000)}
+          value={Math.round(max_output / 1000)}
         />
         <br />
         <i>Max output per cell:</i> if output from a cell exceeds{" "}
         {Math.round(max_output_per_cell / 1000)} KB, then further output is
         truncated.
-        <NumberInput
-          on_change={(n) =>
-            actions.configuration.set_nbgrader_max_output_per_cell(n * 1000)
+        <InputNumber
+          onChange={(n) =>
+            actions.configuration.set_nbgrader_max_output_per_cell(
+              n ? n * 1000 : undefined,
+            )
           }
           min={1}
           max={10000}
-          number={Math.round(max_output_per_cell / 1000)}
+          value={Math.round(max_output_per_cell / 1000)}
         />
       </div>
     );
@@ -260,11 +267,13 @@ export function Nbgrader({ name }: Props) {
         could depend on where grading is happening (see "Where to autograde
         assignments" above), and compute resources you or your students have
         bought.
-        <NumberInput
-          on_change={(n) => actions.configuration.set_nbgrader_parallel(n)}
+        <InputNumber
+          onChange={(n) =>
+            actions.configuration.set_nbgrader_parallel(n ? n : undefined)
+          }
           min={1}
           max={50}
-          number={parallel}
+          value={parallel}
         />
       </div>
     );