raise ProcessGraphVisitException from resolve_from_node

Author: soxofaan

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#233](https://github.com/Open-EO/openeo-python-client/pull/233)).
 - Update documentation/examples/tests: EPSG CRS in `filter_bbox` should be integer code, not string
   ([#233](https://github.com/Open-EO/openeo-python-client/pull/233)).
+- Raise `ProcessGraphVisitException` from `ProcessGraphVisitor.resolve_from_node()` (instead of generic `ValueError`)
 
 
 ### Removed

openeo/_version.py

@@ -1 +1 @@
-__version__ = '0.8.3a1'
+__version__ = '0.8.3a2'

openeo/internal/process_graph_visitor.py

@@ -29,21 +29,21 @@ def dereference_from_node_arguments(cls, process_graph: dict) -> str:
         :return: name of the "result" node of the graph
         """
 
-        # TODO avoid manipulating process graph in place? make it more explicit? work on a copy? Where is this functionality used anyway?
+        # TODO avoid manipulating process graph in place? make it more explicit? work on a copy?
         # TODO call it more something like "unflatten"?. Split this off of ProcessGraphVisitor?
         # TODO implement this through `ProcessGraphUnflattener` ?
 
         def resolve_from_node(process_graph, node, from_node):
             if from_node not in process_graph:
-                raise ValueError('from_node {f!r} (referenced by {n!r}) not in process graph.'.format(
+                raise ProcessGraphVisitException('from_node {f!r} (referenced by {n!r}) not in process graph.'.format(
                     f=from_node, n=node))
             return process_graph[from_node]
 
         result_node = None
         for node, node_dict in process_graph.items():
             if node_dict.get("result", False):
                 if result_node:
-                    raise ValueError("Multiple result nodes: {a}, {b}".format(a=result_node, b=node))
+                    raise ProcessGraphVisitException("Multiple result nodes: {a}, {b}".format(a=result_node, b=node))
                 result_node = node
             arguments = node_dict.get("arguments", {})
             for arg in arguments.values():
@@ -60,7 +60,8 @@ def resolve_from_node(process_graph, node, from_node):
                             arg[i] = resolve_from_node(process_graph, node, element['from_node'])
 
         if result_node is None:
-            raise ValueError("The provided process graph does not contain a result node. Received this graph: " + json.dumps(process_graph, indent=2))
+            dump = json.dumps(process_graph, indent=2)
+            raise ProcessGraphVisitException("No result node in process graph: " + dump[:1000])
         return result_node
 
     def accept_process_graph(self, graph: dict) -> 'ProcessGraphVisitor':

tests/internal/test_process_graph_visitor.py

@@ -292,15 +292,15 @@ def test_dereference_dict_arg():
 
 
 def test_dereference_no_result_node():
-    with pytest.raises(ValueError, match="does not contain a result node"):
+    with pytest.raises(ProcessGraphVisitException, match="No result node in process graph"):
         ProcessGraphVisitor.dereference_from_node_arguments({
             "node1": {},
             "node2": {}
         })
 
 
 def test_dereference_multiple_result_node():
-    with pytest.raises(ValueError, match="Multiple result nodes"):
+    with pytest.raises(ProcessGraphVisitException, match="Multiple result nodes"):
         ProcessGraphVisitor.dereference_from_node_arguments({
             "node1": {"result": True},
             "node2": {"result": True}
@@ -319,7 +319,7 @@ def test_dereference_invalid_node():
             "result": True
         }
     }
-    with pytest.raises(ValueError, match="not in process graph"):
+    with pytest.raises(ProcessGraphVisitException, match="not in process graph"):
         ProcessGraphVisitor.dereference_from_node_arguments(graph)