truss 0.11.8rc5__py3-none-any.whl → 0.11.8rc6__py3-none-any.whl

truss/templates/control/control/application.py

@@ -4,11 +4,11 @@ import logging.config
 import re
 import traceback
 from pathlib import Path
-from typing import Dict
+from typing import Awaitable, Callable, Dict
 
 import httpx
 from endpoints import control_app
-from fastapi import FastAPI, Request
+from fastapi import FastAPI, Request, Response
 from fastapi.responses import JSONResponse
 from helpers.errors import ModelLoadFailed, PatchApplicatonError
 from helpers.inference_server_controller import InferenceServerController
@@ -17,56 +17,53 @@ from helpers.inference_server_starter import async_inference_server_startup_flow
 from helpers.truss_patch.model_container_patch_applier import ModelContainerPatchApplier
 from shared import log_config
 from starlette.datastructures import State
-from starlette.middleware.base import BaseHTTPMiddleware
 
 SANITIZED_EXCEPTION_FRAMES = 2
 
 
-class SanitizedException(Exception):
-    def __init__(self, original_error: Exception, num_frames: int):
-        self.original_error = original_error
-        tb_lines = traceback.format_tb(original_error.__traceback__)
-        if tb_lines and num_frames > 0:
-            # NB(nikhil): Take the last num_frames, join them, and strip extra whitespace
-            selected_frames = tb_lines[-num_frames:]
-            self.concise_msg = "".join(selected_frames).rstrip()
-        else:
-            self.concise_msg = f"{type(original_error).__name__}: {original_error}"
+def create_sanitized_traceback(error: Exception, num_frames: int) -> str:
+    tb_lines = traceback.format_tb(error.__traceback__)
+    if tb_lines and num_frames > 0:
+        selected_frames = tb_lines[-num_frames:]
+        return "".join(selected_frames).rstrip()
+    else:
+        return f"{type(error).__name__}: {error}"
 
-    def __str__(self):
-        return self.concise_msg
 
-    def __repr__(self):
-        return self.concise_msg
+def sanitize_exception(num_frames=SANITIZED_EXCEPTION_FRAMES):
+    def decorator(
+        handler_func: Callable[[Request, Exception], Awaitable[Response]],
+    ) -> Callable[[Request, Exception], Awaitable[Response]]:
+        async def wrapper(request: Request, exc: Exception) -> Response:
+            sanitized_traceback = create_sanitized_traceback(exc, num_frames)
+            if hasattr(request.app.state, "logger"):
+                request.app.state.logger.error(sanitized_traceback)
 
+            return await handler_func(request, exc)
 
-# NB(nikhil): SanitizedExceptionMiddleware runs on every request and cleans up the verbose stack traces
-# that are very noisy for users.
-class SanitizedExceptionMiddleware(BaseHTTPMiddleware):
-    def __init__(self, app, num_frames: int):
-        super().__init__(app)
-        self.num_frames = num_frames
+        return wrapper
 
-    async def dispatch(self, request: Request, call_next):
-        try:
-            return await call_next(request)
-        except Exception as error:
-            raise SanitizedException(error, self.num_frames) from error
+    return decorator
 
 
-async def handle_patch_error(_, exc):
+@sanitize_exception()
+async def handle_patch_error(request, exc):
     error_type = _camel_to_snake_case(type(exc).__name__)
     return JSONResponse(content={"error": {"type": error_type, "msg": str(exc)}})
 
 
-async def generic_error_handler(_, exc):
+@sanitize_exception()
+async def generic_error_handler(request, exc):
+    print("CALLED GENERIC ========== ")
     return JSONResponse(
         content={"error": {"type": "unknown", "msg": f"{type(exc)}: {exc}"}}
     )
 
 
-async def handle_model_load_failed(_, error):
+@sanitize_exception()
+async def handle_model_load_failed(request, error):
     # Model load failures should result in 503 status
+    print("CALLED MODEL LOAD ========== ")
     return JSONResponse({"error": str(error)}, 503)
 
 
@@ -126,9 +123,6 @@ def create_app(base_config: Dict):
     )
     app.state = app_state
     app.include_router(control_app)
-    app.add_middleware(
-        SanitizedExceptionMiddleware, num_frames=SANITIZED_EXCEPTION_FRAMES
-    )
 
     @app.on_event("shutdown")
     def on_shutdown():

{truss-0.11.8rc5.dist-info → truss-0.11.8rc6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.11.8rc5
+Version: 0.11.8rc6
 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.8rc5.dist-info → truss-0.11.8rc6.dist-info}/RECORD

@@ -73,7 +73,7 @@ truss/templates/copy_cache_files.Dockerfile.jinja,sha256=Os5zFdYLZ_AfCRGq4RcpVTO
 truss/templates/docker_server_requirements.txt,sha256=PyhOPKAmKW1N2vLvTfLMwsEtuGpoRrbWuNo7tT6v2Mc,18
 truss/templates/server.Dockerfile.jinja,sha256=CUYnF_hgxPGq2re7__0UPWlwzOHMoFkxp6NVKi3U16s,7071
 truss/templates/control/requirements.txt,sha256=nqqNmlTwFeV8sV4fqwItwzzd_egADBP_e-cEopXBJ4k,358
-truss/templates/control/control/application.py,sha256=_FmSgIetffVpwUYVeMM6rH9pGjjHhALTdtR2RegVyJY,5226
+truss/templates/control/control/application.py,sha256=FuL4DibeWy9ux81B5JhUnXuyu0Ro1t4UnmE-_W89gg4,4967
 truss/templates/control/control/endpoints.py,sha256=VQ1lvZjFvR091yRkiFdvXw1Q7PiNGXT9rJwY7_sX6yg,11828
 truss/templates/control/control/server.py,sha256=R4Y219i1dcz0kkksN8obLoX-YXWGo9iW1igindyG50c,3128
 truss/templates/control/control/helpers/context_managers.py,sha256=W6dyFgLBhPa5meqrOb3w_phMtKfaJI-GhwUfpiycDc8,413
@@ -368,8 +368,8 @@ truss_train/deployment.py,sha256=lWWANSuzBWu2M4oK4qD7n-oVR1JKdmw2Pn5BJQHg-Ck,307
 truss_train/loader.py,sha256=0o66EjBaHc2YY4syxxHVR4ordJWs13lNXnKjKq2wq0U,1630
 truss_train/public_api.py,sha256=9N_NstiUlmBuLUwH_fNG_1x7OhGCytZLNvqKXBlStrM,1220
 truss_train/restore_from_checkpoint.py,sha256=8hdPm-WSgkt74HDPjvCjZMBpvA9MwtoYsxVjOoa7BaM,1176
-truss-0.11.8rc5.dist-info/METADATA,sha256=NIv6jZ6bWqB41Kqdf9SjNWko0fOVcsqc8-FsW9GIPBU,6680
-truss-0.11.8rc5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.11.8rc5.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.11.8rc5.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.11.8rc5.dist-info/RECORD,,
+truss-0.11.8rc6.dist-info/METADATA,sha256=d2tJzaGAOT3N68nSAYVF3DmmN4SMdm29LYpmnvkjqmo,6680
+truss-0.11.8rc6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.11.8rc6.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.11.8rc6.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.11.8rc6.dist-info/RECORD,,