graph: rename add_subgraph/add_conditional to add_subgraph_node/add_conditional_edge (#2)

Align method names with what they add. `add_subgraph_node` pairs with
`add_node` as the non-default node variant; `add_conditional_edge` pairs
with `add_edge` as the non-default edge variant. The implicit "a subgraph
is added as a node" and "a conditional is an edge" framings become
explicit at the call site.

Pre-1.0 rename with no deprecation aliases per rough-edges.md.

Author: chris-colinsky

src/openarmature/graph/builder.py

@@ -43,7 +43,7 @@ def add_node(
         self._nodes[name] = FunctionNode(name=name, fn=fn)
         return self
 
-    def add_subgraph(
+    def add_subgraph_node(
         self,
         name: str,
         compiled: CompiledGraph,
@@ -59,7 +59,7 @@ def add_edge(self, source: str, target: str | EndSentinel) -> Self:
         self._edges.append(StaticEdge(source=source, target=target))
         return self
 
-    def add_conditional(
+    def add_conditional_edge(
         self,
         source: str,
         fn: Callable[[Any], str | EndSentinel],

tests/conformance/adapter.py

@@ -211,7 +211,7 @@ def build_graph(
             builder.add_edge(source, _resolve_target(edge_spec["to"]))
         elif "condition" in edge_spec:
             cond = edge_spec["condition"]
-            builder.add_conditional(
+            builder.add_conditional_edge(
                 source,
                 _make_conditional_fn(cond["if_field"], cond["equals"], cond["then"], cond["else"]),
             )

tests/unit/test_compile_errors.py

@@ -36,4 +36,4 @@ def test_duplicate_subgraph_name_raises_value_error() -> None:
     inner = GraphBuilder(S).add_node("x", _noop).add_edge("x", END).set_entry("x").compile()
     builder = GraphBuilder(S).add_node("a", _noop)
     with pytest.raises(ValueError, match="already declared"):
-        builder.add_subgraph("a", inner)
+        builder.add_subgraph_node("a", inner)

tests/unit/test_runtime_errors.py

@@ -35,7 +35,7 @@ async def node_a(_state: Any) -> dict[str, Any]:
     def bad_edge(_state: Any) -> str | EndSentinel:
         raise RuntimeError("edge boom")
 
-    g = GraphBuilder(S).add_node("a", node_a).add_conditional("a", bad_edge).set_entry("a").compile()
+    g = GraphBuilder(S).add_node("a", node_a).add_conditional_edge("a", bad_edge).set_entry("a").compile()
 
     with pytest.raises(EdgeException) as excinfo:
         await g.invoke(S())

tests/unit/test_subgraph.py

@@ -3,7 +3,7 @@
 The conformance adapter routes around `SubgraphNode` via a function-node
 wrapper (so it can record outer-graph execution order in the parent trace).
 These tests exercise `SubgraphNode.run` directly, plus the
-`builder.add_subgraph` path that constructs one internally.
+`builder.add_subgraph_node` path that constructs one internally.
 """
 
 from typing import Annotated, Any
@@ -42,7 +42,7 @@ async def x(_s: Any) -> dict[str, Any]:
     assert dict(result) == {"msg": "hello", "trace": ["x"]}
 
 
-async def test_outer_graph_composes_subgraph_via_add_subgraph() -> None:
+async def test_outer_graph_composes_subgraph_via_add_subgraph_node() -> None:
     async def x(_s: Any) -> dict[str, Any]:
         return {"msg": "from-x", "trace": ["x"]}
 
@@ -68,7 +68,7 @@ async def outer_b(_s: Any) -> dict[str, Any]:
     outer = (
         GraphBuilder(Outer)
         .add_node("outer_a", outer_a)
-        .add_subgraph("outer_sub", inner)
+        .add_subgraph_node("outer_sub", inner)
         .add_node("outer_b", outer_b)
         .add_edge("outer_a", "outer_sub")
         .add_edge("outer_sub", "outer_b")