jupyverse 0.5.3__tar.gz → 0.6.0__tar.gz

{jupyverse-0.5.3 → jupyverse-0.6.0}/.pre-commit-config.yaml

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

{jupyverse-0.5.3 → jupyverse-0.6.0}/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 0.6.0
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.5.4...74a20c5aba350ae2dac605ff303d4e75f72eff40))
+
+### Merged PRs
+
+- Fix terminals [#414](https://github.com/jupyter-server/jupyverse/pull/414) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2024-05-14&to=2024-05-22&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2024-05-14..2024-05-22&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
+## 0.5.4
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.5.3...9f208a6e2e13396f6723a80e23bef688285611e5))
+
+### Merged PRs
+
+- Improve terminals [#413](https://github.com/jupyter-server/jupyverse/pull/413) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2024-05-13&to=2024-05-14&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2024-05-13..2024-05-14&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2024-05-13..2024-05-14&type=Issues)
+
 ## 0.5.3
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.5.2...d5a5b178b93172a9bb8b90459d45ed20a1b734c5))
@@ -16,8 +46,6 @@
 
 [@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2024-05-02..2024-05-13&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2024-05-02..2024-05-13&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 0.5.2
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.5.1...0bd54d15a6ad7fbfe7c54f5a06ed4546de4ad90d))

{jupyverse-0.5.3 → jupyverse-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jupyverse
-Version: 0.5.3
+Version: 0.6.0
 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.6.0/jupyverse/__init__.py

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

{jupyverse-0.5.3 → jupyverse-0.6.0}/jupyverse_api/jupyverse_api/__init__.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 
 from .app import App
 
-__version__ = "0.5.3"
+__version__ = "0.6.0"
 
 
 class Singleton(type):

{jupyverse-0.5.3 → jupyverse-0.6.0}/jupyverse_api/jupyverse_api/terminals/__init__.py

@@ -83,5 +83,5 @@ class TerminalServer(ABC):
         ...
 
     @abstractmethod
-    def quit(self, websocket):
+    async def exit(self):
         ...

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

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

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

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

{jupyverse-0.5.3 → jupyverse-0.6.0}/plugins/auth_jupyterhub/fps_auth_jupyterhub/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.5.3"
+__version__ = "0.6.0"
 
 from .launch import launch  # noqa

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

{jupyverse-0.5.3 → jupyverse-0.6.0}/plugins/terminals/fps_terminals/routes.py

@@ -26,7 +26,12 @@ class _Terminals(Terminals):
         self,
         user: User,
     ):
-        name = str(len(TERMINALS) + 1)
+        name_int = 1
+        while True:
+            if str(name_int) not in TERMINALS:
+                break
+            name_int += 1
+        name = str(name_int)
         terminal = Terminal(
             name=name,
             last_activity=datetime.utcnow().isoformat() + "Z",
@@ -40,9 +45,7 @@ class _Terminals(Terminals):
         name: str,
         user: User,
     ):
-        for websocket in TERMINALS[name]["server"].websockets:
-            TERMINALS[name]["server"].quit(websocket)
-        del TERMINALS[name]
+        await TERMINALS[name]["server"].exit(TERMINALS, name)
         return Response(status_code=HTTPStatus.NO_CONTENT.value)
 
     async def terminal_websocket(
@@ -54,8 +57,4 @@ class _Terminals(Terminals):
             return
         websocket, permissions = websocket_permissions
         await websocket.accept()
-        await TERMINALS[name]["server"].serve(websocket, permissions)
-        if name in TERMINALS:
-            TERMINALS[name]["server"].quit(websocket)
-            if not TERMINALS[name]["server"].websockets:
-                del TERMINALS[name]
+        await TERMINALS[name]["server"].serve(websocket, permissions, TERMINALS, name)

{jupyverse-0.5.3 → jupyverse-0.6.0}/plugins/terminals/fps_terminals/server.py

@@ -6,8 +6,6 @@ import shlex
 import struct
 import termios
 
-from fastapi import WebSocketDisconnect
-
 from jupyverse_api.terminals import TerminalServer
 
 
@@ -25,27 +23,26 @@ class _TerminalServer(TerminalServer):
     def __init__(self):
         self.fd = open_terminal()
         self.p_out = os.fdopen(self.fd, "w+b", 0)
-        self.websockets = []
-
-    async def serve(self, websocket, permissions):
-        self.websocket = websocket
-        self.websockets.append(websocket)
-        self.event = asyncio.Event()
         self.loop = asyncio.get_event_loop()
-
-        task = asyncio.create_task(self.send_data())
+        self.data_from_terminal = asyncio.Queue()
+        self.websockets = []
 
         def on_output():
             try:
-                self.data_or_disconnect = self.p_out.read(65536).decode()
-                self.event.set()
+                data = self.p_out.read(65536).decode()
             except Exception:
-                os.close(self.fd)
-                self.loop.remove_reader(self.p_out)
-                self.data_or_disconnect = None
-                self.event.set()
+                self.data_from_terminal.put_nowait(None)
+            else:
+                self.data_from_terminal.put_nowait(data)
 
         self.loop.add_reader(self.p_out, on_output)
+
+    async def serve(self, websocket, permissions, terminals, name):
+        self.websocket = websocket
+        self.websockets.append(websocket)
+
+        task = asyncio.create_task(self.send_data(terminals, name))  # noqa: F841
+
         await websocket.send_json(["setup", {}])
         can_execute = permissions is None or "execute" in permissions.get("terminals", [])
         try:
@@ -57,22 +54,29 @@ class _TerminalServer(TerminalServer):
                     elif msg[0] == "set_size":
                         winsize = struct.pack("HH", msg[1], msg[2])
                         fcntl.ioctl(self.fd, termios.TIOCSWINSZ, winsize)
-        except WebSocketDisconnect:
-            task.cancel()
+        except Exception:
+            if websocket in self.websockets:
+                self.websockets.remove(websocket)
 
-    async def send_data(self):
+    async def send_data(self, terminals, name):
         while True:
-            await self.event.wait()
-            self.event.clear()
-            if self.data_or_disconnect is None:
-                await self.websocket.send_json(["disconnect", 1])
-            else:
-                for websocket in self.websockets:
-                    await websocket.send_json(["stdout", self.data_or_disconnect])
+            data = await self.data_from_terminal.get()
+            if data is None:
+                await self.exit(terminals, name)
+                return
 
-    def quit(self, websocket):
-        if websocket in self.websockets:
-            self.websockets.remove(websocket)
-        if not self.websockets:
-            os.close(self.fd)
+            for websocket in self.websockets:
+                await websocket.send_json(["stdout", data])
+
+    async def exit(self, terminals, name):
+        for websocket in self.websockets:
+            try:
+                await websocket.send_json(["disconnect", 1])
+            except Exception:
+                pass
+        self.websockets.clear()
+        try:
             self.loop.remove_reader(self.p_out)
+        except Exception:
+            pass
+        del terminals[name]

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

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

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

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

jupyverse-0.5.3/jupyverse/__init__.py

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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