jupyverse 0.7.5__tar.gz → 0.7.6__tar.gz

{jupyverse-0.7.5 → jupyverse-0.7.6}/.github/workflows/check-release.yml

@@ -31,7 +31,7 @@ jobs:
         run: |
           echo "::set-output name=dir::$(pip cache dir)"
       - name: Cache pip
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}

jupyverse-0.7.6/.github/workflows/prep-release.yml

@@ -0,0 +1,48 @@
+name: "Step 1: Prep Release"
+on:
+  workflow_dispatch:
+    inputs:
+      version_spec:
+        description: "New Version Specifier"
+        default: "next"
+        required: false
+      branch:
+        description: "The branch to target"
+        required: false
+      post_version_spec:
+        description: "Post Version Specifier"
+        required: false
+      # silent:
+      #   description: "Set a placeholder in the changelog and don't publish the release."
+      #   required: false
+      #   type: boolean
+      since:
+        description: "Use PRs with activity since this date or git reference"
+        required: false
+      since_last_stable:
+        description: "Use PRs with activity since the last stable git tag"
+        required: false
+        type: boolean
+jobs:
+  prep_release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+
+      - name: Prep Release
+        id: prep-release
+        uses: jupyter-server/jupyter_releaser/.github/actions/prep-release@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          version_spec: ${{ github.event.inputs.version_spec }}
+          # silent: ${{ github.event.inputs.silent }}
+          post_version_spec: ${{ github.event.inputs.post_version_spec }}
+          branch: ${{ github.event.inputs.branch }}
+          since: ${{ github.event.inputs.since }}
+          since_last_stable: ${{ github.event.inputs.since_last_stable }}
+
+      - name: "** Next Step **"
+        run: |
+          echo "Optional): Review Draft Release: ${{ steps.prep-release.outputs.release_url }}"

jupyverse-0.7.6/.github/workflows/publish-release.yml

@@ -0,0 +1,58 @@
+name: "Step 2: Publish Release"
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "The target branch"
+        required: false
+      release_url:
+        description: "The URL of the draft GitHub release"
+        required: false
+      steps_to_skip:
+        description: "Comma separated list of steps to skip"
+        required: false
+
+jobs:
+  publish_release:
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    steps:
+      - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Populate Release
+        id: populate-release
+        uses: jupyter-server/jupyter_releaser/.github/actions/populate-release@v2
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          branch: ${{ github.event.inputs.branch }}
+          release_url: ${{ github.event.inputs.release_url }}
+          steps_to_skip: ${{ github.event.inputs.steps_to_skip }}
+
+      - name: Finalize Release
+        id: finalize-release
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        uses: jupyter-server/jupyter_releaser/.github/actions/finalize-release@v2
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          release_url: ${{ steps.populate-release.outputs.release_url }}
+
+      - name: "** Next Step **"
+        if: ${{ success() }}
+        run: |
+          echo "Verify the final release"
+          echo ${{ steps.finalize-release.outputs.release_url }}
+
+      - name: "** Failure Message **"
+        if: ${{ failure() }}
+        run: |
+          echo "Failed to Publish the Draft Release Url:"
+          echo ${{ steps.populate-release.outputs.release_url }}

