Switch to http exception.

Author: rhysrevans3

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -10,6 +10,7 @@
 
 import attr
 from elasticsearch_dsl import Q, Search
+from fastapi import HTTPException
 from starlette.requests import Request
 
 from elasticsearch import exceptions, helpers  # type: ignore
@@ -987,8 +988,8 @@ async def json_patch_item(
             )
 
         except exceptions.BadRequestError as exc:
-            raise exceptions.BadRequestError(
-                exc.info["error"]["caused_by"]["to_string"]
+            raise HTTPException(
+                status_code=400, detail=exc.info["error"]["caused_by"]["to_string"]
             ) from exc
 
         item = await self.get_one_item(collection_id, item_id)

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -9,6 +9,7 @@
 from typing import Any, Dict, Iterable, List, Optional, Protocol, Tuple, Type, Union
 
 import attr
+from fastapi import HTTPException
 from opensearchpy import exceptions, helpers
 from opensearchpy.exceptions import TransportError
 from opensearchpy.helpers.query import Q
@@ -1019,8 +1020,8 @@ async def json_patch_item(
             )
 
         except exceptions.BadRequestError as exc:
-            raise exceptions.BadRequestError(
-                exc.info["error"]["caused_by"]["to_string"]
+            raise HTTPException(
+                status_code=400, detail=exc.info["error"]["caused_by"]["to_string"]
             ) from exc
 
         item = await self.get_one_item(collection_id, item_id)

stac_fastapi/tests/clients/test_elasticsearch.py

@@ -1,16 +1,11 @@
-import os
 import uuid
 from copy import deepcopy
 from typing import Callable
 
 import pytest
+from fastapi import HTTPException
 from stac_pydantic import Item, api
 
-if os.getenv("BACKEND", "elasticsearch").lower() == "opensearch":
-    from elasticsearch import exceptions
-else:
-    from opensearchpy import exceptions
-
 from stac_fastapi.extensions.third_party.bulk_transactions import Items
 from stac_fastapi.types.errors import ConflictError, NotFoundError
 from stac_fastapi.types.stac import PatchAddReplaceTest, PatchMoveCopy, PatchRemove
@@ -441,7 +436,7 @@ async def test_json_patch_item_test_wrong_value(ctx, core_client, txn_client):
         ),
     ]
 
-    with pytest.raises(exceptions.BadRequestError):
+    with pytest.raises(HTTPException):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,
@@ -464,7 +459,7 @@ async def test_json_patch_item_replace_property_does_not_exists(
         ),
     ]
 
-    with pytest.raises(exceptions.BadRequestError):
+    with pytest.raises(HTTPException):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,
@@ -485,7 +480,7 @@ async def test_json_patch_item_remove_property_does_not_exists(
         PatchRemove.model_validate({"op": "remove", "path": "properties.foo"}),
     ]
 
-    with pytest.raises(exceptions.BadRequestError):
+    with pytest.raises(HTTPException):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,
@@ -508,7 +503,7 @@ async def test_json_patch_item_move_property_does_not_exists(
         ),
     ]
 
-    with pytest.raises(exceptions.BadRequestError):
+    with pytest.raises(HTTPException):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,
@@ -531,7 +526,7 @@ async def test_json_patch_item_copy_property_does_not_exists(
         ),
     ]
 
-    with pytest.raises(exceptions.BadRequestError):
+    with pytest.raises(HTTPException):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,