Draft: Release 0.3.0

examples/dev_environment/install.sh

@@ -9,15 +9,12 @@ python -m pip install --upgrade pip
 pip install jupyterhub jupyterlab
 
 echo "Installing grader_convert..."
-pip install -r ../../grader_convert/requirements.txt
-pip install --no-use-pep517 ../../grader_convert
+pip install ../../grader_convert
 
 echo "Installing grader_service..."
-pip install -r ../../grader_service/requirements.txt
-pip install --no-use-pep517 ../../grader_service
+pip install ../../grader_service
 
 echo "Installing grader_labextension..."
-#pip install -r ../../grader_labextension/requirements.txt
 pip install ../../grader_labextension # no development install for grader_labextension
 
 jupyter server extension enable grader_labextension

examples/dev_environment/jupyter_hub_config.py

@@ -15,7 +15,7 @@
 c.JupyterHub.authenticator_class = 'jupyterhub.auth.DummyAuthenticator'
 c.DummyAuthenticator.password = "admin"
 c.Authenticator.admin_users = {'user1'}
-c.Authenticator.allowed_users = {"user1", "user2", "user3"}
+c.Authenticator.allowed_users = {"user1", "user2", "user3", "user4", "user5", "user6", "user7"}
 
 ## simple setup
 c.JupyterHub.ip = '127.0.0.1'
@@ -31,7 +31,7 @@
 
 c.JupyterHub.load_groups = {
         "23wsle2:instructor": {'users': ["user1", "user2"]},
-        "23wsle2:student": {'users': ["user3"]},
+        "23wsle2:student": {'users': ["user3", "user4", "user5", "user6", "user7"]},
         "23wsle1:instructor": {'users': ["user1", "user2"]},
         "23wsle1:student": {'users': ["user3"]},
 }

grader_labextension/grader_labextension/handlers/assignment.py

