jupyverse 0.2.5__tar.gz → 0.4.0__tar.gz

jupyverse-0.2.5/.github/workflows/main.yml → jupyverse-0.4.0/.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: CI
+name: test
 
 on:
   push:
@@ -13,8 +13,31 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  types:
+    name: Types
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+        cache: 'pip'
+    - name: Install hatch
+      run: |
+        python3 -m pip install --upgrade pip
+        python3 -m pip install hatch
+    - name: Check types
+      run: |
+        hatch run dev.jupyterlab-noauth:typecheck
+        hatch run dev.jupyterlab-auth:typecheck
+        hatch run dev.jupyterlab-auth_fief:typecheck
+        hatch run dev.retrolab-noauth:typecheck
+        hatch run dev.retrolab-auth:typecheck
+        hatch run dev.retrolab-auth_fief:typecheck
+
   test:
-    name: Test
+    name: Tests
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -31,23 +54,13 @@ jobs:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
 
-    - name: Upgrade pip
-      run: python3 -m pip install --upgrade pip
-
-    - name: Create jupyterlab-auth dev environment
+    - name: Install hatch
       run: |
-        pip install hatch
-        hatch env create dev.jupyterlab-auth
+        python3 -m pip install --upgrade pip
+        python3 -m pip install hatch
 
-    - name: Check types
-      run: |
-        hatch run dev.jupyterlab-noauth:typecheck
-        hatch run dev.jupyterlab-auth:typecheck
-        hatch run dev.jupyterlab-auth_fief:typecheck
-        hatch run dev.retrolab-noauth:typecheck
-        hatch run dev.retrolab-auth:typecheck
-        hatch run dev.retrolab-auth_fief:typecheck
+    - name: Create jupyterlab-auth dev environment
+      run: hatch env create dev.jupyterlab-auth
 
     - name: Run tests
-      run: |
-        hatch run dev.jupyterlab-auth:test
+      run: hatch run dev.jupyterlab-auth:test

{jupyverse-0.2.5 → jupyverse-0.4.0}/.gitignore

@@ -344,3 +344,6 @@ $RECYCLE.BIN/
 .jupyter_ystore.db
 .jupyter_ystore.db-journal
 fps_cli_args.toml
+
+# pixi environments
+.pixi

{jupyverse-0.2.5 → jupyverse-0.4.0}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: check-case-conflict
@@ -15,13 +15,8 @@ repos:
       - id: check-builtin-literals
       - id: trailing-whitespace
 
-  - repo: https://github.com/psf/black
-    rev: 23.7.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.287
+    rev: v0.1.7
     hooks:
       - id: ruff
         args: ["--fix"]

{jupyverse-0.2.5 → jupyverse-0.4.0}/CHANGELOG.md

