all ruff checking and modify Converter class

functions/admin/get_log.py

@@ -1,5 +1,5 @@
 import os
-from typing import List, Dict, Any
+from typing import Any, Dict, List
 
 
 def get_log(log_id: int) -> List[Dict[str, Any]]:

functions/admin/is_logged_in.py

@@ -1,12 +1,14 @@
 import jwt
 from fastapi import Cookie, Depends
-from functions.admin.models import token, database
+
+from functions.admin.models import database, token
 
 
 def is_logged_in(access_token: str = Cookie(None), db=Depends(database.get_db)):
     if not access_token:
         return False
-    response = db.query(token.Token).filter(token.Token.access_token == access_token).first()
+    response = db.query(token.Token).filter(
+        token.Token.access_token == access_token).first()
     if not response or not response.is_active:
         return False
     try:

functions/admin/models/token.py

@@ -1,7 +1,9 @@
 from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
 from sqlalchemy.orm import relationship
+
 from functions.admin.models.database import Base
 
+
 class Token(Base):
     __tablename__ = "tokens"
 

functions/admin/models/user.py

@@ -2,8 +2,10 @@ import hashlib
 
 from sqlalchemy import Boolean, Column, Integer, String
 from sqlalchemy.orm import relationship
+
 from functions.admin.models.database import Base
 
+
 class User(Base):
     __tablename__ = "users"
 

functions/admin/templates/log.py

@@ -1,10 +1,15 @@
-from fastapi import Request, Depends, responses, HTTPException
+from fastapi import Depends, HTTPException, Request, responses
+
 from functions.admin import get_log, is_logged_in
 
-async def log(templates, request: Request, log_id: int, logged_in: bool = Depends(is_logged_in.is_logged_in)):
+
+async def log(templates, request: Request, log_id: int,
+              logged_in: bool = Depends(is_logged_in.is_logged_in)):
     if logged_in:
         if not get_log.get_log(log_id):
             raise HTTPException(status_code=400)
-        return templates.TemplateResponse("log.html", {"request": request, "log": get_log.get_log(log_id)})
+        return templates.TemplateResponse("log.html", {"request": request,
+                                                       "log": get_log.get_log(log_id)})
     else:
-        return responses.RedirectResponse(url=f"/refresh?source=/logs/{log_id}", status_code=303)
+        return responses.RedirectResponse(url=f"/refresh?source=/logs/{log_id}",
+                                          status_code=303)

functions/admin/templates/logins.py

@@ -1,25 +1,31 @@
-from fastapi import Form, Depends, responses, HTTPException
-from functions.admin.models import database, user, token
-import jwt
 from datetime import datetime, timedelta
 
+import jwt
+from fastapi import Depends, Form, HTTPException, responses
 
-async def logins(username: str = Form(...), password: str = Form(...), db=Depends(database.get_db)):
+from functions.admin.models import database, token, user
+
+
+async def logins(username: str = Form(...), password: str = Form(...),
+                 db=Depends(database.get_db)):
     # username = "Dmitrium12"
     response = db.query(user.User).filter(user.User.username == username).first()
     if not response or not response.check_password(password):
-        raise HTTPException(status_code=400, detail="Неправильное имя пользователя или пароль")
+        raise HTTPException(status_code=400,
+                            detail="Неправильное имя пользователя или пароль")
     access_token_expires = datetime.utcnow() + timedelta(minutes=15)
     access_token_payload = {"sub": response.username, "exp": access_token_expires}
     access_token = jwt.encode(access_token_payload, "secret", algorithm="HS256")
     refresh_token_expires = datetime.utcnow() + timedelta(days=7)
     refresh_token_payload = {"sub": response.username, "exp": refresh_token_expires}
     refresh_token = jwt.encode(refresh_token_payload, "secret", algorithm="HS256")
-    db_token = token.Token(access_token=access_token, refresh_token=refresh_token, user=response)
+    db_token = token.Token(access_token=access_token, refresh_token=refresh_token,
+                           user=response)
     db.add(db_token)
     db.commit()
     response = responses.RedirectResponse(url="/logs", status_code=303)
-    response.set_cookie(key="access_token", value=access_token, expires=int(access_token_expires.timestamp()))
+    response.set_cookie(key="access_token", value=access_token,
+                        expires=int(access_token_expires.timestamp()))
     response.set_cookie(key="refresh_token", value=refresh_token,
                         expires=int(refresh_token_expires.timestamp()))
     return response

functions/admin/templates/logs.py

@@ -1,8 +1,12 @@
-from fastapi import Request, Depends, responses
+from fastapi import Depends, Request, responses
+
 from functions.admin import get_logs, is_logged_in
 
-async def logs(templates, request: Request, logged_in: bool = Depends(is_logged_in.is_logged_in)):
+
+async def logs(templates, request: Request,
+               logged_in: bool = Depends(is_logged_in.is_logged_in)):
     if logged_in:
-        return templates.TemplateResponse("logs.html", {"request": request, "logs": get_logs.get_logs()})
+        return templates.TemplateResponse("logs.html",
+                                          {"request": request, "logs": get_logs.get_logs()})
     else:
         return responses.RedirectResponse(url="/refresh?source=/logs", status_code=303)

functions/admin/templates/refresh.py

@@ -1,15 +1,20 @@
-from fastapi import Request, Depends, Cookie, responses
-from functions.admin.models import database, user, token
-import jwt
 from datetime import datetime, timedelta
 
-async def refresh_access_token(req: Request, refresh_token: str = Cookie(None), db=Depends(database.get_db)):
+import jwt
+from fastapi import Cookie, Depends, Request, responses
+
+from functions.admin.models import database, token, user
+
+
+async def refresh_access_token(req: Request, refresh_token: str = Cookie(None),
+                               db=Depends(database.get_db)):
     request_args = dict(req.query_params)
     try:
         refresh_token_payload = jwt.decode(refresh_token, "secret", algorithms=["HS256"])
     except jwt.exceptions.DecodeError:
         return responses.RedirectResponse(url="/login", status_code=303)
-    response = db.query(user.User).filter(user.User.username == refresh_token_payload["sub"]).first()
+    response = db.query(user.User).filter(
+        user.User.username == refresh_token_payload["sub"]).first()
     if not response:
         return responses.RedirectResponse(url="/login", status_code=303)
     access_token_expires = datetime.utcnow() + timedelta(minutes=15)