Comment not working execution cancellation

Author: fcollonval

jupyter_server_nbmodel/handlers.py

@@ -46,18 +46,19 @@ def __del__(self):
         for task in filter(lambda t: not t.cancelled(), self.__tasks.values()):
             task.cancel()
 
-    def cancel(self, kernel_id: str, uid: str) -> None:
-        """Cancel the request ``uid``.
+    # FIXME
+    # def cancel(self, kernel_id: str, uid: str) -> None:
+    #     """Cancel the request ``uid``.
 
-        Args:
-            kernel_id : Kernel identifier
-            uid : Request identifier
-        """
-        get_logger().debug(f"Cancel request {uid}.")
-        if uid not in self.__tasks:
-            raise ValueError(f"Request {uid} does not exists.")
+    #     Args:
+    #         kernel_id : Kernel identifier
+    #         uid : Request identifier
+    #     """
+    #     get_logger().debug(f"Cancel request {uid}.")
+    #     if uid not in self.__tasks:
+    #         raise ValueError(f"Request {uid} does not exists.")
 
-        self.__tasks[uid].cancel()
+    #     self.__tasks[uid].cancel()
 
     def get(self, kernel_id: str, uid: str) -> t.Any:
         """Get the request ``uid`` results, its pending input or None.
@@ -421,24 +422,25 @@ def get(self, kernel_id: str, request_id: str) -> None:
                     self.set_status(200)
                 self.finish(json.dumps(r))
 
-    @tornado.web.authenticated
-    def delete(self, kernel_id: str, request_id: str) -> None:
-        """`DELETE /api/kernels/<kernel_id>/requests/<request_id>` cancels the request ``uid``.
-
-        Status are:
-        * 204: Request cancelled
-
-        Args:
-            kernel_id: Kernel identifier
-            request_id: Request identifier
-
-        Raises:
-            404 if request ``uid`` does not exist
-        """
-        try:
-            self._stack.cancel(request_id)
-        except ValueError as err:
-            raise tornado.web.HTTPError(404, reason=str(err)) from err
-        else:
-            self.set_status(204)
-            self.finish()
+    # FIXME
+    # @tornado.web.authenticated
+    # def delete(self, kernel_id: str, request_id: str) -> None:
+    #     """`DELETE /api/kernels/<kernel_id>/requests/<request_id>` cancels the request ``uid``.
+
+    #     Status are:
+    #     * 204: Request cancelled
+
+    #     Args:
+    #         kernel_id: Kernel identifier
+    #         request_id: Request identifier
+
+    #     Raises:
+    #         404 if request ``uid`` does not exist
+    #     """
+    #     try:
+    #         self._stack.cancel(kernel_id, request_id)
+    #     except ValueError as err:
+    #         raise tornado.web.HTTPError(404, reason=str(err)) from err
+    #     else:
+    #         self.set_status(204)
+    #         self.finish()

jupyter_server_nbmodel/tests/test_handlers.py

@@ -140,3 +140,44 @@ async def test_post_erroneous_execute(jp_fetch, pending_kernel_is_ready, snippet
 
     response2 = await jp_fetch("api", "kernels", kernel["id"], method="DELETE")
     assert response2.code == 204
+
+
+# FIXME
+# @pytest.mark.timeout(TEST_TIMEOUT)
+# async def test_cancel_execute(jp_fetch, pending_kernel_is_ready):
+#     # Start the first kernel
+#     r = await jp_fetch(
+#         "api", "kernels", method="POST", body=json.dumps({"name": NATIVE_KERNEL_NAME})
+#     )
+#     kernel = json.loads(r.body.decode())
+#     await pending_kernel_is_ready(kernel["id"])
+
+#     response = await jp_fetch(
+#         "api",
+#         "kernels",
+#         kernel["id"],
+#         "execute",
+#         method="POST",
+#         body=json.dumps({"code": """import time
+# time.sleep(10)
+# print("end")
+# """}),
+#     )
+
+#     assert response.code == 202
+#     location = response.headers["Location"]
+
+#     # Cancel task
+#     response2 = await jp_fetch(location, method="DELETE")
+
+#     assert response2.code == 204
+
+#     response3 = await jp_fetch(location)
+#     payload = json.loads(response3.body)
+#     assert payload == {
+#         "status": "error",
+#         "execution_count": 1
+#     }
+
+#     r2 = await jp_fetch("api", "kernels", kernel["id"], method="DELETE")
+#     assert r2.code == 204