{jupyverse-0.7.5 → jupyverse-0.7.6}/.pre-commit-config.yaml

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 0.7.6
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.5...510ab6902fb8701df90fb542511b7daa2f7a9537))
+
+### Merged PRs
+
+- Convert repo to use releaser from repo [#474](https://github.com/jupyter-server/jupyverse/pull/474) ([@davidbrochart](https://github.com/davidbrochart))
+- Fix kernel shutdown [#473](https://github.com/jupyter-server/jupyverse/pull/473) ([@davidbrochart](https://github.com/davidbrochart))
+- Bump FPS v0.1.5 [#467](https://github.com/jupyter-server/jupyverse/pull/467) ([@davidbrochart](https://github.com/davidbrochart))
+- Use zmq-anyio [#466](https://github.com/jupyter-server/jupyverse/pull/466) ([@davidbrochart](https://github.com/davidbrochart))
+- Fix connection to existing kernel [#463](https://github.com/jupyter-server/jupyverse/pull/463) ([@davidbrochart](https://github.com/davidbrochart))
+- Bump FPS v0.1.3 [#462](https://github.com/jupyter-server/jupyverse/pull/462) ([@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-26&to=2025-03-28&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2025-02-26..2025-03-28&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2025-02-26..2025-03-28&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 0.7.5
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.4...3c652e450d8ce5e46d7ea1bb00c402d611c4f54f))
@@ -16,8 +37,6 @@
 
 [@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))

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

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

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/jupyverse_api/jupyverse_api/__init__.py

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/jupyverse_api/jupyverse_api/cli.py

@@ -20,6 +20,26 @@ else:
     default=False,
     help="Enable debug mode.",
 )
+@click.option(
+    "--show-config",
+    is_flag=True,
+    show_default=True,
+    default=False,
+    help="Show the actual configuration.",
+)
+@click.option(
+    "--help-all",
+    is_flag=True,
+    show_default=True,
+    default=False,
+    help="Show the configuration description.",
+)
+@click.option(
+    "--backend",
+    show_default=True,
+    default="asyncio",
+    help="The name of the event loop to use (asyncio or trio).",
+)
 @click.option(
     "--open-browser",
     is_flag=True,
@@ -66,6 +86,9 @@ else:
 )
 def main(
     debug: bool = False,
+    show_config: bool = False,
+    help_all: bool = False,
+    backend: str = "asyncio",
     open_browser: bool = False,
     host: str = "127.0.0.1",
     port: int = 8000,
@@ -92,6 +115,9 @@ def main(
         "",
         set_=set_list,
         config=pluggin_config,
+        show_config=show_config,
+        help_all=help_all,
+        backend=backend,
     )  # type: ignore
 
 

{jupyverse-0.7.5 → jupyverse-0.7.6}/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.1.1,<0.2.0",
+  "fps[web] >=0.2.0,<0.3.0",
 ]
 dynamic = ["version"]
 

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

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/auth/fps_auth/main.py

@@ -16,20 +16,20 @@ log = structlog.get_logger()
 class AuthModule(Module):
     def __init__(self, name: str, **kwargs):
         super().__init__(name)
-        self.auth_config = _AuthConfig(**kwargs)
+        self.config = _AuthConfig(**kwargs)
 
     async def prepare(self) -> None:
-        self.put(self.auth_config, AuthConfig)
+        self.put(self.config, AuthConfig)
 
         app = await self.get(App)
         frontend_config = await self.get(FrontendConfig)
 
-        auth = auth_factory(app, self.auth_config, frontend_config)
+        auth = auth_factory(app, self.config, frontend_config)
         self.put(auth, Auth)
 
         await auth.db.create_db_and_tables()
 
-        if self.auth_config.test:
+        if self.config.test:
             try:
                 await auth.create_user(
                     username="admin@jupyter.com",
@@ -42,19 +42,19 @@ class AuthModule(Module):
 
         try:
             await auth.create_user(
-                username=self.auth_config.token,
-                email=self.auth_config.global_email,
+                username=self.config.token,
+                email=self.config.global_email,
                 password="",
                 permissions={},
             )
         except UserAlreadyExists:
-            global_user = await auth.get_user_by_email(self.auth_config.global_email)
+            global_user = await auth.get_user_by_email(self.config.global_email)
             await auth._update_user(
                 global_user,
-                username=self.auth_config.token,
+                username=self.config.token,
                 permissions={},
             )
 
-        if self.auth_config.mode == "token":
+        if self.config.mode == "token":
             query_params = await self.get(QueryParams)
-            query_params.d["token"] = self.auth_config.token
+            query_params.d["token"] = self.config.token

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

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/auth_fief/fps_auth_fief/main.py

@@ -9,12 +9,12 @@ from .routes import auth_factory
 
 class AuthFiefModule(Module):
     def __init__(self, name: str, **kwargs):
-        self.auth_fief_config = _AuthFiefConfig(**kwargs)
+        self.config = _AuthFiefConfig(**kwargs)
 
     async def prepare(self) -> None:
-        self.put(self.auth_fief_config, AuthConfig)
+        self.put(self.config, AuthConfig)
 
         app = await self.get(App)
 
-        auth_fief = auth_factory(app, self.auth_fief_config)
+        auth_fief = auth_factory(app, self.config)
         self.put(auth_fief, Auth)

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/auth_jupyterhub/fps_auth_jupyterhub/__init__.py

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/auth_jupyterhub/fps_auth_jupyterhub/main.py

@@ -11,13 +11,13 @@ from .routes import auth_factory
 class AuthJupyterHubModule(Module):
     def __init__(self, name: str, **kwargs):
         super().__init__(name)
-        self.auth_jupyterhub_config = AuthJupyterHubConfig(**kwargs)
+        self.config = AuthJupyterHubConfig(**kwargs)
 
     async def prepare(self) -> None:
-        self.put(self.auth_jupyterhub_config, AuthConfig)
+        self.put(self.config, AuthConfig)
         app = await self.get(App)
 
-        self.auth_jupyterhub = auth_factory(app, self.auth_jupyterhub_config)
+        self.auth_jupyterhub = auth_factory(app, self.config)
 
         async with create_task_group() as self.tg:
             await self.tg.start(self.auth_jupyterhub.start)

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

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

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

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/frontend/fps_frontend/main.py

@@ -6,7 +6,7 @@ from jupyverse_api.frontend import FrontendConfig
 class FrontendModule(Module):
     def __init__(self, name: str, **kwargs):
         super().__init__(name)
-        self.frontend_config = FrontendConfig(**kwargs)
+        self.config = FrontendConfig(**kwargs)
 
     async def prepare(self) -> None:
-        self.put(self.frontend_config, FrontendConfig)
+        self.put(self.config, FrontendConfig)

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

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/jupyterlab/fps_jupyterlab/main.py

@@ -12,15 +12,15 @@ from .routes import _JupyterLab
 class JupyterLabModule(Module):
     def __init__(self, name: str, **kwargs):
         super().__init__(name)
-        self.jupyterlab_config = JupyterLabConfig(**kwargs)
+        self.config = JupyterLabConfig(**kwargs)
 
     async def prepare(self) -> None:
-        self.put(self.jupyterlab_config, JupyterLabConfig)
+        self.put(self.config, JupyterLabConfig)
 
         app = await self.get(App)
         auth = await self.get(Auth)  # type: ignore[type-abstract]
         frontend_config = await self.get(FrontendConfig)
         lab = await self.get(Lab)  # type: ignore[type-abstract]
 
-        jupyterlab = _JupyterLab(app, self.jupyterlab_config, auth, frontend_config, lab)
+        jupyterlab = _JupyterLab(app, self.config, auth, frontend_config, lab)
         self.put(jupyterlab, JupyterLab)

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

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

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/kernels/fps_kernels/kernel_driver/connect.py

@@ -12,7 +12,7 @@ from typing import Dict, Optional, Tuple, Union
 import zmq
 from anyio import open_process
 from anyio.abc import Process
-from zmq.asyncio import Socket
+from zmq_anyio import Socket
 
 channel_socket_types = {
     "hb": zmq.REQ,
@@ -22,7 +22,30 @@ channel_socket_types = {
     "control": zmq.DEALER,
 }
 
-context = zmq.asyncio.Context()
+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]]
 
@@ -102,7 +125,8 @@ def create_socket(channel: str, cfg: cfg_t, identity: Optional[bytes] = None) ->
     port = cfg[f"{channel}_port"]
     url = f"tcp://{ip}:{port}"
     socket_type = channel_socket_types[channel]
-    sock = context.socket(socket_type)
+    socket_wrapper_type = channel_socket_wrapper_types[channel]
+    sock = socket_wrapper_type(context.socket(socket_type))
     sock.linger = 1000  # set linger to 1s to prevent hangs at exit
     if identity:
         sock.identity = identity

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/kernels/fps_kernels/kernel_driver/driver.py

@@ -102,6 +102,9 @@ class KernelDriver:
 
     async def connect(self, startup_timeout: float = float("inf")) -> None:
         self.connect_channels()
+        await self.task_group.start(self.iopub_channel.start)
+        await self.task_group.start(self.shell_channel.start)
+        await self.task_group.start(self.control_channel.start)
         await self._wait_for_ready(startup_timeout)
         self.listen_channels()
         self.task_group.start_soon(self._handle_comms)
@@ -117,6 +120,14 @@ class KernelDriver:
         self.task_group.start_soon(self.listen_shell)
 
     async def stop(self) -> None:
+        try:
+            async with create_task_group() as tg:
+                tg.start_soon(self.iopub_channel.stop)
+                tg.start_soon(self.shell_channel.stop)
+                tg.start_soon(self.control_channel.stop)
+        except Exception:
+            pass
+
         try:
             self.kernel_process.terminate()
         except ProcessLookupError:

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/kernels/fps_kernels/kernel_driver/message.py

@@ -5,8 +5,8 @@ from typing import Any, Dict, List, Optional, Tuple, cast
 from uuid import uuid4
 
 from dateutil.parser import parse as dateutil_parse
-from zmq.asyncio import Socket
 from zmq.utils import jsonapi
+from zmq_anyio import Socket
 
 protocol_version_info = (5, 3)
 protocol_version = "%i.%i" % protocol_version_info
@@ -123,16 +123,19 @@ def deserialize(
 async def send_message(
     msg: Dict[str, Any], sock: Socket, key: str, change_date_to_str: bool = False
 ) -> None:
-    await sock.send_multipart(serialize(msg, key, change_date_to_str=change_date_to_str), copy=True)
+    await sock.asend_multipart(
+        serialize(msg, key, change_date_to_str=change_date_to_str),
+        copy=True,
+    ).wait()
 
 
 async def receive_message(
     sock: Socket, timeout: float = float("inf"), change_str_to_date: bool = False
 ) -> Optional[Dict[str, Any]]:
     timeout *= 1000  # in ms
-    ready = await sock.poll(timeout)
+    ready = await sock.apoll(timeout).wait()
     if ready:
-        msg_list = await sock.recv_multipart()
-        idents, msg_list = feed_identities(msg_list)
+        msg_list = await sock.arecv_multipart().wait()
+        idents, msg_list = feed_identities(cast(list[bytes], msg_list))
         return deserialize(msg_list, change_str_to_date=change_str_to_date)
     return None

{jupyverse-0.7.5 → jupyverse-0.7.6}/plugins/kernels/fps_kernels/kernel_server/message.py

@@ -1,8 +1,8 @@
 import json
 import struct
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple, cast
 
-from zmq.asyncio import Socket
+from zmq_anyio import Socket
 
 from ..kernel_driver.message import DELIM, deserialize, feed_identities, sign, unpack
 
@@ -38,7 +38,7 @@ async def send_raw_message(parts: List[bytes], sock: Socket, key: str) -> None:
     msg = parts[:4]
     buffers = parts[4:]
     to_send = [DELIM, sign(msg, key)] + msg + buffers
-    await sock.send_multipart(to_send)
+    await sock.asend_multipart(to_send).wait()
 
 
 def deserialize_msg_from_ws_v1(ws_msg: bytes) -> Tuple[str, List[bytes]]:
@@ -53,8 +53,8 @@ def deserialize_msg_from_ws_v1(ws_msg: bytes) -> Tuple[str, List[bytes]]:
 
 
 async def get_zmq_parts(socket: Socket) -> List[bytes]:
-    parts = await socket.recv_multipart()
-    idents, parts = feed_identities(parts)
+    parts = await socket.arecv_multipart().wait()
+    idents, parts = feed_identities(cast(list[bytes], parts))
     return parts