Return HTTP exceptions from individual detectors

Author: RobGeada

detectors/built_in/app.py

@@ -26,6 +26,8 @@ def detect_content(request: ContentAnalysisHttpRequest):
             if detector_kind in request.detector_params:
                 try:
                     message_detections += detector_registry.handle_request(content, request.detector_params)
+                except HTTPException as e:
+                    raise e
                 except Exception as e:
                     raise HTTPException(status_code=500) from e
         detections.append(message_detections)

detectors/built_in/file_type_detectors.py

@@ -1,4 +1,6 @@
 import json
+from fastapi import HTTPException
+
 import jsonschema
 import xml.etree.ElementTree as ET
 import xmlschema
@@ -197,5 +199,5 @@ def handle_request(self, content: str, detector_params: dict) -> List[ContentAna
                     if result is not None:
                         detections += [result]
                 else:
-                    raise ValueError(f"Unrecognized file type: {file_type}")
+                    raise HTTPException(status_code=400, detail=f"Unrecognized file type: {file_type}")
         return detections

tests/detectors/builtIn/test_filetype.py

@@ -210,7 +210,7 @@ def test_detect_content_unrecognized_filetype(self, client: TestClient):
             "detector_params": {"file_type": ["not_a_type"]}
         }
         resp = client.post("/api/v1/text/contents", json=payload)
-        assert resp.status_code == 500
+        assert resp.status_code == 400
         data = resp.json()
         assert "message" in data
         assert "Unrecognized file type" in data["message"]