Fixing pre-commit errors

Author: davidpcls

bluesky_httpserver/app.py

@@ -15,7 +15,6 @@
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.openapi.utils import get_openapi
 
-from .protocols import ExternalAuthenticator, InternalAuthenticator
 from .authenticators import ProxiedOIDCAuthenticator
 from .console_output import (
     CollectPublishedConsoleOutput,
@@ -24,6 +23,7 @@
 )
 from .core import PatchedStreamingResponse
 from .database.core import purge_expired
+from .protocols import ExternalAuthenticator, InternalAuthenticator
 from .resources import SERVER_RESOURCES as SR
 from .routers import core_api
 from .settings import get_settings
@@ -163,9 +163,9 @@ def build_app(authentication=None, api_access=None, resource_access=None, server
         logger.info("All custom routers are included successfully.")
 
     from .authentication import (
-        base_authentication_router,
-        add_internal_routes,
         add_external_routes,
+        add_internal_routes,
+        base_authentication_router,
         oauth2_scheme,
     )
 

bluesky_httpserver/authentication.py

@@ -47,7 +47,6 @@
 
 from . import schemas
 from .authorization._defaults import _DEFAULT_ANONYMOUS_PROVIDER_NAME
-from .protocols import InternalAuthenticator
 from .core import json_or_msgpack
 from .database import orm
 from .database.core import (
@@ -59,6 +58,7 @@
     lookup_valid_pending_session_by_user_code,
     lookup_valid_session,
 )
+from .protocols import InternalAuthenticator
 from .settings import get_sessionmaker, get_settings
 from .utils import (
     API_KEY_COOKIE_NAME,
@@ -676,9 +676,7 @@ async def auth_code(
     return auth_code
 
 
-def add_internal_routes(
-        router: APIRouter, provider: str, authenticator: InternalAuthenticator
-):
+def add_internal_routes(router: APIRouter, provider: str, authenticator: InternalAuthenticator):
     "Register a handle_credentials route function for this Authenticator."
 
     @router.post(f"/provider/{provider}/token")
@@ -715,36 +713,21 @@ async def handle_credentials(
 
     return handle_credentials
 
-def add_external_routes(
-    router: APIRouter, provider: str, authenticator: InternalAuthenticator
-):
-    router.get(f"/provider/{provider}/code")(
-        build_auth_code_route(authenticator, provider)
-    )
-    router.post(f"/provider/{provider}/code")(
-        build_auth_code_route(authenticator, provider)
-    )
+
+def add_external_routes(router: APIRouter, provider: str, authenticator: InternalAuthenticator):
+    router.get(f"/provider/{provider}/code")(build_auth_code_route(authenticator, provider))
+    router.post(f"/provider/{provider}/code")(build_auth_code_route(authenticator, provider))
     # Device code flow routes for CLI/headless clients
     # GET /authorize - redirects browser to OIDC provider
-    router.get(f"/provider/{provider}/authorize")(
-        build_authorize_route(authenticator, provider)
-    )
+    router.get(f"/provider/{provider}/authorize")(build_authorize_route(authenticator, provider))
     # POST /authorize - initiates device code flow (returns device_code, user_code, etc.)
-    router.post(f"/provider/{provider}/authorize")(
-        build_device_code_authorize_route(authenticator, provider)
-    )
+    router.post(f"/provider/{provider}/authorize")(build_device_code_authorize_route(authenticator, provider))
     # GET /device_code - shows user code entry form
-    router.get(f"/provider/{provider}/device_code")(
-        build_device_code_form_route(authenticator, provider)
-    )
+    router.get(f"/provider/{provider}/device_code")(build_device_code_form_route(authenticator, provider))
     # POST /device_code - handles user code submission after browser auth
-    router.post(f"/provider/{provider}/device_code")(
-        build_device_code_submit_route(authenticator, provider)
-    )
+    router.post(f"/provider/{provider}/device_code")(build_device_code_submit_route(authenticator, provider))
     # POST /token - CLI client polls this for tokens
-    router.post(f"/provider/{provider}/token")(
-        build_device_code_token_route(authenticator, provider)
-    )
+    router.post(f"/provider/{provider}/token")(build_device_code_token_route(authenticator, provider))
     # Warn if the operator forgot to configure a redirect target
     # for successful browser-based logins. Without it the user
     # will get a page of raw JSON instead of being sent to the UI.

bluesky_httpserver/tests/conftest.py

@@ -11,9 +11,9 @@
 from cryptography.hazmat.primitives.asymmetric import rsa
 from jose.backends import RSAKey
 from respx import MockRouter
-from xprocess import ProcessStarter
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
+from xprocess import ProcessStarter
 
 import bluesky_httpserver.server as bqss
 from bluesky_httpserver.database.base import Base

bluesky_httpserver/tests/test_database.py

@@ -3,14 +3,14 @@
 import uuid
 from datetime import timedelta
 
-
 from bluesky_httpserver import schemas
 from bluesky_httpserver.database import orm as db_orm
 from bluesky_httpserver.database.core import (
     create_user,
     get_or_create_principal,
 )
 
+
 def test_principal_carries_access_token_field():
     """Externally-authenticated principals attach the raw OIDC access token
     so downstream services can perform OBO exchanges."""

bluesky_httpserver/tests/test_oidc_proxied_authenticators.py

@@ -6,6 +6,7 @@
 
 from bluesky_httpserver.authenticators import ProxiedOIDCAuthenticator
 
+
 @pytest.mark.filterwarnings("ignore::DeprecationWarning")
 class TestProxiedOIDCAuthenticator:
     """Tests for ProxiedOIDCAuthenticator class."""