Replace black with ruff formatter (#361)

.pre-commit-config.yaml

@@ -15,11 +15,6 @@ repos:
       - id: check-builtin-literals
       - id: trailing-whitespace
 
-  - repo: https://github.com/psf/black
-    rev: 23.10.0
-    hooks:
-      - id: black
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.1
     hooks:

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)
 
 # jupyverse
 

jupyverse_api/jupyverse_api/__init__.py

@@ -4,7 +4,6 @@
 
 from .app import App
 
-
 __version__ = "0.3.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_api/jupyverse_api/auth/models.py

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

jupyverse_api/jupyverse_api/cli.py

@@ -1,6 +1,6 @@
-import pkg_resources
 from typing import List, Tuple
 
+import pkg_resources
 import rich_click as click
 from asphalt.core.cli import run
 

jupyverse_api/jupyverse_api/contents/__init__.py

@@ -4,11 +4,12 @@
 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_api/jupyverse_api/jupyterlab/__init__.py

@@ -2,10 +2,11 @@
 
 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):

jupyverse_api/jupyverse_api/kernels/__init__.py

@@ -3,9 +3,10 @@
 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
 from .models import Session

jupyverse_api/jupyverse_api/lab/__init__.py

@@ -5,11 +5,12 @@
 
 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_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_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_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_api/jupyverse_api/retrolab/__init__.py

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

jupyverse_api/jupyverse_api/terminals/__init__.py

@@ -2,11 +2,12 @@
 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_api/jupyverse_api/yjs/__init__.py

@@ -2,10 +2,11 @@
 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):

notebooks/admin_users.py

@@ -1,14 +1,14 @@
 import contextlib
 
-from fps_auth.models import UserCreate, UserUpdate
+from fps_auth.backends import get_backend
 from fps_auth.config import _AuthConfig
-from jupyverse_api.frontend import FrontendConfig
 from fps_auth.db import get_db
-from fps_auth.backends import get_backend
+from fps_auth.models import UserCreate, UserUpdate
 from rich.console import Console
 from rich.table import Table
 from sqlalchemy import select
 
+from jupyverse_api.frontend import FrontendConfig
 
 auth_config = _AuthConfig()
 frontend_config = FrontendConfig()

plugins/auth/fps_auth/backends.py

@@ -20,15 +20,15 @@
 from fastapi_users.authentication.transport.base import Transport
 from fastapi_users.db import SQLAlchemyUserDatabase
 from httpx_oauth.clients.github import GitHubOAuth2
+from starlette.requests import Request
+
 from jupyverse_api.exceptions import RedirectException
 from jupyverse_api.frontend import FrontendConfig
-from starlette.requests import Request
 
 from .config import _AuthConfig
 from .db import User
 from .models import UserCreate, UserRead
 
-
 logger = logging.getLogger("auth")
 
 

plugins/auth/fps_auth/db.py

@@ -5,8 +5,8 @@
 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 .config import _AuthConfig
 
-
 logger = logging.getLogger("auth")
 
 

plugins/auth/fps_auth/main.py

@@ -2,15 +2,15 @@
 
 from asphalt.core import Component, Context
 from fastapi_users.exceptions import UserAlreadyExists
+
+from jupyverse_api.app import App
 from jupyverse_api.auth import Auth, AuthConfig
 from jupyverse_api.frontend import FrontendConfig
-from jupyverse_api.app import App
 from jupyverse_api.main import Host, QueryParams
 
 from .config import _AuthConfig
 from .routes import auth_factory
 
-
 logger = logging.getLogger("auth")
 
 

plugins/auth/fps_auth/models.py

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

plugins/auth/fps_auth/routes.py

@@ -5,19 +5,18 @@
 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")
 
 

plugins/auth_fief/fps_auth_fief/backend.py

@@ -5,6 +5,7 @@
 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

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")

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

plugins/auth_fief/fps_auth_fief/routes.py

@@ -5,6 +5,7 @@
 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

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(

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

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)

plugins/auth_jupyterhub/fps_auth_jupyterhub/routes.py

@@ -5,18 +5,19 @@
 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