Use anyio instead of asyncio

.devcontainer/requirements.txt

@@ -10,4 +10,3 @@
 fps[unicorn] >=0.0.10
 mypy
 pytest
-pytest-asyncio

jupyverse_api/jupyverse_api/contents/__init__.py

@@ -1,8 +1,8 @@
-import asyncio
 from abc import ABC, abstractmethod
 from pathlib import Path
 from typing import Dict, List, Optional, Union
 
+from anyio import Event
 from fastapi import APIRouter, Depends, Request, Response
 from jupyverse_api import Router
 
@@ -12,8 +12,8 @@
 
 
 class FileIdManager(ABC):
-    stop_watching_files: asyncio.Event
-    stopped_watching_files: asyncio.Event
+    stop_watching_files: Event
+    stopped_watching_files: Event
 
     @abstractmethod
     async def get_path(self, file_id: str) -> str:

jupyverse_api/pyproject.toml

@@ -29,6 +29,7 @@ dependencies = [
   "rich-click >=1.6.1,<2",
   "asphalt >=4.11.0,<5",
   "asphalt-web[fastapi] >=1.1.0,<2",
+  "anyio>=3.6.2,<5",
 ]
 dynamic = ["version"]
 

plugins/auth_jupyterhub/fps_auth_jupyterhub/routes.py

@@ -8,6 +8,7 @@
 from typing_extensions import Annotated
 
 import httpx
+from anyio import Lock
 from fastapi import APIRouter, Cookie, Depends, HTTPException, Request, WebSocket, status
 from fastapi.responses import RedirectResponse
 from jupyterhub.services.auth import HubOAuth
@@ -31,7 +32,7 @@ class AuthJupyterHub(Auth, Router):
         def __init__(self) -> None:
             super().__init__(app)
             self.hub_auth = HubOAuth()
-            self.db_lock = asyncio.Lock()
+            self.db_lock = Lock()
             self.activity_url = os.environ.get("JUPYTERHUB_ACTIVITY_URL")
             self.server_name = os.environ.get("JUPYTERHUB_SERVER_NAME")
             self.background_tasks = set()

plugins/auth_jupyterhub/pyproject.toml

@@ -13,6 +13,7 @@ dependencies = [
     "httpx >=0.24.1,<1",
     "jupyterhub >=4.0.1,<5",
     "jupyverse-api >=0.1.2,<1",
+    "anyio>=3.6.2,<5",
 ]
 
 [[project.authors]]

plugins/contents/fps_contents/fileid.py

@@ -4,7 +4,7 @@
 from uuid import uuid4
 
 import aiosqlite
-from anyio import Path
+from anyio import Event, Lock, Path
 from jupyverse_api import Singleton
 from watchfiles import Change, awatch
 
@@ -14,7 +14,7 @@
 class Watcher:
     def __init__(self, path: str) -> None:
         self.path = path
-        self._event = asyncio.Event()
+        self._event = Event()
 
     def __aiter__(self):
         return self
@@ -31,18 +31,18 @@ def notify(self, change):
 
 class FileIdManager(metaclass=Singleton):
     db_path: str
-    initialized: asyncio.Event
+    initialized: Event
     watchers: Dict[str, List[Watcher]]
-    lock: asyncio.Lock
+    lock: Lock
 
     def __init__(self, db_path: str = ".fileid.db"):
         self.db_path = db_path
-        self.initialized = asyncio.Event()
+        self.initialized = Event()
         self.watchers = {}
         self.watch_files_task = asyncio.create_task(self.watch_files())
-        self.stop_watching_files = asyncio.Event()
-        self.stopped_watching_files = asyncio.Event()
-        self.lock = asyncio.Lock()
+        self.stop_watching_files = Event()
+        self.stopped_watching_files = Event()
+        self.lock = Lock()
 
     async def get_id(self, path: str) -> Optional[str]:
         await self.initialized.wait()

plugins/terminals/fps_terminals/server.py

@@ -6,6 +6,7 @@
 import struct
 import termios
 
