jupyverse 0.9.0__tar.gz → 0.10.1__tar.gz

{jupyverse-0.9.0 → jupyverse-0.10.1}/.pre-commit-config.yaml

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

{jupyverse-0.9.0 → jupyverse-0.10.1}/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Version history
 
+## 0.10.1
+
+- Fix optional dependencies pinning.
+
+## 0.10.0
+
+- Fix write permissions in RTC.
+- Make `watchfiles` an optional dependency in `fps-kernels`.
+- Support kernel launchers.
+- Remove `websockets` dependency.
+
 ## 0.9.0
 
 - Extract out file ID from contents to its own plugin.

{jupyverse-0.9.0 → jupyverse-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyverse
-Version: 0.9.0
+Version: 0.10.1
 Summary: A set of FPS plugins implementing a Jupyter server
 Project-URL: Homepage, https://jupyter.org
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
@@ -9,33 +9,34 @@ License-File: COPYING.md
 Keywords: fastapi,jupyter,plugins,server
 Requires-Python: >=3.9
 Requires-Dist: eval-type-backport; python_version < '3.10'
-Requires-Dist: fps-contents<0.10.0,>=0.9.0
-Requires-Dist: fps-file-id<0.2.0,>=0.1.0
-Requires-Dist: fps-frontend<0.9.0,>=0.8.0
-Requires-Dist: fps-kernels<0.9.0,>=0.8.0
-Requires-Dist: fps-lab<0.9.0,>=0.8.1
-Requires-Dist: fps-nbconvert<0.9.0,>=0.8.0
-Requires-Dist: fps-terminals<0.9.0,>=0.8.0
-Requires-Dist: fps-yjs<0.10.0,>=0.9.0
+Requires-Dist: fps-contents<0.11.0,>=0.10.0
+Requires-Dist: fps-file-id<0.3.0,>=0.2.0
+Requires-Dist: fps-frontend<0.10.0,>=0.9.0
+Requires-Dist: fps-kernel-subprocess<0.2.0,>=0.1.0
+Requires-Dist: fps-kernels<0.10.0,>=0.9.0
+Requires-Dist: fps-lab<0.10.0,>=0.9.0
+Requires-Dist: fps-nbconvert<0.10.0,>=0.9.0
+Requires-Dist: fps-terminals<0.10.0,>=0.9.0
+Requires-Dist: fps-yjs<0.11.0,>=0.10.0
 Requires-Dist: fps[anycorn,click,fastapi]<0.5.0,>=0.4.0
-Requires-Dist: jupyverse-api<0.10.0,>=0.9.0
+Requires-Dist: jupyverse-api<0.11.0,>=0.10.0
 Requires-Dist: rich-click<2,>=1.6.1
 Provides-Extra: auth
-Requires-Dist: fps-auth<0.9.0,>=0.8.0; extra == 'auth'
-Requires-Dist: fps-login<0.9.0,>=0.8.0; extra == 'auth'
+Requires-Dist: fps-auth<0.10.0,>=0.9.0; extra == 'auth'
+Requires-Dist: fps-login<0.10.0,>=0.9.0; extra == 'auth'
 Provides-Extra: auth-fief
-Requires-Dist: fps-auth-fief<0.9.0,>=0.8.0; extra == 'auth-fief'
+Requires-Dist: fps-auth-fief<0.10.0,>=0.9.0; extra == 'auth-fief'
 Provides-Extra: auth-jupyterhub
-Requires-Dist: fps-auth-jupyterhub<0.9.0,>=0.8.0; extra == 'auth-jupyterhub'
+Requires-Dist: fps-auth-jupyterhub<0.10.0,>=0.9.0; extra == 'auth-jupyterhub'
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == 'docs'
 Requires-Dist: mkdocs-material; extra == 'docs'
 Provides-Extra: jupyterlab
-Requires-Dist: fps-jupyterlab<0.9.0,>=0.8.0; extra == 'jupyterlab'
+Requires-Dist: fps-jupyterlab<0.10.0,>=0.9.0; extra == 'jupyterlab'
 Provides-Extra: noauth
-Requires-Dist: fps-noauth<0.9.0,>=0.8.0; extra == 'noauth'
+Requires-Dist: fps-noauth<0.10.0,>=0.9.0; extra == 'noauth'
 Provides-Extra: notebook
-Requires-Dist: fps-notebook<0.9.0,>=0.8.0; extra == 'notebook'
+Requires-Dist: fps-notebook<0.10.0,>=0.9.0; extra == 'notebook'
 Provides-Extra: test
 Requires-Dist: httpx; extra == 'test'
 Requires-Dist: httpx-ws>=0.4.1; extra == 'test'

jupyverse-0.10.1/jupyverse_api/jupyverse_api/kernel/__init__.py

@@ -0,0 +1,82 @@
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+
+from anyio import TASK_STATUS_IGNORED, create_memory_object_stream
+from anyio.abc import TaskStatus
+from anyio.streams.memory import MemoryObjectReceiveStream
+from anyio.streams.stapled import StapledObjectStream
+
+
+class Kernel(ABC):
+    key = "0"
+    wait_for_ready = False
+
+    def __init__(self) -> None:
+        self._to_shell_send_stream, self._to_shell_receive_stream = create_memory_object_stream[
+            list[bytes]
+        ]()
+        self._from_shell_send_stream, self._from_shell_receive_stream = create_memory_object_stream[
+            list[bytes]
+        ]()
+        self._to_control_send_stream, self._to_control_receive_stream = create_memory_object_stream[
+            list[bytes]
+        ]()
+        self._from_control_send_stream, self._from_control_receive_stream = (
+            create_memory_object_stream[list[bytes]]()
+        )
+        self._to_stdin_send_stream, self._to_stdin_receive_stream = create_memory_object_stream[
+            list[bytes]
+        ]()
+        self._from_stdin_send_stream, self._from_stdin_receive_stream = create_memory_object_stream[
+            list[bytes]
+        ]()
+        self._from_iopub_send_stream, self._from_iopub_receive_stream = create_memory_object_stream[
+            list[bytes]
+        ](max_buffer_size=float("inf"))
+        self._shell_stream = StapledObjectStream(
+            self._to_shell_send_stream, self._from_shell_receive_stream
+        )
+        self._control_stream = StapledObjectStream(
+            self._to_control_send_stream, self._from_control_receive_stream
+        )
+        self._stdin_stream = StapledObjectStream(
+            self._to_stdin_send_stream, self._from_stdin_receive_stream
+        )
+
+    @abstractmethod
+    async def start(self, *, task_status: TaskStatus[None] = TASK_STATUS_IGNORED,) -> None: ...
+
+    @abstractmethod
+    async def stop(self) -> None: ...
+
+    @abstractmethod
+    async def interrupt(self) -> None: ...
+
+    @property
+    def shell_stream(self) -> StapledObjectStream[list[bytes]]:
+        return self._shell_stream
+
+    @property
+    def control_stream(self) -> StapledObjectStream[list[bytes]]:
+        return self._control_stream
+
+    @property
+    def stdin_stream(self) -> StapledObjectStream[list[bytes]]:
+        return self._stdin_stream
+
+    @property
+    def iopub_stream(self) -> MemoryObjectReceiveStream[list[bytes]]:
+        return self._from_iopub_receive_stream
+
+
+class KernelFactory:
+    def __init__(self, kernel_factory: type[Kernel]) -> None:
+        self._kernel_factory = kernel_factory
+
+    def __call__(self, *args, **kwargs) -> Kernel:
+        return self._kernel_factory(*args, **kwargs)
+
+
+class DefaultKernelFactory(KernelFactory):
+    pass

{jupyverse-0.9.0 → jupyverse-0.10.1}/jupyverse_api/jupyverse_api/kernels/__init__.py

@@ -10,6 +10,7 @@ from jupyverse_api import Config, Router
 
 from ..app import App
 from ..auth import Auth, User
+from ..kernel import KernelFactory
 from .models import Session
 
 
@@ -224,6 +225,13 @@ class Kernels(Router, ABC):
         websocket_permissions,
     ): ...
 