@@ -2,6 +2,44 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 0.4.0
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.3.0...73a16c326e333838aaa8ec2321c40d5d13a96f05))
+
+### Merged PRs
+
+- Check types in a separate CI job [#373](https://github.com/jupyter-server/jupyverse/pull/373) ([@davidbrochart](https://github.com/davidbrochart))
+- Add pytest color [#372](https://github.com/jupyter-server/jupyverse/pull/372) ([@davidbrochart](https://github.com/davidbrochart))
+- Update pycrdt v0.7.2 [#371](https://github.com/jupyter-server/jupyverse/pull/371) ([@davidbrochart](https://github.com/davidbrochart))
+- Implement server-side ypywidgets rendering [#364](https://github.com/jupyter-server/jupyverse/pull/364) ([@davidbrochart](https://github.com/davidbrochart))
+- Improve data read [#362](https://github.com/jupyter-server/jupyverse/pull/362) ([@davidbrochart](https://github.com/davidbrochart))
+- Replace black with ruff formatter [#361](https://github.com/jupyter-server/jupyverse/pull/361) ([@davidbrochart](https://github.com/davidbrochart))
+- Replace Ypy with pycrdt [#359](https://github.com/jupyter-server/jupyverse/pull/359) ([@davidbrochart](https://github.com/davidbrochart))
+- Set optional contents API model fields to None by default [#358](https://github.com/jupyter-server/jupyverse/pull/358) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2023-10-10&to=2023-12-16&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2023-10-10..2023-12-16&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2023-10-10..2023-12-16&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
+## 0.3.0
+
+([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.2.5...88f061e58d22963f7b195b5677c983a7b1056b94))
+
+### Merged PRs
+
+- Send notebook cell source as string when type is list [#354](https://github.com/jupyter-server/jupyverse/pull/354) ([@davidbrochart](https://github.com/davidbrochart))
+- Align external kernel connections with jupyter-server [#352](https://github.com/jupyter-server/jupyverse/pull/352) ([@davidbrochart](https://github.com/davidbrochart))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyverse/graphs/contributors?from=2023-09-06&to=2023-10-10&type=c))
+
+[@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2023-09-06..2023-10-10&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2023-09-06..2023-10-10&type=Issues)
+
 ## 0.2.5
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.2.4...18f312eb8b3dee262fb512af7e7ec3996674c4d4))
@@ -16,8 +54,6 @@
 
 [@davidbrochart](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Adavidbrochart+updated%3A2023-08-31..2023-09-06&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyverse+involves%3Apre-commit-ci+updated%3A2023-08-31..2023-09-06&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 0.2.4
 
 ([Full Changelog](https://github.com/jupyter-server/jupyverse/compare/v0.2.3...5f49cddd48ea1344f21acc79b4a07ba2068ade51))

{jupyverse-0.2.5 → jupyverse-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jupyverse
-Version: 0.2.5
+Version: 0.4.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>
@@ -34,7 +34,7 @@ Provides-Extra: retrolab
 Requires-Dist: fps-retrolab<1,>=0.1.2; extra == 'retrolab'
 Provides-Extra: test
 Requires-Dist: httpx; extra == 'test'
-Requires-Dist: httpx-ws; extra == 'test'
+Requires-Dist: httpx-ws>=0.4.1; extra == 'test'
 Requires-Dist: ipykernel; extra == 'test'
 Requires-Dist: mypy; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
@@ -43,12 +43,14 @@ Requires-Dist: pytest-env; extra == 'test'
 Requires-Dist: pytest-rerunfailures; extra == 'test'
 Requires-Dist: pytest-timeout; extra == 'test'
 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'
 Description-Content-Type: text/markdown
 
-[![Build Status](https://github.com/jupyter-server/jupyverse/workflows/CI/badge.svg)](https://github.com/jupyter-server/jupyverse/actions)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Build Status](https://github.com/jupyter-server/jupyverse/workflows/test/badge.svg)](https://github.com/jupyter-server/jupyverse/actions)
 
 # jupyverse
 

{jupyverse-0.2.5 → jupyverse-0.4.0}/README.md

@@ -1,5 +1,4 @@
-[![Build Status](https://github.com/jupyter-server/jupyverse/workflows/CI/badge.svg)](https://github.com/jupyter-server/jupyverse/actions)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Build Status](https://github.com/jupyter-server/jupyverse/workflows/test/badge.svg)](https://github.com/jupyter-server/jupyverse/actions)
 
 # jupyverse
 

jupyverse-0.4.0/jupyverse/__init__.py

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

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/__init__.py

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

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/app/__init__.py

@@ -1,15 +1,14 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime, timezone
 from collections import defaultdict
+from datetime import datetime, timezone
 from typing import Dict, List
 
 from fastapi import FastAPI, Request
 
 from ..exceptions import RedirectException, _redirect_exception_handler
 
-
 logger = logging.getLogger("app")
 
 

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/auth/models.py

@@ -1,4 +1,5 @@
 from typing import Optional
+
 from pydantic import BaseModel
 
 

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/contents/__init__.py

@@ -4,11 +4,12 @@ from pathlib import Path
 from typing import Dict, List, Optional, Union
 
 from fastapi import APIRouter, Depends, Request, Response
+
 from jupyverse_api import Router
 
-from .models import Checkpoint, Content, SaveContent
-from ..auth import Auth, User
 from ..app import App
+from ..auth import Auth, User
+from .models import Checkpoint, Content, SaveContent
 
 
 class FileIdManager(ABC):

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/contents/models.py

@@ -11,24 +11,24 @@ class Checkpoint(BaseModel):
 class Content(BaseModel):
     name: str
     path: str
-    last_modified: Optional[str]
-    created: Optional[str]
-    content: Optional[Union[List[Dict], str, Dict]]
-    format: Optional[str]
-    mimetype: Optional[str]
-    size: Optional[int]
+    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
     writable: bool
     type: str
 
 
 class CreateContent(BaseModel):
-    ext: Optional[str]
+    ext: Optional[str] = None
     path: str
     type: str
 
 
 class SaveContent(BaseModel):
-    content: Optional[Union[str, Dict]]
+    content: Optional[Union[str, Dict]] = None
     format: str
     path: str
     type: str

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/jupyterlab/__init__.py

@@ -2,10 +2,11 @@ from abc import ABC, abstractmethod
 
 from fastapi import APIRouter, Depends, Request
 from fastapi.responses import HTMLResponse
+
 from jupyverse_api import Config, Router
 
-from ..auth import Auth, User
 from ..app import App
+from ..auth import Auth, User
 
 
 class JupyterLab(Router, ABC):
@@ -88,3 +89,4 @@ class JupyterLab(Router, ABC):
 
 class JupyterLabConfig(Config):
     dev_mode: bool = False
+    server_side_execution: bool = False

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/kernels/__init__.py

@@ -3,7 +3,9 @@ from pathlib import Path
 from typing import List, Optional
 
 from fastapi import APIRouter, Depends, Request
-from jupyverse_api import Router, Config
+from pydantic import Field
+
+from jupyverse_api import Config, Router
 
 from ..app import App
 from ..auth import Auth, User
@@ -239,5 +241,19 @@ class Kernels(Router, ABC):
 
 class KernelsConfig(Config):
     default_kernel: str = "python3"
-    connection_path: Optional[str] = None
+    allow_external_kernels: bool = Field(
+        description=(
+            "Whether or not to allow external kernels, whose connection files are placed in "
+            "external_connection_dir."
+        ),
+        default=False,
+    )
+    external_connection_dir: Optional[str] = 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. "
+            "Make sure that this directory is not filled with left-over connection files."
+        ),
+        default=None,
+    )
     require_yjs: bool = False

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/kernels/models.py

@@ -39,4 +39,4 @@ class Session(BaseModel):
 
 class Execution(BaseModel):
     document_id: str
-    cell_idx: int
+    cell_id: str

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/lab/__init__.py

@@ -5,11 +5,12 @@ from typing import List, Optional, Tuple
 
 from fastapi import APIRouter, Depends, Request, Response
 from fastapi.staticfiles import StaticFiles
+
 from jupyverse_api import Router
 from jupyverse_api.jupyterlab import JupyterLabConfig
 
-from ..auth import Auth, User
 from ..app import App
+from ..auth import Auth, User
 
 
 class Lab(Router, ABC):

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/login/__init__.py

@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
 
 from fastapi import APIRouter
+
 from jupyverse_api import Router
 
 from ..app import App

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/nbconvert/__init__.py

@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
 
 from fastapi import APIRouter, Depends
+
 from jupyverse_api import Router
 
 from ..app import App

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/resource_usage/__init__.py

@@ -1,10 +1,11 @@
 from abc import ABC, abstractmethod
 
 from fastapi import APIRouter, Depends
-from jupyverse_api import Router, Config
 
-from ..auth import Auth, User
+from jupyverse_api import Config, Router
+
 from ..app import App
+from ..auth import Auth, User
 
 
 class ResourceUsage(Router, ABC):

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/retrolab/__init__.py

@@ -2,6 +2,7 @@ from abc import ABC, abstractmethod
 
 from fastapi import APIRouter, Depends
 from fastapi.responses import HTMLResponse
+
 from jupyverse_api import Router
 
 from ..app import App

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/terminals/__init__.py

@@ -2,11 +2,12 @@ from abc import ABC, abstractmethod
 from typing import List
 
 from fastapi import APIRouter, Depends
+
 from jupyverse_api import Router
 
-from .models import Terminal
 from ..app import App
 from ..auth import Auth, User
+from .models import Terminal
 
 
 class Terminals(Router, ABC):

{jupyverse-0.2.5 → jupyverse-0.4.0}/jupyverse_api/jupyverse_api/yjs/__init__.py

@@ -2,10 +2,11 @@ from abc import ABC, abstractmethod
 from typing import Any
 
 from fastapi import APIRouter, Depends, Request, Response
+
 from jupyverse_api import Router
 
-from ..auth import Auth, User
 from ..app import App
+from ..auth import Auth, User
 
 
 class Yjs(Router, ABC):

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

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

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth/fps_auth/db.py

@@ -5,8 +5,8 @@ from pathlib import Path
 from typing import Any, AsyncGenerator, List
 
 from fastapi import Depends
-from fastapi_users.db import SQLAlchemyBaseOAuthAccountTableUUID
 from fastapi_users.db import (
+    SQLAlchemyBaseOAuthAccountTableUUID,
     SQLAlchemyBaseUserTableUUID,
     SQLAlchemyUserDatabase,
 )
@@ -16,7 +16,6 @@ from sqlalchemy.orm import DeclarativeBase, Mapped, relationship
 
 from .config import _AuthConfig
 
-
 logger = logging.getLogger("auth")
 
 

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth/fps_auth/models.py

@@ -2,6 +2,7 @@ import uuid
 from typing import Dict, List
 
 from fastapi_users import schemas
+
 from jupyverse_api.auth import User
 
 

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth/fps_auth/routes.py

@@ -5,19 +5,18 @@ import random
 from typing import Any, Callable, Dict, List, Optional, Tuple
 
 from fastapi import APIRouter, Depends
+from sqlalchemy import select  # type: ignore
+
 from jupyverse_api import Router
 from jupyverse_api.app import App
 from jupyverse_api.auth import Auth
 from jupyverse_api.frontend import FrontendConfig
-from sqlalchemy import select  # type: ignore
 
 from .backends import get_backend
 from .config import _AuthConfig
 from .db import get_db
-
 from .models import UserCreate, UserRead, UserUpdate
 
-
 logger = logging.getLogger("auth")
 
 

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

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

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_fief/fps_auth_fief/backend.py

@@ -5,6 +5,7 @@ from fastapi import Depends, HTTPException, Request, Response, WebSocket, status
 from fastapi.security import APIKeyCookie
 from fief_client import FiefAccessTokenInfo, FiefAsync, FiefUserInfo
 from fief_client.integrations.fastapi import FiefAuth
+
 from jupyverse_api.auth import User
 
 from .config import _AuthFiefConfig

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_fief/fps_auth_fief/config.py

@@ -1,6 +1,7 @@
-from jupyverse_api.auth import AuthConfig
 from pydantic import Field
 
+from jupyverse_api.auth import AuthConfig
+
 
 class _AuthFiefConfig(AuthConfig):
     base_url: str = Field(description="Base URL of Fief tenant")

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_fief/fps_auth_fief/main.py

@@ -1,6 +1,7 @@
 from asphalt.core import Component, Context
-from jupyverse_api.auth import Auth, AuthConfig
+
 from jupyverse_api.app import App
+from jupyverse_api.auth import Auth, AuthConfig
 
 from .config import _AuthFiefConfig
 from .routes import auth_factory

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_fief/fps_auth_fief/routes.py

@@ -5,6 +5,7 @@ import httpx
 from fastapi import APIRouter, Depends, Query, Request, Response
 from fastapi.responses import RedirectResponse
 from fief_client import FiefAccessTokenInfo
+
 from jupyverse_api import Router
 from jupyverse_api.app import App
 from jupyverse_api.auth import Auth, User

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_jupyterhub/fps_auth_jupyterhub/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.2.5"
+__version__ = "0.4.0"
 
 from .launch import launch  # noqa

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_jupyterhub/fps_auth_jupyterhub/config.py

@@ -1,6 +1,7 @@
-from jupyverse_api.auth import AuthConfig
 from pydantic import Field
 
+from jupyverse_api.auth import AuthConfig
+
 
 class AuthJupyterHubConfig(AuthConfig):
     db_url: str = Field(

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_jupyterhub/fps_auth_jupyterhub/main.py

@@ -1,9 +1,10 @@
 import httpx
 from asphalt.core import Component, ContainerComponent, Context, context_teardown
-from jupyverse_api.auth import Auth, AuthConfig
-from jupyverse_api.app import App
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession
 
+from jupyverse_api.app import App
+from jupyverse_api.auth import Auth, AuthConfig
+
 from .config import AuthJupyterHubConfig
 from .db import Base
 from .routes import auth_factory

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_jupyterhub/fps_auth_jupyterhub/models.py

@@ -1,8 +1,9 @@
 from typing import Dict, List
 
-from jupyverse_api.auth import User
 from pydantic import ConfigDict
 
+from jupyverse_api.auth import User
+
 
 class JupyterHubUser(User):
     model_config = ConfigDict(from_attributes=True)

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/auth_jupyterhub/fps_auth_jupyterhub/routes.py

@@ -5,18 +5,19 @@ import json
 import os
 from datetime import datetime
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
-from typing_extensions import Annotated
 
 import httpx
 from fastapi import APIRouter, Cookie, Depends, HTTPException, Request, WebSocket, status
 from fastapi.responses import RedirectResponse
 from jupyterhub.services.auth import HubOAuth
 from jupyterhub.utils import isoformat
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.future import select
+from typing_extensions import Annotated
+
 from jupyverse_api import Router
 from jupyverse_api.app import App
 from jupyverse_api.auth import Auth, User
-from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.future import select
 
 from .db import UserDB
 from .models import JupyterHubUser

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

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

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/contents/fps_contents/fileid.py

@@ -5,9 +5,10 @@ from uuid import uuid4
 
 import aiosqlite
 from anyio import Path
-from jupyverse_api import Singleton
 from watchfiles import Change, awatch
 
+from jupyverse_api import Singleton
+
 logger = logging.getLogger("contents")
 
 
@@ -49,7 +50,7 @@ class FileIdManager(metaclass=Singleton):
         async with self.lock:
             async with aiosqlite.connect(self.db_path) as db:
                 async with db.execute("SELECT id FROM fileids WHERE path = ?", (path,)) as cursor:
-                    async for idx, in cursor:
+                    async for (idx,) in cursor:
                         return idx
                     return None
 
@@ -58,7 +59,7 @@ class FileIdManager(metaclass=Singleton):
         async with self.lock:
             async with aiosqlite.connect(self.db_path) as db:
                 async with db.execute("SELECT path FROM fileids WHERE id = ?", (idx,)) as cursor:
-                    async for path, in cursor:
+                    async for (path,) in cursor:
                         return path
                     return None
 
@@ -174,7 +175,7 @@ class FileIdManager(metaclass=Singleton):
 async def get_mtime(path, db) -> Optional[float]:
     if db:
         async with db.execute("SELECT mtime FROM fileids WHERE path = ?", (path,)) as cursor:
-            async for mtime, in cursor:
+            async for (mtime,) in cursor:
                 return mtime
             # deleted file is not in database, shouldn't happen
             return None

{jupyverse-0.2.5 → jupyverse-0.4.0}/plugins/contents/fps_contents/main.py

@@ -1,4 +1,5 @@
 from asphalt.core import Component, Context
+
 from jupyverse_api.app import App
 from jupyverse_api.auth import Auth
 from jupyverse_api.contents import Contents