+from anyio import Event
 from fastapi import WebSocketDisconnect
 from jupyverse_api.terminals import TerminalServer
 
@@ -29,7 +30,7 @@ def __init__(self):
     async def serve(self, websocket, permissions):
         self.websocket = websocket
         self.websockets.append(websocket)
-        self.event = asyncio.Event()
+        self.event = Event()
         self.loop = asyncio.get_event_loop()
 
         task = asyncio.create_task(self.send_data())

plugins/terminals/fps_terminals/win_server.py

@@ -1,6 +1,7 @@
 import asyncio
 import os
 
+from anyio import sleep
 from jupyverse_api.terminals import TerminalServer
 from winpty import PTY  # type: ignore
 
@@ -36,7 +37,7 @@ async def send_data(self):
                 await self.websocket.send_json(["disconnect", 1])
                 return
             if not data:
-                await asyncio.sleep(0.1)
+                await sleep(0.1)
             else:
                 for websocket in self.websockets:
                     await websocket.send_json(["stdout", data])

plugins/terminals/pyproject.toml

@@ -11,6 +11,7 @@ dependencies = [
     "websockets",
     "pywinpty;platform_system=='Windows'",
     "jupyverse-api >=0.1.2,<1",
+    "anyio>=3.6.2,<5",
 ]
 dynamic = ["version"]
 [[project.authors]]

plugins/webdav/pyproject.toml

@@ -30,7 +30,6 @@ Homepage = "https://jupyter.org"
 test = [
     "easywebdav",
     "pytest",
-    "pytest-asyncio",
 ]
 
 [tool.check-manifest]

plugins/webdav/tests/test_webdav.py

