jupyverse 0.10.12__tar.gz → 0.10.14__tar.gz

{jupyverse-0.10.12 → jupyverse-0.10.14}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: check-case-conflict
@@ -16,7 +16,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.12.11
     hooks:
       - id: ruff
         args: ["--fix"]

{jupyverse-0.10.12 → jupyverse-0.10.14}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Version history
 
+## 0.10.14
+
+- Fix document duplication with out-of-band changes.
+
+## 0.10.13
+
+- Support separate kernel environment.
+
 ## 0.10.12
 
 - Add `FileWatcher` API.

{jupyverse-0.10.12 → jupyverse-0.10.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyverse
-Version: 0.10.12
+Version: 0.10.14
 Summary: A set of FPS plugins implementing a Jupyter server
 Project-URL: Homepage, https://jupyter.org
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
@@ -13,14 +13,14 @@ Requires-Dist: fps-contents<0.11.0,>=0.10.1
 Requires-Dist: fps-file-id<0.4.0,>=0.3.2
 Requires-Dist: fps-file-watcher<0.2.0,>=0.1.1
 Requires-Dist: fps-frontend<0.10.0,>=0.9.1
-Requires-Dist: fps-kernel-subprocess<0.2.0,>=0.1.2
-Requires-Dist: fps-kernels<0.11.0,>=0.10.2
+Requires-Dist: fps-kernel-subprocess<0.2.0,>=0.1.3
+Requires-Dist: fps-kernels<0.11.0,>=0.10.3
 Requires-Dist: fps-lab<0.10.0,>=0.9.1
 Requires-Dist: fps-nbconvert<0.10.0,>=0.9.1
 Requires-Dist: fps-terminals<0.10.0,>=0.9.1
-Requires-Dist: fps-yjs<0.11.0,>=0.10.5
+Requires-Dist: fps-yjs<0.12.0,>=0.11.0
 Requires-Dist: fps[anycorn,click,fastapi]<0.6.0,>=0.5.1
-Requires-Dist: jupyverse-api<0.12.0,>=0.11.2
+Requires-Dist: jupyverse-api<0.12.0,>=0.11.3
 Requires-Dist: rich-click<2,>=1.6.1
 Provides-Extra: auth
 Requires-Dist: fps-auth<0.10.0,>=0.9.1; extra == 'auth'

{jupyverse-0.10.12 → jupyverse-0.10.14}/jupyverse_api/jupyverse_api/kernels/__init__.py

@@ -251,3 +251,4 @@ class KernelsConfig(Config):
         default=None,
     )
     require_yjs: bool = False
+    kernelenv_path: str = ""

{jupyverse-0.10.12 → jupyverse-0.10.14}/jupyverse_api/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jupyverse_api"
-version = "0.11.2"
+version = "0.11.3"
 description = "The public API for Jupyverse"
 readme = "README.md"
 requires-python = ">=3.9"

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/kernel_subprocess/fps_kernel_subprocess/kernel_subprocess.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import os
 import signal
 import subprocess
 import sys
@@ -9,8 +10,9 @@ from dataclasses import dataclass
 from typing import cast
 
 import anyio
-from anyio import TASK_STATUS_IGNORED, create_task_group, open_process
+from anyio import TASK_STATUS_IGNORED, create_task_group, open_file, open_process, run_process
 from anyio.abc import TaskStatus
+from anyio.streams.text import TextReceiveStream
 
 from jupyverse_api.kernel import Kernel
 
@@ -32,6 +34,7 @@ class KernelSubprocess(Kernel):
     kernel_cwd: str | None
     capture_output: bool
     connection_cfg: cfg_t | None = None
+    kernelenv_path: str = ""
 
     def __post_init__(self):
         super().__init__()
@@ -45,6 +48,8 @@ class KernelSubprocess(Kernel):
                 raise RuntimeError("No connection_cfg")
         self.key = cast(str, self.connection_cfg["key"])
         self.wait_for_ready = True
+        self._process = None
+        self._pid = None
 
     async def start(self, *, task_status: TaskStatus[None] = TASK_STATUS_IGNORED) -> None:
         async with (
@@ -64,15 +69,12 @@ class KernelSubprocess(Kernel):
             self._from_iopub_receive_stream,
             create_task_group() as self.task_group,
         ):
-            with open(self.kernelspec_path) as f:
-                kernelspec = json.load(f)
-            cmd = [s.format(connection_file=self.connection_file) for s in kernelspec["argv"]]
-            if cmd and cmd[0] in {
-                "python",
-                f"python{sys.version_info[0]}",
-                "python" + ".".join(map(str, sys.version_info[:2])),
-            }:
-                cmd[0] = sys.executable
+            async with await open_file(self.kernelspec_path) as f:
+                contents = await f.read()
+            kernelspec = json.loads(contents)
+            launch_kernel_cmd = [
+                s.format(connection_file=self.connection_file) for s in kernelspec["argv"]
+            ]
             if self.capture_output:
                 stdout = subprocess.DEVNULL
                 stderr = subprocess.STDOUT
@@ -80,7 +82,35 @@ class KernelSubprocess(Kernel):
                 stdout = None
                 stderr = None
             kernel_cwd = self.kernel_cwd if self.kernel_cwd else None
-            self._process = await open_process(cmd, stdout=stdout, stderr=stderr, cwd=kernel_cwd)
+            kernelenv = ""
+            if self.kernelenv_path:
+                path = anyio.Path(self.kernelenv_path)
+                if await path.is_file():
+                    kernelenv = await path.read_text()
+            if kernelenv:
+                import yaml  # type: ignore[import-untyped]
+                env_name = yaml.load(kernelenv, Loader=yaml.CLoader)["name"]
+                cmd = f"micromamba create -f {self.kernelenv_path} --yes"
+                result = await run_process(cmd)
+                if result.returncode == 0:
+                    cmd = """bash -c 'eval "$(micromamba shell hook --shell bash)";""" + \
+                        f"micromamba activate {env_name};" + \
+                        " ".join(launch_kernel_cmd) + "' & echo $!"
+                    process = await open_process(cmd)
+                    assert process.stdout is not None
+                    async for text in TextReceiveStream(process.stdout):
+                        self._pid = int(text)
+                        break
+            else:
+                if launch_kernel_cmd and launch_kernel_cmd[0] in {
+                    "python",
+                    f"python{sys.version_info[0]}",
+                    "python" + ".".join(map(str, sys.version_info[:2])),
+                }:
+                    launch_kernel_cmd[0] = sys.executable
+                self._process = await open_process(
+                    launch_kernel_cmd, stdout=stdout, stderr=stderr, cwd=kernel_cwd
+                )
 
             assert self.connection_cfg is not None
             identity = uuid.uuid4().hex.encode("ascii")
@@ -108,14 +138,17 @@ class KernelSubprocess(Kernel):
             self.started.set()
 
     async def stop(self) -> None:
-        try:
-            self._process.terminate()
-        except ProcessLookupError:
-            pass
-        await self._process.wait()
-        if self.write_connection_file:
-            path = anyio.Path(self.connection_file)
-            await path.unlink(missing_ok=True)
+        if self._process:
+            try:
+                self._process.terminate()
+            except ProcessLookupError:
+                pass
+            await self._process.wait()
+            if self.write_connection_file:
+                path = anyio.Path(self.connection_file)
+                await path.unlink(missing_ok=True)
+        else:
+            os.kill(self._pid, signal.SIGTERM)
 
         await self.shell_channel.stop()
         await self.stdin_channel.stop()
@@ -124,7 +157,10 @@ class KernelSubprocess(Kernel):
         self.task_group.cancel_scope.cancel()
 
     async def interrupt(self) -> None:
-        self._process.send_signal(signal.SIGINT)
+        if self._process:
+            self._process.send_signal(signal.SIGINT)
+        else:
+            os.kill(self._pid, signal.SIGINT)
 
     async def forward_messages_to_shell(self) -> None:
         async for msg in self._to_shell_receive_stream:

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/kernel_subprocess/fps_kernel_subprocess/main.py

@@ -10,4 +10,4 @@ from .kernel_subprocess import KernelSubprocess
 class KernelSubprocessModule(Module):
     async def prepare(self) -> None:
         default_kernel_factory = DefaultKernelFactory(KernelSubprocess)
-        self.put(default_kernel_factory, DefaultKernelFactory)
+        self.put(default_kernel_factory)

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/kernel_subprocess/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_kernel_subprocess"
-version = "0.1.2"
+version = "0.1.3"
 description = "An FPS plugin for the kernel subprocess API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
-    "jupyverse-api >=0.11.0,<0.12.0",
+    "jupyverse-api >=0.11.3,<0.12.0",
     "anyio",
     "pyzmq",
     "zmq-anyio >=0.3.1,<0.4.0",

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/kernels/fps_kernels/kernel_server/server.py

