Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grading CSV #2657

Draft
wants to merge 35 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b8ef27b
LLM Frontend
clementlemon02 Jul 16, 2023
7bceb47
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 Sep 3, 2023
9589c55
Use optional chaining and reformat files
RichDom2185 Jul 18, 2023
b2cb352
Run yarn format
RichDom2185 Jul 18, 2023
a030c99
fix lint issues
clementlemon02 Aug 8, 2023
bbfa704
fix lint issues
clementlemon02 Aug 8, 2023
137eee2
fix lint issues
clementlemon02 Aug 8, 2023
21e606a
fix lint issues
clementlemon02 Aug 8, 2023
9a5fbfa
fix lint issues
clementlemon02 Aug 8, 2023
bd4b401
Remove unnecessary empty line
RichDom2185 Aug 10, 2023
5c75726
resolving comments
clementlemon02 Aug 12, 2023
7a2a8d6
fix format
clementlemon02 Aug 12, 2023
1f21138
Delete unused component
RichDom2185 Sep 3, 2023
77687cd
Delete unused action
RichDom2185 Sep 3, 2023
e5cf900
Remove LLM items
RichDom2185 Sep 3, 2023
afcefa2
Fix incorrect deletion
RichDom2185 Sep 3, 2023
df50842
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 Jan 16, 2024
b83a6ff
Restore changes post-merge
RichDom2185 Jan 16, 2024
b31f3ce
Merge branch 'master' into grading-csv
RichDom2185 Jan 25, 2024
89f61a9
Merge branch 'master' into grading-csv
RichDom2185 Feb 3, 2024
35c1a7b
Merge branch 'master' into grading-csv
RichDom2185 Feb 5, 2024
0412dab
Merge branch 'master' into grading-csv
RichDom2185 Feb 11, 2024
886247c
Merge branch 'master' into grading-csv
RichDom2185 Feb 11, 2024
36744aa
Merge branch 'master' into grading-csv
RichDom2185 Feb 12, 2024
0c6d37a
Merge branch 'master' into grading-csv
RichDom2185 Feb 13, 2024
9cc0558
Merge branch 'master' into grading-csv
RichDom2185 Feb 14, 2024
bb32a92
Merge branch 'master' into grading-csv
RichDom2185 Feb 14, 2024
6cdf52e
Merge branch 'master' into grading-csv
RichDom2185 Feb 20, 2024
175fbdc
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 Feb 23, 2024
d967f62
Fix format
RichDom2185 Feb 23, 2024
671c665
Fix format
RichDom2185 Feb 23, 2024
0154b90
Merge branch 'master' into grading-csv
RichDom2185 Feb 23, 2024
059787e
Merge branch 'master' into grading-csv
RichDom2185 Feb 23, 2024
66075d6
Merge branch 'master' into grading-csv
RichDom2185 Feb 24, 2024
9376925
Merge branch 'master' into grading-csv
RichDom2185 Mar 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove LLM items
  • Loading branch information
RichDom2185 committed Sep 3, 2023
commit e5cf900be176df863b8252897404856520eb2498
3 changes: 0 additions & 3 deletions src/commons/application/actions/__tests__/SessionActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ test('setCourseConfiguration generates correct action object', () => {
sourceChapter: Chapter.SOURCE_1,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help text',
defaultLlmPrompt: 'defaul Llm Prompt',
assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
};
const action = setCourseConfiguration(courseConfig);
Expand Down Expand Up @@ -511,7 +510,6 @@ test('updateGradingOverviews generates correct action object', () => {
{
assessmentId: 1,
assessmentName: 'test assessment',
questions: '',
assessmentType: 'Contests',
initialXp: 0,
xpBonus: 100,
Expand Down Expand Up @@ -614,7 +612,6 @@ test('updateCourseConfig generates correct action object', () => {
sourceChapter: Chapter.SOURCE_1,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help text',
defaultLlmPrompt: 'default LLM Prompt',
assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
};
const action = updateCourseConfig(courseConfig);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ test('SET_COURSE_CONFIGURATION works correctly', () => {
sourceChapter: Chapter.SOURCE_1,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help text',
defaultLlmPrompt: 'default LLM Prompt',
assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
};
const action = {
Expand Down
2 changes: 0 additions & 2 deletions src/commons/application/types/SessionTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ export type SessionState = {
readonly sourceChapter?: number;
readonly sourceVariant?: Variant;
readonly moduleHelpText?: string;
readonly defaultLlmPrompt?: string;
readonly assetsPrefix?: string;

readonly assessmentConfigurations?: AssessmentConfiguration[];
Expand Down Expand Up @@ -172,7 +171,6 @@ export type CourseConfiguration = {
sourceChapter: Chapter;
sourceVariant: Variant;
moduleHelpText: string;
defaultLlmPrompt: string;
assetsPrefix: string;
};

Expand Down
37 changes: 1 addition & 36 deletions src/commons/dropdown/DropdownCreateCourse.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
enableSourcecast: true,
sourceChapter: Chapter.SOURCE_1,
sourceVariant: Variant.DEFAULT,
moduleHelpText: '',
defaultLlmPrompt: ''
moduleHelpText: ''
});

const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
Expand Down Expand Up @@ -174,40 +173,6 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
)}
</FormGroup>

<FormGroup helperText="defaultLlmPrompt" labelFor="defaultLlmPrompt">
<Text tagName="span">Default LLM Prompt&nbsp;</Text>
<Text tagName="span" className="optional-text">
(optional)
</Text>
<Tabs
selectedTabId={courseHelpTextSelectedTab}
onChange={onChangeTabs}
className="module-help-text-tabs"
>
<Tab id={CourseHelpTextEditorTab.WRITE} title="Write" />
<Tab id={CourseHelpTextEditorTab.PREVIEW} title="Preview" />
</Tabs>
{courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && (
<TextArea
id="defaultLlmPrompt"
className="input-textarea"
fill={true}
value={courseConfig.defaultLlmPrompt}
onChange={e =>
setCourseConfig({
...courseConfig,
defaultLlmPrompt: e.target.value
})
}
/>
)}
{courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && (
<div className="input-markdown">
<Markdown content={courseConfig.defaultLlmPrompt || ''} openLinksInNewWindow />
</div>
)}
</FormGroup>

<div className="boolean-container">
<div>
<Switch
Expand Down
2 changes: 0 additions & 2 deletions src/commons/mocks/UserMocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
sourceChapter: Chapter.SOURCE_1,
sourceVariant: Variant.DEFAULT,
moduleHelpText: '',
defaultLlmPrompt: '',
assetsPrefix: ''
},
{
Expand All @@ -146,7 +145,6 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
sourceChapter: Chapter.SOURCE_2,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help Text!',
defaultLlmPrompt: 'Default LLM Prompt',
assetsPrefix: ''
}
];
Expand Down
6 changes: 1 addition & 5 deletions src/commons/sagas/__tests__/BackendSaga.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ const mockCourseConfiguration1: CourseConfiguration = {
sourceChapter: Chapter.SOURCE_1,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help text',
defaultLlmPrompt: 'default LLM prompt',
assetsPrefix: ''
};

Expand Down Expand Up @@ -207,7 +206,6 @@ const mockCourseConfiguration2: CourseConfiguration = {
sourceChapter: Chapter.SOURCE_4,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help text',
defaultLlmPrompt: 'default LLM prompt',
assetsPrefix: ''
};

Expand Down Expand Up @@ -891,7 +889,6 @@ describe('Test UPDATE_COURSE_CONFIG action', () => {
sourceChapter: Chapter.SOURCE_4,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help',
defaultLlmPrompt: 'default LLM prompt',
assetsPrefix: ''
};

Expand Down Expand Up @@ -988,8 +985,7 @@ describe('Test CREATE_COURSE action', () => {
enableSourcecast: true,
sourceChapter: Chapter.SOURCE_1,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help Text',
defaultLlmPrompt: 'default Llm prompt'
moduleHelpText: 'Help Text'
};
const user = mockUser;
const courseConfiguration = mockCourseConfiguration1;
Expand Down
3 changes: 1 addition & 2 deletions src/features/academy/__tests__/AcademyActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ test('createCourse generates correct action object', () => {
enableSourcecast: true,
sourceChapter: Chapter.SOURCE_1,
sourceVariant: Variant.DEFAULT,
moduleHelpText: 'Help Text',
defaultLlmPrompt: 'default LLM prompt'
moduleHelpText: 'Help Text'
};

const action = createCourse(courseConfig);
Expand Down
1 change: 0 additions & 1 deletion src/pages/__tests__/localStorage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const mockShortDefaultState: SavedState = {
enableAchievements: defaultState.session.enableAchievements,
enableSourcecast: defaultState.session.enableSourcecast,
moduleHelpText: defaultState.session.moduleHelpText,
defaultLlmPrompt: defaultState.session.defaultLlmPrompt,
assetsPrefix: defaultState.session.assetsPrefix,
assessmentConfigurations: defaultState.session.assessmentConfigurations
},
Expand Down
6 changes: 2 additions & 4 deletions src/pages/academy/adminPanel/AdminPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ const AdminPanel: React.FC = () => {
enableGame: true,
enableAchievements: true,
enableSourcecast: true,
moduleHelpText: '',
defaultLlmPrompt: ''
moduleHelpText: ''
});

const dispatch = useDispatch();
Expand Down Expand Up @@ -85,8 +84,7 @@ const AdminPanel: React.FC = () => {
enableGame: session.enableGame,
enableAchievements: session.enableAchievements,
enableSourcecast: session.enableSourcecast,
moduleHelpText: session.moduleHelpText,
defaultLlmPrompt: session.defaultLlmPrompt
moduleHelpText: session.moduleHelpText
});

// IMPT: To prevent mutation of props
Expand Down
Loading