Move config to the top level

Author: marius-mather

auth/management.py

@@ -3,7 +3,7 @@
 import httpx
 from fastapi import Depends
 
-from .config import Settings, get_settings
+from config import Settings, get_settings
 
 
 def get_management_token(settings: Annotated[Settings, Depends(get_settings)]):

auth/validator.py

@@ -6,7 +6,7 @@
 from jose import jwk, jwt
 from jose.exceptions import JWTError
 
-from auth.config import Settings, get_settings
+from config import Settings, get_settings
 from schemas.tokens import AccessTokenPayload
 from schemas.user import SessionUser
 

auth0/client.py

@@ -6,8 +6,8 @@
 from fastapi import Depends
 from pydantic import BaseModel
 
-from auth.config import Settings, get_settings
 from auth.management import get_management_token
+from config import Settings, get_settings
 from schemas.biocommons import BiocommonsAuth0User
 
 

auth/config.py config.pyauth/config.py renamed to config.py

@@ -3,7 +3,7 @@
 from fastapi import HTTPException
 from jose import JWTError, jwt
 
-from auth.config import Settings
+from config import Settings
 
 ALGORITHM = "HS256"
 TOKEN_EXPIRATION_MINUTES = 5

register/tokens.py

@@ -6,7 +6,6 @@
 from pydantic import BaseModel
 from sqlmodel import Session
 
-from auth.config import Settings, get_settings
 from auth.ses import EmailService
 from auth.validator import get_current_user, user_is_admin
 from auth0.client import Auth0Client, get_auth0_client
@@ -16,6 +15,7 @@
     GroupId,
     RoleId,
 )
+from config import Settings, get_settings
 from db.models import ApprovalStatusEnum, Auth0Role, GroupMembership
 from db.setup import get_db_session
 from schemas.user import SessionUser

routers/biocommons_groups.py

@@ -4,9 +4,9 @@
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
 from httpx import AsyncClient
 
-from auth.config import Settings, get_settings
 from auth.management import get_management_token
 from auth.ses import EmailService
+from config import Settings, get_settings
 from schemas.biocommons import BiocommonsRegisterData
 from schemas.bpa import BPARegistrationRequest
 from schemas.service import Resource, Service

routers/bpa_register.py

@@ -5,8 +5,8 @@
 from fastapi import APIRouter, Header, HTTPException
 from fastapi.params import Depends
 
-from auth.config import Settings, get_settings
 from auth.management import get_management_token
+from config import Settings, get_settings
 from galaxy.client import GalaxyClient, get_galaxy_client
 from register.tokens import create_registration_token, verify_registration_token
 from schemas.biocommons import BiocommonsRegisterData

routers/galaxy_register.py

@@ -4,9 +4,9 @@
 from fastapi import APIRouter, Depends, HTTPException
 from httpx import AsyncClient
 
-from auth.config import Settings, get_settings
 from auth.management import get_management_token
 from auth.validator import get_current_user
+from config import Settings, get_settings
 from schemas.biocommons import BiocommonsAuth0User
 from schemas.requests import ResourceRequest, ServiceRequest
 from schemas.service import Resource, Service

routers/user.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 
-from auth.config import Settings
+from config import Settings
 
 from .tokens import AccessTokenPayload