jupyverse 0.8.4__tar.gz → 0.9.0__tar.gz

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

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

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

@@ -1,5 +1,9 @@
 # Version history
 
+## 0.9.0
+
+- Extract out file ID from contents to its own plugin.
+
 ## 0.8.4
 
 - Check if `labextensions` directory exists.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyverse
-Version: 0.8.4
+Version: 0.9.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>
@@ -9,15 +9,16 @@ 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.9.0,>=0.8.0
+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.9.0,>=0.8.0
+Requires-Dist: fps-yjs<0.10.0,>=0.9.0
 Requires-Dist: fps[anycorn,click,fastapi]<0.5.0,>=0.4.0
-Requires-Dist: jupyverse-api<0.9.0,>=0.8.2
+Requires-Dist: jupyverse-api<0.10.0,>=0.9.0
 Requires-Dist: rich-click<2,>=1.6.1
 Provides-Extra: auth
 Requires-Dist: fps-auth<0.9.0,>=0.8.0; extra == 'auth'

{jupyverse-0.8.4 → jupyverse-0.9.0}/jupyverse_api/jupyverse_api/contents/__init__.py

@@ -12,24 +12,6 @@ from ..auth import Auth, User
 from .models import Checkpoint, Content, SaveContent
 
 
-class FileIdManager(ABC):
-    @abstractmethod
-    async def start(self) -> None: ...
-
-    @abstractmethod
-    async def stop(self) -> None: ...
-
-    @abstractmethod
-    async def get_path(self, file_id: str) -> str: ...
-
-    @abstractmethod
-    async def get_id(self, file_path: str) -> str: ...
-
-    def watch(self, path: str): ...
-
-    def unwatch(self, path: str, watcher): ...
-
-
 class Contents(Router, ABC):
     file_lock: ResourceLock
 
@@ -108,10 +90,6 @@ class Contents(Router, ABC):
 
         self.include_router(router)
 
