computation-graph 58__tar.gz → 60__tar.gz

{computation_graph-58 → computation_graph-60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: computation-graph
-Version: 58
+Version: 60
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 License-File: LICENSE.md

{computation_graph-58 → computation_graph-60}/computation_graph/graph_test.py

@@ -233,6 +233,18 @@ def test_first():
     )
 
 
+async def test_raise_handled_from_async():
+    async def raises():
+        raise base_types.SkipComputationError
+
+    assert (
+        await graph_runners.nullary_infer_sink(
+            composers.make_first(raises, lambda: 1, lambda: 2)
+        )
+        == 1
+    )
+
+
 def test_raise_unhandled_exception():
     class MyExceptionError(Exception):
         ...
@@ -244,6 +256,32 @@ def test_raise_unhandled_exception():
         graph_runners.nullary_infer_sink(composers.make_first(raises, lambda: 1))
 
 
+async def test_raise_exception_in_sync_after_async():
+    def raises(x):
+        raise TypeError("BAD")
+
+    async def async_source():
+        return 4
+
+    with pytest.raises(TypeError, match="BAD"):
+        await run.to_callable_strict(
+            composers.compose_left(async_source, raises, lambda x: 1)
+        )({}, {})
+
+
+async def test_raise_exception_in_async_after_sync():
+    async def raises(x):
+        raise TypeError("BAD")
+
+    def source():
+        return 4
+
+    with pytest.raises(TypeError, match="BAD"):
+        await run.to_callable_strict(
+            composers.compose_left(source, raises, lambda x: 1)
+        )({}, {})
+
+
 def test_first_all_unactionable():
     def raises():
         raise base_types.SkipComputationError

{computation_graph-58 → computation_graph-60}/computation_graph/run.py

@@ -102,7 +102,7 @@ def _profile(node, time_started: float):
     )
 
 
-_group_by_is_async_result = opt_gamla.groupby(lambda k_v: inspect.isawaitable(k_v[1]))
+_group_by_is_future = opt_gamla.groupby(lambda k_v: asyncio.isfuture(k_v[1]))
 
 
 _is_graph_async = opt_gamla.compose_left(
@@ -210,7 +210,7 @@ def _to_callable_with_side_effect_for_single_and_multiple(
         edges, handled_exceptions, single_node_side_effect
     )
 
-    topological_layers = opt_gamla.pipe(
+    topological_sorted_nodes = opt_gamla.pipe(
         edges,
         _toposort_nodes,
         gamla.remove(gamla.contains(placeholder_to_future_source)),
@@ -226,46 +226,44 @@ def _to_callable_with_side_effect_for_single_and_multiple(
     if is_async:
 
         async def final_runner(sources_to_values):
-            d = gamla.pipe(
-                topological_layers,
-                _run_graph(
-                    translate_source_to_placeholder(sources_to_values),
-                    handled_exceptions,
-                ),
-                dict,
+            node_to_task_or_result = _run_graph(
+                translate_source_to_placeholder(sources_to_values),
+                handled_exceptions,
+                topological_sorted_nodes,
             )
-            results_by_is_async = _group_by_is_async_result(d.items())
+            results_by_is_async = _group_by_is_future(node_to_task_or_result.items())
             async_results = tuple(zip(*results_by_is_async.get(True, ())))
             sync_results = dict(results_by_is_async.get(False, ()))
-            return all_node_side_effects_on_edges(
-                sync_results
-                | (
-                    {
-                        k: v
-                        for (k, v) in zip(
-                            async_results[0],
-                            await asyncio.gather(
-                                *async_results[1], return_exceptions=True
-                            ),
-                        )
-                        if not isinstance(v, Exception)
-                    }
-                    if async_results
-                    else {}
-                )
-            )
+
+            all_results = sync_results
+            if async_results:
+                for (node, node_result) in zip(
+                    async_results[0],
+                    await asyncio.gather(*async_results[1], return_exceptions=True),
+                ):
+                    e = node_to_task_or_result[node].exception()
+                    if e and not isinstance(
+                        e,
+                        (
+                            _DepNotFoundError,
+                            base_types.SkipComputationError,
+                            *handled_exceptions,
+                        ),
+                    ):
+                        raise e from e
+                    all_results[node] = node_result
+
+            return all_node_side_effects_on_edges(all_results)
 
     else:
 
         def final_runner(sources_to_values):
-            return gamla.pipe(
-                topological_layers,
+            return all_node_side_effects_on_edges(
                 _run_graph(
                     translate_source_to_placeholder(sources_to_values),
                     handled_exceptions,
-                ),
-                dict,
-                all_node_side_effects_on_edges,
+                    topological_sorted_nodes,
+                )
             )
 
     return (_async_graph_reducer if is_async else _graph_reducer)(final_runner)
@@ -506,25 +504,24 @@ def _make_get_node_executor(
     return get_executor
 
 
-def _run_graph(inputs: dict, handled_exceptions):
-    def run_graph(
-        nodes: tuple[tuple[base_types.ComputationNode, _NodeExecutor]]
-    ) -> _NodeToResults:
-        accumulated_results = inputs.copy()
-        for node_executor in nodes:
-            try:
-                accumulated_results[node_executor[0]] = node_executor[1](
-                    accumulated_results, node_executor[0]
-                )
-            except (
-                _DepNotFoundError,
-                base_types.SkipComputationError,
-                *handled_exceptions,
-            ):
-                pass
-        return accumulated_results
-
-    return run_graph
+def _run_graph(
+    inputs: dict,
+    handled_exceptions,
+    topological_sorted_nodes: tuple[tuple[base_types.ComputationNode, _NodeExecutor]],
+) -> _NodeToResults:
+    accumulated_results = inputs.copy()
+    for node_executor in topological_sorted_nodes:
+        try:
+            accumulated_results[node_executor[0]] = node_executor[1](
+                accumulated_results, node_executor[0]
+            )
+        except (
+            _DepNotFoundError,
+            base_types.SkipComputationError,
+            *handled_exceptions,
+        ):
+            pass
+    return accumulated_results
 
 
 def _graph_reducer(graph_callable):

{computation_graph-58 → computation_graph-60}/computation_graph.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: computation-graph
-Version: 58
+Version: 60
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 License-File: LICENSE.md

{computation_graph-58 → computation_graph-60}/setup.py

@@ -7,7 +7,7 @@ with open("README.md", "r") as fh:
 setuptools.setup(
     name="computation-graph",
     python_requires=">=3",
-    version="58",
+    version="60",
     long_description=_LONG_DESCRIPTION,
     long_description_content_type="text/markdown",
     packages=setuptools.find_namespace_packages(),