EP-4011 add ProcessBuilder support for eq/neq through ==/!= operators

Author: soxofaan

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `Connection.load_result()` (EP-4008)
 - Add proper support for child callbacks in `fit_curve` and `predict_curve` ([#229](https://github.com/Open-EO/openeo-python-client/issues/229))
 - `ProcessBuilder`: Add support for `array_element(data, n)` through `data[n]` syntax ([#228](https://github.com/Open-EO/openeo-python-client/issues/228))
+- `ProcessBuilder`: Add support for `eq` and `neq` through `==` and `!=` operators (EP-4011)
 
 
 ### Changed

openeo/internal/processes/generator.py

@@ -149,6 +149,12 @@ def __getitem__(self, key) -> 'ProcessBuilder':
                 else:
                     return self.array_element(label=key)
 
+            def __eq__(self, other) -> 'ProcessBuilder':
+                return eq(self, other)
+
+            def __ne__(self, other) -> 'ProcessBuilder':
+                return neq(self, other)
+
     """)
     fun_src = textwrap.dedent("""
         # Public shortcut

openeo/processes.py

@@ -46,6 +46,12 @@ def __getitem__(self, key) -> 'ProcessBuilder':
         else:
             return self.array_element(label=key)
 
+    def __eq__(self, other) -> 'ProcessBuilder':
+        return eq(self, other)
+
+    def __ne__(self, other) -> 'ProcessBuilder':
+        return neq(self, other)
+
     def absolute(self) -> 'ProcessBuilder':
         """
         Absolute value

tests/data/1.0.0/load_collection_properties_eq.json

@@ -0,0 +1,27 @@
+{
+  "loadcollection1": {
+    "process_id": "load_collection",
+    "arguments": {
+      "id": "S2",
+      "spatial_extent": null,
+      "temporal_extent": null,
+      "properties": {
+        "provider": {
+          "process_graph": {
+            "eq1": {
+              "process_id": "eq",
+              "arguments": {
+                "x": {
+                  "from_parameter": "value"
+                },
+                "y": "ESA"
+              },
+              "result": true
+            }
+          }
+        }
+      }
+    },
+    "result": true
+  }
+}

tests/rest/datacube/test_processbuilder.py

@@ -460,3 +460,53 @@ def callback(data: ProcessBuilder):
             "result": True
         }
     }
+
+
+def test_load_collection_properties_eq_process(con100):
+    from openeo.processes import eq
+    cube = con100.load_collection("S2", properties={"provider": lambda v: eq(v, "ESA")})
+    expected = load_json_resource('data/1.0.0/load_collection_properties_eq.json')
+    assert cube.flat_graph() == expected
+
+    # Hack to swap x and y args in expected result
+    args = expected["loadcollection1"]["arguments"]["properties"]["provider"]["process_graph"]["eq1"]["arguments"]
+    args["x"], args["y"] = args["y"], args["x"]
+    cube = con100.load_collection("S2", properties={"provider": lambda v: eq("ESA", v)})
+    assert cube.flat_graph() == expected
+
+
+def test_load_collection_properties_eq_operator(con100):
+    cube = con100.load_collection("S2", properties={"provider": lambda v: v == "ESA"})
+    expected = load_json_resource('data/1.0.0/load_collection_properties_eq.json')
+    assert cube.flat_graph() == expected
+
+    cube = con100.load_collection("S2", properties={"provider": lambda v: "ESA" == v})
+    assert cube.flat_graph() == expected
+
+
+def test_load_collection_properties_neq_process(con100):
+    from openeo.processes import neq
+    cube = con100.load_collection("S2", properties={"provider": lambda v: neq(v, "ESA")})
+    expected = load_json_resource(
+        'data/1.0.0/load_collection_properties_eq.json',
+        preprocess=lambda s: s.replace('"eq', '"neq')
+    )
+    assert cube.flat_graph() == expected
+
+    # Hack to swap x and y args in expected result
+    args = expected["loadcollection1"]["arguments"]["properties"]["provider"]["process_graph"]["neq1"]["arguments"]
+    args["x"], args["y"] = args["y"], args["x"]
+    cube = con100.load_collection("S2", properties={"provider": lambda v: neq("ESA", v)})
+    assert cube.flat_graph() == expected
+
+
+def test_load_collection_properties_neq_operator(con100):
+    cube = con100.load_collection("S2", properties={"provider": lambda v: v != "ESA"})
+    expected = load_json_resource(
+        'data/1.0.0/load_collection_properties_eq.json',
+        preprocess=lambda s: s.replace('"eq', '"neq')
+    )
+    assert cube.flat_graph() == expected
+
+    cube = con100.load_collection("S2", properties={"provider": lambda v: "ESA" != v})
+    assert cube.flat_graph() == expected