Merge remote-tracking branch 'mntm/dev' into asset-packs-index

indexer/main.py

@@ -1,27 +1,18 @@
 #!/usr/bin/env python3
-import sys
 import os
 import logging
 import uvicorn
+from contextlib import asynccontextmanager
 from fastapi import FastAPI, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
 from src import directories, file_upload, security
 from src.repository import indexes, raw_file_upload_directories
 from src.settings import settings
 from pygelf import GelfTcpHandler
 
-app = FastAPI(docs_url=None, redoc_url=None)
 
-
-@app.middleware("http")
-async def check_token(request: Request, call_next):
-    if security.check_token(request):
-        return await call_next(request)
-    return Response(status_code=401)
-
-
-@app.on_event("startup")
-def startup_event() -> None:
+@asynccontextmanager
+async def lifespan(app: FastAPI):
     if not os.path.isdir(settings.files_dir):
         os.makedirs(settings.files_dir)
     for index in indexes:
@@ -43,6 +34,18 @@ def startup_event() -> None:
     logging.info("Startup complete")
     logger.setLevel(prev_level)
 
+    yield
+
+
+app = FastAPI(lifespan=lifespan, docs_url=None, redoc_url=None)
+
+
+@app.middleware("http")
+async def check_token(request: Request, call_next):
+    if security.check_token(request):
+        return await call_next(request)
+    return Response(status_code=401)
+
 
 app.include_router(file_upload.router)
 app.include_router(directories.router)

indexer/src/settings.py

@@ -11,13 +11,13 @@ class Settings(BaseModel):
     base_url: str
     token: str
     github_org: str
-    gelf_host: str = None
-    gelf_port: str = None
-    kubernetes_namespace: str = None
-    kubernetes_app: str = None
-    kubernetes_container: str = None
-    kubernetes_pod: str = None
-    firmware_github_token: str = None
+    gelf_host: str | None
+    gelf_port: str | None
+    kubernetes_namespace: str | None
+    kubernetes_app: str | None
+    kubernetes_container: str | None
+    kubernetes_pod: str | None
+    firmware_github_token: str | None
     firmware_github_repo: str
     private_paths: List[str]
 

requirements.txt

@@ -1,6 +1,6 @@
-fastapi==0.88.0
+fastapi==0.109.1
 uvicorn==0.20.0
-python-multipart==0.0.5
+python-multipart==0.0.7
 jsonschema==4.17.3
 PyGithub==1.57
 black==24.3.0