jupyverse 0.7.6__tar.gz → 0.7.7__tar.gz

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

@@ -2,6 +2,24 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 0.7.7
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.7.6...69a1ecaa8f61a83c441d1c8e69a02835085fceb6))
+
+### Merged PRs
+
+- Check if file exists before inserting it in fileids [#478](https://github.com/jupyter-server/jupyverse/pull/478) ([@davidbrochart](https://github.com/davidbrochart))
+- Bump fps >=0.2.1 [#476](https://github.com/jupyter-server/jupyverse/pull/476) ([@davidbrochart](https://github.com/davidbrochart))
+- Update types [#475](https://github.com/jupyter-server/jupyverse/pull/475) ([@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-03-28&to=2025-04-04&type=c))
+
+[@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))
@@ -21,8 +39,6 @@
 
 [@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))

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyverse
-Version: 0.7.6
+Version: 0.7.7
 Summary: A set of FPS plugins implementing a Jupyter server
 Project-URL: Homepage, https://jupyter.org
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
@@ -8,6 +8,7 @@ License: BSD 3-Clause License
 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<1,>=0.7.0
 Requires-Dist: fps-frontend<1,>=0.7.0
 Requires-Dist: fps-kernels<1,>=0.7.0

jupyverse-0.7.7/jupyverse/__init__.py

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

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

@@ -1,19 +1,19 @@
-from typing import Any, Dict
+from typing import Any
 
 from anyio import Event
 from pydantic import BaseModel
 
 from .app import App
 
-__version__ = "0.7.6"
+__version__ = "0.7.7"
 
 
 class Singleton(type):
-    _instances: Dict = {}
+    _instances: dict = {}
 
     def __call__(cls, *args, **kwargs):
         if cls not in cls._instances:
-            cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
+            cls._instances[cls] = super().__call__(*args, **kwargs)
         return cls._instances[cls]
 
 
@@ -45,9 +45,9 @@ class Router:
 
 
 class ResourceLock:
-    """ResourceLock ensures that accesses cannot be done concurrently on the same resource.
-    """
-    _locks: Dict[Any, Event]
+    """ResourceLock ensures that accesses cannot be done concurrently on the same resource."""
+
+    _locks: dict[Any, Event]
 
     def __init__(self):
         self._locks = {}
@@ -58,10 +58,10 @@ class ResourceLock:
 
 class _ResourceLock:
     _idx: Any
-    _locks: Dict[Any, Event]
+    _locks: dict[Any, Event]
     _lock: Event
 
-    def __init__(self, idx: Any, locks: Dict[Any, Event]):
+    def __init__(self, idx: Any, locks: dict[Any, Event]):
         self._idx = idx
         self._locks = locks
 

{jupyverse-0.7.6 → jupyverse-0.7.7}/jupyverse_api/jupyverse_api/app/__init__.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from collections import defaultdict
 from datetime import datetime, timezone
-from typing import Dict, List
 
 import structlog
 from fastapi import FastAPI, Request
@@ -16,7 +15,7 @@ class App:
     """A wrapper around FastAPI that checks for endpoint path conflicts."""
 
     _app: FastAPI
-    _router_paths: Dict[str, List[str]]
+    _router_paths: dict[str, list[str]]
 
     def __init__(self, app: FastAPI, mount_path: str | None = None):
         if mount_path is None:
@@ -66,7 +65,7 @@ class App:
         for _router, _paths in self._router_paths.items():
             if path in _paths:
                 raise RuntimeError(
-                    f"{_type } mounts a path that is already defined in {_router}: {path}"
+                    f"{_type} mounts a path that is already defined in {_router}: {path}"
                 )
         self._router_paths[_type].append(path)
         logger.debug("Path mounted", type=_type, path=path)

jupyverse-0.7.7/jupyverse_api/jupyverse_api/auth/__init__.py

@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from collections.abc import Awaitable
+from typing import Any, Callable
+
+from jupyverse_api import Config
+
+from .models import User  # noqa
+
+
+class Auth(ABC):
+    @abstractmethod
+    def current_user(self, permissions: dict[str, list[str]] | None = None) -> Callable: ...
+
+    @abstractmethod
+    async def update_user(self) -> Callable: ...
+
+    @abstractmethod
+    def websocket_auth(
+        self,
+        permissions: dict[str, list[str]] | None = None,
+    ) -> Callable[[Any], Awaitable[tuple[Any, dict[str, list[str]] | None] | None]]: ...
+
+
+class AuthConfig(Config):
+    pass

{jupyverse-0.7.6 → jupyverse-0.7.7}/jupyverse_api/jupyverse_api/auth/models.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from __future__ import annotations
 
 from pydantic import BaseModel
 
@@ -7,8 +7,8 @@ class User(BaseModel):
     username: str = ""
     name: str = ""
     display_name: str = ""
-    initials: Optional[str] = None
-    color: Optional[str] = None
-    avatar_url: Optional[str] = None
+    initials: str | None = None
+    color: str | None = None
+    avatar_url: str | None = None
     workspace: str = "{}"
     settings: str = "{}"

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

@@ -1,7 +1,7 @@
 import io
 import json
 import sys
-from typing import Any, List, Tuple
+from typing import Any
 
 import rich_click as click
 from fps import main as fps_main
@@ -92,10 +92,10 @@ def main(
     open_browser: bool = False,
     host: str = "127.0.0.1",
     port: int = 8000,
-    set_: Tuple[str, ...] = (),
-    disable: Tuple[str, ...] = (),
-    allow_origin: Tuple[str, ...] = (),
-    query_param: Tuple[str, ...] = (),
+    set_: tuple[str, ...] = (),
+    disable: tuple[str, ...] = (),
+    allow_origin: tuple[str, ...] = (),
+    query_param: tuple[str, ...] = (),
 ) -> None:
     query_params_dict = {}
     for qp in query_param:
@@ -103,7 +103,7 @@ def main(
         query_params_dict[key] = value
     query_params_str = json.dumps(query_params_dict)
     allow_origins_str = json.dumps(allow_origin)
-    set_list: List[str] = list(set_)
+    set_list: list[str] = list(set_)
     set_list.append(f"debug={debug}")
     set_list.append(f"open_browser={open_browser}")
     set_list.append(f"host={host}")
@@ -121,21 +121,14 @@ def main(
     )  # type: ignore
 
 
-def get_pluggin_config(disable: Tuple[str, ...]) -> dict[str, Any]:
+def get_pluggin_config(disable: tuple[str, ...]) -> dict[str, Any]:
     jupyverse_modules = [
-        ep.name
-        for ep in entry_points(group="jupyverse.modules")
-        if ep.name not in disable
+        ep.name for ep in entry_points(group="jupyverse.modules") if ep.name not in disable
     ]
     config = {
         "jupyverse": {
-            "type":"jupyverse_api.main:JupyverseModule",
-            "modules": {
-                module: {
-                    "type": module
-                }
-                for module in jupyverse_modules
-            }
+            "type": "jupyverse_api.main:JupyverseModule",
+            "modules": {module: {"type": module} for module in jupyverse_modules},
         }
     }
     return config

{jupyverse-0.7.6 → jupyverse-0.7.7}/jupyverse_api/jupyverse_api/contents/__init__.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Dict, List, Optional, Union
 
 from fastapi import APIRouter, Depends, Request, Response
 
@@ -15,26 +14,20 @@ from .models import Checkpoint, Content, SaveContent
 
 class FileIdManager(ABC):
     @abstractmethod
-    async def start(self) -> None:
-        ...
+    async def start(self) -> None: ...
 
     @abstractmethod
-    async def stop(self) -> None:
-        ...
+    async def stop(self) -> None: ...
 
     @abstractmethod
-    async def get_path(self, file_id: str) -> str:
-        ...
+    async def get_path(self, file_id: str) -> str: ...
 
     @abstractmethod
-    async def get_id(self, file_path: str) -> str:
-        ...
+    async def get_id(self, file_path: str) -> str: ...
 
-    def watch(self, path: str):
-        ...
+    def watch(self, path: str): ...
 
-    def unwatch(self, path: str, watcher):
-        ...
+    def unwatch(self, path: str, watcher): ...
 
 
 class Contents(Router, ABC):
@@ -59,7 +52,7 @@ class Contents(Router, ABC):
             status_code=201,
         )
         async def create_content(
-            path: Optional[str],
+            path: str | None,
             request: Request,
             user: User = Depends(auth.current_user(permissions={"contents": ["write"]})),
         ) -> Content:
@@ -75,7 +68,7 @@ class Contents(Router, ABC):
         @router.get("/api/contents/{path:path}/checkpoints")
         async def get_checkpoint(
             path, user: User = Depends(auth.current_user(permissions={"contents": ["read"]}))
-        ) -> List[Checkpoint]:
+        ) -> list[Checkpoint]:
             return await self.get_checkpoint(path, user)
 
         @router.get("/api/contents/{path:path}")
