Merge all prompts into :prompts

Author: Tkaixiang

src/commons/application/actions/__tests__/SessionActions.test.ts

@@ -605,6 +605,8 @@ test('updateGrading generates correct action object', async () => {
   const grading: GradingQuery = {
     answers: [
       {
+        id: 0,
+        prompts: [],
         question: await vi.importMock('../../../../features/grading/GradingTypes'),
         student: {
           name: 'test student',
@@ -627,7 +629,6 @@ test('updateGrading generates correct action object', async () => {
     ],
     enable_llm_grading: false,
     assessment: {
-      llm_assessment_prompt: null,
       coverPicture: 'https://i.imgur.com/dR7zBPI.jpeg',
       id: 1,
       number: '5',

src/commons/application/reducers/__tests__/SessionReducer.test.ts

@@ -405,6 +405,8 @@ const gradingTest1: GradingQuery = {
   enable_llm_grading: false,
   answers: [
     {
+      id: 0,
+      prompts: [],
       autogradingResults: [],
       autoGradingStatus: 'N/A',
       question: await vi.importMock('../../../../features/grading/GradingTypes'),
@@ -421,7 +423,6 @@ const gradingTest1: GradingQuery = {
     }
   ],
   assessment: {
-    llm_assessment_prompt: null,
     coverPicture: 'test string',
     id: 1,
     number: 'M1A',
@@ -437,6 +438,8 @@ const gradingTest2: GradingQuery = {
   enable_llm_grading: false,
   answers: [
     {
+      id: 0,
+      prompts: [],
       autogradingResults: [],
       autoGradingStatus: 'N/A',
       question: await vi.importMock('../../../../features/grading/GradingTypes'),
@@ -453,7 +456,6 @@ const gradingTest2: GradingQuery = {
     }
   ],
   assessment: {
-    llm_assessment_prompt: null,
     coverPicture: 'another test string',
     id: 2,
     number: 'P2',

src/commons/assessment/AssessmentTypes.ts

@@ -121,7 +121,6 @@ export interface IProgrammingQuestion extends BaseQuestion {
   prepend: string;
   postpend: string;
   solutionTemplate: string;
-  llm_prompt?: string | null;
   testcases: Testcase[];
   testcasesPrivate?: Testcase[]; // For mission control
   type: 'programming';
@@ -144,6 +143,11 @@ export interface IContestVotingQuestion extends BaseQuestion {
   type: 'voting';
 }
 
+export type LLMPrompt = {
+  role: string;
+  content: string;
+};
+
 export type BaseQuestion = {
   answer: string | number | ContestEntry[] | null;
   comments?: string;
@@ -281,7 +285,6 @@ export const programmingTemplate = (): IProgrammingQuestion => {
     prepend: '',
     solutionTemplate: '//This is a mock solution template',
     postpend: '',
-    llm_prompt: null,
     testcases: [],
     testcasesPrivate: [],
     type: 'programming',

src/commons/mocks/GradingMocks.ts

@@ -128,6 +128,8 @@ export const mockTestcases: Testcase[] = [
 
 export const mockGradingAnswer: GradingAnswer = [
   {
+    id: 0,
+    prompts: [],
     autogradingResults: [],
     autoGradingStatus: 'N/A',
     question: {
@@ -246,6 +248,8 @@ _italics_
     }
   },
   {
+    id: 1,
+    prompts: [],
     autogradingResults: [],
     autoGradingStatus: 'N/A',
     question: {
@@ -340,6 +344,8 @@ New message from **Avenger**!
     }
   },
   {
+    id: 2,
+    prompts: [],
     autogradingResults: [],
     autoGradingStatus: 'N/A',
     question: {
@@ -421,7 +427,6 @@ New message from **Avenger**!
 
 export const mockGradingAssessment: GradingAssessment = {
   coverPicture: 'https://i.imgur.com/dR7zBPI.jpeg',
-  llm_assessment_prompt: null,
   id: 1,
   number: '10',
   reading:

src/commons/sagas/RequestsSaga.ts

@@ -1045,7 +1045,6 @@ export const getGrading = async (
         solutionTemplate: question.solutionTemplate,
         prepend: question.prepend || '',
         postpend: question.postpend || '',
-        llm_prompt: question.llm_prompt || null,
         testcases: question.testcases || [],
         type: question.type as QuestionType,
         maxXp: question.maxXp
@@ -1057,7 +1056,8 @@ export const getGrading = async (
         xpAdjustment: grade.xpAdjustment,
         comments: grade.comments
       },
-      ai_comments: gradingQuestion.ai_comments?.response?.split('|||') || []
+      ai_comments: gradingQuestion.ai_comments?.response?.split('|||') || [],
+      prompts: gradingQuestion.prompts
     } as GradingQuestion;
 
     if (gradingQuestion.grade.grader !== null) {

src/features/grading/GradingTypes.ts

@@ -4,6 +4,7 @@ import {
   AssessmentStatus,
   AssessmentType,
   AutogradingResult,
+  LLMPrompt,
   MCQChoice,
   ProgressStatus,
   Question,
@@ -94,7 +95,6 @@ export type GradingAssessment = {
   summaryLong: string;
   summaryShort: string;
   title: string;
-  llm_assessment_prompt: string | null;
 };
 
 export type GradingQuery = {
@@ -195,6 +195,7 @@ export type GradingQuestion = {
   autogradingResults: AutogradingResult[];
   autoGradingStatus: string;
   ai_comments?: string[];
+  prompts: LLMPrompt[];
 };
 
 /**

src/pages/academy/grading/subcomponents/GradingEditor.tsx

@@ -3,7 +3,6 @@ import {
   Dialog,
   Divider,
   H3,
-  H5,
   Icon,
   IconName,
   Intent,
@@ -15,7 +14,7 @@ import { IconNames } from '@blueprintjs/icons';
 import React, { useEffect, useMemo, useState } from 'react';
 import ReactMde, { ReactMdeProps } from 'react-mde';
 import { useDispatch } from 'react-redux';
-import { AutogradingResult } from 'src/commons/assessment/AssessmentTypes';
+import { AutogradingResult, LLMPrompt } from 'src/commons/assessment/AssessmentTypes';
 import { useTokens } from 'src/commons/utils/Hooks';
 
 import SessionActions from '../../../../commons/application/actions/SessionActions';
@@ -41,6 +40,7 @@ type GradingSaveFunction = (
 ) => void;
 
 type Props = {
+  prompts: LLMPrompt[];
   answer_id: number;
   solution: number | string | null;
   questionId: number;
@@ -52,12 +52,8 @@ type Props = {
   studentUsernames: string[];
   is_llm: boolean;
   comments: string;
-  llm_course_level_prompt: string | null;
-  llm_assessment_prompt: string | null;
-  llm_question_prompt: string | null;
   autoGradingStatus: string;
   autoGradingResults: AutogradingResult[];
-  questionContent: string;
   studentAnswer: string | null;
   graderName?: string;
   gradedAt?: string;
@@ -261,24 +257,11 @@ const GradingEditor: React.FC<Props> = props => {
 
   const copyComposedPromptToClipboard = () => {
     navigator.clipboard.writeText(
-      `${props.llm_course_level_prompt || ''}\n
-${props.llm_assessment_prompt || ''}\n
-${props.llm_question_prompt || ''}\n
-**Question:** \n
-\`\`\`\n
-${props.questionContent}\n
-\`\`\`\n\n
-**Model Solution:** \n
-\`\`\`\n
-${props.solution || 'N/A'}\n
-\`\`\`\n\n
-**Autograding Status:** ${props.autoGradingStatus}\n
-**Autograding Results:** ${props.autoGradingResults ? JSON.stringify(props.autoGradingResults) : 'N/A'}\n
-The student answer will be given below as part of the User Prompt.\n
-**Student Answer:** \n
-\`\`\`\n
-${props.studentAnswer}\n
-\`\`\``
+      props.prompts
+        .map(prompt => {
+          return `**${prompt.role} Prompt**\n\n${prompt.content}`;
+        })
+        .join('\n\n')
     );
     showSuccessMessage('Composed prompt copied to clipboard!', 2000);
   };
@@ -393,43 +376,15 @@ ${props.studentAnswer}\n
                   <Icon icon={IconNames.Clipboard} />
                 </Button>
               </div>
-              <H3>System Prompt</H3>
-              <Divider />
-              <H5>Course Level Prompt</H5>
-              {props.llm_course_level_prompt || ''}
-              <br />
-              <H5>Assessment Level Prompt</H5>
-              {props.llm_assessment_prompt || ''}
-              <br />
-              <H5>Question Level Prompt</H5>
-              {props.llm_question_prompt || ''}
-              <H5>Generic Info From Question</H5>
-              **Question:** <br />
-              ```
-              <br />
-              {props.questionContent}
-              <br />
-              ```
-              <br />
-              <br />
-              **Model Solution:** <br />
-              ``` <br />
-              {props.solution || 'N/A'}
-              <br />
-              ```
-              <br />
-              <br />
-              **Autograding Status:** {props.autoGradingStatus} <br />
-              **Autograding Results:**{' '}
-              {props.autoGradingResults ? JSON.stringify(props.autoGradingResults) : 'N/A'} <br />
-              The student answer will be given below as part of the User Prompt.
-              <H3>User Prompt</H3>
-              <Divider />
-              **Student Answer:** <br />
-              ``` <br />
-              {props.studentAnswer}
-              <br />
-              ``` <br />
+              {props.prompts.map(prompt => {
+                return (
+                  <>
+                    <H3>{prompt.role} Level Prompt</H3>
+                    <Divider />
+                    {prompt.content}
+                  </>
+                );
+              })}
             </div>
           </Dialog>
           <div style={{ marginBottom: '10px' }}>

src/pages/academy/grading/subcomponents/GradingWorkspace.tsx

@@ -77,7 +77,6 @@ const GradingWorkspace: React.FC<Props> = props => {
   const grading = useTypedSelector(state => state.session.gradings[props.submissionId]);
   const courseId = useTypedSelector(state => state.session.courseId);
   const llm_grading = useTypedSelector(state => state.session.enableLlmGrading);
-  const llm_course_level_prompt = useTypedSelector(state => state.session.llmCourseLevelPrompt);
   const {
     autogradingResults,
     isFolderModeEnabled,
@@ -308,7 +307,7 @@ const GradingWorkspace: React.FC<Props> = props => {
             ai_comments={grading!.answers[questionId].ai_comments || []}
             solution={grading!.answers[questionId].question.solution}
             questionId={grading!.answers[questionId].question.id}
-            questionContent={grading!.answers[questionId].question.content}
+            prompts={grading!.answers[questionId].prompts}
             submissionId={props.submissionId}
             initialXp={grading!.answers[questionId].grade.xp}
             xpAdjustment={grading!.answers[questionId].grade.xpAdjustment}
@@ -328,13 +327,6 @@ const GradingWorkspace: React.FC<Props> = props => {
                 : grading!.answers[questionId].team!.map(member => member.username)
             }
             is_llm={!!llm_grading && grading!.answers[questionId].question.type == 'programming'}
-            llm_course_level_prompt={llm_course_level_prompt || ''}
-            llm_assessment_prompt={grading!.assessment.llm_assessment_prompt}
-            llm_question_prompt={
-              (grading!.answers[questionId].question.type === 'programming' &&
-                grading!.answers[questionId].question.llm_prompt) ||
-              ''
-            }
             comments={grading!.answers[questionId].grade.comments ?? ''}
             graderName={
               grading!.answers[questionId].grade.grader

src/styles/_academy.scss

@@ -263,6 +263,7 @@
   padding: 1rem;
   h3 {
     margin-top: 1rem;
+    text-transform: capitalize;
   }
   h5 {
     margin-top: 0.5rem;