jupyverse 0.7.7__tar.gz → 0.7.8__tar.gz

{jupyverse-0.7.7 → jupyverse-0.7.8}/.pre-commit-config.yaml

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

{jupyverse-0.7.7 → jupyverse-0.7.8}/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 0.7.8
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.7...aef97417f06bbb76e9a6b060b5f662dd555caaae))
+
+### Merged PRs
+
+- Use jupyter-ydoc instead of vendored version [#484](https://github.com/jupyter-server/jupyverse/pull/484) ([@davidbrochart](https://github.com/davidbrochart))
+- Upgrade FPS to v0.3.0 [#482](https://github.com/jupyter-server/jupyverse/pull/482) ([@davidbrochart](https://github.com/davidbrochart))
+- Fix stream outputs [#480](https://github.com/jupyter-server/jupyverse/pull/480) ([@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-04-04&to=2025-04-23&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2025-04-04..2025-04-23&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2025-04-04..2025-04-23&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 0.7.7
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.6...69a1ecaa8f61a83c441d1c8e69a02835085fceb6))
@@ -18,8 +36,6 @@
 
 [@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2025-03-28..2025-04-04&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 0.7.6
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.5...510ab6902fb8701df90fb542511b7daa2f7a9537))

{jupyverse-0.7.7 → jupyverse-0.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyverse
-Version: 0.7.7
+Version: 0.7.8
 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.8/jupyverse/__init__.py

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

{jupyverse-0.7.7 → jupyverse-0.7.8}/jupyverse_api/jupyverse_api/__init__.py

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

{jupyverse-0.7.7 → jupyverse-0.7.8}/jupyverse_api/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
   "pydantic >=2,<3",
   "fastapi >=0.95.0,<1",
   "rich-click >=1.6.1,<2",
-  "fps[web] >=0.2.1,<0.3.0",
+  "fps[web] >=0.3.0,<0.4.0",
 ]
 dynamic = ["version"]
 

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

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

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

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

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/auth_jupyterhub/fps_auth_jupyterhub/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.7.7"
+__version__ = "0.7.8"
 
 from .launch import launch  # noqa

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/auth_jupyterhub/fps_auth_jupyterhub/main.py

@@ -21,9 +21,5 @@ class AuthJupyterHubModule(Module):
 
         async with create_task_group() as self.tg:
             await self.tg.start(self.auth_jupyterhub.start)
-            self.put(self.auth_jupyterhub, Auth)
+            self.put(self.auth_jupyterhub, Auth, teardown_callback=self.auth_jupyterhub.stop)
             self.done()
-
-    async def stop(self) -> None:
-        await self.auth_jupyterhub.stop()
-        self.tg.cancel_scope.cancel()

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/auth_jupyterhub/fps_auth_jupyterhub/routes.py

