(fix) import order

travian/backend/src/__init__.py

@@ -1,8 +1,9 @@
 from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse
-from src.api.v1.village import village_router
+
 from src.api.v1.auth import auth_router
-from fastapi.middleware.cors import CORSMiddleware
+from src.api.v1.village import village_router
 
 
 def create_app() -> FastAPI:

travian/backend/src/api/v1/auth.py

@@ -1,7 +1,9 @@
 from datetime import timedelta
-from fastapi import APIRouter, Depends, HTTPException, status, Response
+
+from fastapi import APIRouter, Depends, HTTPException, Response, status
 from fastapi.security import OAuth2PasswordRequestForm
-from src.core.auth import sign_up_new_user, authenticate_user
+
+from src.core.auth import authenticate_user, sign_up_new_user
 from src.core.security import create_access_token
 from src.db.utils import get_db
 

travian/backend/src/api/v1/village.py

@@ -1,11 +1,9 @@
 from fastapi import APIRouter, Depends
-from src.db.utils import get_db
+
 from src.core.auth import get_current_user
-from src.db.services.village import (
-    create_village,
-    get_user_villages,
-)
 from src.db.schemas.villages import NewVillage, NewVillageRequest, UserVillages
+from src.db.services.village import create_village, get_user_villages
+from src.db.utils import get_db
 
 village_router = village = APIRouter()
 

travian/backend/src/core/auth.py

@@ -1,10 +1,11 @@
-from jose import jwt
 from fastapi import Depends
-from src.db.services.user import create_user, get_user_by_email, user_exits
-from src.db.schemas.user import UserCreate, UserJWTToken
-from src.core.security import password_verify, oauth2_scheme
-from src.core.config import SECRET_KEY, AUTH_TOKEN_ALGO
+from jose import jwt
+
+from src.core.config import AUTH_TOKEN_ALGO, SECRET_KEY
+from src.core.security import oauth2_scheme, password_verify
 from src.db.conn import Database
+from src.db.schemas.user import UserCreate, UserJWTToken
+from src.db.services.user import create_user, get_user_by_email, user_exits
 from src.db.utils import get_db
 
 

travian/backend/src/core/config.py

@@ -1,4 +1,5 @@
 import os
+
 from dotenv import load_dotenv
 
 load_dotenv(dotenv_path="local.env")

travian/backend/src/core/security.py

@@ -1,19 +1,16 @@
 import hashlib
-import os
 import hmac
+import os
 from datetime import datetime, timedelta
-import jwt
-from src.core.config import SECRET_KEY, AUTH_TOKEN_ALGO
-
+from typing import Dict, Optional
 
-from fastapi.security import OAuth2
+import jwt
+from fastapi import HTTPException, Request, status
 from fastapi.openapi.models import OAuthFlows as OAuthFlowsModel
-from fastapi import Request
+from fastapi.security import OAuth2
 from fastapi.security.utils import get_authorization_scheme_param
-from fastapi import HTTPException
-from fastapi import status
-from typing import Optional
-from typing import Dict
+
+from src.core.config import AUTH_TOKEN_ALGO, SECRET_KEY
 
 
 class OAuth2PasswordBearerWithCookie(OAuth2):

travian/backend/src/db/schemas/auth.py

@@ -1,11 +1,12 @@
 import jwt
 from fastapi import Depends, HTTPException, status
-from src.db.services.user import create_user, get_user_by_email, user_exits
-from src.db.schemas.user import UserCreate
-from src.db.schemas.token import TokenData
-from src.core.security import password_verify, oauth2_scheme
-from src.core.config import SECRET_KEY, AUTH_TOKEN_ALGO
+
+from src.core.config import AUTH_TOKEN_ALGO, SECRET_KEY
+from src.core.security import oauth2_scheme, password_verify
 from src.db.conn import Database
+from src.db.schemas.token import TokenData
+from src.db.schemas.user import UserCreate
+from src.db.services.user import create_user, get_user_by_email, user_exits
 from src.db.utils import get_db
 
 

travian/backend/src/db/services/user.py

@@ -1,8 +1,9 @@
 import datetime
 from uuid import uuid4
-from src.db.schemas import user as user_schemas
-from src.db.conn import Database
+
 from src.core.security import password_hash
+from src.db.conn import Database
+from src.db.schemas import user as user_schemas
 
 
 def create_user(

travian/backend/src/db/utils.py

@@ -1,11 +1,6 @@
+from src.core.config import (DATABASE_HOST, DATABASE_NAME, DATABASE_PASSWORD,
+                             DATABASE_PORT, DATABASE_USERNAME)
 from src.db.conn import Database
-from src.core.config import (
-    DATABASE_HOST,
-    DATABASE_USERNAME,
-    DATABASE_PASSWORD,
-    DATABASE_PORT,
-    DATABASE_NAME,
-)
 
 
 def get_db() -> Database: