cleanup around the house

Author: AbstractUmbra

mystbin/backend/models/responses.py

@@ -30,7 +30,6 @@ class File(BaseModel):
     tab_id: int | None
     image: str | None
 
-
     class Config:
         schema_extra = {
             "example": {
@@ -39,7 +38,7 @@ class Config:
                 "loc": 2,
                 "charcount": 49,
                 "tab_id": 0,
-                "url": "..."
+                "url": "...",
             }
         }
 

mystbin/backend/mystbin_models.py

@@ -2,6 +2,7 @@
 
 from typing import TYPE_CHECKING, List, Optional, TypedDict
 
+import aiohttp
 from fastapi import Request
 from starlette.datastructures import State
 
@@ -37,6 +38,7 @@ class MystbinState(State):
 
     db: Database
     user: Optional[_StateUser]
+    session: aiohttp.ClientSession
 
 
 class MystbinRequest(Request):

mystbin/backend/routers/pastes.py

@@ -18,7 +18,6 @@
 """
 from __future__ import annotations
 
-import asyncio
 import datetime
 import json
 import pathlib
@@ -27,7 +26,7 @@
 from typing import Dict, List, Optional, Union
 
 from asyncpg import Record
-from fastapi import APIRouter, Response, UploadFile, File
+from fastapi import APIRouter, File, Response, UploadFile
 from fastapi.responses import UJSONResponse
 from models import errors, payloads, responses
 
@@ -177,43 +176,45 @@ async def put_pastes(
     paste = recursive_hook(paste.dict())
     return UJSONResponse(paste, status_code=201)
 
+
 @router.put(
     "/images/upload/{paste_id}",
     tags=["pastes"],
     responses={
         201: {"model": responses.PastePostResponse},
         401: {"model": errors.Unauthorized},
-        404: {"model": errors.NotFound}
+        404: {"model": errors.NotFound},
     },
     include_in_schema=False,
 )
 @limit("postpastes")
-async def get_image_upload_link(request: MystbinRequest, paste_id: str, password: Optional[str] = None, images: List[UploadFile] = File(...)):
-    """    user = request.state.user
+async def get_image_upload_link(
+    request: MystbinRequest, paste_id: str, password: Optional[str] = None, images: List[UploadFile] = File(...)
+):
+    """user = request.state.user
     if not user:
         return UJSONResponse({"error": "Unauthorized", "notice": "You must be signed in to use this route"}, status_code=401)"""
 
     paste = await request.app.state.db.get_paste(paste_id, password)
     if paste is None:
         return UJSONResponse({"error": "Not Found"}, status_code=404)
 
-    headers = {
-        "Content-Type": "application/octet-stream",
-        "AccessKey": f"{__config['bunny_cdn']['token']}"
-    }
+    headers = {"Content-Type": "application/octet-stream", "AccessKey": f"{__config['bunny_cdn']['token']}"}
 
     for image in images:
         i = image.filename[0]
-        await request.app.state.db.update_paste_with_files(paste_id=paste_id, tab_id=i, url=f'https://mystbin.b-cdn.net/images/{image.filename}')
+        await request.app.state.db.update_paste_with_files(
+            paste_id=paste_id, tab_id=i, url=f"https://mystbin.b-cdn.net/images/{image.filename}"
+        )
 
         URL = f'https://storage.bunnycdn.com/{__config["bunny_cdn"]["hostname"]}/images/{image.filename}'
         data = await image.read()
 
-        async with request.app.state.client.put(URL, headers=headers, data=data) as resp:
-            pass
+        await request.app.state.client.put(URL, headers=headers, data=data)
 
     return Response(status_code=201)
 
+
 desc = f"""Get a paste by ID.
 
 This endpoint falls under the `getpaste` ratelimit bucket.

mystbin/backend/utils/db.py

@@ -185,10 +185,10 @@ async def get_paste(self, paste_id: str, password: Optional[str] = None) -> Opti
 
                 images = await self.get_images(paste_id=paste_id)
 
-                for index, file in enumerate(resp['files']):
+                for index, file in enumerate(resp["files"]):
                     try:
-                        file['image'] = images[index]['url']
-                        file['tab_id'] = images[index]['tab_id']
+                        file["image"] = images[index]["url"]
+                        file["tab_id"] = images[index]["tab_id"]
                     except IndexError:
                         pass
 
@@ -311,7 +311,7 @@ async def get_images(self, *, paste_id: str):
 
         query = """SELECT * FROM images WHERE parent_id = $1"""
         async with self.pool.acquire() as conn:
-             return [dict(x) for x in await self._do_query(query, paste_id)]
+            return [dict(x) for x in await self._do_query(query, paste_id)]
 
     @wrapped_hook_callback
     async def edit_paste(
@@ -995,8 +995,4 @@ async def put_log(self, request: Request, response: Response) -> None:
         async def put_paste_images(self, parent_id, tab_id) -> None:
             query = """INSERT INTO images VALUES($1, $2)"""
 
-            await self._do_query(
-            query,
-            parent_id,
-            tab_id
-            )
+            await self._do_query(query, parent_id, tab_id)