wow, thats pretty ruff

ran 'ruff check --fix app'

app/services/auth.py

@@ -1,16 +1,21 @@
 import logging
+
 logger = logging.getLogger(__name__)
+import os
+import secrets
+import string
+from datetime import UTC, datetime, timedelta
 from typing import Annotated
-from datetime import datetime, timedelta, timezone
-from fastapi import APIRouter, HTTPException, Depends, status
-from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
-from sqlmodel import Session, select
-from pwdlib import PasswordHash
+
 import jwt
+from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from jwt.exceptions import InvalidTokenError
-from app.model.models import UserDB, Token, TokenData, UserCreate
+from pwdlib import PasswordHash
+from sqlmodel import Session, select
+
+from app.model.models import Token, TokenData, UserDB
 from app.services.database import *
-import secrets, string, os
 
 SECRET_KEY = os.getenv("SECRET_KEY", default="ff"*16)
 ALGORITHM = "HS256"
@@ -43,9 +48,9 @@ def authenticate_user(db, username: str, password: str):
 def create_access_token(data: dict, expires_delta: timedelta | None = None):
     to_encode = data.copy()
     if expires_delta:
-        expire = datetime.now(timezone.utc) + expires_delta
+        expire = datetime.now(UTC) + expires_delta
     else:
-        expire = datetime.now(timezone.utc) + timedelta(minutes=15)
+        expire = datetime.now(UTC) + timedelta(minutes=15)
     to_encode.update({"exp": expire})
     encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
     return encoded_jwt

app/services/database.py

@@ -1,9 +1,9 @@
 import logging
+
 logger = logging.getLogger(__name__)
 from os import getenv, path
-from sqlmodel import create_engine, SQLModel, Session
 
-from app.model.models import Base
+from sqlmodel import Session, SQLModel, create_engine
 
 SQLALCHEMY_DATABASE_URL = getenv("SQLALCHEMY_DATABASE_URL", "sqlite:///./gatekeeper.db")
 
@@ -13,6 +13,7 @@ def create_db_and_tables():
     if not path.exists(SQLALCHEMY_DATABASE_URL):
         SQLModel.metadata.create_all(engine)
         from alembic.config import Config
+
         from alembic import command
         alembic_cfg = Config("./alembic.ini")
         command.stamp(alembic_cfg, "head")

app/services/door.py

@@ -1,13 +1,13 @@
 import logging
-logger = logging.getLogger(__name__)
-from sqlmodel import select
-from fastapi import Depends, HTTPException, status
-from sqlalchemy.orm import selectinload
-import sqlalchemy.exc as exc
-from datetime import datetime, date, timedelta
 
-from app.services.database import Session, get_session, add_and_refresh
+logger = logging.getLogger(__name__)
+from datetime import date, datetime, timedelta
+
+from sqlalchemy import exc
+from sqlmodel import select
+
 from app.model.models import *
+from app.services.database import Session, add_and_refresh
 
 doorIsOpen = True
 # I think this could also be gpio controlled
@@ -17,13 +17,11 @@ def openDoor():
     global doorIsOpen
     doorIsOpen = True
     logger.info("Still needs gpio out")
-    pass
 
 def closeDoor():
     global doorIsOpen
     doorIsOpen = False
     logger.info("Still needs gpio out")
-    pass
 
 def isDoorOpen():
     return doorIsOpen

app/services/scanner.py

@@ -1,27 +1,34 @@
 import logging
+
 logger = logging.getLogger(__name__)
 
-import threading
-import time
 import os
 import secrets
+import threading
+import time
 
-from typing import Optional
-from sqlmodel import Session
+from desfire import (
+    DESFire,
+    DESFireKey,
+    PCSCDevice,
+    diversify_key,
+    get_list,
+    to_hex_string,
+)
+from desfire.enums import (
+    DESFireCommunicationMode,
+    DESFireFileType,
+    DESFireKeySettings,
+    DESFireKeyType,
+)
+from desfire.schemas import FilePermissions, FileSettings, KeySettings
 from dotenv import load_dotenv
 from fastapi import HTTPException, status
-
 from smartcard.CardRequest import CardRequest
 from smartcard.CardType import AnyCardType
 from smartcard.Exceptions import CardRequestTimeoutException
 
-from desfire import DESFire, DESFireKey, PCSCDevice, diversify_key, get_list, to_hex_string
-from desfire.enums import DESFireCommunicationMode, DESFireFileType, DESFireKeySettings, DESFireKeyType
-from desfire.schemas import FilePermissions, FileSettings, KeySettings
-import desfire.exceptions as desExceptions
-
-from app.services.door import openDoor, closeDoor, isDoorOpen, checkAccess
-
+from app.services.door import checkAccess, openDoor
 
 #ENV vars
 load_dotenv()
@@ -112,7 +119,7 @@ def DeleteCard():
 
         try:
             try:
-                logger.debug("Auth1")#
+                logger.debug("Auth1")
                 desfire.authenticate(0x0, aes_master_key)
             except:
                 logger.debug("Auth2")
@@ -244,7 +251,7 @@ class BackgroundScanner:
     def __init__(self, db):
         self.db = db
         self.is_running = False
-        self.thread: Optional[threading.Thread] = None
+        self.thread: threading.Thread | None = None
 
     def start(self):
         if self.is_running:

app/services/settings.py

@@ -1,5 +1,6 @@
-import os
 import logging
+import os
+
 logger = logging.getLogger(__name__)
 
 def verify_settings():