Remove index from patch class.

Author: rhysrevans3

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/utils.py

@@ -103,7 +103,6 @@ def check_commands(
     """
     if path.nest:
         part_nest = ""
-
         for index, path_part in enumerate(path.parts):
 
             # Create nested dictionaries if not present for merge operations
@@ -126,20 +125,21 @@ def check_commands(
 
             part_nest += f"['{path_part}']"
 
-    if path.index or from_path or op in ["remove", "replace", "test"]:
-        commands.add(
-            f"if (!ctx._source{path.es_nest}.containsKey('{path.key}'))"
-            f"{{Debug.explain('{path.key} does not exist in {path.nest}');}}"
-        )
+    if from_path or op in ["remove", "replace", "test"]:
 
-    if from_path and path.index is not None:
-        commands.add(
-            f"if ((ctx._source{path.es_location} instanceof ArrayList"
-            f" && ctx._source{path.es_location}.size() < {abs(path.index)})"
-            f" || (!(ctx._source{path.es_location} instanceof ArrayList)"
-            f" && !ctx._source{path.es_location}.containsKey('{path.index}')))"
-            f"{{Debug.explain('{path.es_location} does not exist');}}"
-        )
+        if isinstance(path.key, int):
+            commands.add(
+                f"if ((ctx._source{path.es_nest} instanceof ArrayList"
+                f" && ctx._source{path.es_nest}.size() < {abs(path.key)})"
+                f" || (!(ctx._source{path.es_nest} instanceof ArrayList)"
+                f" && !ctx._source{path.es_nest}.containsKey('{path.key}')))"
+                f"{{Debug.explain('{path.key} does not exist in {path.nest}');}}"
+            )
+        else:
+            commands.add(
+                f"if (!ctx._source{path.es_nest}.containsKey('{path.key}'))"
+                f"{{Debug.explain('{path.key} does not exist in {path.nest}');}}"
+            )
 
 
 def remove_commands(commands: ESCommandSet, path: ElasticPath) -> None:
@@ -150,15 +150,15 @@ def remove_commands(commands: ESCommandSet, path: ElasticPath) -> None:
         path (ElasticPath): Path to value to be removed
 
     """
-    if path.index is not None:
+    if isinstance(path.key, int):
         commands.add(
-            f"def {path.variable_name} = ctx._source{path.es_location}.remove({path.es_index});"
+            f"if ((ctx._source{path.es_nest} instanceof ArrayList"
+            f"{{def {path.variable_name} = ctx._source{path.es_nest}.remove({path.es_key});}} else "
         )
 
-    else:
-        commands.add(
-            f"def {path.variable_name} = ctx._source{path.es_nest}.remove('{path.key}');"
-        )
+    commands.add(
+        f"def {path.variable_name} = ctx._source{path.es_nest}.remove('{path.key}');"
+    )
 
 
 def add_commands(
@@ -180,21 +180,21 @@ def add_commands(
         value = (
             from_path.variable_name
             if operation.op == "move"
-            else f"ctx._source{from_path.es_location}"
+            else f"ctx._source{from_path.es_path}"
         )
+
     else:
         value = f"params.{path.param_key}"
         params[path.param_key] = operation.value
 
-    if path.index is not None:
+    if isinstance(path.key, int):
         commands.add(
-            f"if (ctx._source{path.es_location} instanceof ArrayList)"
-            f"{{ctx._source{path.es_location}.{'add' if operation.op in ['add', 'move'] else 'set'}({path.es_index}, {value})}}"
-            f"else{{ctx._source{path.es_location}['{path.index}'] = {value}}}"
+            f"if (ctx._source{path.es_nest} instanceof ArrayList)"
+            f"{{ctx._source{path.es_nest}.{'add' if operation.op in ['add', 'move'] else 'set'}({path.es_key}, {value})}}"
+            f" else "
         )
 
-    else:
-        commands.add(f"ctx._source{path.es_location} = {value};")
+    commands.add(f"ctx._source{path.es_location} = {value};")
 
 
 def test_commands(
@@ -210,10 +210,19 @@ def test_commands(
     value = f"params.{path.param_key}"
     params[path.param_key] = operation.value
 
+    if isinstance(path.key, int):
+        commands.add(
+            f"if (ctx._source{path.es_nest} instanceof ArrayList)"
+            f"{{if (ctx._source{path.es_nest}[{path.es_key}] != {value})"
+            f"{{Debug.explain('Test failed `{path.es_path}`"
+            f" != ' + ctx._source{path.es_path});}}"
+            f"}} else "
+        )
+
     commands.add(
-        f"if (ctx._source{path.es_location} != {value})"
-        f"{{Debug.explain('Test failed `{path.location}`"
-        f" != ' + ctx._source{path.es_location});}}"
+        f"if (ctx._source{path.es_path} != {value})"
+        f"{{Debug.explain('Test failed `{path.es_path}`"
+        f" != ' + ctx._source{path.es_path});}}"
     )
 
 

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/models/patch.py

@@ -73,15 +73,13 @@ class ElasticPath(BaseModel):
 
     parts: list[str] = []
 
+    path: Optional[str] = None
     key: Optional[str] = None
     nest: Optional[str] = None
-    location: Optional[str] = None
-    index: Optional[int] = None
 
+    es_path: Optional[str] = None
     es_key: Optional[str] = None
     es_nest: Optional[str] = None
-    es_location: Optional[str] = None
-    es_index: Optional[str] = None
 
     variable_name: Optional[str] = None
     param_key: Optional[str] = None
@@ -100,34 +98,28 @@ def validate_model(cls, data: Any):
             data (Any): input data
         """
         data["parts"] = data["path"].lstrip("/").split("/")
+
         data["key"] = data["parts"].pop(-1)
+        data["nest"] = "/".join(data["parts"])
+        data["path"] = data["nest"] + "/" + data["key"]
 
-        if data["key"].lstrip("-").isdigit() or data["key"] == "-":
-            data["index"] = -1 if data["key"] == "-" else int(data["key"])
-            data["key"] = data["parts"].pop(-1)
+        data["es_key"] = data["key"]
+        data["es_nest"] = "".join([f"['{part}']" for part in data["parts"]])
+        data["es_path"] = data["es_nest"] + f"['{data['es_key']}']"
 
-        data["nest"] = ".".join(data["parts"])
-        data["location"] = data["nest"] + "." + data["key"]
+        if data["key"].lstrip("-").isdigit() or data["key"] == "-":
+            data["key"] = -1 if data["key"] == "-" else int(data["key"])
+            data["es_key"] = (
+                f"ctx._source{data['es_nest']}.size() - {-data['key']}"
+                if data["key"] < 0
+                else str(data["key"])
+            )
+            # data["es_key"] = f"[{data['key']}]"
+            data["es_path"] = data["es_nest"] + f"[{data['es_key']}]"
 
-        data["es_key"] = f"['{data['key']}']"
-        data["es_nest"] = "".join([f"['{part}']" for part in data["parts"]])
-        data["es_location"] = data["es_nest"] + data["es_key"]
         data[
             "variable_name"
-        ] = f"{data['nest'].replace('.','_').replace(':','_')}_{data['key'].replace(':','_')}"
-        data["param_key"] = data["location"].translate(replacements)
-
-        if "index" in data:
-            data["es_index"] = (
-                f"ctx._source{data['es_location']}.size() - {-data['index']}"
-                if data["index"] < 0
-                else str(data["index"])
-            )
-
-            data["es_location"] = data["es_location"] + f"[{data['es_index']}]"
-
-            data[
-                "variable_name"
-            ] = f"{data['location'].replace('.','_').replace(':','_')}_{data['index']}"
+        ] = f"{data['nest'].replace('.','_').replace(':','_')}_{str(data['key']).replace(':','_')}"
+        data["param_key"] = data["path"].translate(replacements)
 
         return data