24w1 changes

packages/autotest/src/autotest/AutoTest.ts

@@ -350,7 +350,8 @@ export abstract class AutoTest implements IAutoTest {
                     const totalJobsRunning = that.jobs.length;
                     Log.info("AutoTest::tick::tickQueue(..)         [JOB] - job start: " + queue.getName() + "; deliv: " +
                         (info.target.delivId + ";").padEnd(8, " ") + " repo: " + (info.target.repoId + ";").padEnd(18, " ") + " SHA: " +
-                        Util.shaHuman(info.target.commitSHA) + "; # running: " + totalJobsRunning + "; # queued: " + totalNumQueued +
+                        Util.shaHuman(info.target.commitSHA) + "; # running: " + totalJobsRunning +
+                        "; # queued: " + (totalNumQueued + "").padStart(4, " ") +
                         " ( e: " + that.expressQueue.length() + ", s: " + that.standardQueue.length() + ", l: " + that.lowQueue.length() + " )");
 
                     let gradingJob: GradingJob;
@@ -607,6 +608,8 @@ export abstract class AutoTest implements IAutoTest {
                 Log.info("AutoTest::handleTick(..) - stale job; old container: " +
                     input.containerConfig.dockerImage + "; new container: " + containerConfig.dockerImage);
                 input.containerConfig = containerConfig;
+            } else if (containerConfig === null) {
+                Log.warn("AutoTest::handleTick(..) - no container found for delivId: " + input.target.delivId);
             }
         } catch (err) {
             Log.warn("AutoTest::handleTick(..) - problem updating container config: " + err.message);
@@ -620,13 +623,18 @@ export abstract class AutoTest implements IAutoTest {
 
         try {
             await job.prepare();
+
+            Log.info("AutoTest::handleTick(..) - prepared; deliv: " + input.target.delivId +
+                "; repo: " + input.target.repoId + "; SHA: " + Util.shaHuman(
+                    input.target.commitSHA));
+
             record = await job.run(this.docker);
 
             Log.info("AutoTest::handleTick(..) - executed; deliv: " + input.target.delivId +
                 "; repo: " + input.target.repoId + "; SHA: " + Util.shaHuman(input.target.commitSHA));
 
             let score = -1;
-            if (record.output.report !== null && typeof record.output.report.scoreOverall !== "undefined") {
+            if (record?.output?.report?.scoreOverall) {
                 score = record.output.report.scoreOverall;
             }
             const githubHost = Config.getInstance().getProp(ConfigKey.githubHost);
@@ -643,6 +651,14 @@ export abstract class AutoTest implements IAutoTest {
                 timestamp: input.target.timestamp,
                 custom: {}
             };
+            // provide a way for the grade controller to contribute data directly
+            // to the grade record
+            if (record?.output?.custom) {
+                gradePayload.custom.output = record.output.custom;
+            }
+            if (record?.output?.report?.custom) {
+                gradePayload.custom.result = record.output.report.custom;
+            }
         } catch (err) {
             Log.error("AutoTest::handleTick(..) - ERROR in execution for SHA: " + input.target.commitSHA + "; ERROR: " + err);
         } finally {

packages/autotest/src/autotest/ClassPortal.ts

@@ -128,7 +128,7 @@ export interface IClassPortal {
      * @param timestamp
      */
     requestFeedbackDelay(delivId: string, personId: string, timestamp: number):
-        Promise<{ accepted: boolean, message: string } | null>;
+        Promise<{ accepted: boolean, message: string, fullMessage?: string } | null>;
 }
 
 /**
@@ -286,8 +286,8 @@ export class ClassPortal implements IClassPortal {
                 body: JSON.stringify(grade)
             };
 
-            Log.trace("ClassPortal::sendGrade(..) - sending to: " + url + "; deliv: " + grade.delivId +
-                "; repo: " + grade.repoId + "; url: " + grade.URL);
+            Log.trace("ClassPortal::sendGrade(..) - deliv: " + grade.delivId +
+                "; repo: " + grade.repoId + "; grade: " + grade.score + "; url: " + grade.URL);
             Log.trace("ClassPortal::sendGrade(..) - payload: " + JSON.stringify(grade));
             const res = await fetch(url, opts);
 
@@ -453,7 +453,8 @@ export class ClassPortal implements IClassPortal {
 
     public async requestFeedbackDelay(delivId: string, personId: string, timestamp: number): Promise<{
         accepted: boolean;
-        message: string
+        message: string;
+        fullMessage?: string;
     } | null> {
 
         const url = `${this.host}:${this.port}/portal/at/feedbackDelay`;
@@ -462,7 +463,7 @@ export class ClassPortal implements IClassPortal {
         Log.info(`ClassPortal::requestFeedbackDelay(..) - start; person: ${personId}; delivId: ${delivId}`);
 
         // default to null
-        let resp: { accepted: boolean, message: string } | null = null;
+        let resp: { accepted: boolean, message: string, fullMessage: string } | null = null;
 
         try {
             const opts: RequestInit = {
@@ -489,12 +490,14 @@ export class ClassPortal implements IClassPortal {
             Log.trace("ClassPortal::requestFeedbackDelay(..) - types; json: " + typeof json +
                 "; json.accepted: " + typeof json?.accepted +
                 "; json.message: " + typeof json?.message +
-                "; json.notImplemented: " + typeof json?.notImplemented);
+                "; json.fullMessage: " + typeof json?.fullMessage);
 
-            if (typeof json?.accepted === "boolean" && typeof json?.message === "string") {
+            if (typeof json?.accepted === "boolean" &&
+                (typeof json?.message === "string" || typeof json?.fullMessage === "string")) {
                 resp = {
                     accepted: json.accepted,
-                    message: json.message
+                    message: json.message,
+                    fullMessage: json.fullMessage
                 };
             } else if (typeof json?.notImplemented === "boolean" && json.notImplemented === true) {
                 resp = null;

packages/autotest/src/autotest/DataStore.ts

@@ -6,6 +6,7 @@ import {AutoTestResult, IFeedbackGiven} from "@common/types/AutoTestTypes";
 import {CommitTarget} from "@common/types/ContainerTypes";
 
 import Util from "@common/Util";
+import {GitHubUtil} from "@autotest/github/GitHubUtil";
 
 export interface IDataStore {
 
@@ -154,37 +155,39 @@ export class MongoDataStore implements IDataStore {
 
     /**
      * Gets the push event record for a given commitURL. If more than one exist,
-     * return the one for main/master. If there isn't a main/master push, return the
+     * return the one for main/master. If there is not a main/master push, return the
      * most recent one.
      */
     public async getPushRecord(commitURL: string): Promise<CommitTarget | null> {
-        Log.trace("MongoDataStore::getPushRecord(..) - start");
+        // Log.trace("MongoDataStore::getPushRecord(..) - start");
         try {
             const start = Date.now();
-            let res = await this.getRecords(this.PUSHCOLL, {commitURL: commitURL});
-            if (res === null) {
+            let records = await this.getRecords(this.PUSHCOLL, {commitURL: commitURL}) as CommitTarget[];
+            if (records === null) {
                 Log.trace("MongoDataStore::getPushRecord(..) - record not found for: " + commitURL);
             } else {
-                Log.trace("MongoDataStore::getPushRecord(..) - found; took: " + Util.took(start));
-                if (res.length === 1) {
+                if (records.length === 1) {
+                    Log.trace("MongoDataStore::getPushRecord(..) - one found; took: " + Util.took(start));
                     // the usual case
-                    return res[0] as CommitTarget;
+                    return records[0];
                 } else {
                     // return main/master if exists
-                    for (const r of res as CommitTarget[]) {
-                        if (typeof r.ref !== "undefined" && (r.ref === "refs/heads/main" || r.ref === "refs/heads/master")) {
-                            return r as CommitTarget;
+                    for (const r of records) {
+
+                        if (typeof r.ref !== "undefined" && GitHubUtil.isMain(r.ref) === true) {
+                            Log.trace("MongoDataStore::getPushRecord(..) - multiple found, returning main; took: " + Util.took(start));
+                            return r;
                         }
                     }
 
                     // sort, should make the oldest record first
-                    res = res.sort(function (c1: CommitTarget, c2: CommitTarget) {
+                    records = records.sort(function (c1: CommitTarget, c2: CommitTarget) {
                         return c1.timestamp - c2.timestamp;
                     });
-                    return res[0] as CommitTarget;
+                    Log.trace("MongoDataStore::getPushRecord(..) - multiple found, returning oldest; took: " + Util.took(start));
+                    return records[0] as CommitTarget;
                 }
             }
-
         } catch (err) {
             Log.error("MongoDataStore::getPushRecord(..) - ERROR: " + err);
         }

packages/autotest/src/autotest/GradingJob.ts

@@ -116,14 +116,12 @@ export class GradingJob {
         Log.trace("GradingJob::run() - updated: " + this.id);
         const maxExecTime = this.input.containerConfig.maxExecTime;
 
-        Log.trace("GradingJob::run() - after container: " + this.id);
-
         const stdio = fs.createWriteStream(this.path + "/staff/stdio.txt");
         const stream = await container.attach({stream: true, stdout: true, stderr: true});
         container.modem.demuxStream(stream, stdio, stdio);
 
         const exitCode = await GradingJob.runContainer(container, maxExecTime);
-        Log.trace("GradingJob::run() - after run: " + this.id + "; exit code: " + exitCode);
+        Log.trace("GradingJob::run() - container complete: " + this.id + "; exit code: " + exitCode);
 
         // NOTE: at this point, out just contains default values
         const out = this.record.output;
@@ -149,7 +147,7 @@ export class GradingJob {
             out.state = ContainerState.FAIL;
             out.postbackOnComplete = true; // always send fail feedback
         } else if (exitCode === -1) {
-            let msg = "Container did not complete for `" + this.input.target.delivId + "` in the allotted time. ";
+            let msg = "Container did not complete for **`#" + this.input.target.delivId + "`** in the allotted time. ";
             msg += "This likely means that _our_ tests exposed a slow or non-terminating path in _your_ implementation. ";
             msg += "You should augment your tests; a comprehensive local suite will uncover the problem.";
 
@@ -161,7 +159,7 @@ export class GradingJob {
         } else if (reportRead === false) {
             Log.warn("GradingJob::run() - No grading report for repo: " + this.input.target.repoId +
                 "; delivId: " + this.input.target.delivId + "; SHA: " + Util.shaHuman(this.input.target.commitSHA));
-            out.report.feedback = "Failed to read grade report. Make a new commit and try again.";
+            out.report.feedback = "Failed to read grade report for **`#" + this.input.target.delivId + "`**. Make a new commit and try again.";
             out.report.result = ContainerState.NO_REPORT;
             out.state = ContainerState.NO_REPORT;
         } else {