@@ -117,35 +110,30 @@ class Contents(Router, ABC):
 
     @property
     @abstractmethod
-    def file_id_manager(self) -> FileIdManager:
-        ...
+    def file_id_manager(self) -> FileIdManager: ...
 
     @abstractmethod
     async def read_content(
-        self, path: Union[str, Path], get_content: bool, file_format: Optional[str] = None
-    ) -> Content:
-        ...
+        self, path: str | Path, get_content: bool, file_format: str | None = None
+    ) -> Content: ...
 
     @abstractmethod
-    async def write_content(self, content: Union[SaveContent, Dict]) -> None:
-        ...
+    async def write_content(self, content: SaveContent | dict) -> None: ...
 
     @abstractmethod
     async def create_checkpoint(
         self,
         path,
         user: User,
-    ) -> Checkpoint:
-        ...
+    ) -> Checkpoint: ...
 
     @abstractmethod
     async def create_content(
         self,
-        path: Optional[str],
+        path: str | None,
         request: Request,
         user: User,
-    ) -> Content:
-        ...
+    ) -> Content: ...
 
     @abstractmethod
     async def get_root_content(
@@ -160,8 +148,7 @@ class Contents(Router, ABC):
         self,
         path,
         user: User,
-    ) -> List[Checkpoint]:
-        ...
+    ) -> list[Checkpoint]: ...
 
     @abstractmethod
     async def get_content(
@@ -169,8 +156,7 @@ class Contents(Router, ABC):
         path: str,
         content: int,
         user: User,
-    ) -> Content:
-        ...
+    ) -> Content: ...
 
     @abstractmethod
     async def save_content(
@@ -179,16 +165,14 @@ class Contents(Router, ABC):
         request: Request,
         response: Response,
         user: User,
-    ) -> Content:
-        ...
+    ) -> Content: ...
 
     @abstractmethod
     async def delete_content(
         self,
         path,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def rename_content(
@@ -196,5 +180,4 @@ class Contents(Router, ABC):
         path,
         request: Request,
         user: User,
-    ) -> Content:
-        ...
+    ) -> Content: ...

