Merge branch 'main' into release-0.9.0

Author: florian-jaeger

binder/environment.yml

@@ -43,5 +43,4 @@ dependencies:
   - sqlite
   - pip:
       - grader-service==0.5.1
-      - grader-labextension==0.8.0
-      
+      - grader-labextension==0.8.2

grader_labextension/api/models/submission.py

@@ -225,6 +225,27 @@ def user_display_name(self, user_display_name: str):
         """Sets the user_display_name of this Submission.
 
 
+        :param user_display_name: The user_display_name of this Submission.
+        :type user_display_name: str
+        """
+
+        self._user_display_name = user_display_name
+
+    @property
+    def user_display_name(self) -> str:
+        """Gets the user_display_name of this Submission.
+
+
+        :return: The user_display_name of this Submission.
+        :rtype: str
+        """
+        return self._user_display_name
+
+    @user_display_name.setter
+    def user_display_name(self, user_display_name: str):
+        """Sets the user_display_name of this Submission.
+
+
         :param user_display_name: The user_display_name of this Submission.
         :type user_display_name: str
         """

grader_labextension/handlers/version_control.py

@@ -357,7 +357,7 @@ async def put(self, lecture_id: int, assignment_id: int, repo: str):
 
     def _extract_request_params(
         self,
-    ) -> (Optional[str], Optional[str], List[str], bool, Optional[str]):
+    ) -> tuple[Optional[str], Optional[str], List[str], bool, Optional[str]]:
         sub_id_str = self.get_argument("subid", None)
         commit_message = self.get_argument("commit-message", None)
         selected_files = self.get_arguments("selected-files")

grader_labextension/services/git.py

@@ -212,11 +212,23 @@ def undo_commit(self, n: int = 1) -> None:
         self._run_command("git gc", cwd=self.path)
 
     def revert(self, commit_hash: str):
+        """Revert the repository to a previous commit.
+        If the commit hash equal the HEAD commit, all local changes will be undone.
+        Otherwise, the files will be reset to the specified commit.
+
+        Args:
+            commit_hash (str): The hash of the commit to revert to.
+        """
         self.log.info(f"Reverting to {commit_hash}")
-        self._run_command(f"git revert --no-commit {commit_hash}..HEAD", cwd=self.path)
-        self._run_command(
-            f'git commit -m "reverting to {commit_hash}" --allow-empty', cwd=self.path
-        )
+        if commit_hash == self._run_command("git rev-parse HEAD", cwd=self.path).strip():
+            # If the commit hash is the HEAD commit, all local changes will be undone.
+            self._run_command("git reset --hard", cwd=self.path)
+        else:
+            # If the commit hash is not the HEAD commit, revert to the specified commit and create a new revert commit.
+            self._run_command(f"git revert --no-commit {commit_hash}..HEAD", cwd=self.path)
+            self._run_command(
+                f'git commit -m "reverting to {commit_hash}" --allow-empty', cwd=self.path
+            )
 
     def is_git(self) -> bool:
         """Check if the directory is a git repository.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "grader-labextension",
-    "version": "0.8.0",
+    "version": "0.8.2",
     "description": "Grader Labextension is a JupyterLab extension to enable automatic grading of assignment notebooks.",
     "keywords": [
         "jupyter",

pyproject.toml

@@ -23,9 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-
-    "grader-service>=0.8.1,<0.9",
-
+    "grader-service>=0.8.2,<0.9",
     "jupyter_server>=2.4.0,<3"
 ]
 dynamic = ["version", "description", "authors", "urls", "keywords"]
@@ -40,7 +38,7 @@ test = [
 ]
 
 [tool.tbump.version]
-current = "0.8.0"
+current = "0.8.2"
 
 regex = '''
   (?P<major>\d+)

src/model/assignment.ts

@@ -18,13 +18,13 @@ export interface Assignment {
     settings?: AssignmentSettings;
 }
 export namespace Assignment {
-    export type StatusEnum = 'created' | 'pushed' | 'released' | 'complete';
     export const StatusEnum = {
-        Created: 'created' as StatusEnum,
-        Pushed: 'pushed' as StatusEnum,
-        Released: 'released' as StatusEnum,
-        Complete: 'complete' as StatusEnum
-    };
+        Created: 'created',
+        Pushed: 'pushed',
+        Released: 'released',
+        Complete: 'complete'
+    } as const;
+    export type StatusEnum = typeof StatusEnum[keyof typeof StatusEnum];
 }
 
 

src/model/assignmentDetail.ts

@@ -20,13 +20,13 @@ export interface AssignmentDetail {
     submissions?: Array<Submission>;
 }
 export namespace AssignmentDetail {
-    export type StatusEnum = 'created' | 'pushed' | 'released' | 'complete';
     export const StatusEnum = {
-        Created: 'created' as StatusEnum,
-        Pushed: 'pushed' as StatusEnum,
-        Released: 'released' as StatusEnum,
-        Complete: 'complete' as StatusEnum
-    };
+        Created: 'created',
+        Pushed: 'pushed',
+        Released: 'released',
+        Complete: 'complete'
+    } as const;
+    export type StatusEnum = typeof StatusEnum[keyof typeof StatusEnum];
 }
 
 

src/model/assignmentSettings.ts

@@ -18,12 +18,12 @@ export interface AssignmentSettings {
     autograde_type?: AssignmentSettings.AutogradeTypeEnum;
 }
 export namespace AssignmentSettings {
-    export type AutogradeTypeEnum = 'auto' | 'full_auto' | 'unassisted';
     export const AutogradeTypeEnum = {
-        Auto: 'auto' as AutogradeTypeEnum,
-        FullAuto: 'full_auto' as AutogradeTypeEnum,
-        Unassisted: 'unassisted' as AutogradeTypeEnum
-    };
+        Auto: 'auto',
+        FullAuto: 'full_auto',
+        Unassisted: 'unassisted'
+    } as const;
+    export type AutogradeTypeEnum = typeof AutogradeTypeEnum[keyof typeof AutogradeTypeEnum];
 }
 
 

src/model/remoteFileStatus.ts

@@ -13,14 +13,14 @@ export interface RemoteFileStatus {
     status: RemoteFileStatus.StatusEnum;
 }
 export namespace RemoteFileStatus {
-    export type StatusEnum = 'UP_TO_DATE' | 'DIVERGENT' | 'PULL_NEEDED' | 'PUSH_NEEDED' | 'NO_REMOTE_REPO';
     export const StatusEnum = {
-        UpToDate: 'UP_TO_DATE' as StatusEnum,
-        Divergent: 'DIVERGENT' as StatusEnum,
-        PullNeeded: 'PULL_NEEDED' as StatusEnum,
-        PushNeeded: 'PUSH_NEEDED' as StatusEnum,
-        NoRemoteRepo: 'NO_REMOTE_REPO' as StatusEnum
-    };
+        UpToDate: 'UP_TO_DATE',
+        Divergent: 'DIVERGENT',
+        PullNeeded: 'PULL_NEEDED',
+        PushNeeded: 'PUSH_NEEDED',
+        NoRemoteRepo: 'NO_REMOTE_REPO'
+    } as const;
+    export type StatusEnum = typeof StatusEnum[keyof typeof StatusEnum];
 }