simplify pathing to obey push dirs for node autoinsertion (#844)

ucb-bar · Feb 28, 2024 · 5897249 · 5897249
1 parent 9d0961f
commit 5897249
Show file tree

Hide file tree

Showing 2 changed files with 674 additions and 607 deletions.
diff --git a/hammer/flowgraph/flowgraph.py b/hammer/flowgraph/flowgraph.py
@@ -201,7 +201,7 @@ def insert_auxiliary_actions(edge_list: dict[Node, list[Node]]) -> dict[Node, li
                     aux_node = Node(
                         aux_action,
                         parent.tool,
-                        os.path.join(os.path.dirname(parent.pull_dir), f"{aux_action}-dir"),
+                        parent.push_dir,
                         child.pull_dir,
                         parent.required_outputs,
                         [f"{aux_action}-out.json"],
@@ -211,9 +211,6 @@ def insert_auxiliary_actions(edge_list: dict[Node, list[Node]]) -> dict[Node, li
         edge_list_copy = edge_list.copy()
         for parent_idx, child_idx, aux_node in changes:
             parent, children = list(edge_list_copy.items())[parent_idx]
-            parent.push_dir = os.path.join(
-                os.path.dirname(parent.pull_dir),
-                f"{aux_node.action}-dir")
 
             child = children[child_idx]
             child.required_inputs = aux_node.required_outputs