@@ -52,6 +52,7 @@ class KernelServer:
         self,
         default_kernel_factory: DefaultKernelFactory,
         kernelspec_path: str = "",
+        kernelenv_path: str = "",
         kernel_cwd: str = "",
         connection_file: str = "",
         write_connection_file: bool = True,
@@ -60,6 +61,7 @@ class KernelServer:
         self.default_kernel_factory = default_kernel_factory
         self.capture_kernel_output = capture_kernel_output
         self.kernelspec_path = kernelspec_path
+        self.kernelenv_path = kernelenv_path
         self.kernel_cwd = kernel_cwd
         self.connection_file = connection_file
         self.write_connection_file = write_connection_file
@@ -109,6 +111,7 @@ class KernelServer:
                     self.kernel = self.default_kernel_factory(
                         write_connection_file=self.write_connection_file,
                         kernelspec_path=self.kernelspec_path,
+                        kernelenv_path=self.kernelenv_path,
                         connection_file=self.connection_file,
                         kernel_cwd=self.kernel_cwd,
                         capture_output=self.capture_kernel_output,
@@ -116,6 +119,7 @@ class KernelServer:
                 else:
                     self.kernel = kernel_factory(
                         kernelspec_path=self.kernelspec_path,
+                        kernelenv_path=self.kernelenv_path,
                         connection_file=self.connection_file,
                         kernel_cwd=self.kernel_cwd,
                         capture_output=self.capture_kernel_output,

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/kernels/fps_kernels/routes.py

@@ -223,6 +223,7 @@ class _Kernels(Kernels):
                 kernel_cwd = kernel_cwd.parent
             kernel_server = KernelServer(
                 kernelspec_path=Path(find_kernelspec(kernel_name)).as_posix(),
+                kernelenv_path=self.kernels_config.kernelenv_path,
                 kernel_cwd=str(kernel_cwd),
                 default_kernel_factory=self.default_kernel_factory,
             )

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/kernels/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_kernels"
-version = "0.10.2"
+version = "0.10.3"
 description = "An FPS plugin for the kernels API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
     "python-dateutil",
     "types-python-dateutil",
-    "jupyverse-api >=0.11.2,<0.12.0",
+    "jupyverse-api >=0.11.3,<0.12.0",
     "pycrdt >=0.10.3,<0.13.0",
     "anyio",
 ]

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/yjs/fps_yjs/routes.py

@@ -256,12 +256,13 @@ class RoomManager:
                                 file_type,
                                 file_format,
                                 document,
+                                room,
                             )
                         )
                         # update the document when file changes
                         if file_id not in self.watchers:
                             self.watchers[file_id] = create_task(
-                                self.watch_file(file_format, file_id, document),
+                                self.watch_file(file_format, file_id, document, room),
                                 self.task_group,
                             )
 
@@ -317,7 +318,13 @@ class RoomManager:
             document.path = file_path
         return file_path
 
-    async def watch_file(self, file_format: str, file_id: str, document: YBaseDoc) -> None:
+    async def watch_file(
+        self,
+        file_format: str,
+        file_id: str,
+        document: YBaseDoc,
+        room: YRoom,
+    ) -> None:
         file_path = await self.get_file_path(file_id, document)
         assert file_path is not None
         logger.info("Watching file", path=file_path)
@@ -332,11 +339,17 @@ class RoomManager:
                 self.file_id.unwatch(file_path, watcher)
                 file_path = new_file_path
                 # break
-            await self.maybe_load_file(file_format, file_path, file_id)
+            await self.maybe_load_file(file_format, file_path, file_id, room)
         if file_id in self.watchers:
             del self.watchers[file_id]
 
-    async def maybe_load_file(self, file_format: str, file_path: str, file_id: str) -> None:
+    async def maybe_load_file(
+        self,
+        file_format: str,
+        file_path: str,
+        file_id: str,
+        room: YRoom,
+    ) -> None:
         model = await self.contents.read_content(file_path, False)
         # do nothing if the file was saved by us
         assert model.last_modified is not None
@@ -347,10 +360,19 @@ class RoomManager:
             documents = [v for k, v in self.documents.items() if k.split(":", 2)[2] == file_id]
             for document in documents:
                 document.source = model.content