@@ -24,7 +24,7 @@ def configure(components, config):
     return _components
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.skipif(sys.version_info < (3, 10), reason="Requires Python >=3.10")
 async def test_webdav(unused_tcp_port):
     components = configure(

plugins/yjs/fps_yjs/routes.py

@@ -7,6 +7,7 @@
 from typing import Dict
 from uuid import uuid4
 
+from anyio import Lock, sleep
 from fastapi import (
     HTTPException,
     Request,
@@ -138,7 +139,7 @@ class RoomManager:
     cleaners: Dict[YRoom, asyncio.Task]
     last_modified: Dict[str, datetime]
     websocket_server: JupyterWebsocketServer
-    lock: asyncio.Lock
+    lock: Lock
 
     def __init__(self, contents: Contents):
         self.contents = contents
@@ -149,7 +150,7 @@ def __init__(self, contents: Contents):
         self.last_modified = {}  # a dictionary of file_id:last_modification_date
         self.websocket_server = JupyterWebsocketServer(rooms_ready=False, auto_clean_rooms=False)
         self.websocket_server_task = asyncio.create_task(self.websocket_server.start())
-        self.lock = asyncio.Lock()
+        self.lock = Lock()
 
     def stop(self):
         for watcher in self.watchers.values():
@@ -305,7 +306,7 @@ async def maybe_save_document(
         self, file_id: str, file_type: str, file_format: str, document: YBaseDoc
     ) -> None:
         # save after 1 second of inactivity to prevent too frequent saving
-        await asyncio.sleep(1)  # FIXME: pass in config
+        await sleep(1)  # FIXME: pass in config
         # if the room cannot be found, don't save
         try:
             file_path = await self.get_file_path(file_id, document)
@@ -342,7 +343,7 @@ async def maybe_save_document(
     async def maybe_clean_room(self, room, ws_path: str) -> None:
         file_id = ws_path.split(":", 2)[2]
         # keep the document for a while in case someone reconnects
-        await asyncio.sleep(60)  # FIXME: pass in config
+        await sleep(60)  # FIXME: pass in config
         document = self.documents[ws_path]
         document.unobserve()
         del self.documents[ws_path]

pyproject.toml

@@ -43,8 +43,8 @@ noauth = ["fps-noauth >=0.1.2,<1"]
 test = [
     "mypy",
     "types-setuptools",
+    "anyio>=3.6.2,<5",
     "pytest",
-    "pytest-asyncio",
     "pytest-rerunfailures",
     "pytest-timeout",
     "pytest-env",

tests/test_app.py

@@ -9,7 +9,7 @@
 from utils import configure
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize(
     "mount_path",
     (

tests/test_auth.py

@@ -20,7 +20,7 @@
 }
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_kernel_channels_unauthenticated(unused_tcp_port):
     async with Context() as ctx:
         await JupyverseComponent(
@@ -35,7 +35,7 @@ async def test_kernel_channels_unauthenticated(unused_tcp_port):
                 pass
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 async def test_kernel_channels_authenticated(unused_tcp_port):
     async with Context() as ctx, AsyncClient() as http:
         await JupyverseComponent(
@@ -51,7 +51,7 @@ async def test_kernel_channels_authenticated(unused_tcp_port):
             pass
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("auth_mode", ("noauth", "token", "user"))
 async def test_root_auth(auth_mode, unused_tcp_port):
     components = configure(COMPONENTS, {"auth": {"mode": auth_mode}})
@@ -71,7 +71,7 @@ async def test_root_auth(auth_mode, unused_tcp_port):
         assert response.headers["content-type"] == "application/json"
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("auth_mode", ("noauth",))
 async def test_no_auth(auth_mode, unused_tcp_port):
     components = configure(COMPONENTS, {"auth": {"mode": auth_mode}})
@@ -85,7 +85,7 @@ async def test_no_auth(auth_mode, unused_tcp_port):
         assert response.status_code == 200
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("auth_mode", ("token",))
 async def test_token_auth(auth_mode, unused_tcp_port):
     components = configure(COMPONENTS, {"auth": {"mode": auth_mode}})
@@ -105,7 +105,7 @@ async def test_token_auth(auth_mode, unused_tcp_port):
         assert response.status_code == 302
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("auth_mode", ("user",))
 @pytest.mark.parametrize(
     "permissions",

tests/test_contents.py

@@ -16,7 +16,7 @@
 }
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("auth_mode", ("noauth",))
 async def test_tree(auth_mode, tmp_path, unused_tcp_port):
     prev_dir = os.getcwd()

tests/test_kernels.py

@@ -26,7 +26,7 @@
 }
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("auth_mode", ("noauth",))
 async def test_kernel_messages(auth_mode, capfd, unused_tcp_port):
     kernel_id = "kernel_id_0"

tests/test_server.py

@@ -1,10 +1,10 @@
-import asyncio
 import json
 from pathlib import Path
 
 import pytest
 import requests
 import y_py as Y
+from anyio import sleep
 from websockets import connect
 from ypy_websocket import WebsocketProvider
 
@@ -45,7 +45,7 @@ def test_settings_persistence_get(start_jupyverse):
     assert response.status_code == 204
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("auth_mode", ("noauth",))
 @pytest.mark.parametrize("clear_users", (False,))
 async def test_rest_api(start_jupyverse):
@@ -85,7 +85,7 @@ async def test_rest_api(start_jupyverse):
     ) as websocket, WebsocketProvider(ydoc, websocket):
         # connect to the shared notebook document
         # wait for file to be loaded and Y model to be created in server and client
-        await asyncio.sleep(0.5)
+        await sleep(0.5)
         # execute notebook
         for cell_idx in range(3):
             response = requests.post(
@@ -98,7 +98,7 @@ async def test_rest_api(start_jupyverse):
                 ),
             )
         # wait for Y model to be updated
-        await asyncio.sleep(0.5)
+        await sleep(0.5)
         # retrieve cells
         cells = json.loads(ydoc.get_array("cells").to_json())
         assert cells[0]["outputs"] == [

tests/test_settings.py

@@ -22,7 +22,7 @@
 }
 
 
-@pytest.mark.asyncio
+@pytest.mark.anyio
 @pytest.mark.parametrize("auth_mode", ("noauth",))
 async def test_settings(auth_mode, unused_tcp_port):
     components = configure(COMPONENTS, {"auth": {"mode": auth_mode}})