-    @property
-    @abstractmethod
-    def file_id_manager(self) -> FileIdManager: ...
-
     @abstractmethod
     async def read_content(
         self, path: str | Path, get_content: bool, file_format: str | None = None

jupyverse-0.9.0/jupyverse_api/jupyverse_api/file_id/__init__.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+
+
+class FileId(ABC):
+    @abstractmethod
+    async def start(self) -> None: ...
+
+    @abstractmethod
+    async def stop(self) -> None: ...
+
+    @abstractmethod
+    async def get_path(self, file_id: str) -> str | None: ...
+
+    @abstractmethod
+    async def get_id(self, file_path: str) -> str | None: ...
+
+    @abstractmethod
+    async def index(self, path: str) -> str | None: ...
+
+    def watch(self, path: str): ...
+
+    def unwatch(self, path: str, watcher): ...

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

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

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

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

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

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

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

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

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

@@ -23,12 +23,8 @@ from jupyverse_api.contents.models import (
     SaveContent,
 )
 
-from .fileid import FileIdManager
-
 
 class _Contents(Contents):
-    _file_id_manager: FileIdManager | None = None
-
     async def create_checkpoint(
         self,
         path,
@@ -251,12 +247,6 @@ class _Contents(Contents):
                             content.content = cast(str, content.content)
                             await f.write(content.content)
 
-    @property
-    def file_id_manager(self):
-        if self._file_id_manager is None:
-            self._file_id_manager = FileIdManager()
-        return self._file_id_manager
-
 
 def get_available_path(path: Path, sep: str = "") -> Path:
     directory = path.parent

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

@@ -8,12 +8,10 @@ description = "An FPS plugin for the contents API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
-    "watchfiles >=1.0.4,<2",
-    "sqlite-anyio >=0.2.0,<0.3.0",
     "anyio>=3.6.2,<5",
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
 ]
-version = "0.8.0"
+version = "0.9.0"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

jupyverse-0.9.0/plugins/file_id/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.9.0/plugins/file_id/README.md

@@ -0,0 +1,3 @@
+# fps-contents
+
+An FPS plugin for the file ID API.

jupyverse-0.9.0/plugins/file_id/fps_file_id/__init__.py

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

jupyverse-0.8.4/plugins/contents/fps_contents/fileid.py → jupyverse-0.9.0/plugins/file_id/fps_file_id/file_id.py

@@ -9,6 +9,8 @@ from anyio import Event, Lock, Path
 from sqlite_anyio import connect
 from watchfiles import Change, awatch
 
+from jupyverse_api.file_id import FileId
+
 logger = structlog.get_logger()
 watchfiles_logger = logging.getLogger("watchfiles")
 watchfiles_logger.setLevel(logging.WARNING)
@@ -32,7 +34,7 @@ class Watcher:
         self._event.set()
 
 
-class FileIdManager:
+class _FileId(FileId):
     db_path: str
     initialized: Event
     watchers: dict[str, list[Watcher]]

jupyverse-0.9.0/plugins/file_id/fps_file_id/main.py

@@ -0,0 +1,16 @@
+from anyio import create_task_group
+from fps import Module
+
+from jupyverse_api.file_id import FileId
+
+from .file_id import _FileId
+
+
+class FileIdModule(Module):
+    async def prepare(self) -> None:
+        self.file_id = _FileId()
+
+        async with create_task_group() as tg:
+            tg.start_soon(self.file_id.start)
+            self.put(self.file_id, FileId, teardown_callback=self.file_id.stop)
+            self.done()

jupyverse-0.9.0/plugins/file_id/pyproject.toml

@@ -0,0 +1,33 @@
+[build-system]
+requires = [ "hatchling",]
+build-backend = "hatchling.build"
+
+[project]
+name = "fps_file_id"
+description = "An FPS plugin for the file ID API"
+keywords = ["jupyter", "server", "fastapi", "plugins"]
+requires-python = ">=3.9"
+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",
+]
+version = "0.1.0"
+[[project.authors]]
+name = "Jupyter Development Team"
+email = "jupyter@googlegroups.com"
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.license]
+text = "BSD 3-Clause License"
+
+[project.urls]
+Homepage = "https://jupyter.org"
+
+[project.entry-points]
+"fps.modules"       = {file_id = "fps_file_id.main:FileIdModule"}
+"jupyverse.modules" = {file_id = "fps_file_id.main:FileIdModule"}

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

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

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

@@ -9,9 +9,9 @@ keywords = [ "jupyter", "server", "fastapi", "plugins" ]
 requires-python = ">=3.9"
 dependencies = [
   "jupyterlab-js >=4.4.2,<5",
-  "jupyverse-api >=0.8.0,<0.9.0",
+  "jupyverse-api >=0.9.0,<0.10.0",
 ]
-version = "0.8.0"
+version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/kernels/pyproject.toml

@@ -14,11 +14,11 @@ dependencies = [
     "python-dateutil",
     "types-python-dateutil",
     "watchfiles >=1.0.4,<2",
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
     "pycrdt >=0.10.3,<0.13.0",
     "anyio",
 ]
-version = "0.8.0"
+version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/lab/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fps_lab"
-version = "0.8.1"
+version = "0.8.2"
 description = "An FPS plugin for the JupyterLab/Notebook API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
@@ -12,7 +12,7 @@ dependencies = [
   "importlib_metadata >=3.6; python_version<'3.10'",
   "babel",
   "json5",
-  "jupyverse-api >=0.8.0,<0.9.0",
+  "jupyverse-api >=0.9.0,<0.10.0",
 ]
 [[project.authors]]
 name = "Jupyter Development Team"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/login/pyproject.toml

@@ -8,9 +8,9 @@ description = "An FPS plugin for the login API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
-  "jupyverse-api >=0.8.0,<0.9.0",
+  "jupyverse-api >=0.9.0,<0.10.0",
 ]
-version = "0.8.0"
+version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/nbconvert/pyproject.toml

@@ -9,9 +9,9 @@ keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
     "nbconvert",
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
 ]
-version = "0.8.0"
+version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/noauth/pyproject.toml

@@ -6,10 +6,10 @@ build-backend = "hatchling.build"
 name = "fps_noauth"
 description = "An FPS plugin for an unprotected API"
 keywords = ["jupyter", "server", "fastapi", "plugins"]
-version = "0.8.0"
+version = "0.8.1"
 requires-python = ">=3.9"
 dependencies = [
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
 ]
 
 [[project.authors]]

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/notebook/pyproject.toml

@@ -9,9 +9,9 @@ keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
     "notebook-frontend >=7.4.2,<8.0.0",
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
 ]
-version = "0.8.0"
+version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/resource_usage/pyproject.toml

@@ -11,9 +11,9 @@ dependencies = [
     "psutil >=5.9.4",
     "types-psutil",
     "anyio >=3.6.2,<5",
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
 ]
-version = "0.8.0"
+version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/terminals/pyproject.toml

@@ -10,10 +10,10 @@ requires-python = ">=3.9"
 dependencies = [
     "websockets",
     "pywinpty;platform_system=='Windows'",
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
     "anyio >=4.8.0,<5.0.0",
 ]
-version = "0.8.0"
+version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/webdav/pyproject.toml

@@ -9,9 +9,9 @@ keywords = ["jupyter", "server", "fastapi", "plugins"]
 requires-python = ">=3.9"
 dependencies = [
     "asgiwebdav>=1.3.2,<2; python_version >= '3.10'",
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
 ]
-version = "0.8.0"
+version = "0.8.1"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/yjs/fps_yjs/main.py

@@ -6,6 +6,7 @@ from fps import Module
 from jupyverse_api.app import App
 from jupyverse_api.auth import Auth
 from jupyverse_api.contents import Contents
+from jupyverse_api.file_id import FileId
 from jupyverse_api.main import Lifespan
 from jupyverse_api.yjs import Yjs, YjsConfig
 
@@ -22,10 +23,11 @@ class YjsModule(Module):
 
         app = await self.get(App)
         auth = await self.get(Auth)  # type: ignore[type-abstract]
-        self.contents = await self.get(Contents)  # type: ignore[type-abstract]
+        contents = await self.get(Contents)  # type: ignore[type-abstract]
+        file_id = await self.get(FileId)  # type: ignore[type-abstract]
         lifespan = await self.get(Lifespan)
 
-        self.yjs = _Yjs(app, auth, self.contents, lifespan)
+        self.yjs = _Yjs(app, auth, contents, file_id, lifespan)
 
         async with create_task_group() as tg:
             await tg.start(self.yjs.start)

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/yjs/fps_yjs/routes.py

@@ -24,6 +24,7 @@ from jupyverse_api import ResourceLock
 from jupyverse_api.app import App
 from jupyverse_api.auth import Auth, User
 from jupyverse_api.contents import Contents
+from jupyverse_api.file_id import FileId
 from jupyverse_api.main import Lifespan
 from jupyverse_api.yjs import Yjs
 from jupyverse_api.yjs.models import CreateDocumentSession
@@ -48,10 +49,12 @@ class _Yjs(Yjs):
         app: App,
         auth: Auth,
         contents: Contents,
+        file_id: FileId,
         lifespan: Lifespan,
     ) -> None:
         super().__init__(app=app, auth=auth)
         self.contents = contents
+        self.file_id = file_id
         self.lifespan = lifespan
         if Widgets is None:
             self.widgets = None
@@ -60,14 +63,12 @@ class _Yjs(Yjs):
 
     async def start(self, *, task_status: TaskStatus[None] = TASK_STATUS_IGNORED) -> None:
         async with create_task_group() as tg:
-            self.room_manager = RoomManager(self.contents, self.lifespan)
+            self.room_manager = RoomManager(self.contents, self.file_id, 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,
@@ -91,7 +92,7 @@ class _Yjs(Yjs):
         # we need to process the request manually
         # see https://github.com/tiangolo/fastapi/issues/3373#issuecomment-1306003451
         create_document_session = CreateDocumentSession(**(await request.json()))
-        idx = await self.contents.file_id_manager.get_id(path)
+        idx = await self.file_id.get_id(path)
         res = {
             "format": create_document_session.format,
             "type": create_document_session.type,
@@ -101,7 +102,7 @@ class _Yjs(Yjs):
             res["fileId"] = idx
             return res
 
-        idx = await self.contents.file_id_manager.index(path)
+        idx = await self.file_id.index(path)
         if idx is None:
             raise HTTPException(status_code=404, detail=f"File {path} does not exist")
 
@@ -154,6 +155,7 @@ class YWebsocket:
 
 class RoomManager:
     contents: Contents
+    file_id: FileId
     lifespan: Lifespan
     documents: dict[str, YBaseDoc]
     watchers: dict[str, Task]
@@ -163,8 +165,9 @@ class RoomManager:
     websocket_server: JupyterWebsocketServer
     room_lock: ResourceLock
 
-    def __init__(self, contents: Contents, lifespan: Lifespan):
+    def __init__(self, contents: Contents, file_id: FileId, lifespan: Lifespan):
         self.contents = contents
+        self.file_id = file_id
         self.lifespan = lifespan
         self.documents = {}  # a dictionary of room_name:document
         self.watchers = {}  # a dictionary of file_id:task
@@ -205,7 +208,8 @@ class RoomManager:
                     if room in self.cleaners:
                         del self.cleaners[room]
                 if not room.ready:
-                    file_path = await self.contents.file_id_manager.get_path(file_id)
+                    file_path = await self.file_id.get_path(file_id)
+                    assert file_path is not None
                     logger.info(
                         "Opening collaboration room",
                         room_id=websocket.path,
@@ -287,9 +291,9 @@ class RoomManager:
         return skip
 
     async def get_file_path(self, file_id: str, document) -> str | None:
-        file_path = await self.contents.file_id_manager.get_path(file_id)
+        file_path = await self.file_id.get_path(file_id)
         if file_path is None:
-            return
+            return None
         if file_path != document.path:
             document.path = file_path
         return file_path
@@ -299,14 +303,14 @@ class RoomManager:
         assert file_path is not None
         logger.info("Watching file", path=file_path)
         # FIXME: handle file rename/move?
-        watcher = self.contents.file_id_manager.watch(file_path)
+        watcher = self.file_id.watch(file_path)
         async for changes in watcher:
             new_file_path = await self.get_file_path(file_id, document)
             if new_file_path is None:
                 continue
             if new_file_path != file_path:
                 # file was renamed
-                self.contents.file_id_manager.unwatch(file_path, watcher)
+                self.file_id.unwatch(file_path, watcher)
                 file_path = new_file_path
                 # break
             await self.maybe_load_file(file_format, file_path, file_id)

{jupyverse-0.8.4 → jupyverse-0.9.0}/plugins/yjs/pyproject.toml

@@ -10,11 +10,11 @@ requires-python = ">=3.9"
 dependencies = [
     "importlib_metadata >=3.6; python_version<'3.10'",
     "pycrdt >=0.9.0,<0.13.0",
-    "jupyverse-api >=0.8.0,<0.9.0",
+    "jupyverse-api >=0.9.0,<0.10.0",
     "sqlite-anyio >=0.2.0,<0.3.0",
     "jupyter_ydoc>3.0.1,<4.0.0",
 ]
-version = "0.8.0"
+version = "0.9.0"
 [[project.authors]]
 name = "Jupyter Development Team"
 email = "jupyter@googlegroups.com"