Chore: update openapi schema (#74)

* chore: Regenerate the API models

* chore[FE]: Use enums for submission statuses in the code

* fix: Improve the error message when restoring a submission

Author: natkam

grader_labextension/api/models/auto_status.py

@@ -0,0 +1,41 @@
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from grader_labextension.api.models.base_model import Model
+from grader_labextension.api import util
+
+
+class AutoStatus(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    NOT_GRADED = 'not_graded'
+    PENDING = 'pending'
+    AUTOMATICALLY_GRADED = 'automatically_graded'
+    GRADING_FAILED = 'grading_failed'
+    def __init__(self):  # noqa: E501
+        """AutoStatus - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AutoStatus':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AutoStatus of this AutoStatus.  # noqa: E501
+        :rtype: AutoStatus
+        """
+        return util.deserialize_model(dikt, cls)

grader_labextension/api/models/feedback_status.py

@@ -0,0 +1,42 @@
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from grader_labextension.api.models.base_model import Model
+from grader_labextension.api import util
+
+
+class FeedbackStatus(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    NOT_GENERATED = 'not_generated'
+    GENERATING = 'generating'
+    GENERATED = 'generated'
+    GENERATION_FAILED = 'generation_failed'
+    FEEDBACK_OUTDATED = 'feedback_outdated'
+    def __init__(self):  # noqa: E501
+        """FeedbackStatus - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'FeedbackStatus':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The FeedbackStatus of this FeedbackStatus.  # noqa: E501
+        :rtype: FeedbackStatus
+        """
+        return util.deserialize_model(dikt, cls)

grader_labextension/api/models/manual_status.py

@@ -0,0 +1,40 @@
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from grader_labextension.api.models.base_model import Model
+from grader_labextension.api import util
+
+
+class ManualStatus(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    NOT_GRADED = 'not_graded'
+    MANUALLY_GRADED = 'manually_graded'
+    BEING_EDITED = 'being_edited'
+    def __init__(self):  # noqa: E501
+        """ManualStatus - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ManualStatus':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ManualStatus of this ManualStatus.  # noqa: E501
+        :rtype: ManualStatus
+        """
+        return util.deserialize_model(dikt, cls)

grader_labextension/api/models/submission.py

@@ -5,24 +5,43 @@
 from grader_labextension.api.models.base_model import Model
 from grader_labextension.api import util
 
+from grader_labextension.api.models.auto_status import AutoStatus  # noqa: E501
+from grader_labextension.api.models.feedback_status import FeedbackStatus  # noqa: E501
+from grader_labextension.api.models.manual_status import ManualStatus  # noqa: E501
+
 
 class Submission(Model):
     """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 
     Do not edit the class manually.
     """
 
-    def __init__(self, id=None, submitted_at=None, auto_status=None, manual_status=None, username=None, user_display_name=None, grading_score=None, score_scaling=None, score=None, assignid=None, commit_hash=None, feedback_status=None, edited=None):  # noqa: E501
+    def __init__(
+        self,
+        id=None,
+        submitted_at=None,
+        auto_status=None,
+        manual_status=None,
+        username=None,
+        user_display_name=None,
+        grading_score=None,
+        score_scaling=None,
+        score=None,
+        assignid=None,
+        commit_hash=None,
+        feedback_status=None,
+        edited=None,
+    ):  # noqa: E501
         """Submission - a model defined in OpenAPI
 
         :param id: The id of this Submission.  # noqa: E501
         :type id: int
         :param submitted_at: The submitted_at of this Submission.  # noqa: E501
         :type submitted_at: datetime
         :param auto_status: The auto_status of this Submission.  # noqa: E501
-        :type auto_status: str
+        :type auto_status: AutoStatus
         :param manual_status: The manual_status of this Submission.  # noqa: E501
-        :type manual_status: str
+        :type manual_status: ManualStatus
         :param username: The username of this Submission.  # noqa: E501
         :type username: str
         :param user_display_name: The user_display_name of this Submission.  # noqa: E501
@@ -38,40 +57,40 @@ def __init__(self, id=None, submitted_at=None, auto_status=None, manual_status=N
         :param commit_hash: The commit_hash of this Submission.  # noqa: E501
         :type commit_hash: str
         :param feedback_status: The feedback_status of this Submission.  # noqa: E501
-        :type feedback_status: str
+        :type feedback_status: FeedbackStatus
         :param edited: The edited of this Submission.  # noqa: E501
         :type edited: bool
         """
         self.openapi_types = {
-            'id': int,
-            'submitted_at': datetime,
-            'auto_status': str,
-            'manual_status': str,
-            'username': str,
-            'user_display_name': str,
-            'grading_score': float,
-            'score_scaling': float,
-            'score': float,
-            'assignid': int,
-            'commit_hash': str,
-            'feedback_status': str,
-            'edited': bool
+            "id": int,
+            "submitted_at": datetime,
+            "auto_status": AutoStatus,
+            "manual_status": ManualStatus,
+            "username": str,
+            "user_display_name": str,
+            "grading_score": float,
+            "score_scaling": float,
+            "score": float,
+            "assignid": int,
+            "commit_hash": str,
+            "feedback_status": FeedbackStatus,
+            "edited": bool,
         }
 
         self.attribute_map = {
-            'id': 'id',
-            'submitted_at': 'submitted_at',
-            'auto_status': 'auto_status',
-            'manual_status': 'manual_status',
-            'username': 'username',
-            'user_display_name': 'user_display_name',
-            'grading_score': 'grading_score',
-            'score_scaling': 'score_scaling',
-            'score': 'score',
-            'assignid': 'assignid',
-            'commit_hash': 'commit_hash',
-            'feedback_status': 'feedback_status',
-            'edited': 'edited'
+            "id": "id",
+            "submitted_at": "submitted_at",
+            "auto_status": "auto_status",
+            "manual_status": "manual_status",
+            "username": "username",
+            "user_display_name": "user_display_name",
+            "grading_score": "grading_score",
+            "score_scaling": "score_scaling",
+            "score": "score",
+            "assignid": "assignid",
+            "commit_hash": "commit_hash",
+            "feedback_status": "feedback_status",
+            "edited": "edited",
         }
 
         self._id = id
@@ -89,7 +108,7 @@ def __init__(self, id=None, submitted_at=None, auto_status=None, manual_status=N
         self._edited = edited
 
     @classmethod
-    def from_dict(cls, dikt) -> 'Submission':
+    def from_dict(cls, dikt) -> "Submission":
         """Returns the dict as a model
 
         :param dikt: A dict.
@@ -142,56 +161,44 @@ def submitted_at(self, submitted_at: datetime):
         self._submitted_at = submitted_at
 
     @property
-    def auto_status(self) -> str:
+    def auto_status(self) -> AutoStatus:
         """Gets the auto_status of this Submission.
 
 
         :return: The auto_status of this Submission.
-        :rtype: str
+        :rtype: AutoStatus
         """
         return self._auto_status
 
     @auto_status.setter
-    def auto_status(self, auto_status: str):
+    def auto_status(self, auto_status: AutoStatus):
         """Sets the auto_status of this Submission.
 
 
         :param auto_status: The auto_status of this Submission.
-        :type auto_status: str
+        :type auto_status: AutoStatus
         """
-        allowed_values = ["not_graded", "pending", "automatically_graded", "grading_failed"]  # noqa: E501
-        if auto_status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `auto_status` ({0}), must be one of {1}"
-                .format(auto_status, allowed_values)
-            )
 
         self._auto_status = auto_status
 
     @property
-    def manual_status(self) -> str:
+    def manual_status(self) -> ManualStatus:
         """Gets the manual_status of this Submission.
 
 
         :return: The manual_status of this Submission.
-        :rtype: str
+        :rtype: ManualStatus
         """
         return self._manual_status
 
     @manual_status.setter
-    def manual_status(self, manual_status: str):
+    def manual_status(self, manual_status: ManualStatus):
         """Sets the manual_status of this Submission.
 
 
         :param manual_status: The manual_status of this Submission.
-        :type manual_status: str
+        :type manual_status: ManualStatus
         """
-        allowed_values = ["not_graded", "manually_graded", "being_edited", "grading_failed"]  # noqa: E501
-        if manual_status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `manual_status` ({0}), must be one of {1}"
-                .format(manual_status, allowed_values)
-            )
 
         self._manual_status = manual_status
 
@@ -277,9 +284,13 @@ def score_scaling(self, score_scaling: float):
         :type score_scaling: float
         """
         if score_scaling is not None and score_scaling > 1.0:  # noqa: E501
-            raise ValueError("Invalid value for `score_scaling`, must be a value less than or equal to `1.0`")  # noqa: E501
+            raise ValueError(
+                "Invalid value for `score_scaling`, must be a value less than or equal to `1.0`"
+            )  # noqa: E501
         if score_scaling is not None and score_scaling < 0.0:  # noqa: E501
-            raise ValueError("Invalid value for `score_scaling`, must be a value greater than or equal to `0.0`")  # noqa: E501
+            raise ValueError(
+                "Invalid value for `score_scaling`, must be a value greater than or equal to `0.0`"
+            )  # noqa: E501
 
         self._score_scaling = score_scaling
 
@@ -347,29 +358,23 @@ def commit_hash(self, commit_hash: str):
         self._commit_hash = commit_hash
 
     @property
-    def feedback_status(self) -> str:
+    def feedback_status(self) -> FeedbackStatus:
         """Gets the feedback_status of this Submission.
 
 
         :return: The feedback_status of this Submission.
-        :rtype: str
+        :rtype: FeedbackStatus
         """
         return self._feedback_status
 
     @feedback_status.setter
-    def feedback_status(self, feedback_status: str):
+    def feedback_status(self, feedback_status: FeedbackStatus):
         """Sets the feedback_status of this Submission.
 
 
         :param feedback_status: The feedback_status of this Submission.
-        :type feedback_status: str
+        :type feedback_status: FeedbackStatus
         """
-        allowed_values = ["not_generated", "generating", "generated", "generation_failed", "feedback_outdated"]  # noqa: E501
-        if feedback_status not in allowed_values:
-            raise ValueError(
-                "Invalid value for `feedback_status` ({0}), must be one of {1}"
-                .format(feedback_status, allowed_values)
-            )
 
         self._feedback_status = feedback_status
 

src/components/assignment/assignment.tsx

@@ -55,13 +55,14 @@ import { FilesList } from '../util/file-list';
 import { Contents } from '@jupyterlab/services';
 import { GlobalObjects } from '../..';
 import { RepoType } from '../util/repo-type';
+import { FeedbackStatus } from '../../model/feedbackStatus';
 
 const calculateActiveStep = (submissions: Submission[]) => {
   const hasFeedback = submissions.reduce(
     (accum: boolean, curr: Submission) =>
       accum ||
-      curr.feedback_status === 'generated' ||
-      curr.feedback_status === 'feedback_outdated',
+      curr.feedback_status === FeedbackStatus.Generated ||
+      curr.feedback_status === FeedbackStatus.FeedbackOutdated,
     false
   );
   if (hasFeedback) {