jupyverse 0.7.4__tar.gz → 0.7.5__tar.gz

{jupyverse-0.7.4 → 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.4 → jupyverse-0.7.5}/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 <!-- <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))
@@ -16,8 +32,6 @@
 
 [@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2025-02-17..2025-02-17&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 0.7.3
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.2...2c046e8db0203c7d90476bf11ab11b89c0b0af51))

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyverse
-Version: 0.7.4
+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.4 → 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.4"
+__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.4 → jupyverse-0.7.5}/plugins/auth_jupyterhub/fps_auth_jupyterhub/__init__.py

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

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.4 → 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.4 → 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.4 → 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.4/jupyverse/__init__.py

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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