jupyverse 0.7.3__tar.gz → 0.7.5__tar.gz

{jupyverse-0.7.3 → jupyverse-0.7.5}/.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.1
+    rev: v0.9.7
     hooks:
       - id: ruff
         args: ["--fix"]

{jupyverse-0.7.3 → jupyverse-0.7.5}/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 0.7.5
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.4...3c652e450d8ce5e46d7ea1bb00c402d611c4f54f))
+
+### Merged PRs
+
+- Use AnyIO's wait_readable for terminals [#461](https://github.com/jupyter-server/jupyverse/pull/461) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2025-02-17&to=2025-02-26&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2025-02-17..2025-02-26&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2025-02-17..2025-02-26&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
+## 0.7.4
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.3...3dee770cdcb8ae2529874a0a73592d2744eed63e))
+
+### Merged PRs
+
+- Fix fps-auth-jupyterhub [#460](https://github.com/jupyter-server/jupyverse/pull/460) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2025-02-17&to=2025-02-17&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2025-02-17..2025-02-17&type=Issues)
+
 ## 0.7.3
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.2...2c046e8db0203c7d90476bf11ab11b89c0b0af51))
@@ -16,8 +46,6 @@
 
 [@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2025-02-15..2025-02-17&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 0.7.2
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.1...4d739c76ef3891c6fe8b6e7397e215efe348e95b))