@@ -185,28 +185,15 @@ async def delete(self, lecture_id: int, assignment_id: int):
         """
 
         try:
-            assignment = await self.request_service.request(
-                method="GET",
-                endpoint=f"{self.service_base_url}/lectures/{lecture_id}/assignments/{assignment_id}",
-                header=self.grader_authentication_header,
-            )
-            lecture = await self.request_service.request(
-                "GET",
-                f"{self.service_base_url}/lectures/{lecture_id}",
-                header=self.grader_authentication_header,
-            )
             await self.request_service.request(
                 method="DELETE",
                 endpoint=f"{self.service_base_url}/lectures/{lecture_id}/assignments/{assignment_id}",
                 header=self.grader_authentication_header,
                 decode_response=False
             )
         except HTTPClientError as e:
-            self.log.error(e.response)
             raise HTTPError(e.code, reason=e.response.reason)
-
-        self.log.warn(f'Deleting directory {self.root_dir}/{lecture["code"]}/assignments/{assignment["id"]}')
-        shutil.rmtree(os.path.expanduser(f'{self.root_dir}/{lecture["code"]}/assignments/{assignment["id"]}'), ignore_errors=True)
+
         self.write("OK")
 
 

grader_labextension/grader_labextension/handlers/base_handler.py

@@ -4,6 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 import functools
+from http.client import responses
 import json
 import traceback
 from typing import Optional, Awaitable
@@ -86,7 +87,7 @@ def grader_authentication_header(self):
 
     @property
     def user_name(self):
-        return self.current_user.name
+        return self.current_user['name']
 
     async def get_lecture(self, lecture_id) -> dict:
         try:
@@ -111,24 +112,23 @@ async def get_assignment(self, lecture_id, assignment_id):
         except HTTPClientError as e:
             self.log.error(e.response)
             raise HTTPError(e.code, reason=e.response.reason)
-
-    def write_error(self, status_code: int, **kwargs) -> None:
-        self.set_header('Content-Type', 'application/json')
-        self.set_status(status_code)
-        _, e, _ = kwargs.get("exc_info", (None, None, None))
-        error = httputil.responses.get(status_code, "Unknown")
-        reason = kwargs.get("reason", None)
-        if e and isinstance(e, HTTPError) and e.reason:
-            reason = e.reason
-        if self.settings.get("serve_traceback") and "exc_info" in kwargs:
-            # in debug mode, try to send a traceback
-            lines = []
-            for line in traceback.format_exception(*kwargs["exc_info"]):
-                lines.append(line)
-            self.finish(json.dumps(
-                ErrorMessage(status_code, error, self.request.path, reason,
-                             traceback=json.dumps(lines)).to_dict()))
-        else:
-            self.finish(json.dumps(ErrorMessage(status_code, error,
-                                                self.request.path,
-                                                reason).to_dict()))
+
+    def write_error(self, status_code, **kwargs):
+            """APIHandler errors are JSON, not human pages"""
+            self.set_header("Content-Type", "application/json")
+            message = responses.get(status_code, "Unknown HTTP Error")
+            reply: dict = {
+                "message": message,
+            }
+            exc_info = kwargs.get("exc_info")
+            if exc_info:
+                e = exc_info[1]
+                if isinstance(e, HTTPError):
+                    reply["message"] = e.log_message or message
+                    reply["reason"] = e.reason
+                else:
+                    reply["message"] = "Unhandled error"
+                    reply["reason"] = None
+                    reply["traceback"] = "".join(traceback.format_exception(*exc_info))
+            self.log.warning("wrote error: %r", reply["message"], exc_info=True)
+            self.finish(json.dumps(reply))

grader_labextension/src/components/assignment/assignment.tsx

@@ -8,8 +8,8 @@ import * as React from 'react';
 import { Lecture } from '../../model/lecture';
 import { Assignment } from '../../model/assignment';
 import { Submission } from '../../model/submission';
-import { Box, Button, Chip, Stack, Tooltip, Typography } from '@mui/material';
-
+import { Box, Button, Chip, IconButton, Stack, Tooltip, Typography } from '@mui/material';
+import ReplayIcon from '@mui/icons-material/Replay';
 import { SubmissionList } from './submission-list';
 import { AssignmentStatus } from './assignment-status';
 import { Files } from './files/files';
@@ -51,6 +51,21 @@ const calculateActiveStep = (submissions: Submission[]) => {
   return 0;
 };
 
+interface ISubmissionsLeft{
+  subLeft: number;
+}
+const SubmissionsLeftChip = (props: ISubmissionsLeft) =>{
+  const output = props.subLeft + ' submission' + (props.subLeft === 1 ? ' left' : 's left'); 
+  return(
+    <Chip
+      sx={{ ml: 2 }}
+      size='medium'
+      icon={<WarningIcon />}
+      label={output}
+                      />
+  )
+}
+
 /**
  * Renders the components available in the extended assignment modal view
  */
@@ -79,14 +94,17 @@ export const AssignmentComponent = () => {
 
   /* Now we can divvy this into a useReducer  */
   const [allSubmissions, setSubmissions] = React.useState(submissions);
-
   const [files, setFiles] = React.useState([]);
   const [activeStatus, setActiveStatus] = React.useState(0);
+  const [subLeft, setSubLeft] = React.useState(0);
+
 
   React.useEffect(() => {
     getAllSubmissions(lecture.id, assignment.id, 'none', false).then(
       response => {
         setSubmissions(response);
+        if(assignment.max_submissions - response.length < 0) setSubLeft(0);
+        else setSubLeft(assignment.max_submissions - response.length);
       }
     );
     getFiles(path).then(files => {
@@ -149,6 +167,8 @@ export const AssignmentComponent = () => {
           response => {
             console.log('Submitted');
             setSubmissions([response, ...allSubmissions]);
+            if(subLeft - 1 < 0) setSubLeft(0);
+            else setSubLeft(subLeft - 1);
             enqueueSnackbar('Successfully Submitted Assignment', {
               variant: 'success'
             });
@@ -242,7 +262,11 @@ export const AssignmentComponent = () => {
     const scope = permissions[lecture.code];
     return scope >= Scope.tutor;
   };
+  const [reloadFilesToggle, setReloadFiles] = React.useState(false);
 
+  const reloadFiles = () => {
+    setReloadFiles(!reloadFilesToggle);
+  };
 
   return (
     <Box sx={{ flex: 1, overflow: 'auto' }}>
@@ -260,9 +284,16 @@ export const AssignmentComponent = () => {
           <DeadlineDetail due_date={assignment.due_date} late_submissions={assignment.settings.late_submission || []} />
         </Box>
         <Box sx={{ mt: 4 }}>
-          <Typography variant={'h6'} sx={{ ml: 2 }}>
+        <Stack direction={'row'} justifyContent={'flex-start'} alignItems={'center'} spacing={2} sx={{ ml: 2 }} >
+        <Typography variant={'h6'} sx={{ ml: 2 }}>
             Files
           </Typography>
+          <Tooltip title='Reload Files'>
+            <IconButton aria-label='reload' onClick={() => reloadFiles()}>
+              <ReplayIcon />
+            </IconButton>
+          </Tooltip>
+        </Stack>
           <Files
             lecture={lecture}
             assignment={assignment}
@@ -359,18 +390,24 @@ export const AssignmentComponent = () => {
       <Box sx={{ mt: 4 }}>
         <Typography variant={'h6'} sx={{ ml: 2, mt: 3 }}>
           Submissions
-          {assignment.max_submissions !== null ? (
-            <Chip
-              sx={{ ml: 2 }}
-              size='medium'
-              icon={<WarningIcon />}
-              label={
-                assignment.max_submissions -
-                submissions.length +
-                ' submissions left'
-              }
-            />
-          ) : null}
+
+          { assignment.max_submissions !== null
+              ? ( hasPermissions()
+                  ? (
+                      <Stack direction={'row'}>
+                      <SubmissionsLeftChip subLeft={subLeft}/>
+                      <Chip sx={{ml: 2}}
+                       color="success" variant="outlined"
+                       label={'As instructor you have unlimited submissions'}/>
+                      </Stack>
+                    )
+                  : (
+                    <SubmissionsLeftChip subLeft={subLeft}/>
+                  )
+                )
+              : null
+          }
+
         </Typography>
         <SubmissionList
           submissions={allSubmissions}

grader_labextension/src/components/assignment/feedback.tsx

@@ -60,7 +60,7 @@ export const Feedback = () => {
   }, [lecture, assignment, submission]);
 
   return (
-    <Box>
+    <Box sx={{overflow: 'auto'}}>
       <SectionTitle title={'Feedback for ' + assignment.name} />
       <Box sx={{ m: 2, mt: 12 }}>
         <Stack direction='row' spacing={2} sx={{ ml: 2 }}>
@@ -143,7 +143,8 @@ export const Feedback = () => {
         Feedback Files
       </Typography>
 
-      <FilesList path={path} sx={{ m: 2 }} />
+      <FilesList path={path} sx={{ m: 2, overflow: 'auto'}} />
+
       <Stack direction={'row'} spacing={2} sx={{ m: 2 }}>
         <Button variant='outlined' component={Link as any} to={assignmentLink}>Back</Button>
         <Button

grader_labextension/src/components/assignment/files/files.tsx

@@ -35,7 +35,7 @@ export const Files = (
   openBrowser(path);
   return (
     <div>
-      <FilesList path={path} sx={{ m: 2, mt: 1 }} />
+      <FilesList path={path} sx={{ m: 2, mt: 1 }} lecture={props.lecture} shouldContain={props.files} assignment={props.assignment} />
     </div>
   );
 };

grader_labextension/src/components/coursemanage/files/files.tsx

@@ -333,7 +333,7 @@ export const Files = (props: IFilesProps) => {
           <Tab label='Source' value='source' />
           <Tab label='Release' value='release' />
         </Tabs>
-        <Box height={200}>
+        <Box>
           <FilesList
             path={`${lectureBasePath}${props.lecture.code}/${selectedDir}/${props.assignment.id}`}
           />

grader_labextension/src/components/coursemanage/grading/edit-submission.tsx

@@ -2,6 +2,10 @@ import { SectionTitle } from '../../util/section-title';
 import {
   Box,
   Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
   IconButton,
   Stack,
   Tooltip,
@@ -13,6 +17,7 @@ import { Assignment } from '../../../model/assignment';
 import { Submission } from '../../../model/submission';
 import {
   createOrOverrideEditRepository,
+  getLogs,
   getProperties,
   pullSubmissionFiles,
   pushSubmissionFiles,
@@ -52,6 +57,24 @@ export const EditSubmission = () => {
   const [submission, setSubmission] = React.useState(manualGradeSubmission);
   const [loading, setLoading] = React.useState(false);
 
+  const [showLogs, setShowLogs] = React.useState(false);
+  const [logs, setLogs] = React.useState(undefined);
+
+  const openLogs = (event: React.MouseEvent<unknown>, submissionId: number) => {
+    getLogs(lecture.id, assignment.id, submissionId).then(
+      logs => {
+        setLogs(logs);
+        setShowLogs(true);
+      },
+      error => {
+        enqueueSnackbar('No logs for submission', {
+          variant: 'error'
+        });
+      }
+    );
+    event.stopPropagation();
+  };
+
   const pushEditedFiles = async () => {
     await pushSubmissionFiles(lecture, assignment, submission).then(
       response => {
@@ -137,7 +160,17 @@ export const EditSubmission = () => {
           </Stack>
         </Stack>
       </Box>
+      <Stack direction = {'row'} justifyContent='space-between'>
       <Typography sx={{ m: 2, mb: 0 }}>Submission Files</Typography>
+      <Button
+        sx = {{mr: 2}}
+        variant='outlined'
+        size="small"
+        onClick={(event) => openLogs(event, manualGradeSubmission.id)}>
+          Show Logs
+        </Button>
+      </Stack>
+
       <FilesList path={path} sx={{ m: 2 }} />
 
       <Stack direction={'row'} sx={{ ml: 2 }} spacing={2}>
@@ -191,6 +224,25 @@ export const EditSubmission = () => {
       <Toolbar>
         <Button variant='outlined' component={Link as any} to={submissionsLink}>Back</Button>
       </Toolbar>
+      <Dialog
+        open={showLogs}
+        onClose={() => setShowLogs(false)}
+        aria-labelledby='alert-dialog-title'
+        aria-describedby='alert-dialog-description'
+      >
+        <DialogTitle id='alert-dialog-title'>{'Logs'}</DialogTitle>
+        <DialogContent>
+          <Typography
+            id='alert-dialog-description'
+            sx={{ fontSize: 10, fontFamily: '\'Roboto Mono\', monospace' }}
+          >
+            {logs}
+          </Typography>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setShowLogs(false)}>Close</Button>
+        </DialogActions>
+      </Dialog>
     </Stack>
   );
 };