@@ -170,6 +170,7 @@ def auth_factory(
             await self.http_client.aclose()
             await self.db_session.close()
             await self.db_engine.dispose()
+            self.task_group.cancel_scope.cancel()
 
         async def update_user(
             self, jupyverse_jupyterhub_token: Annotated[str | None, Cookie()] = None

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

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

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

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

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

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

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/jupyterlab/pyproject.toml

@@ -8,7 +8,7 @@ description = "An FPS plugin for the JupyterLab API"
 keywords = [ "jupyter", "server", "fastapi", "plugins" ]
 requires-python = ">=3.9"
 dependencies = [
-  "jupyterlab >=4.0.0,<5",
+  "jupyterlab >=4.4.1,<5",
   "jupyverse-api >=0.7.0,<1",
 ]
 dynamic = [ "version",]

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

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

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/kernels/fps_kernels/kernel_driver/driver.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import os
 import time
 import uuid
 from typing import Any, cast
@@ -15,7 +14,7 @@ from anyio import (
 )
 from anyio.abc import TaskGroup, TaskStatus
 from anyio.streams.stapled import StapledObjectStream
-from pycrdt import Array, Map
+from pycrdt import Array, Map, Text
 
 from jupyverse_api.yjs import Yjs
 
@@ -271,22 +270,19 @@ class KernelDriver:
         content = msg["content"]
         if msg_type == "stream":
             with outputs.doc.transaction():
-                # TODO: uncomment when changes are made in jupyter-ydoc
-                text = content["text"]
-                if text.endswith((os.linesep, "\n")):
-                    text = text[:-1]
                 if (not outputs) or (outputs[-1]["name"] != content["name"]):  # type: ignore
                     outputs.append(
                         Map(
                             {
                                 "name": content["name"],
                                 "output_type": msg_type,
-                                "text": Array([content["text"]]),
+                                "text": Text(content["text"]),
                             }
                         )
                     )
                 else:
-                    outputs[-1]["text"].append(content["text"])  # type: ignore
+                    text = outputs[-1]["text"]
+                    text += content["text"]  # type: ignore
         elif msg_type in ("display_data", "execute_result"):
             if "application/vnd.jupyter.ywidget-view+json" in content["data"]:
                 # this is a collaborative widget

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/kernels/fps_kernels/main.py

@@ -35,11 +35,8 @@ class KernelsModule(Module):
         )
 
         self.kernels = _Kernels(app, self.config, auth, frontend_config, yjs, lifespan)
-        self.put(self.kernels, Kernels)
+        self.put(self.kernels, Kernels, teardown_callback=self.kernels.stop)
 
         async with create_task_group() as tg:
             tg.start_soon(self.kernels.start)
             self.done()
-
-    async def stop(self) -> None:
-        await self.kernels.stop()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/terminals/fps_terminals/main.py

@@ -22,10 +22,7 @@ class TerminalsModule(Module):
         auth = await self.get(Auth)  # type: ignore[type-abstract]
 
         self.terminals = _Terminals(app, auth, _TerminalServer)
-        self.put(self.terminals, Terminals)
         async with create_task_group() as tg:
             tg.start_soon(self.terminals.start)
+            self.put(self.terminals, Terminals, teardown_callback=self.terminals.stop)
             self.done()
-
-    async def stop(self) -> None:
-        await self.terminals.stop()

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

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

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

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

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/yjs/fps_yjs/main.py

@@ -26,13 +26,8 @@ class YjsModule(Module):
         lifespan = await self.get(Lifespan)
 
         self.yjs = _Yjs(app, auth, self.contents, lifespan)
-        self.put(self.yjs, Yjs)
 
         async with create_task_group() as tg:
-            tg.start_soon(self.yjs.start)
-            tg.start_soon(self.contents.file_id_manager.start)
+            await tg.start(self.yjs.start)
+            self.put(self.yjs, Yjs, teardown_callback=self.yjs.stop)
             self.done()
-
-    async def stop(self) -> None:
-        await self.yjs.stop()
-        await self.contents.file_id_manager.stop()

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/yjs/fps_yjs/routes.py

@@ -15,6 +15,8 @@ from fastapi import (
     WebSocketDisconnect,
     status,
 )
+from jupyter_ydoc import ydocs as YDOCS
+from jupyter_ydoc.ybasedoc import YBaseDoc
 from pycrdt import Doc, YMessageType, YSyncMessageType
 from websockets.exceptions import ConnectionClosedOK
 
@@ -26,8 +28,6 @@ from jupyverse_api.main import Lifespan
 from jupyverse_api.yjs import Yjs
 from jupyverse_api.yjs.models import CreateDocumentSession
 
-from .ydocs import ydocs as YDOCS
-from .ydocs.ybasedoc import YBaseDoc
 from .ywebsocket.websocket_server import WebsocketServer, YRoom
 from .ywebsocket.ystore import SQLiteYStore, YDocNotFound
 from .ywidgets import Widgets
@@ -62,10 +62,12 @@ class _Yjs(Yjs):
         async with create_task_group() as tg:
             self.room_manager = RoomManager(self.contents, self.lifespan)
             tg.start_soon(self.room_manager.start)
+            tg.start_soon(self.contents.file_id_manager.start)
             task_status.started()
 
     async def stop(self) -> None:
         await self.room_manager.stop()
+        await self.contents.file_id_manager.stop()
 
     async def collaboration_room_websocket(
         self,

{jupyverse-0.7.7 → jupyverse-0.7.8}/plugins/yjs/pyproject.toml

@@ -12,6 +12,7 @@ dependencies = [
     "pycrdt >=0.9.0,<0.13.0",
     "jupyverse-api >=0.7.0,<1",
     "sqlite-anyio >=0.2.0,<0.3.0",
+    "jupyter_ydoc>3.0.1,<4.0.0",
 ]
 dynamic = [ "version",]
 [[project.authors]]

{jupyverse-0.7.7 → jupyverse-0.7.8}/tests/test_execute.py

@@ -5,10 +5,10 @@ from pathlib import Path
 import anyio
 import pytest
 from fps import get_root_module, merge_config
-from fps_yjs.ydocs import ydocs
 from fps_yjs.ywebsocket import WebsocketProvider
 from httpx import AsyncClient
 from httpx_ws import aconnect_ws
+from jupyter_ydoc import ydocs
 from pycrdt import Doc, Map, Text
 
 os.environ["PYDEVD_DISABLE_FILE_VALIDATION"] = "1"

{jupyverse-0.7.7 → jupyverse-0.7.8}/tests/test_server.py

@@ -5,9 +5,9 @@ from pathlib import Path
 import anyio
 import pytest
 import requests
-from fps_yjs.ydocs import ydocs
 from fps_yjs.ywebsocket import WebsocketProvider
 from httpx_ws import aconnect_ws
+from jupyter_ydoc import ydocs
 from pycrdt import Array, Doc, Map, Text
 from utils import Websocket
 
@@ -113,7 +113,7 @@ async def test_rest_api(start_jupyverse):
             }
         ]
         assert cells[1]["outputs"] == [
-            {"name": "stdout", "output_type": "stream", "text": ["Hello World!\n"]}
+            {"name": "stdout", "output_type": "stream", "text": "Hello World!\n"}
         ]
         assert cells[2]["outputs"] == [
             {

jupyverse-0.7.7/jupyverse/__init__.py

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

jupyverse-0.7.7/plugins/yjs/fps_yjs/ydocs/__init__.py

@@ -1,8 +0,0 @@
-import sys
-
-if sys.version_info < (3, 10):
-    from importlib_metadata import entry_points
-else:
-    from importlib.metadata import entry_points
-
-ydocs = {ep.name: ep.load() for ep in entry_points(group="jupyverse_ydoc")}

jupyverse-0.7.7/plugins/yjs/fps_yjs/ydocs/utils.py

@@ -1,26 +0,0 @@
-from typing import Union
-
-INT = type[int]
-FLOAT = type[float]
-
-
-def cast_all(
-    o: Union[list, dict], from_type: Union[INT, FLOAT], to_type: Union[FLOAT, INT]
-) -> Union[list, dict]:
-    if isinstance(o, list):
-        for i, v in enumerate(o):
-            if type(v) is from_type:
-                v2 = to_type(v)
-                if v == v2:
-                    o[i] = v2
-            elif isinstance(v, (list, dict)):
-                cast_all(v, from_type, to_type)
-    elif isinstance(o, dict):
-        for k, v in o.items():
-            if type(v) is from_type:
-                v2 = to_type(v)
-                if v == v2:
-                    o[k] = v2
-            elif isinstance(v, (list, dict)):
-                cast_all(v, from_type, to_type)
-    return o

jupyverse-0.7.7/plugins/yjs/fps_yjs/ydocs/ybasedoc.py

@@ -1,82 +0,0 @@
-from __future__ import annotations
-
-from abc import ABC, abstractmethod
-from typing import Any, Callable
-
-from pycrdt import Doc, Map, Subscription
-
-
-class YBaseDoc(ABC):
-    _ydoc: Doc
-    _ystate: Map
-
-    def __init__(self, ydoc: Doc | None = None):
-        if ydoc is None:
-            self._ydoc = Doc()
-        else:
-            self._ydoc = ydoc
-        self._ystate = Map()
-        self._ydoc["state"] = self._ystate
-        self._subscriptions: dict[Any, Subscription] = {}
-
-    @property
-    @abstractmethod
-    def version(self) -> str:
-        ...
-
-    @property
-    def ystate(self) -> Map:
-        return self._ystate
-
-    @property
-    def ydoc(self) -> Doc:
-        return self._ydoc
-
-    @property
-    def source(self) -> Any:
-        return self.get()
-
-    @source.setter
-    def source(self, value: Any):
-        return self.set(value)
-
-    @property
-    def dirty(self) -> bool | None:
-        return self._ystate.get("dirty")
-
-    @dirty.setter
-    def dirty(self, value: bool) -> None:
-        self._ystate["dirty"] = value
-
-    @property
-    def path(self) -> str | None:
-        return self._ystate.get("path")
-
-    @path.setter
-    def path(self, value: str) -> None:
-        self._ystate["path"] = value
-
-    @property
-    def file_id(self) -> str | None:
-        return self._ystate.get("file_id")
-
-    @file_id.setter
-    def file_id(self, value: str) -> None:
-        self._ystate["file_id"] = value
-
-    @abstractmethod
-    def get(self) -> Any:
-        ...
-
-    @abstractmethod
-    def set(self, value: Any) -> None:
-        ...
-
-    @abstractmethod
-    def observe(self, callback: Callable[[str, Any], None]) -> None:
-        ...
-
-    def unobserve(self) -> None:
-        for k, v in self._subscriptions.items():
-            k.unobserve(v)
-        self._subscriptions = {}

jupyverse-0.7.7/plugins/yjs/fps_yjs/ydocs/yblob.py

@@ -1,43 +0,0 @@
-from __future__ import annotations
-
-import base64
-from functools import partial
-from typing import Any, Callable
-
-from pycrdt import Doc, Map
-
-from .ybasedoc import YBaseDoc
-
-
-class YBlob(YBaseDoc):
-    """
-    Extends :class:`YBaseDoc`, and represents a blob document.
-    It is currently encoded as base64 because of:
-    https://github.com/y-crdt/ypy/issues/108#issuecomment-1377055465
-    The Y document can be set from bytes or from str, in which case it is assumed to be encoded as
-    base64.
-    """
-
-    _ysource: Map
-
-    def __init__(self, ydoc: Doc | None = None):
-        super().__init__(ydoc)
-        self._ysource = Map()
-        self._ydoc["source"] = self._ysource
-
-    @property
-    def version(self) -> str:
-        return "1.0.0"
-
-    def get(self) -> bytes:
-        return base64.b64decode(self._ysource["base64"].encode())
-
-    def set(self, value: bytes | str) -> None:
-        if isinstance(value, bytes):
-            value = base64.b64encode(value).decode()
-        self._ysource["base64"] = value
-
-    def observe(self, callback: Callable[[str, Any], None]) -> None:
-        self.unobserve()
-        self._subscriptions[self._ystate] = self._ystate.observe(partial(callback, "state"))
-        self._subscriptions[self._ysource] = self._ysource.observe(partial(callback, "source"))

jupyverse-0.7.7/plugins/yjs/fps_yjs/ydocs/yfile.py

@@ -1,5 +0,0 @@
-from .yunicode import YUnicode
-
-
-class YFile(YUnicode):  # for backwards-compatibility
-    pass