+    def register_kernel_factory(
+        self,
+        kernel_name: str,
+        kernel_factory: KernelFactory,
+    ) -> None:
+        pass
+
 
 class KernelsConfig(Config):
     default_kernel: str = "python3"

{jupyverse-0.9.0 → jupyverse-0.10.1}/jupyverse_api/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jupyverse_api"
-version = "0.9.0"
+version = "0.10.0"
 description = "The public API for Jupyverse"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -30,6 +30,7 @@ dependencies = [
   "pydantic >=2,<3",
   "fastapi >=0.95.0,<1",
   "fps >=0.4.0,<0.5.0",
+  "anyio >=3.6.2,<5",
 ]
 
 [project.license]

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/auth/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_auth"
+version = "0.9.0"
 description = "An FPS plugin for the authentication API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
-version = "0.8.1"
 requires-python = ">=3.9"
 dependencies = [
     "aiosqlite",
     "fastapi-users[sqlalchemy,oauth] >=14.0.1,<15.0.0",
-    "jupyverse-api >=0.9.0,<0.10.0",
+    "jupyverse-api >=0.10.0,<0.11.0",
 ]
 
 [[project.authors]]

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/auth_fief/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_auth_fief"
+version = "0.9.0"
 description = "An FPS plugin for the authentication API, using Fief"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
