update after review

Author: alinbutu

services/staging/rs_server_staging/main.py

@@ -44,7 +44,6 @@
 from starlette.status import (
     HTTP_200_OK,
     HTTP_404_NOT_FOUND,
-    HTTP_500_INTERNAL_SERVER_ERROR,
     HTTP_503_SERVICE_UNAVAILABLE,
 )
 
@@ -288,18 +287,9 @@ async def get_job_status_endpoint(job_id: str = Path(..., title="The ID of the j
     """Used to get status of processing job."""
     try:
         return app.extra["process_manager"].get_job(job_id)
-    except JobNotFoundError:
+    except JobNotFoundError as error:
         # Handle case when job_id is not found
-        return JSONResponse(
-            status_code=HTTP_404_NOT_FOUND,
-            content={"title": "No Such Job", "detail": f"Job with ID {job_id} not found"},
-        )
-    except Exception as e:  # pylint: disable=broad-exception-caught
-        # Catch any other unexpected exceptions
-        return JSONResponse(
-            status_code=HTTP_500_INTERNAL_SERVER_ERROR,
-            content={"title": "Internal Server Error", "detail": str(e)},
-        )
+        raise HTTPException(status_code=HTTP_404_NOT_FOUND, detail=f"Job with ID {job_id} not found") from error
 
 
 @router.get("/jobs")
@@ -318,18 +308,9 @@ async def delete_job_endpoint(job_id: str = Path(..., title="The ID of the job t
     try:
         app.extra["process_manager"].delete_job(job_id)
         return {"message": f"Job {job_id} deleted successfully"}
-    except JobNotFoundError:
+    except JobNotFoundError as error:
         # Handle case when job_id is not found
-        return JSONResponse(
-            status_code=HTTP_404_NOT_FOUND,
-            content={"title": "No Such Job", "detail": f"Job with ID {job_id} not found"},
-        )
-    except Exception as e:  # pylint: disable=broad-exception-caught
-        # Catch any other unexpected exceptions
-        return JSONResponse(
-            status_code=HTTP_500_INTERNAL_SERVER_ERROR,
-            content={"title": "Internal Server Error", "detail": str(e)},
-        )
+        raise HTTPException(status_code=HTTP_404_NOT_FOUND, detail=f"Job with ID {job_id} not found") from error
 
 
 @router.get("/jobs/{job_id}/results")
@@ -339,18 +320,9 @@ async def get_specific_job_result_endpoint(job_id: str = Path(..., title="The ID
         # Query the database to find the job by job_id
         job = app.extra["process_manager"].get_job(job_id)
         return JSONResponse(status_code=HTTP_200_OK, content=job["status"])
-    except JobNotFoundError:
+    except JobNotFoundError as error:
         # Handle case when job_id is not found
-        return JSONResponse(
-            status_code=HTTP_404_NOT_FOUND,
-            content={"title": "No Such Job", "detail": f"Job with ID {job_id} not found"},
-        )
-    except Exception as e:  # pylint: disable=broad-exception-caught
-        # Catch any other unexpected exceptions
-        return JSONResponse(
-            status_code=HTTP_500_INTERNAL_SERVER_ERROR,
-            content={"title": "Internal Server Error", "detail": str(e)},
-        )
+        raise HTTPException(status_code=HTTP_404_NOT_FOUND, detail=f"Job with ID {job_id} not found") from error
 
 
 # Configure OpenTelemetry

services/staging/tests/test_staging.py

@@ -29,7 +29,6 @@
 from starlette.status import (
     HTTP_200_OK,
     HTTP_404_NOT_FOUND,
-    HTTP_500_INTERNAL_SERVER_ERROR,
     HTTP_503_SERVICE_UNAVAILABLE,
 )
 
@@ -226,12 +225,7 @@ async def test_get_jobs_endpoint(mocker, set_db_env_var, staging_client):  # pyl
         (
             {"identifier": "non_existing_id"},
             HTTP_404_NOT_FOUND,
-            {"title": "No Such Job", "detail": "Job with ID non_existing_id not found"},
-        ),
-        (
-            {"identifier": "trigger_500"},
-            HTTP_500_INTERNAL_SERVER_ERROR,
-            {"title": "Internal Server Error", "detail": "Unexpected error occurred"},
+            {"message": "Job with ID non_existing_id not found"},
         ),
         *[(job, HTTP_200_OK, job) for job in expected_jobs_test],
     ],
@@ -265,17 +259,13 @@ async def test_get_job(
         - Asserts that the response status code is 200 and the returned job
           details match the expected job dictionary when the job exists.
         - Asserts that the response status code is 404 when the job does not exist.
-        - Asserts that the response status code is 500 if other exception occurs.
     """
     # Mock app.extra to ensure 'db_table' exists
     mock_db_table = mocker.MagicMock()
 
     # Simulate JobNotFoundError for non-existing jobs (HTTP 404)
     if expected_status == HTTP_404_NOT_FOUND:
         mock_db_table.get_job.side_effect = JobNotFoundError
-    # Simulate an unexpected exception (HTTP 500)
-    elif expected_status == HTTP_500_INTERNAL_SERVER_ERROR:
-        mock_db_table.get_job.side_effect = Exception("Unexpected error occurred")
     # Return an existing job normally (HTTP 200)
     else:
         mock_db_table.get_job.return_value = next(
@@ -300,12 +290,7 @@ async def test_get_job(
         (
             {"identifier": "non_existing_id"},
             HTTP_404_NOT_FOUND,
-            {"title": "No Such Job", "detail": "Job with ID non_existing_id not found"},
-        ),
-        (
-            {"identifier": "trigger_500"},
-            HTTP_500_INTERNAL_SERVER_ERROR,
-            {"title": "Internal Server Error", "detail": "Unexpected error occurred"},
+            {"message": "Job with ID non_existing_id not found"},
         ),
         *[(job, HTTP_200_OK, job["status"]) for job in expected_jobs_test],
     ],
@@ -339,17 +324,13 @@ async def test_get_job_result(
         - Asserts that the response status code is 200 and the returned job result
           matches the expected job status when the job exists.
         - Asserts that the response status code is 404 when the job does not exist.
-        - Asserts that the response status code is 500 if other exception occurs.
     """
     # Mock app.extra to ensure 'db_table' exists
     mock_db_table = mocker.MagicMock()
 
     # Simulate JobNotFoundError for non-existing jobs (HTTP 404)
     if expected_status == HTTP_404_NOT_FOUND:
         mock_db_table.get_job.side_effect = JobNotFoundError
-    # Simulate an unexpected exception (HTTP 500)
-    elif expected_status == HTTP_500_INTERNAL_SERVER_ERROR:
-        mock_db_table.get_job.side_effect = Exception("Unexpected error occurred")
     # Return an existing job normally (HTTP 200)
     else:
         mock_db_table.get_job.return_value = next(
@@ -375,12 +356,7 @@ async def test_get_job_result(
         (
             {"identifier": "non_existing_id"},
             HTTP_404_NOT_FOUND,
-            {"title": "No Such Job", "detail": "Job with ID non_existing_id not found"},
-        ),
-        (
-            {"identifier": "trigger_500"},
-            HTTP_500_INTERNAL_SERVER_ERROR,
-            {"title": "Internal Server Error", "detail": "Unexpected error occurred"},
+            {"message": "Job with ID non_existing_id not found"},
         ),
         *[
             (job, HTTP_200_OK, {"message": f"Job {job['identifier']} deleted successfully"})
@@ -424,9 +400,6 @@ async def test_delete_job_endpoint(
     # Simulate JobNotFoundError for non-existing jobs (HTTP 404)
     if expected_status == HTTP_404_NOT_FOUND:
         mock_db_table.delete_job.side_effect = JobNotFoundError
-    # Simulate an unexpected exception (HTTP 500)
-    elif expected_status == HTTP_500_INTERNAL_SERVER_ERROR:
-        mock_db_table.delete_job.side_effect = Exception("Unexpected error occurred")
     # Return an existing job normally (HTTP 200)
     else:
         mock_db_table.delete_job.return_value = next(