+                assert room.ystore is not None
+                await room.ystore.encode_state_as_update(room.ydoc)
             self.last_modified[file_id] = to_datetime(model.last_modified)
 
     def on_document_change(
-        self, file_id: str, file_type: str, file_format: str, document: YBaseDoc, target, event
+        self,
+        file_id: str,
+        file_type: str,
+        file_format: str,
+        document: YBaseDoc,
+        room: YRoom,
+        target,
+        event,
     ) -> None:
         if target == "state" and "dirty" in event.keys:
             dirty = event.keys["dirty"]["newValue"]
@@ -361,17 +383,22 @@ class RoomManager:
         # e.g. a new cell added to a notebook
         document.unobserve()
         document.observe(
-            partial(self.on_document_change, file_id, file_type, file_format, document)
+            partial(self.on_document_change, file_id, file_type, file_format, document, room)
         )
         if file_id in self.savers:
             self.savers[file_id].cancel(raise_exception=False)
         self.savers[file_id] = create_task(
-            self.maybe_save_document(file_id, file_type, file_format, document),
+            self.maybe_save_document(file_id, file_type, file_format, document, room),
             self.task_group,
         )
 
     async def maybe_save_document(
-        self, file_id: str, file_type: str, file_format: str, document: YBaseDoc
+        self,
+        file_id: str,
+        file_type: str,
+        file_format: str,
+        document: YBaseDoc,
+        room: YRoom,
     ) -> None:
         # save after configured delay to prevent too frequent saving
         await sleep(self.config.document_save_delay)
@@ -386,6 +413,8 @@ class RoomManager:
         if self.last_modified[file_id] < to_datetime(model.last_modified):
             # file changed on disk, let's revert
             document.source = model.content
+            assert room.ystore is not None
+            await room.ystore.encode_state_as_update(room.ydoc)
             self.last_modified[file_id] = to_datetime(model.last_modified)
             return
         if model.content != document.source:

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/yjs/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_yjs"
-version = "0.10.5"
+version = "0.11.0"
 description = "An FPS plugin for the Yjs API"
 keywords = [ "jupyter", "server", "fastapi", "plugins" ]
 requires-python = ">=3.9"

{jupyverse-0.10.12 → jupyverse-0.10.14}/plugins/yjs/tests/test_yjs.py

@@ -1,3 +1,5 @@
+import sys
+
 import pytest
 from anyio import create_task_group
 from fps import get_root_module
@@ -10,7 +12,15 @@ from jupyverse_api.yjs.models import CreateDocumentSession
 
 
 @pytest.mark.anyio
-async def test_concurrent_disconnect(tmp_path):
+async def test_concurrent_disconnect(tmp_path, anyio_backend_name):
+    if (
+        anyio_backend_name == "trio" and
+        sys.version_info >= (3, 13) and
+        sys.version_info < (3, 14) and
+        sys.platform == "darwin"
+    ):
+        pytest.skip("Timeout")
+
     config = {
         "jupyverse": {
             "type": "jupyverse",

{jupyverse-0.10.12 → jupyverse-0.10.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jupyverse"
-version = "0.10.12"
+version = "0.10.14"
 description = "A set of FPS plugins implementing a Jupyter server"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
@@ -13,14 +13,14 @@ dependencies = [
     "fps-contents >=0.10.1,<0.11.0",
     "fps-file-id >=0.3.2,<0.4.0",
     "fps-file-watcher >=0.1.1,<0.2.0",
-    "fps-kernel-subprocess >=0.1.2,<0.2.0",
-    "fps-kernels >=0.10.2,<0.11.0",
+    "fps-kernel-subprocess >=0.1.3,<0.2.0",
+    "fps-kernels >=0.10.3,<0.11.0",
     "fps-terminals >=0.9.1,<0.10.0",
     "fps-nbconvert >=0.9.1,<0.10.0",
-    "fps-yjs >=0.10.5,<0.11.0",
+    "fps-yjs >=0.11.0,<0.12.0",
     "fps-lab >=0.9.1,<0.10.0",
     "fps-frontend >=0.9.1,<0.10.0",
-    "jupyverse-api >=0.11.2,<0.12.0",
+    "jupyverse-api >=0.11.3,<0.12.0",
     "rich-click >=1.6.1,<2",
     "eval-type-backport; python_version<'3.10'",
 ]
@@ -89,6 +89,7 @@ pre-install-commands = [
   "pip install -e ./plugins/auth_jupyterhub",
   "pip install -e ./plugins/jupyterlab",
   "pip install -e ./plugins/notebook",
+  "pip install pyyaml",
 ]
 features = ["test"]