-version = "0.8.1"
 requires-python = ">=3.8"
 dependencies = [
     "fief-client[fastapi]",
-    "jupyverse-api >=0.9.0,<0.10.0",
+    "jupyverse-api >=0.10.0,<0.11.0",
 ]
 
 [[project.authors]]

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/auth_jupyterhub/fps_auth_jupyterhub/models.py

@@ -1,4 +1,3 @@
-
 from pydantic import ConfigDict
 
 from jupyverse_api.auth import User

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/auth_jupyterhub/pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_auth_jupyterhub"
+version = "0.9.0"
 description = "An FPS plugin for the authentication API, using JupyterHbu"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
-version = "0.8.1"
 requires-python = ">=3.9"
 dependencies = [
     "aiosqlite",
     "httpx >=0.24.1,<1",
     "jupyterhub >=4.0.1,<5",
-    "jupyverse-api >=0.9.0,<0.10.0",
+    "jupyverse-api >=0.10.0,<0.11.0",
     "anyio",
 ]
 

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/contents/fps_contents/routes.py

@@ -268,15 +268,19 @@ def get_available_path(path: Path, sep: str = "") -> Path:
 
 def get_file_modification_time(path: Path):
     if path.exists():
-        return datetime.fromtimestamp(path.stat().st_mtime, tz=timezone.utc).isoformat().replace(
-            "+00:00", "Z"
+        return (
+            datetime.fromtimestamp(path.stat().st_mtime, tz=timezone.utc)
+            .isoformat()
+            .replace("+00:00", "Z")
         )
 
 
 def get_file_creation_time(path: Path):
     if path.exists():
-        return datetime.fromtimestamp(path.stat().st_ctime, tz=timezone.utc).isoformat().replace(
-            "+00:00", "Z"
+        return (
+            datetime.fromtimestamp(path.stat().st_ctime, tz=timezone.utc)
+            .isoformat()
+            .replace("+00:00", "Z")
         )
 
 

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/contents/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_contents"
+version = "0.10.0"
 description = "An FPS plugin for the contents API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
-    "anyio>=3.6.2,<5",
-    "jupyverse-api >=0.9.0,<0.10.0",
+    "anyio >=3.6.2,<5",
+    "jupyverse-api >=0.10.0,<0.11.0",
 ]
-version = "0.9.0"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/file_id/pyproject.toml

@@ -4,6 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_file_id"
+version = "0.2.0"
 description = "An FPS plugin for the file ID API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
@@ -11,9 +12,8 @@ dependencies = [
     "watchfiles >=1.0.4,<2",
     "sqlite-anyio >=0.2.0,<0.3.0",
     "anyio>=3.6.2,<5",
-    "jupyverse-api >=0.9.0,<0.10.0",
+    "jupyverse-api >=0.10.0,<0.11.0",
 ]
-version = "0.1.0"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/frontend/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_frontend"
+version = "0.9.0"
 description = "An FPS plugin for the frontend related configuration"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
-    "jupyverse-api >=0.9.0,<0.10.0",
+    "jupyverse-api >=0.10.0,<0.11.0",
 ]
-version = "0.8.1"
 
 [[project.authors]]
 name = "Jupyter Development Team"

{jupyverse-0.9.0 → jupyverse-0.10.1}/plugins/jupyterlab/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_jupyterlab"
+version = "0.9.0"
 description = "An FPS plugin for the JupyterLab API"
 keywords = [ "jupyter", "server", "fastapi", "plugins" ]
 requires-python = ">=3.9"
 dependencies = [
   "jupyterlab-js >=4.4.2,<5",
-  "jupyverse-api >=0.9.0,<0.10.0",
+  "jupyverse-api >=0.10.0,<0.11.0",
 ]
-version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

jupyverse-0.10.1/plugins/kernel_subprocess/COPYING.md

