jupyverse 0.5.0__tar.gz → 0.5.2__tar.gz

{jupyverse-0.5.0 → jupyverse-0.5.2}/.pre-commit-config.yaml

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

{jupyverse-0.5.0 → jupyverse-0.5.2}/CHANGELOG.md

@@ -2,6 +2,41 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 0.5.2
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.5.1...0bd54d15a6ad7fbfe7c54f5a06ed4546de4ad90d))
+
+### Merged PRs
+
+- Fix typo [#407](https://github.com/jupyter-server/jupyverse/pull/407) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2024-04-29&to=2024-05-02&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2024-04-29..2024-05-02&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2024-04-29..2024-05-02&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
+## 0.5.1
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.5.0...4ddd9ab118c9ed47340d44b6eb57b68894b1bcc5))
+
+### Merged PRs
+
+- Check terminal websocket before removing it [#405](https://github.com/jupyter-server/jupyverse/pull/405) ([@davidbrochart](https://github.com/davidbrochart))
+- Update documentation URL [#404](https://github.com/jupyter-server/jupyverse/pull/404) ([@davidbrochart](https://github.com/davidbrochart))
+- Set watchfiles log level to WARNING [#403](https://github.com/jupyter-server/jupyverse/pull/403) ([@davidbrochart](https://github.com/davidbrochart))
+- Update ypywidgets v0.7.0 for tests [#400](https://github.com/jupyter-server/jupyverse/pull/400) ([@davidbrochart](https://github.com/davidbrochart))
+- Remove output trailing newline [#399](https://github.com/jupyter-server/jupyverse/pull/399) ([@davidbrochart](https://github.com/davidbrochart))
+- Save anonymous user info in database [#397](https://github.com/jupyter-server/jupyverse/pull/397) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2024-04-12&to=2024-04-29&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2024-04-12..2024-04-29&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2024-04-12..2024-04-29&type=Issues)
+
 ## 0.5.0
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.4.2...66aac71cf07cbc14c5196cc1c144b9965fec7d2c))
@@ -17,8 +52,6 @@
 
 [@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2024-01-02..2024-04-12&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2024-01-02..2024-04-12&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 0.4.2
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.4.1...2f084c7c744bb2d2865bdad223c680eca5c8a2cb))

{jupyverse-0.5.0 → jupyverse-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jupyverse
-Version: 0.5.0
+Version: 0.5.2
 Summary: A set of FPS plugins implementing a Jupyter server
 Project-URL: Homepage, https://jupyter.org
 Author-email: Jupyter Development Team <jupyter@googlegroups.com>
@@ -46,8 +46,8 @@ Requires-Dist: requests; extra == 'test'
 Requires-Dist: ruff>=0.1.2; extra == 'test'
 Requires-Dist: types-setuptools; extra == 'test'
 Requires-Dist: websockets; extra == 'test'
-Requires-Dist: ypywidgets-textual<0.3.0,>=0.2.2; extra == 'test'
-Requires-Dist: ypywidgets<0.7.0,>=0.6.4; extra == 'test'
+Requires-Dist: ypywidgets-textual<0.5.0,>=0.4.0; extra == 'test'
+Requires-Dist: ypywidgets<0.8.0,>=0.7.0; extra == 'test'
 Description-Content-Type: text/markdown
 
 [![Build Status](https://github.com/jupyter-server/jupyverse/workflows/test/badge.svg)](https://github.com/jupyter-server/jupyverse/actions)
@@ -60,7 +60,7 @@ Try it online:
 - JupyterLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-jupyterlab)
 - Jupyter Notebook frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-notebook)
 
-Documentation is available [here](https://davidbrochart.github.io/jupyverse).
+Documentation is available [here](https://jupyter-server.github.io/jupyverse).
 
 ## Motivation
 

{jupyverse-0.5.0 → jupyverse-0.5.2}/README.md

@@ -8,7 +8,7 @@ Try it online:
 - JupyterLab frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-jupyterlab)
 - Jupyter Notebook frontend: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter-server/jupyverse/HEAD?urlpath=jupyverse-notebook)
 
-Documentation is available [here](https://davidbrochart.github.io/jupyverse).
+Documentation is available [here](https://jupyter-server.github.io/jupyverse).
 
 ## Motivation
 

jupyverse-0.5.2/jupyverse/__init__.py

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

{jupyverse-0.5.0 → jupyverse-0.5.2}/jupyverse_api/jupyverse_api/__init__.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 
 from .app import App
 
-__version__ = "0.5.0"
+__version__ = "0.5.2"
 
 
 class Singleton(type):

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

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

{jupyverse-0.5.0 → jupyverse-0.5.2}/plugins/auth/fps_auth/routes.py

@@ -72,6 +72,7 @@ def auth_factory(
             async def get_api_me(
                 permissions: Optional[str] = None,
                 user: UserRead = Depends(backend.current_user()),
+                update_user = Depends(backend.update_user),
             ):
                 checked_permissions: Dict[str, List[str]] = {}
                 if permissions is None:
@@ -96,6 +97,14 @@ def auth_factory(
                     moon = get_anonymous_username()
                     identity["name"] = f"Anonymous {moon}"
                     identity["display_name"] = f"Anonymous {moon}"
+                    identity["initials"] = f"A{moon[0]}"
+                    await update_user(
+                        dict(
+                            name=identity["name"],
+                            display_name=identity["display_name"],
+                            permissions=checked_permissions,
+                        )
+                    )
                 return {
                     "identity": identity,
                     "permissions": checked_permissions,

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

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

{jupyverse-0.5.0 → jupyverse-0.5.2}/plugins/auth_jupyterhub/fps_auth_jupyterhub/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.5.0"
+__version__ = "0.5.2"
 
 from .launch import launch  # noqa

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

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

{jupyverse-0.5.0 → jupyverse-0.5.2}/plugins/contents/fps_contents/fileid.py

@@ -9,7 +9,9 @@ from watchfiles import Change, awatch
 
 from jupyverse_api import Singleton
 
-logger = logging.getLogger("contents")
+contents_logger = logging.getLogger("contents")
+watchfiles_logger = logging.getLogger("watchfiles")
+watchfiles_logger.setLevel(logging.WARNING)
 
 
 class Watcher:
@@ -110,13 +112,13 @@ class FileIdManager(metaclass=Singleton):
                         changed_path_str = str(changed_path)
 
                         if change == Change.deleted:
-                            logger.debug("File %s was deleted", changed_path_str)
+                            contents_logger.debug("File %s was deleted", changed_path_str)
                             async with db.execute(
                                 "SELECT COUNT(*) FROM fileids WHERE path = ?", (changed_path_str,)
                             ) as cursor:
                                 if not (await cursor.fetchone())[0]:
                                     # path is not indexed, ignore
-                                    logger.debug(
+                                    contents_logger.debug(
                                         "File %s is not indexed, ignoring", changed_path_str
                                     )
                                     continue
@@ -125,12 +127,12 @@ class FileIdManager(metaclass=Singleton):
                                 db, changed_path_str, deleted_paths, added_paths, False
                             )
                         elif change == Change.added:
-                            logger.debug("File %s was added", changed_path_str)
+                            contents_logger.debug("File %s was added", changed_path_str)
                             await maybe_rename(
                                 db, changed_path_str, added_paths, deleted_paths, True
                             )
                         elif change == Change.modified:
-                            logger.debug("File %s was modified", changed_path_str)
+                            contents_logger.debug("File %s was modified", changed_path_str)
                             if changed_path_str == self.db_path:
                                 continue
                             async with db.execute(
@@ -138,7 +140,7 @@ class FileIdManager(metaclass=Singleton):
                             ) as cursor:
                                 if not (await cursor.fetchone())[0]:
                                     # path is not indexed, ignore
-                                    logger.debug(
+                                    contents_logger.debug(
                                         "File %s is not indexed, ignoring", changed_path_str
                                     )
                                     continue
@@ -149,7 +151,7 @@ class FileIdManager(metaclass=Singleton):
                             )
 
                     for path in deleted_paths - added_paths:
-                        logger.debug("Unindexing file %s ", path)
+                        contents_logger.debug("Unindexing file %s ", path)
                         await db.execute("DELETE FROM fileids WHERE path = ?", (path,))
                     await db.commit()
 
@@ -203,7 +205,7 @@ async def maybe_rename(
             path1, path2 = changed_path, other_path
             if is_added_path:
                 path1, path2 = path2, path1
-            logger.debug("File %s was renamed to %s", path1, path2)
+            contents_logger.debug("File %s was renamed to %s", path1, path2)
             await db.execute("UPDATE fileids SET path = ? WHERE path = ?", (path2, path1))
             other_paths.remove(other_path)
             return

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

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

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

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

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

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

{jupyverse-0.5.0 → jupyverse-0.5.2}/plugins/kernels/fps_kernels/kernel_driver/driver.py

@@ -223,6 +223,9 @@ class KernelDriver:
         if msg_type == "stream":
             with outputs.doc.transaction():
                 # TODO: uncomment when changes are made in jupyter-ydoc
+                text = content["text"]
+                if text.endswith((os.linesep, "\n")):
+                    text = text[:-1]
                 if (not outputs) or (outputs[-1]["name"] != content["name"]):  # type: ignore
                     outputs.append(
                         #Map(
@@ -235,13 +238,13 @@ class KernelDriver:
                         {
                             "name": content["name"],
                             "output_type": msg_type,
-                            "text": [content["text"]],
+                            "text": [text],
                         }
                     )
                 else:
                     #outputs[-1]["text"].append(content["text"])  # type: ignore
                     last_output = outputs[-1]
-                    last_output["text"].append(content["text"])  # type: ignore
+                    last_output["text"].append(text)  # type: ignore
                     outputs[-1] = last_output
         elif msg_type in ("display_data", "execute_result"):
             if "application/vnd.jupyter.ywidget-view+json" in content["data"]:

jupyverse-0.5.2/plugins/lab/fps_lab/__init__.py

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

jupyverse-0.5.2/plugins/login/fps_login/__init__.py

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

jupyverse-0.5.2/plugins/nbconvert/fps_nbconvert/__init__.py

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

jupyverse-0.5.2/plugins/noauth/fps_noauth/__init__.py

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

jupyverse-0.5.2/plugins/notebook/fps_notebook/__init__.py

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

jupyverse-0.5.2/plugins/resource_usage/fps_resource_usage/__init__.py

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

jupyverse-0.5.2/plugins/terminals/fps_terminals/__init__.py

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

{jupyverse-0.5.0 → jupyverse-0.5.2}/plugins/terminals/fps_terminals/server.py

@@ -70,6 +70,7 @@ class _TerminalServer(TerminalServer):
                     await websocket.send_json(["stdout", self.data_or_disconnect])
 
     def quit(self, websocket):
-        self.websockets.remove(websocket)
+        if websocket in self.websockets:
+            self.websockets.remove(websocket)
         if not self.websockets:
             os.close(self.fd)

jupyverse-0.5.2/plugins/webdav/fps_webdav/__init__.py

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

jupyverse-0.5.2/plugins/yjs/fps_yjs/__init__.py

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

{jupyverse-0.5.0 → jupyverse-0.5.2}/pyproject.toml

@@ -54,8 +54,8 @@ test = [
     "requests",
     "websockets",
     "ipykernel",
-    "ypywidgets >=0.6.4,<0.7.0",
-    "ypywidgets-textual >=0.2.2,<0.3.0",
+    "ypywidgets >=0.7.0,<0.8.0",
+    "ypywidgets-textual >=0.4.0,<0.5.0",
 ]
 docs = [ "mkdocs", "mkdocs-material" ]
 
@@ -184,12 +184,3 @@ path = "jupyverse/__init__.py"
 
 [tool.pytest.ini_options]
 asyncio_mode = "strict"
-
-[tool.pixi.project]
-name = ""
-channels = ["conda-forge"]
-platforms = ["linux-64"]
-
-[tool.pixi.dependencies]
-pip = ">=24.0,<25"
-python = "<3.12"

{jupyverse-0.5.0 → jupyverse-0.5.2}/tests/test_server.py

@@ -113,7 +113,7 @@ async def test_rest_api(start_jupyverse):
             }
         ]
         assert cells[1]["outputs"] == [
-            {"name": "stdout", "output_type": "stream", "text": ["Hello World!\n"]}
+            {"name": "stdout", "output_type": "stream", "text": ["Hello World!"]}
         ]
         assert cells[2]["outputs"] == [
             {

jupyverse-0.5.0/jupyverse/__init__.py

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

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

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

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

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

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

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

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

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

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

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

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

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

jupyverse-0.5.0/plugins/lab/fps_lab/__init__.py

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

jupyverse-0.5.0/plugins/login/fps_login/__init__.py

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

jupyverse-0.5.0/plugins/nbconvert/fps_nbconvert/__init__.py

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

jupyverse-0.5.0/plugins/noauth/fps_noauth/__init__.py

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

jupyverse-0.5.0/plugins/notebook/fps_notebook/__init__.py

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

jupyverse-0.5.0/plugins/resource_usage/fps_resource_usage/__init__.py

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

jupyverse-0.5.0/plugins/terminals/fps_terminals/__init__.py

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

jupyverse-0.5.0/plugins/webdav/fps_webdav/__init__.py

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

jupyverse-0.5.0/plugins/yjs/fps_yjs/__init__.py

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