{jupyverse-0.7.3 → jupyverse-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyverse
-Version: 0.7.3
+Version: 0.7.5
 Summary: A set of FPS plugins implementing a Jupyter server
 Project-URL: Homepage, https://jupyter.org
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>

jupyverse-0.7.5/jupyverse/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

{jupyverse-0.7.3 → jupyverse-0.7.5}/jupyverse_api/jupyverse_api/__init__.py

@@ -5,7 +5,7 @@ from pydantic import BaseModel
 
 from .app import App
 
-__version__ = "0.7.3"
+__version__ = "0.7.5"
 
 
 class Singleton(type):

jupyverse-0.7.5/plugins/auth/fps_auth/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/auth_fief/fps_auth_fief/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

{jupyverse-0.7.3 → jupyverse-0.7.5}/plugins/auth_jupyterhub/fps_auth_jupyterhub/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.7.3"
+__version__ = "0.7.5"
 
 from .launch import launch  # noqa

jupyverse-0.7.5/plugins/auth_jupyterhub/fps_auth_jupyterhub/main.py

@@ -0,0 +1,29 @@
+from anyio import create_task_group
+from fps import Module
+
+from jupyverse_api.app import App
+from jupyverse_api.auth import Auth, AuthConfig
+
+from .config import AuthJupyterHubConfig
+from .routes import auth_factory
+
+
+class AuthJupyterHubModule(Module):
+    def __init__(self, name: str, **kwargs):
+        super().__init__(name)
+        self.auth_jupyterhub_config = AuthJupyterHubConfig(**kwargs)
+
+    async def prepare(self) -> None:
+        self.put(self.auth_jupyterhub_config, AuthConfig)
+        app = await self.get(App)
+
+        self.auth_jupyterhub = auth_factory(app, self.auth_jupyterhub_config)
+
+        async with create_task_group() as self.tg:
+            await self.tg.start(self.auth_jupyterhub.start)
+            self.put(self.auth_jupyterhub, Auth)
+            self.done()
+
+    async def stop(self) -> None:
+        await self.auth_jupyterhub.stop()
+        self.tg.cancel_scope.cancel()

{jupyverse-0.7.3 → jupyverse-0.7.5}/plugins/auth_jupyterhub/fps_auth_jupyterhub/routes.py

@@ -6,14 +6,14 @@ from datetime import datetime
 from functools import partial
 from typing import Any, Awaitable, Callable, Dict, List, Optional, Tuple, Union
 
-from anyio import TASK_STATUS_IGNORED, Lock, create_task_group
+from anyio import TASK_STATUS_IGNORED, Lock, create_task_group, sleep
 from anyio.abc import TaskStatus
 from fastapi import APIRouter, Cookie, Depends, HTTPException, Request, WebSocket, status
 from fastapi.responses import RedirectResponse
 from httpx import AsyncClient
 from jupyterhub.services.auth import HubOAuth
 from jupyterhub.utils import isoformat
-from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
 from sqlalchemy.future import select
 from typing_extensions import Annotated
 
@@ -21,18 +21,22 @@ from jupyverse_api import Router
 from jupyverse_api.app import App
 from jupyverse_api.auth import Auth, User
 
-from .db import UserDB
+from .config import AuthJupyterHubConfig
+from .db import Base, UserDB
 from .models import JupyterHubUser
 
 
 def auth_factory(
     app: App,
-    db_session: AsyncSession,
-    http_client: AsyncClient,
+    auth_jupyterhub_config: AuthJupyterHubConfig,
 ):
     class AuthJupyterHub(Auth, Router):
         def __init__(self) -> None:
             super().__init__(app)
+            self.db_engine = create_async_engine(auth_jupyterhub_config.db_url)
+            self.db_session = AsyncSession(self.db_engine)
+
+            self.http_client = AsyncClient()
             self.hub_auth = HubOAuth()
             self.db_lock = Lock()
             self.activity_url = os.environ.get("JUPYTERHUB_ACTIVITY_URL")
@@ -57,14 +61,14 @@ def auth_factory(
                 token = self.hub_auth.token_for_code(code)
                 hub_user = await self.hub_auth.user_for_token(token, use_cache=False, sync=False)
                 async with self.db_lock:
-                    db_session.add(
+                    self.db_session.add(
                         UserDB(
                             token=token,
                             name=hub_user["name"],
                             username=hub_user["name"],
                         ),
                     )
-                    await db_session.commit()
+                    await self.db_session.commit()
 
                 next_url = self.hub_auth.get_next_url(cookie_state)
                 response = RedirectResponse(next_url)
@@ -115,7 +119,7 @@ def auth_factory(
                         )
 
                     async with self.db_lock:
-                        user_db = await db_session.scalar(
+                        user_db = await self.db_session.scalar(
                             select(UserDB).filter_by(token=jupyverse_jupyterhub_token)
                         )
                     user = JupyterHubUser.model_validate(user_db)
@@ -154,13 +158,18 @@ def auth_factory(
             return _
 
         async def start(self, *, task_status: TaskStatus[None] = TASK_STATUS_IGNORED) -> None:
+            async with self.db_engine.begin() as conn:
+                await conn.run_sync(Base.metadata.create_all)
+
             async with create_task_group() as tg:
                 self.task_group = tg
                 task_status.started()
+                await sleep(float("inf"))
 
         async def stop(self) -> None:
             await self.http_client.aclose()
-            self.task_group.cancel_scope.cancel()
+            await self.db_session.close()
+            await self.db_engine.dispose()
 
         async def update_user(
             self, jupyverse_jupyterhub_token: Annotated[Union[str, None], Cookie()] = None
@@ -168,12 +177,12 @@ def auth_factory(
             async def _(data: Dict[str, Any]) -> JupyterHubUser | None:
                 if jupyverse_jupyterhub_token is not None:
                     async with self.db_lock:
-                        user_db = await db_session.scalar(
+                        user_db = await self.db_session.scalar(
                             select(UserDB).filter_by(token=jupyverse_jupyterhub_token)
                         )
                         for k, v in data.items():
                             setattr(user_db, k, v)
-                        await db_session.commit()
+                        await self.db_session.commit()
                     user = JupyterHubUser.model_validate(user_db)
                     return user
                 return None
@@ -191,7 +200,7 @@ def auth_factory(
                 if "jupyverse_jupyterhub_token" in websocket._cookies:
                     jupyverse_jupyterhub_token = websocket._cookies["jupyverse_jupyterhub_token"]
                     async with self.db_lock:
-                        user_db = await db_session.scalar(
+                        user_db = await self.db_session.scalar(
                             select(UserDB).filter_by(token=jupyverse_jupyterhub_token)
                         )
                     if user_db:

jupyverse-0.7.5/plugins/contents/fps_contents/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/frontend/fps_frontend/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/jupyterlab/fps_jupyterlab/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/kernels/fps_kernels/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/lab/fps_lab/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/login/fps_login/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/nbconvert/fps_nbconvert/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/noauth/fps_noauth/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/notebook/fps_notebook/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/resource_usage/fps_resource_usage/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/terminals/fps_terminals/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

{jupyverse-0.7.3 → jupyverse-0.7.5}/plugins/terminals/fps_terminals/routes.py

@@ -3,7 +3,7 @@ from http import HTTPStatus
 from typing import Any, Dict, Type
 
 import structlog
-from anyio import Event, create_task_group
+from anyio import Event
 from fastapi import Response
 
 from jupyverse_api.app import App
@@ -25,9 +25,8 @@ class _Terminals(Terminals):
         await self.stop_event.wait()
 
     async def stop(self):
-        async with create_task_group() as tg:
-            for terminal in TERMINALS.values():
-                tg.start_soon(terminal["server"].stop)
+        for terminal in TERMINALS.values():
+            terminal["server"].quit()
         self.stop_event.set()
 
     async def get_terminals(

{jupyverse-0.7.3 → jupyverse-0.7.5}/plugins/terminals/fps_terminals/server.py

@@ -1,13 +1,17 @@
 import fcntl
 import os
 import pty
-import selectors
 import shlex
 import struct
 import termios
 from functools import partial
 
-from anyio import Lock, create_memory_object_stream, create_task_group, from_thread, to_thread
+from anyio import (
+    Lock,
+    create_memory_object_stream,
+    create_task_group,
+    wait_readable,
+)
 from anyio.abc import ByteReceiveStream, ByteSendStream
 from fastapi import WebSocketDisconnect
 
@@ -78,10 +82,6 @@ class _TerminalServer(TerminalServer):
             self.task_group.cancel_scope.cancel()
 
     def quit(self, websocket=None):
-        try:
-            self.recv_stream_from_backend.sel.unregister(self.p_out)
-        except Exception:
-            pass
         if websocket is None:
             self.websockets.clear()
         elif websocket in self.websockets:
@@ -103,33 +103,20 @@ class ReceiveStream(ByteReceiveStream):
         self.p_out = p_out
         self.task_group = task_group
         self.quit = quit
-        self.sel = selectors.DefaultSelector()
-        self.sel.register(self.p_out, selectors.EVENT_READ, self._read)
         self.send_stream, self.recv_stream = create_memory_object_stream[bytes](
             max_buffer_size=65536
         )
+        task_group.start_soon(self.read)
 
-        def reader():
-            # this runs in a thread
-            # the callback is self._read, which returns True when the terminal was exited
-            while True:
-                events = self.sel.select()
-                for key, mask in events:
-                    callback = key.data
-                    if callback():
-                        return
-
-        task_group.start_soon(partial(to_thread.run_sync, reader, abandon_on_cancel=True))
-
-    def _read(self) -> bool:
-        try:
-            data = self.p_out.read(65536)
-        except OSError:
-            from_thread.run_sync(self.quit)
-            return True
-        else:
-            from_thread.run_sync(self.send_stream.send_nowait, data)
-            return False
+    async def read(self):
+        while True:
+            await wait_readable(self.p_out)
+            try:
+                data = self.p_out.read(65536)
+            except OSError:
+                self.quit()
+                return
+            await self.send_stream.send(data)
 
     async def receive(self, max_bytes: int = 65536) -> bytes:
         data = await self.recv_stream.receive()

{jupyverse-0.7.3 → jupyverse-0.7.5}/plugins/terminals/pyproject.toml

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

jupyverse-0.7.5/plugins/webdav/fps_webdav/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.5/plugins/yjs/fps_yjs/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.5"

jupyverse-0.7.3/jupyverse/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/auth/fps_auth/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/auth_fief/fps_auth_fief/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/auth_jupyterhub/fps_auth_jupyterhub/main.py

@@ -1,34 +0,0 @@
-import httpx
-from fps import Module
-from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
-
-from jupyverse_api.app import App
-from jupyverse_api.auth import Auth, AuthConfig
-
-from .config import AuthJupyterHubConfig
-from .db import Base
-from .routes import auth_factory
-
-
-class AuthJupyterHubModule(Module):
-    def __init__(self, name: str, **kwargs):
-        super().__init__(name)
-        self.auth_jupyterhub_config = AuthJupyterHubConfig(**kwargs)
-
-    async def prepare(self) -> None:
-        self.put(self.auth_jupyterhub_config, AuthConfig)
-        app = await self.get(App)
-        self.db_engine = create_async_engine(self.auth_jupyterhub_config.db_url)
-        self.db_session = AsyncSession(self.db_engine)
-
-        self.http_client = httpx.AsyncClient()
-        auth_jupyterhub = auth_factory(app, self.db_session, self.http_client)
-        self.put(auth_jupyterhub, Auth)
-
-        async with self.db_engine.begin() as conn:
-            await conn.run_sync(Base.metadata.create_all)
-
-    async def stop(self) -> None:
-        await self.http_client.aclose()
-        await self.db_session.close()
-        await self.db_engine.dispose()

jupyverse-0.7.3/plugins/contents/fps_contents/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/frontend/fps_frontend/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/jupyterlab/fps_jupyterlab/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/kernels/fps_kernels/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/lab/fps_lab/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/login/fps_login/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/nbconvert/fps_nbconvert/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/noauth/fps_noauth/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/notebook/fps_notebook/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/resource_usage/fps_resource_usage/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/terminals/fps_terminals/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/webdav/fps_webdav/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"

jupyverse-0.7.3/plugins/yjs/fps_yjs/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.7.3"