Merge remote-tracking branch 'origin/master' into delete-project-data

Author: haraldschilly

src/compute/compute/lib/manager.ts

@@ -334,6 +334,9 @@ class Manager {
       COCALC_PROJECT_ID: this.project_id,
       COCALC_USERNAME: userInfo().username,
       COMPUTE_SERVER_ID: `${this.compute_server_id}`,
+      // default so that any windows that any user apps in terminal or jupyter run will
+      // automatically just work in xpra's X11 desktop.... if they happen to be running it.
+      DISPLAY: ":0",
     };
   };
 

src/packages/frontend/jupyter/insert-cell/ai-cell-generator.tsx

@@ -364,6 +364,7 @@ export function AIGenerateCodeCell({
 
   function doQuery(prevCodeContents: string) {
     cancel.current = false;
+    setError("");
     setQuerying(true);
 
     if (showAICellGen == null) return;
@@ -571,7 +572,12 @@ export function AIGenerateCodeCell({
             >
               <Icon name="arrow-left" /> Discard
             </Button>
-            <Button onClick={insert} type="primary" disabled={querying}>
+            <Button
+              size="large"
+              onClick={insert}
+              type="primary"
+              disabled={querying}
+            >
               <Icon name="plus" /> Insert {capitalize(cellStr)}
             </Button>
           </Space>
@@ -688,7 +694,10 @@ export function AIGenerateCodeCell({
           <LLMSelector
             project_id={project_id}
             model={model}
-            setModel={setModel}
+            setModel={(model) => {
+              setError("");
+              setModel(model);
+            }}
           />
           <Button
             onClick={() => setShowAICellGen(null)}

src/packages/frontend/jupyter/nbgrader/actions.ts

@@ -149,12 +149,12 @@ export class NBGraderActions {
         { title: "Cancel" },
         {
           title: "Generate student version",
-          style: !minimal_stubs ? "success" : undefined,
+          style: !minimal_stubs ? "primary" : undefined,
           default: !minimal_stubs,
         },
         {
           title: MINIMAL_STUBS,
-          style: minimal_stubs ? "success" : undefined,
+          style: minimal_stubs ? "primary" : undefined,
           default: minimal_stubs,
         },
       ],

src/packages/frontend/jupyter/nbgrader/autograde.ts

@@ -27,7 +27,7 @@ import type { JupyterNotebook, Cell } from "@cocalc/jupyter/nbgrader/types";
 
 export function create_autograde_ipynb(
   instructor_ipynb: string,
-  student_ipynb: string
+  student_ipynb: string,
 ): { autograde_ipynb: string; ids: string[] } {
   const instructor = JSON.parse(instructor_ipynb);
   const student = JSON.parse(student_ipynb);
@@ -45,7 +45,7 @@ export function create_autograde_ipynb(
       // TODO: be more clever within inserting this...?  What does nbgrader upstream do?
       console.warn(
         "WARNING: student deleted locked cell with grade_id (inserting at end for now)",
-        grade_id
+        grade_id,
       );
       student.cells.push(copy(instructor_cell));
     } else {
@@ -175,10 +175,12 @@ function get_score(output: object, lang: string): number | undefined {
     output["traceback"] != null || // has a traceback
     output["ename"] != null || // name of the error
     output["evalue"] != null || // metadata about error
-    output["output_type"] == "error" || // it's an error output
-    output["name"] == "stderr" // writing to stderr stream
+    output["output_type"] == "error" // it's an error output
   ) {
     // If there is any traceback or error indication at all, it's obviously 0 points.
+    // However, the one thing that is NOT zero points is 'output["name"] == "stderr"'
+    // since warnings output to stderr with some kernels (e.g., R), and there's a lot
+    // of cases when warnings are OK.
     return 0;
   }
   if (output["text"] == null) {