switch to uvicorn for custom logging

Dockerfile

@@ -24,4 +24,4 @@ RUN pixi run uv sync --project .
 
 # HELLO WORLD
 EXPOSE 7860
-CMD .venv/bin/fastapi run fetch.py --host 0.0.0.0 --port 7860
+CMD .venv/bin/python -m fetch

fetch.py

@@ -4,12 +4,15 @@ from contextlib import asynccontextmanager
 from datetime import datetime
 from fastapi import FastAPI, Request
 from fastapi.responses import FileResponse, PlainTextResponse, Response
+from pathlib import Path
 from typing import Any
 
 import httpx
 import json
 import subprocess
 
+LOGFILE = Path.home() / "a.json"
+
 
 class PrettyJSONResponse(Response):
     media_type = "application/json"
@@ -46,7 +49,7 @@ async def log_request(request: Request, call_next: Any):
         indent=None,
         separators=(", ", ":"),
     )
-    with open("a.json", "a") as f:
+    with open(LOGFILE, "a") as f:
         separator = "\n" if f.tell() else ""
         f.write(separator + output)
 
@@ -93,9 +96,9 @@ def read_root(request: Request):
 @app.get("/a", response_class=PrettyJSONResponse)
 def get_analytics(n: int = 5):
     if n == 0:
-        cmd = "cat a.json"
+        cmd = f"cat {LOGFILE.as_posix()}"
     else:
-        cmd = f"tail -{n} a.json"
+        cmd = f"tail -{n} {LOGFILE.as_posix()}"
     json_lines = subprocess.run(cmd.split(), capture_output=True).stdout
     content = json.loads(f"[{json_lines.replace(b"\n", b",").decode()}]")
     return content
@@ -103,7 +106,7 @@ def get_analytics(n: int = 5):
 
 @app.api_route("/qa", response_class=FileResponse, methods=["GET", "HEAD"])
 def query_analytics():
-    return "a.json"
+    return LOGFILE.as_posix()
 
 
 @app.get("/favicon.ico")
@@ -123,3 +126,15 @@ async def self_ping():
 
 scheduler = AsyncIOScheduler(executors={"default": AsyncIOExecutor()})
 scheduler.add_job(self_ping, "interval", minutes=60)
+
+
+if __name__ == "__main__":
+    import uvicorn
+
+    fmt = "%(asctime)s %(levelprefix)s %(message)s"
+    uvicorn_logging = uvicorn.config.LOGGING_CONFIG
+    uvicorn_logging["formatters"]["access"]["datefmt"] = "%y%m%d @ %T"
+    uvicorn_logging["formatters"]["access"]["fmt"] = fmt
+    uvicorn_logging["formatters"]["default"]["datefmt"] = "%y%m%d @ %T"
+    uvicorn_logging["formatters"]["default"]["fmt"] = fmt
+    uvicorn.run(app, host="0.0.0.0", port=7860)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fetch"
-version = "0.3.1"
+version = "0.3.2"
 description = "Puppy Installer"
 authors = [
     { name = "Alex Kislukhin" }