Un-reverse DeduplicateIds order

jupyter · Mar 13, 2023 · 3b3c672 · 3b3c672
1 parent f42b1fe
commit 3b3c672
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/nbgrader/converters/base.py b/nbgrader/converters/base.py
@@ -387,25 +387,32 @@ def _handle_failure(gd: typing.Dict[str, str]) -> None:
 
                 # convert all the notebooks
                 for notebook_filename in self.notebooks:
-                    self.convert_single_notebook(notebook_filename)
+                    try:
+                        self.convert_single_notebook(notebook_filename)
+
+                    # Exceptions that shouldn't interrupt the entire conversion process should go here
+                    # Those that should go in outer try/except
+                    except UnresponsiveKernelError:
+                        self.log.error(
+                            "While processing assignment %s, the kernel became "
+                            "unresponsive and we could not interrupt it. This probably "
+                            "means that the students' code has an infinite loop that "
+                            "consumes a lot of memory or something similar. nbgrader "
+                            "doesn't know how to deal with this problem, so you will "
+                            "have to manually edit the students' code (for example, to "
+                            "just throw an error rather than enter an infinite loop). ",
+                            assignment)
+                        errors.append((gd['assignment_id'], gd['student_id']))
+                        _handle_failure(gd)
+
+                    except Exception as e:
+                        raise e
 
                 # set assignment permissions
                 self.set_permissions(gd['assignment_id'], gd['student_id'])
                 self.run_post_convert_hook()
 
-            except UnresponsiveKernelError:
-                self.log.error(
-                    "While processing assignment %s, the kernel became "
-                    "unresponsive and we could not interrupt it. This probably "
-                    "means that the students' code has an infinite loop that "
-                    "consumes a lot of memory or something similar. nbgrader "
-                    "doesn't know how to deal with this problem, so you will "
-                    "have to manually edit the students' code (for example, to "
-                    "just throw an error rather than enter an infinite loop). ",
-                    assignment)
-                errors.append((gd['assignment_id'], gd['student_id']))
-                _handle_failure(gd)
-
+            # Exceptions that should interrupt the entire conversion go here
             except sqlalchemy.exc.OperationalError:
                 _handle_failure(gd)
                 self.log.error(traceback.format_exc())

diff --git a/nbgrader/preprocessors/deduplicateids.py b/nbgrader/preprocessors/deduplicateids.py
@@ -12,15 +12,9 @@ def preprocess(self, nb: NotebookNode, resources: ResourcesDict) -> Tuple[Notebo
         # keep track of grade ids encountered so far
         self.grade_ids = set([])
 
-        # reverse cell order
-        nb.cells = nb.cells[::-1]
-
         # process each cell in reverse order
         nb, resources = super(DeduplicateIds, self).preprocess(nb, resources)
 
-        # unreverse cell order
-        nb.cells = nb.cells[::-1]
-
         return nb, resources
 
     def preprocess_cell(self,

diff --git a/nbgrader/tests/preprocessors/test_deduplicateids.py b/nbgrader/tests/preprocessors/test_deduplicateids.py
@@ -25,8 +25,8 @@ def test_duplicate_grade_cell(self, preprocessor):
 
         nb, resources = preprocessor.preprocess(nb, {})
 
-        assert nb.cells[0].metadata.nbgrader == {}
-        assert nb.cells[1].metadata.nbgrader != {}
+        assert nb.cells[0].metadata.nbgrader != {}
+        assert nb.cells[1].metadata.nbgrader == {}
 
     def test_duplicate_solution_cell(self, preprocessor):
         cell1 = create_solution_cell("hello", "code", "foo")
@@ -37,8 +37,8 @@ def test_duplicate_solution_cell(self, preprocessor):
 
         nb, resources = preprocessor.preprocess(nb, {})
 
-        assert nb.cells[0].metadata.nbgrader == {}
-        assert nb.cells[1].metadata.nbgrader != {}
+        assert nb.cells[0].metadata.nbgrader != {}
+        assert nb.cells[1].metadata.nbgrader == {}
 
     def test_duplicate_locked_cell(self, preprocessor):
         cell1 = create_locked_cell("hello", "code", "foo")
@@ -49,5 +49,5 @@ def test_duplicate_locked_cell(self, preprocessor):
 
         nb, resources = preprocessor.preprocess(nb, {})
 
-        assert nb.cells[0].metadata.nbgrader == {}
-        assert nb.cells[1].metadata.nbgrader != {}
+        assert nb.cells[0].metadata.nbgrader != {}
+        assert nb.cells[1].metadata.nbgrader == {}