{jupyverse-0.7.6 → jupyverse-0.7.7}/jupyverse_api/jupyverse_api/contents/models.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Union
+from __future__ import annotations
 
 from pydantic import BaseModel
 
@@ -11,24 +11,24 @@ class Checkpoint(BaseModel):
 class Content(BaseModel):
     name: str
     path: str
-    last_modified: Optional[str] = None
-    created: Optional[str] = None
-    content: Optional[Union[List[Dict], str, Dict]] = None
-    format: Optional[str] = None
-    mimetype: Optional[str] = None
-    size: Optional[int] = None
+    last_modified: str | None = None
+    created: str | None = None
+    content: list[dict] | str | dict | None = None
+    format: str | None = None
+    mimetype: str | None = None
+    size: int | None = None
     writable: bool
     type: str
 
 
 class CreateContent(BaseModel):
-    ext: Optional[str] = None
+    ext: str | None = None
     path: str
     type: str
 
 
 class SaveContent(BaseModel):
-    content: Optional[Union[str, Dict]] = None
+    content: str | dict | None = None
     format: str
     path: str
     type: str

{jupyverse-0.7.6 → jupyverse-0.7.7}/jupyverse_api/jupyverse_api/jupyterlab/__init__.py

@@ -55,19 +55,16 @@ class JupyterLab(Router, ABC):
     async def get_lab(
         self,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def load_workspace(
         self,
         path,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
-    async def get_workspace_data(self, user: User):
-        ...
+    async def get_workspace_data(self, user: User): ...
 
     @abstractmethod
     async def set_workspace(
@@ -75,16 +72,14 @@ class JupyterLab(Router, ABC):
         request: Request,
         user: User,
         user_update,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def get_workspace(
         self,
         name,
         user: User,
-    ):
-        ...
+    ): ...
 
 
 class JupyterLabConfig(Config):

{jupyverse-0.7.6 → jupyverse-0.7.7}/jupyverse_api/jupyverse_api/kernels/__init__.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import List, Optional
 
 from fastapi import APIRouter, Depends, Request
 from pydantic import Field
@@ -61,7 +62,7 @@ class Kernels(Router, ABC):
         @router.get("/api/sessions")
         async def get_sessions(
             user: User = Depends(auth.current_user(permissions={"sessions": ["read"]})),
-        ) -> List[Session]:
+        ) -> list[Session]:
             return await self.get_sessions(user)
 
         @router.post(
@@ -124,22 +125,19 @@ class Kernels(Router, ABC):
         self.include_router(router)
 
     @abstractmethod
-    async def watch_connection_files(self, path: Path) -> None:
-        ...
+    async def watch_connection_files(self, path: Path) -> None: ...
 
     @abstractmethod
     async def get_status(
         self,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def get_kernelspecs(
         self,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def get_kernelspec(
@@ -147,62 +145,54 @@ class Kernels(Router, ABC):
         kernel_name,
         file_name,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def get_kernels(
         self,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def delete_session(
         self,
         session_id: str,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def rename_session(
         self,
         request: Request,
         user: User,
-    ) -> Session:
-        ...
+    ) -> Session: ...
 
     @abstractmethod
     async def get_sessions(
         self,
         user: User,
-    ) -> List[Session]:
-        ...
+    ) -> list[Session]: ...
 
     @abstractmethod
     async def create_session(
         self,
         request: Request,
         user: User,
-    ) -> Session:
-        ...
+    ) -> Session: ...
 
     @abstractmethod
     async def interrupt_kernel(
         self,
         kernel_id,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def restart_kernel(
         self,
         kernel_id,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def execute_cell(
@@ -210,24 +200,21 @@ class Kernels(Router, ABC):
         request: Request,
         kernel_id,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def get_kernel(
         self,
         kernel_id,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def shutdown_kernel(
         self,
         kernel_id,
         user: User,
-    ):
-        ...
+    ): ...
 
     @abstractmethod
     async def kernel_channels(
@@ -235,8 +222,7 @@ class Kernels(Router, ABC):
         kernel_id,
         session_id,
         websocket_permissions,
-    ):
-        ...
+    ): ...
 
 
 class KernelsConfig(Config):
@@ -248,7 +234,7 @@ class KernelsConfig(Config):
         ),
         default=False,
     )
-    external_connection_dir: Optional[str] = Field(
+    external_connection_dir: str | None = Field(
         description=(
             "The directory to look at for external kernel connection files, if "
             "allow_external_kernels is True. Defaults to Jupyter runtime_dir/external_kernels. "

{jupyverse-0.7.6 → jupyverse-0.7.7}/jupyverse_api/jupyverse_api/kernels/models.py

@@ -1,11 +1,11 @@
-from typing import Optional
+from __future__ import annotations
 
 from pydantic import BaseModel
 
 
 class KernelInfo(BaseModel):
-    name: Optional[str] = None
-    id: Optional[str] = None
+    name: str | None = None
+    id: str | None = None
 
 
 class CreateSession(BaseModel):