Backport PR #1014 on branch 1.x (Handle client 8 pending kernels) (#1026)

Co-authored-by: Steven Silvester <[email protected]>

Author: meeseeksmachine

.github/workflows/python-tests.yml

@@ -118,8 +118,7 @@ jobs:
           pip check
       - name: Run the tests
         run: |
-          pip install jupyter_client@https://github.com/blink1073/jupyter_client/archive/refs/heads/synchronous_managers.zip
-          pytest -vv || pytest -vv --lf
+          pytest -vv -W default || pytest -vv -W default --lf
 
   make_sdist:
     name: Make SDist

jupyter_server/services/kernels/handlers.py

@@ -397,8 +397,11 @@ async def pre_get(self):
         kernel = self.kernel_manager.get_kernel(self.kernel_id)
 
         if hasattr(kernel, "ready"):
+            ready = kernel.ready
+            if not isinstance(ready, asyncio.Future):
+                ready = asyncio.wrap_future(ready)
             try:
-                await kernel.ready
+                await ready
             except Exception as e:
                 kernel.execution_state = "dead"
                 kernel.reason = str(e)

jupyter_server/services/kernels/kernelmanager.py

@@ -246,8 +246,11 @@ async def start_kernel(self, kernel_id=None, path=None, **kwargs):
     async def _finish_kernel_start(self, kernel_id):
         km = self.get_kernel(kernel_id)
         if hasattr(km, "ready"):
+            ready = km.ready
+            if not isinstance(ready, asyncio.Future):
+                ready = asyncio.wrap_future(ready)
             try:
-                await km.ready
+                await ready
             except Exception:
                 self.log.exception("Error waiting for kernel manager ready")
                 return

setup.cfg

@@ -65,7 +65,7 @@ test =
     pytest-mock
     pytest-timeout
     pytest-tornasync
-    pytest>=6.0
+    pytest>=7.0
     requests
     requests
 

tests/services/kernels/test_api.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 import os
 import time
@@ -22,7 +23,10 @@ async def _(kernel_id):
         if getattr(km, "use_pending_kernels", False):
             kernel = km.get_kernel(kernel_id)
             if getattr(kernel, "ready", None):
-                await kernel.ready
+                ready = kernel.ready
+                if not isinstance(ready, asyncio.Future):
+                    ready = asyncio.wrap_future(ready)
+                await ready
 
     return _
 

tests/services/sessions/test_api.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 import os
 import shutil
@@ -163,7 +164,10 @@ async def _(session_id):
             kernel_id = session["kernel"]["id"]
             kernel = mkm.get_kernel(kernel_id)
             if getattr(kernel, "ready", None):
-                await kernel.ready
+                ready = kernel.ready
+                if not isinstance(ready, asyncio.Future):
+                    ready = asyncio.wrap_future(ready)
+                await ready
 
     return _