truss 0.11.8rc3__tar.gz → 0.11.8rc4__tar.gz

{truss-0.11.8rc3 → truss-0.11.8rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.8rc3
+Version: 0.11.8rc4
 Summary: A seamless bridge from model development to model delivery
 Project-URL: Repository, https://github.com/basetenlabs/truss
 Project-URL: Homepage, https://truss.baseten.co

{truss-0.11.8rc3 → truss-0.11.8rc4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truss"
-version = "0.11.8rc3"
+version = "0.11.8rc4"
 description = "A seamless bridge from model development to model delivery"
 authors = [
     { name = "Pankaj Gupta", email = "no-reply@baseten.co" },

{truss-0.11.8rc3 → truss-0.11.8rc4}/truss/templates/control/control/application.py

@@ -2,13 +2,15 @@ import asyncio
 import logging
 import logging.config
 import re
+import traceback
+from functools import wraps
 from pathlib import Path
-from typing import Dict
+from typing import Any, Callable, Coroutine, Dict
 
 import httpx
 from endpoints import control_app
-from fastapi import FastAPI
-from fastapi.responses import JSONResponse
+from fastapi import FastAPI, Request
+from fastapi.responses import JSONResponse, Response
 from helpers.errors import ModelLoadFailed, PatchApplicatonError
 from helpers.inference_server_controller import InferenceServerController
 from helpers.inference_server_process_controller import InferenceServerProcessController
@@ -18,17 +20,43 @@ from shared import log_config
 from starlette.datastructures import State
 
 
+def sanitized_exception_logging(
+    original_handler: Callable[[Request, Any], Coroutine[Any, Any, Response]],
+) -> Callable[[Request, Any], Coroutine[Any, Any, Response]]:
+    @wraps(original_handler)
+    async def wrapper(request: Request, error: Exception) -> Response:
+        logger = request.app.state.logger
+        traceback_error = traceback.extract_tb(error.__traceback__)
+
+        if traceback_error:
+            last_frame = traceback_error[-1]
+            concise_error = (
+                f'  File "{last_frame.filename}", line {last_frame.lineno}, in {last_frame.name}\n'
+                f"    {last_frame.line}"
+            )
+        else:
+            concise_error = f"{type(error).__name__}: {error}"
+
+        logger.error(concise_error)
+        return await original_handler(request, error)
+
+    return wrapper
+
+
+@sanitized_exception_logging
 async def handle_patch_error(_, exc):
     error_type = _camel_to_snake_case(type(exc).__name__)
     return JSONResponse(content={"error": {"type": error_type, "msg": str(exc)}})
 
 
+@sanitized_exception_logging
 async def generic_error_handler(_, exc):
     return JSONResponse(
         content={"error": {"type": "unknown", "msg": f"{type(exc)}: {exc}"}}
     )
 
 
+@sanitized_exception_logging
 async def handle_model_load_failed(_, error):
     # Model load failures should result in 503 status
     return JSONResponse({"error": str(error)}, 503)