chore(fastapi): use middleware instead of log_dto

Author: grieve54706

ibis-server/app/logger.py

@@ -1,3 +1,5 @@
+import uuid
+
 from fastapi import FastAPI
 from fastapi.responses import RedirectResponse
 from loguru import logger
@@ -14,6 +16,18 @@
 get_config().init_logger()
 
 
+@app.middleware("http")
+async def request_logger(request, call_next):
+    with logger.contextualize(request_id=str(uuid.uuid4())):
+        logger.info("{method} {path}", method=request.method, path=request.url.path)
+        logger.info("Request params: {params}", params=dict(request.query_params))
+        logger.info("Request body: {body}", body=(await request.body()).decode("utf-8"))
+        try:
+            return await call_next(request)
+        finally:
+            logger.info("Request ended")
+
+
 @app.get("/")
 def root():
     return RedirectResponse(url="/docs")

ibis-server/app/main.py

@@ -1,19 +1,16 @@
 from fastapi import APIRouter
 
-from app.logger import log_dto
 from app.mdl.analyzer import analyze, analyze_batch
 from app.model import AnalyzeSQLBatchDTO, AnalyzeSQLDTO
 
 router = APIRouter(prefix="/analysis", tags=["analysis"])
 
 
 @router.get("/sql")
-@log_dto
 def analyze_sql(dto: AnalyzeSQLDTO) -> list[dict]:
     return analyze(dto.manifest_str, dto.sql)
 
 
 @router.get("/sqls")
-@log_dto
 def analyze_sql_batch(dto: AnalyzeSQLBatchDTO) -> list[list[dict]]:
     return analyze_batch(dto.manifest_str, dto.sqls)

ibis-server/app/routers/v2/analysis.py

@@ -4,7 +4,6 @@
 from fastapi.responses import JSONResponse
 
 from app.dependencies import verify_query_dto
-from app.logger import log_dto
 from app.mdl.rewriter import ExternalEngineRewriter
 from app.model import (
     DryPlanDTO,
@@ -22,7 +21,6 @@
 
 
 @router.post("/{data_source}/query", dependencies=[Depends(verify_query_dto)])
-@log_dto
 def query(
     data_source: DataSource,
     dto: QueryDTO,
@@ -42,7 +40,6 @@ def query(
 
 
 @router.post("/{data_source}/validate/{rule_name}")
-@log_dto
 def validate(data_source: DataSource, rule_name: str, dto: ValidateDTO) -> Response:
     validator = Validator(
         Connector(data_source, dto.connection_info, dto.manifest_str),
@@ -53,26 +50,22 @@ def validate(data_source: DataSource, rule_name: str, dto: ValidateDTO) -> Respo
 
 
 @router.post("/{data_source}/metadata/tables", response_model=list[Table])
-@log_dto
 def get_table_list(data_source: DataSource, dto: MetadataDTO) -> list[Table]:
     metadata = MetadataFactory(data_source, dto.connection_info)
     return metadata.get_table_list()
 
 
 @router.post("/{data_source}/metadata/constraints", response_model=list[Constraint])
-@log_dto
 def get_constraints(data_source: DataSource, dto: MetadataDTO) -> list[Constraint]:
     metadata = MetadataFactory(data_source, dto.connection_info)
     return metadata.get_constraints()
 
 
 @router.post("/dry-plan")
-@log_dto
 def dry_plan(dto: DryPlanDTO) -> str:
     return ExternalEngineRewriter(dto.manifest_str).rewrite(dto.sql)
 
 
 @router.post("/{data_source}/dry-plan")
-@log_dto
 def dry_plan_for_data_source(data_source: DataSource, dto: DryPlanDTO) -> str:
     return ExternalEngineRewriter(dto.manifest_str, data_source).rewrite(dto.sql)

ibis-server/app/routers/v2/connector.py

@@ -4,7 +4,6 @@
 from fastapi.responses import JSONResponse
 
 from app.dependencies import verify_query_dto
-from app.logger import log_dto
 from app.mdl.rewriter import EmbeddedEngineRewriter
 from app.model import (
     DryPlanDTO,
@@ -20,7 +19,6 @@
 
 
 @router.post("/{data_source}/query", dependencies=[Depends(verify_query_dto)])
-@log_dto
 def query(
     data_source: DataSource,
     dto: QueryDTO,
@@ -43,7 +41,6 @@ def query(
 
 
 @router.post("/dry-plan")
-@log_dto
 def dry_plan(dto: DryPlanDTO) -> str:
     try:
         return EmbeddedEngineRewriter(dto.manifest_str).rewrite(dto.sql)
@@ -52,7 +49,6 @@ def dry_plan(dto: DryPlanDTO) -> str:
 
 
 @router.post("/{data_source}/dry-plan")
-@log_dto
 def dry_plan_for_data_source(data_source: DataSource, dto: DryPlanDTO) -> str:
     try:
         return EmbeddedEngineRewriter(dto.manifest_str, data_source).rewrite(dto.sql)
@@ -61,7 +57,6 @@ def dry_plan_for_data_source(data_source: DataSource, dto: DryPlanDTO) -> str:
 
 
 @router.post("/{data_source}/validate/{rule_name}")
-@log_dto
 def validate(data_source: DataSource, rule_name: str, dto: ValidateDTO) -> Response:
     try:
         validator = Validator(