computation-graph 64__tar.gz → 66__tar.gz

{computation_graph-64 → computation_graph-66}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: computation-graph
-Version: 64
+Version: 66
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
@@ -12,6 +12,12 @@ Requires-Dist: termcolor
 Provides-Extra: test
 Requires-Dist: pygraphviz; extra == "test"
 Requires-Dist: pytest>=5.4.0; extra == "test"
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
 
 [![Build Status](https://travis-ci.com/hyroai/computation-graph.svg?branch=master)](https://travis-ci.com/hyroai/computation-graph)
 

{computation_graph-64 → computation_graph-66}/computation_graph/composers/lift.py

@@ -5,11 +5,19 @@ import gamla
 from computation_graph import base_types, composers
 
 
+def _short_name(x) -> str:
+    if x is None or isinstance(x, (int, float, str)):
+        return f"{x!s:.30}"
+    if isinstance(x, (dict, list, tuple, set, frozenset)):
+        return f"{type(x).__name__}[{len(x)}]"
+    return type(x).__name__
+
+
 def always(x):
     def always():
         return x
 
-    always.__name__ = f"always {x!s:.30}"
+    always.__name__ = f"always {_short_name(x)}"
     return always
 
 

computation_graph-66/computation_graph/composers/lift_test.py

@@ -0,0 +1,42 @@
+from computation_graph.composers import lift
+
+
+def test_always_returns_the_value():
+    assert lift.always(5)() == 5
+    obj = {"a": 1}
+    assert lift.always(obj)() is obj
+
+
+def test_always_name_keeps_scalars_readable():
+    assert lift.always(5).__name__ == "always 5"
+    assert lift.always(3.5).__name__ == "always 3.5"
+    assert lift.always("cardiology").__name__ == "always cardiology"
+    assert lift.always(None).__name__ == "always None"
+
+
+def test_always_name_summarizes_containers_by_type_and_length():
+    assert lift.always({"a": 1, "b": 2}).__name__ == "always dict[2]"
+    assert lift.always([1, 2, 3]).__name__ == "always list[3]"
+    assert lift.always((1, 2)).__name__ == "always tuple[2]"
+
+
+def test_always_name_does_not_render_large_container_contents():
+    # The point of the summary: naming a node must not stringify a huge value.
+    name = lift.always({i: i for i in range(10_000)}).__name__
+    assert name == "always dict[10000]"
+
+
+def test_always_name_falls_back_to_type_for_other_objects():
+    class Custom:
+        pass
+
+    assert lift.always(Custom()).__name__ == "always Custom"
+
+
+def test_distinct_always_calls_produce_distinct_nodes_despite_equal_names():
+    # Names are display-only; node identity is hash(func), and every always()
+    # call is a fresh function, so equal names must not collapse two nodes.
+    a, b = lift.always({"x": 1}), lift.always({"y": 2})
+    assert a.__name__ == b.__name__ == "always dict[1]"
+    assert a is not b
+    assert hash(a) != hash(b)

{computation_graph-64 → computation_graph-66}/computation_graph/run.py

@@ -276,14 +276,6 @@ def _node_incoming_edges_to_input_spec(
     )
 
 
-def _to_awaitable(v) -> Awaitable:
-    if inspect.isawaitable(v):
-        return v
-    f = asyncio.get_event_loop().create_future()
-    f.set_result(v)
-    return f
-
-
 def _make_get_node_executor(
     edges, handled_exceptions, single_node_side_effect: _SingleNodeSideEffect
 ):
@@ -301,25 +293,6 @@ def _make_get_node_executor(
         )
     )
 
-    async def gather(
-        args: Tuple[Awaitable, ...], kwargs: Mapping[str, Awaitable]
-    ) -> tuple[tuple[Any, ...], dict[str, Any]]:
-        if args or kwargs:
-            try:
-                gathered = await asyncio.gather(*args, *kwargs.values())
-                return gathered[: len(args)], dict(
-                    zip(kwargs.keys(), gathered[len(args) :])
-                )
-            except (
-                _DepNotFoundError,
-                base_types.SkipComputationError,
-                *handled_exceptions,
-            ):
-                # We delete the references to the upstream tasks to avoid circular reference (task->exception->traceback->task) and improve memory performance
-                del args, kwargs
-                raise _DepNotFoundError() from None
-        return (), {}
-
     def node_to_input_sync(
         accumulated_results: Mapping[base_types.ComputationNode, base_types.Result],
         input_options: Iterable[_ComputationInputSpec],
@@ -349,12 +322,20 @@ def _make_get_node_executor(
                 accumulated_results.get(kwarg, CG_NO_RESULT) is not CG_NO_RESULT
                 for kwarg in kwargs_spec.values()
             ):
+                # Resolve inputs in place: await only the still-pending ones
+                # (already-scheduled tasks, so concurrency is preserved) and pass
+                # concrete values straight through. This avoids allocating a
+                # resolved Future per concrete input and the asyncio.gather
+                # machinery; the comprehension does zero awaits when nothing is
+                # pending, so it completes without suspending.
+                args = [accumulated_results[a] for a in args_spec]
+                kwargs = {k: accumulated_results[v] for k, v in kwargs_spec.items()}
                 try:
-                    return await gather(
-                        tuple(_to_awaitable(accumulated_results[a]) for a in args_spec),
+                    return (
+                        tuple([await x if inspect.isawaitable(x) else x for x in args]),
                         {
-                            k: _to_awaitable(accumulated_results[v])
-                            for k, v in kwargs_spec.items()
+                            k: (await x if inspect.isawaitable(x) else x)
+                            for k, x in kwargs.items()
                         },
                     )
                 except (
@@ -362,7 +343,9 @@ def _make_get_node_executor(
                     base_types.SkipComputationError,
                     *handled_exceptions,
                 ):
-                    ...
+                    # Drop refs to the upstream tasks to avoid a
+                    # task -> exception -> traceback -> task reference cycle.
+                    del args, kwargs
         return None
 
     @opt_gamla.after(asyncio.create_task)

{computation_graph-64 → computation_graph-66}/computation_graph.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: computation-graph
-Version: 64
+Version: 66
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
@@ -12,6 +12,12 @@ Requires-Dist: termcolor
 Provides-Extra: test
 Requires-Dist: pygraphviz; extra == "test"
 Requires-Dist: pytest>=5.4.0; extra == "test"
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
 
 [![Build Status](https://travis-ci.com/hyroai/computation-graph.svg?branch=master)](https://travis-ci.com/hyroai/computation-graph)
 

{computation_graph-64 → computation_graph-66}/computation_graph.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ computation_graph/composers/condition_test.py
 computation_graph/composers/debug.py
 computation_graph/composers/duplication.py
 computation_graph/composers/lift.py
+computation_graph/composers/lift_test.py
 computation_graph/composers/logic.py
 computation_graph/composers/memory.py
 computation_graph/composers/memory_test.py

{computation_graph-64 → computation_graph-66}/setup.py

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