patch bugs.

Author: rhysrevans3

stac_fastapi/core/stac_fastapi/core/utilities.py

@@ -8,7 +8,12 @@
 from typing import Any, Dict, List, Optional, Set, Union
 
 from stac_fastapi.core.models.patch import ElasticPath
-from stac_fastapi.types.stac import Item, PatchOperation
+from stac_fastapi.types.stac import (
+    Item,
+    PatchAddReplaceTest,
+    PatchOperation,
+    PatchRemove,
+)
 
 MAX_LIMIT = 10000
 
@@ -152,7 +157,7 @@ def merge_to_operations(data: Dict) -> List:
     for key, value in data.copy().items():
 
         if value is None:
-            operations.append(PatchOperation(op="remove", path=key))
+            operations.append(PatchRemove(op="remove", path=key))
 
         elif isinstance(value, dict):
             nested_operations = merge_to_operations(value)
@@ -162,7 +167,7 @@ def merge_to_operations(data: Dict) -> List:
                 operations.append(nested_operation)
 
         else:
-            operations.append(PatchOperation(op="add", path=key, value=value))
+            operations.append(PatchAddReplaceTest(op="add", path=key, value=value))
 
     return operations
 
@@ -210,7 +215,7 @@ def copy_commands(
         from_path (ElasticPath): Path to copy from
 
     """
-    check_commands(operation.op, from_path, True)
+    check_commands(commands=commands, op=operation.op, path=from_path, from_path=True)
 
     if from_path.index:
         commands.append(
@@ -329,22 +334,24 @@ def operations_to_script(operations: List) -> Dict:
             ElasticPath(path=operation.from_) if hasattr(operation, "from_") else None
         )
 
-        check_commands(commands, operation.op, path)
+        check_commands(commands=commands, op=operation.op, path=path)
 
         if operation.op in ["copy", "move"]:
-            copy_commands(commands, operation, path, from_path)
+            copy_commands(
+                commands=commands, operation=operation, path=path, from_path=from_path
+            )
 
         if operation.op in ["remove", "move"]:
             remove_path = from_path if from_path else path
-            remove_commands(commands, remove_path)
+            remove_commands(commands=commands, path=remove_path)
 
         if operation.op in ["add", "replace"]:
-            add_commands(commands, operation, path)
+            add_commands(commands=commands, operation=operation, path=path)
 
         if operation.op == "test":
-            test_commands(commands, operation, path)
+            test_commands(commands=commands, operation=operation, path=path)
 
-        source = commands_to_source(commands)
+        source = commands_to_source(commands=commands)
 
     return {
         "source": source,

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -987,7 +987,9 @@ async def json_patch_item(
             )
 
         except exceptions.BadRequestError as exc:
-            raise KeyError(exc.info["error"]["caused_by"]["to_string"]) from exc
+            raise exceptions.BadRequestError(
+                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

@@ -1019,7 +1019,9 @@ async def json_patch_item(
             )
 
         except exceptions.BadRequestError as exc:
-            raise KeyError(exc.info["error"]["caused_by"]["to_string"]) from exc
+            raise exceptions.BadRequestError(
+                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,10 +1,16 @@
+import os
 import uuid
 from copy import deepcopy
 from typing import Callable
 
 import pytest
 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
@@ -265,15 +271,14 @@ async def test_merge_patch_item_remove(ctx, core_client, txn_client):
     await txn_client.merge_patch_item(
         collection_id=collection_id,
         item_id=item_id,
-        item={"properties": {"foo": None, "hello": None}},
+        item={"properties": {"gsd": None}},
         request=MockRequest,
     )
 
     updated_item = await core_client.get_item(
         item_id, collection_id, request=MockRequest
     )
-    assert "foo" not in updated_item["properties"]
-    assert "hello" not in updated_item["properties"]
+    assert "gsd" not in updated_item["properties"]
 
 
 @pytest.mark.asyncio
@@ -298,7 +303,7 @@ async def test_json_patch_item_add(ctx, core_client, txn_client):
         item_id, collection_id, request=MockRequest
     )
 
-    assert updated_item["properties"]["bar"] == "foo"
+    assert updated_item["properties"]["foo"] == "bar"
 
 
 @pytest.mark.asyncio
@@ -308,7 +313,7 @@ async def test_json_patch_item_replace(ctx, core_client, txn_client):
     item_id = item["id"]
     operations = [
         PatchAddReplaceTest.model_validate(
-            {"op": "replace", "path": "properties.foo", "value": 100}
+            {"op": "replace", "path": "properties.gsd", "value": 100}
         ),
     ]
 
@@ -323,7 +328,7 @@ async def test_json_patch_item_replace(ctx, core_client, txn_client):
         item_id, collection_id, request=MockRequest
     )
 
-    assert updated_item["properties"]["foo"] == 100
+    assert updated_item["properties"]["gsd"] == 100
 
 
 @pytest.mark.asyncio
@@ -333,7 +338,7 @@ async def test_json_patch_item_test(ctx, core_client, txn_client):
     item_id = item["id"]
     operations = [
         PatchAddReplaceTest.model_validate(
-            {"op": "test", "path": "properties.foo", "value": 100}
+            {"op": "test", "path": "properties.gsd", "value": 15}
         ),
     ]
 
@@ -348,7 +353,7 @@ async def test_json_patch_item_test(ctx, core_client, txn_client):
         item_id, collection_id, request=MockRequest
     )
 
-    assert updated_item["properties"]["foo"] == 100
+    assert updated_item["properties"]["gsd"] == 15
 
 
 @pytest.mark.asyncio
@@ -358,7 +363,7 @@ async def test_json_patch_item_move(ctx, core_client, txn_client):
     item_id = item["id"]
     operations = [
         PatchMoveCopy.model_validate(
-            {"op": "move", "path": "properties.bar", "from": "properties.foo"}
+            {"op": "move", "path": "properties.bar", "from": "properties.gsd"}
         ),
     ]
 
@@ -373,8 +378,8 @@ async def test_json_patch_item_move(ctx, core_client, txn_client):
         item_id, collection_id, request=MockRequest
     )
 
-    assert updated_item["properties"]["bar"] == 100
-    assert "foo" not in updated_item["properties"]
+    assert updated_item["properties"]["bar"] == 15
+    assert "gsd" not in updated_item["properties"]
 
 
 @pytest.mark.asyncio
@@ -384,7 +389,7 @@ async def test_json_patch_item_copy(ctx, core_client, txn_client):
     item_id = item["id"]
     operations = [
         PatchMoveCopy.model_validate(
-            {"op": "copy", "path": "properties.foo", "from": "properties.bar"}
+            {"op": "copy", "path": "properties.foo", "from": "properties.gsd"}
         ),
     ]
 
@@ -399,7 +404,7 @@ async def test_json_patch_item_copy(ctx, core_client, txn_client):
         item_id, collection_id, request=MockRequest
     )
 
-    assert updated_item["properties"]["foo"] == updated_item["properties"]["bar"]
+    assert updated_item["properties"]["foo"] == updated_item["properties"]["gsd"]
 
 
 @pytest.mark.asyncio
@@ -408,8 +413,7 @@ async def test_json_patch_item_remove(ctx, core_client, txn_client):
     collection_id = item["collection"]
     item_id = item["id"]
     operations = [
-        PatchRemove.model_validate({"op": "remove", "path": "properties.foo"}),
-        PatchRemove.model_validate({"op": "remove", "path": "properties.bar"}),
+        PatchRemove.model_validate({"op": "remove", "path": "properties.gsd"}),
     ]
 
     await txn_client.json_patch_item(
@@ -423,8 +427,7 @@ async def test_json_patch_item_remove(ctx, core_client, txn_client):
         item_id, collection_id, request=MockRequest
     )
 
-    assert "foo" not in updated_item["properties"]
-    assert "bar" not in updated_item["properties"]
+    assert "gsd" not in updated_item["properties"]
 
 
 @pytest.mark.asyncio
@@ -438,7 +441,7 @@ async def test_json_patch_item_test_wrong_value(ctx, core_client, txn_client):
         ),
     ]
 
-    with pytest.raises(ConflictError):
+    with pytest.raises(exceptions.BadRequestError):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,
@@ -461,7 +464,7 @@ async def test_json_patch_item_replace_property_does_not_exists(
         ),
     ]
 
-    with pytest.raises(ConflictError):
+    with pytest.raises(exceptions.BadRequestError):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,
@@ -482,7 +485,7 @@ async def test_json_patch_item_remove_property_does_not_exists(
         PatchRemove.model_validate({"op": "remove", "path": "properties.foo"}),
     ]
 
-    with pytest.raises(ConflictError):
+    with pytest.raises(exceptions.BadRequestError):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,
@@ -505,7 +508,7 @@ async def test_json_patch_item_move_property_does_not_exists(
         ),
     ]
 
-    with pytest.raises(ConflictError):
+    with pytest.raises(exceptions.BadRequestError):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,
@@ -528,7 +531,7 @@ async def test_json_patch_item_copy_property_does_not_exists(
         ),
     ]
 
-    with pytest.raises(ConflictError):
+    with pytest.raises(exceptions.BadRequestError):
 
         await txn_client.json_patch_item(
             collection_id=collection_id,