Issue #522 support optional child callbacks in generated openeo.processes

Author: soxofaan

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix band name support in `DataCube.band()` when no metadata is available ([#515](https://github.com/Open-EO/openeo-python-client/issues/515))
+- Support optional child callbacks in generated `openeo.processes`, e.g. `merge_cubes` ([#522]((https://github.com/Open-EO/openeo-python-client/issues/522)))
 
 
 ## [0.26.0] - 2023-11-27 - "SRR6" release

openeo/internal/processes/generator.py

@@ -82,6 +82,8 @@ def _call_args(self, process: Process) -> Iterator[str]:
             if parameter.schema.is_process_graph():
                 parent_parameters = [p["name"] for p in parameter.schema.schema["parameters"]]
                 arg_expression = f"build_child_callback({arg_expression}, parent_parameters={parent_parameters})"
+                if parameter.optional:
+                    arg_expression = f"({arg_expression} if {arg_name} not in [None, {self.optional_default}] else {arg_name})"
             yield f"{par_name}={arg_expression}"
 
     def _def_arguments(self, process: Process) -> Iterator[str]:

openeo/processes.py

@@ -3,7 +3,7 @@
 # It is automatically generated.
 # Used command line arguments:
 #    openeo/internal/processes/generator.py specs/openeo-processes specs/openeo-processes/proposals specs/openeo-processes-legacy --output openeo/processes.py
-# Generated on 2023-11-28
+# Generated on 2024-01-09
 
 from __future__ import annotations
 
@@ -1942,7 +1942,7 @@ def merge_cubes(self, cube2, overlap_resolver=UNSET, context=UNSET) -> ProcessBu
         return merge_cubes(
             cube1=self,
             cube2=cube2,
-            overlap_resolver=build_child_callback(overlap_resolver, parent_parameters=['x', 'y', 'context']),
+            overlap_resolver=(build_child_callback(overlap_resolver, parent_parameters=['x', 'y', 'context']) if overlap_resolver not in [None, UNSET] else overlap_resolver),
             context=context
         )
 
@@ -4707,7 +4707,7 @@ def merge_cubes(cube1, cube2, overlap_resolver=UNSET, context=UNSET) -> ProcessB
     return _process('merge_cubes', 
         cube1=cube1,
         cube2=cube2,
-        overlap_resolver=build_child_callback(overlap_resolver, parent_parameters=['x', 'y', 'context']),
+        overlap_resolver=(build_child_callback(overlap_resolver, parent_parameters=['x', 'y', 'context']) if overlap_resolver not in [None, UNSET] else overlap_resolver),
         context=context
     )
 

tests/internal/processes/test_generator.py

@@ -293,6 +293,53 @@ def apply_dimension(data, dimension, process):
     )
 
 
+def test_render_process_graph_optional_callback():
+    process = Process.from_dict(
+        {
+            "id": "apply",
+            "description": "Apply",
+            "summary": "Apply",
+            "parameters": [
+                {
+                    "name": "data",
+                    "description": "Data cube",
+                    "schema": {"type": "object", "subtype": "raster-cube"},
+                },
+                {
+                    "name": "process",
+                    "description": "Process",
+                    "schema": {
+                        "type": "object",
+                        "subtype": "process-graph",
+                        "parameters": [{"name": "data", "schema": {"type": "array"}}],
+                    },
+                    "optional": True,
+                },
+            ],
+            "returns": {"description": "Data cube", "schema": {"type": "object", "subtype": "raster-cube"}},
+        }
+    )
+
+    renderer = PythonRenderer(optional_default="UNSET")
+    src = renderer.render_process(process)
+    assert src == dedent(
+        '''\
+        def apply(data, process=UNSET):
+            """
+            Apply
+
+            :param data: Data cube
+            :param process: Process
+
+            :return: Data cube
+            """
+            return _process('apply', 
+                data=data,
+                process=(build_child_callback(process, parent_parameters=['data']) if process not in [None, UNSET] else process)
+            )'''
+    )
+
+
 def test_collect_processes_basic(tmp_path):
     processes = collect_processes(sources=[get_test_resource("data/processes/1.0")])
     assert [p.id for p in processes] == ["add", "cos"]

tests/test_processes.py

@@ -77,3 +77,25 @@ def test_apply_udf():
             "result": True,
         }
     }
+
+
+def test_merge_cubes_no_overlap_resolver():
+    res = openeo.processes.merge_cubes(cube1="dummy1", cube2="dummy2")
+    assert res.flat_graph() == {
+        "mergecubes1": {
+            "process_id": "merge_cubes",
+            "arguments": {"cube1": "dummy1", "cube2": "dummy2"},
+            "result": True,
+        }
+    }
+
+
+def test_merge_cubes_overlap_resolver_none():
+    res = openeo.processes.merge_cubes(cube1="dummy1", cube2="dummy2", overlap_resolver=None)
+    assert res.flat_graph() == {
+        "mergecubes1": {
+            "process_id": "merge_cubes",
+            "arguments": {"cube1": "dummy1", "cube2": "dummy2", "overlap_resolver": None},
+            "result": True,
+        }
+    }