pretty plaintext errors

Author: isabelizimm

vetiver/server.py

@@ -1,17 +1,16 @@
 from typing import Callable, List, Union
 from urllib.parse import urljoin
 
+import re
 import httpx
 import pandas as pd
 import requests
 import uvicorn
-from fastapi import FastAPI, Request, testclient, status
-from fastapi.encoders import jsonable_encoder
+from fastapi import FastAPI, Request, testclient
 from fastapi.exceptions import RequestValidationError
 from fastapi.openapi.utils import get_openapi
-from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse
+from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.responses import PlainTextResponse
-from starlette.exceptions import HTTPException as StarletteHTTPException
 from warnings import warn
 
 from .utils import _jupyter_nb
@@ -143,17 +142,8 @@ async def rapidoc():
             """
 
         @app.exception_handler(RequestValidationError)
-        async def validation_exception_handler(
-            request: Request, exc: RequestValidationError
-        ):
-            return JSONResponse(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                content=jsonable_encoder({"detail": exc.errors(), "body": exc.body}),
-            )
-
-        @app.exception_handler(StarletteHTTPException)
-        async def http_exception_handler(request, exc):
-            return PlainTextResponse(str(exc.detail), status_code=exc.status_code)
+        async def validation_exception_handler(request, exc):
+            return PlainTextResponse(str(exc), status_code=422)
 
         return app
 
@@ -282,9 +272,7 @@ def predict(endpoint, data: Union[dict, pd.DataFrame, pd.Series], **kw) -> pd.Da
         response.raise_for_status()
     except (requests.exceptions.HTTPError, httpx.HTTPStatusError) as e:
         if response.status_code == 422:
-            raise TypeError(
-                PlainTextResponse(str(response), status_code=response.status_code)
-            )
+            raise TypeError(re.sub(r"\n", ": ", response.text))
         raise requests.exceptions.HTTPError(
             f"Could not obtain data from endpoint with error: {e}"
         )

vetiver/tests/test_pytorch.py

@@ -106,7 +106,7 @@ def test_torch_predict_ptype_error(vetiver_client_prototype):
 
     data = {"0": "bad"}
 
-    with pytest.raises(requests.exceptions.HTTPError):
+    with pytest.raises(TypeError):
         predict(endpoint=vetiver_client_prototype, data=data)
 
 

vetiver/tests/test_sklearn.py

@@ -80,9 +80,15 @@ def test_predict_sklearn_series_check_ptype(vetiver_client):
     assert len(response) == 1
 
 
-@pytest.mark.parametrize("data", [(0, 0), 0, 0.0, "0"])
+@pytest.mark.parametrize("data", [(0), 0, 0.0, "0"])
 def test_predict_sklearn_type_error(data, vetiver_client):
-    msg = f"Predict expects DataFrame, Series, or dict. Given type is {type(data)}"
+    import re
+
+    msg = re.sub(
+        r"\n",
+        ": ",
+        "1 validation error for Request\nbody\n  value is not a valid list \(type=type_error.list\)",  # noqa
+    )
 
     with pytest.raises(TypeError, match=msg):
         predict(endpoint=vetiver_client, data=data)