@@ -0,0 +1,59 @@
+# Licensing terms
+
+This project is licensed under the terms of the Modified BSD License
+(also known as New or Revised or 3-Clause BSD), as follows:
+
+- Copyright (c) 2025-, Jupyter Development Team
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+Neither the name of the Jupyter Development Team nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## About the Jupyter Development Team
+
+The Jupyter Development Team is the set of all contributors to the Jupyter project.
+This includes all of the Jupyter subprojects.
+
+The core team that coordinates development on GitHub can be found here:
+https://github.com/jupyter/.
+
+## Our Copyright Policy
+
+Jupyter uses a shared copyright model. Each contributor maintains copyright
+over their contributions to Jupyter. But, it is important to note that these
+contributions are typically only changes to the repositories. Thus, the Jupyter
+source code, in its entirety is not the copyright of any single person or
+institution. Instead, it is the collective copyright of the entire Jupyter
+Development Team. If individual contributors want to maintain a record of what
+changes/contributions they have specific copyright on, they should indicate
+their copyright in the commit message of the change, when they commit the
+change to one of the Jupyter repositories.
+
+With this in mind, the following banner should be used in any source code file
+to indicate the copyright and license terms:
+
+    # Copyright (c) Jupyter Development Team.
+    # Distributed under the terms of the Modified BSD License.

jupyverse-0.10.1/plugins/kernel_subprocess/README.md

@@ -0,0 +1,3 @@
+# fps-kernel-subprocess
+
+An FPS plugin for the kernel subprocess API.

jupyverse-0.10.1/plugins/kernel_subprocess/fps_kernel_subprocess/__init__.py

@@ -0,0 +1,6 @@
+import importlib.metadata
+
+try:
+    __version__ = importlib.metadata.version("fps_kernel_subprocess")
+except importlib.metadata.PackageNotFoundError:
+    __version__ = "unknown"

{jupyverse-0.9.0/plugins/kernels/fps_kernels/kernel_driver → jupyverse-0.10.1/plugins/kernel_subprocess/fps_kernel_subprocess}/connect.py

@@ -3,15 +3,11 @@ from __future__ import annotations
 import json
 import os
 import socket
-import subprocess
-import sys
 import tempfile
 import uuid
 from typing import Union
 
 import zmq
-from anyio import open_process
-from anyio.abc import Process
 from zmq_anyio import Socket
 
 channel_socket_types = {
@@ -22,29 +18,6 @@ channel_socket_types = {
     "control": zmq.DEALER,
 }
 
-class HbSocket(Socket):
-    pass
-
-class ShellSocket(Socket):
-    pass
-
-class StdinSocket(Socket):
-    pass
-
-class IOPubSocket(Socket):
-    pass
-
-class ControlSocket(Socket):
-    pass
-
-channel_socket_wrapper_types = {
-    "hb": HbSocket,
-    "shell": ShellSocket,
-    "iopub": IOPubSocket,
-    "stdin": StdinSocket,
-    "control": ControlSocket,
-}
-
 context = zmq.Context()
 
 cfg_t = dict[str, Union[str, int]]
@@ -96,37 +69,12 @@ def read_connection_file(fname: str) -> cfg_t:
     return cfg
 
 
-async def launch_kernel(
-    kernelspec_path: str, connection_file_path: str, kernel_cwd: str | None, capture_output: bool
-) -> Process:
-    with open(kernelspec_path) as f:
-        kernelspec = json.load(f)
-    cmd = [s.format(connection_file=connection_file_path) 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
-    if capture_output:
-        stdout = subprocess.DEVNULL
-        stderr = subprocess.STDOUT
-    else:
-        stdout = None
-        stderr = None
-    if not kernel_cwd:
-        kernel_cwd = None
-    process = await open_process(cmd, stdout=stdout, stderr=stderr, cwd=kernel_cwd)
-    return process
-
-
 def create_socket(channel: str, cfg: cfg_t, identity: bytes | None = None) -> Socket:
     ip = cfg["ip"]
     port = cfg[f"{channel}_port"]
     url = f"tcp://{ip}:{port}"
     socket_type = channel_socket_types[channel]
-    socket_wrapper_type = channel_socket_wrapper_types[channel]
-    sock = socket_wrapper_type(context.socket(socket_type))
+    sock = Socket(context.socket(socket_type))
     sock.linger = 1000  # set linger to 1s to prevent hangs at exit
     if identity:
         sock.identity = identity