fix: add authlib + format code

Author: inimaz

carbonserver/carbonserver/api/routers/authenticate.py

@@ -3,9 +3,8 @@
 import logging
 import random
 from typing import Optional
-from authlib.integrations.starlette_client import OAuth, OAuthError
 
-import requests
+from authlib.integrations.starlette_client import OAuthError
 from dependency_injector.wiring import Provide, inject
 from fastapi import APIRouter, Depends, HTTPException, Query, Request, Response
 from fastapi.responses import RedirectResponse
@@ -88,7 +87,7 @@ async def get_login(
     if code:
         try:
             token = await auth_provider.client.authorize_access_token(request)
-        except OAuthError as error:
+        except OAuthError:
             return "Error"
         user = token.get("userinfo")
         if user:
@@ -121,7 +120,7 @@ async def get_login(
         return response
     return await auth_provider.get_authorize_url(request, str(login_url))
 
-    state = str(int(random.random() * 1000))
+    str(int(random.random() * 1000))
     client_id, _ = auth_provider.get_client_credentials()
     return await auth_provider.client.authorize_redirect(
         request, str(login_url), scope=" ".join(OAUTH_SCOPES)

carbonserver/carbonserver/api/services/auth_providers/oidc_auth_provider.py

@@ -5,19 +5,15 @@
 It can work with any OIDC-compliant provider (Fief, Keycloak, Auth0, etc.).
 """
 
-import asyncio
-from typing import Any, Dict, List, Optional, Tuple
-from urllib.parse import urlencode
-from carbonserver.config import settings
+from typing import Any, Dict, Optional, Tuple
 
-import httpx
-from fastapi_oidc import discovery, get_auth
-from jose import jwt
+from authlib.integrations.starlette_client import OAuth
+from carbonserver.config import settings
 
 DEFAULT_SIGNATURE_CACHE_TTL = 3600  # seconds
 OAUTH_SCOPES = ["openid", "email", "profile"]
 
-from authlib.integrations.starlette_client import OAuth
+
 oauth = OAuth()
 oauth.register(
     "client",
@@ -27,6 +23,7 @@
     client_kwargs={"scope": "openid profile email"},
 )
 
+
 class OIDCAuthProvider:
     def __init__(
         self,

carbonserver/carbonserver/api/services/auth_service.py

@@ -4,7 +4,7 @@
 import jwt
 from dependency_injector.wiring import Provide
 from fastapi import Depends, HTTPException
-from fastapi.security import APIKeyCookie, HTTPBearer, OAuth2AuthorizationCodeBearer
+from fastapi.security import APIKeyCookie, HTTPBearer
 
 from carbonserver.api.services.auth_providers.oidc_auth_provider import (
     OIDCAuthProvider,

carbonserver/initial_data.py

@@ -37,11 +37,6 @@ def check_initial_data(db):
 def shell(db):
     if settings.environment not in ("develop", "local"):
         raise Exception("This script must be run in develop environment")
-    from carbonserver.api.infra.database.sql_models import (
-        Membership as SqlModelMembership,
-    )
-    from carbonserver.api.infra.database.sql_models import Project as SqlModelProject
-    from carbonserver.api.infra.database.sql_models import User as SqlModelUser
 
     logger.info("Checking initial data...")
     with db.session() as session:

carbonserver/main.py

@@ -5,6 +5,7 @@
 from fastapi_pagination import add_pagination
 from pydantic import ValidationError
 from starlette.middleware.cors import CORSMiddleware
+from starlette.middleware.sessions import SessionMiddleware
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 
@@ -25,7 +26,6 @@
 from carbonserver.container import ServerContainer
 from carbonserver.database.database import engine
 from carbonserver.logger import logger
-from starlette.middleware.sessions import SessionMiddleware
 
 
 async def db_exception_handler(request: Request, exc: DBException):

pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
     "requests",
     "questionary",
     "rich",
-    "typer"
+    "typer",
 ]
 
 [tool.setuptools.dynamic]
@@ -79,6 +79,32 @@ Changelog = "https://github.com/mlco2/codecarbon/releases"
 
 
 [dependency-groups]
+api  = [
+    "alembic<2.0.0",
+    "authlib>=1.2.1",
+    "bcrypt<5.0.0",
+    "python-dateutil<3.0.0",
+    "dependency-injector<5.0.0",
+    "fastapi<1.0.0",
+    "fief-client[fastapi]",
+    "httpx",
+    "pydantic[email]<2.0.0",
+    "psycopg2-binary<3.0.0",
+    "requests<3.0.0",
+    "sqlalchemy<2.0.0",
+    "uvicorn[standard]<1.0.0",
+    "fastapi-pagination<1.0.0",
+    "pytest",
+    "mock",
+    "responses",
+    "fastapi-oidc;python_version>='3.10'",
+    "numpy",
+    "psutil",
+    "requests-mock",
+    "rapidfuzz",
+    "PyJWT",
+    "logfire[fastapi]>=1.0.1",
+]
 dev = [
     "taskipy",
     "bumpver",
@@ -109,31 +135,6 @@ viz-legacy = [
     "dash_bootstrap_components > 1.0.0",
     "fire",
 ]
-api  = [
-    "alembic<2.0.0",
-    "bcrypt<5.0.0",
-    "python-dateutil<3.0.0",
-    "dependency-injector<5.0.0",
-    "fastapi<1.0.0",
-    "fief-client[fastapi]",
-    "httpx",
-    "pydantic[email]<2.0.0",
-    "psycopg2-binary<3.0.0",
-    "requests<3.0.0",
-    "sqlalchemy<2.0.0",
-    "uvicorn[standard]<1.0.0",
-    "fastapi-pagination<1.0.0",
-    "pytest",
-    "mock",
-    "responses",
-    "fastapi-oidc;python_version>='3.10'",
-    "numpy",
-    "psutil",
-    "requests-mock",
-    "rapidfuzz",
-    "PyJWT",
-    "logfire[fastapi]>=1.0.1",
-]
 
 [project.scripts]
 carbonboard = "codecarbon.viz.carbonboard:main"