frameplot 0.5.3__tar.gz → 0.5.5__tar.gz

{frameplot-0.5.3/src/frameplot.egg-info → frameplot-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frameplot
-Version: 0.5.3
+Version: 0.5.5
 Summary: Turn Python-defined pipeline graphs into presentation-ready SVG and PNG diagrams.
 Author: Small Turtle 2
 License-Expression: MIT

{frameplot-0.5.3 → frameplot-0.5.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frameplot"
-version = "0.5.3"
+version = "0.5.5"
 description = "Turn Python-defined pipeline graphs into presentation-ready SVG and PNG diagrams."
 readme = "README.md"
 requires-python = ">=3.11"

{frameplot-0.5.3 → frameplot-0.5.5}/src/frameplot/layout/order.py

@@ -33,9 +33,6 @@ def order_nodes(
             _resort_rank(nodes_by_rank[rank], outgoing, order, validated)
             _refresh_order(nodes_by_rank[rank], order)
 
-    if isinstance(validated, ValidatedDetailPanel):
-        _apply_detail_panel_shared_source_lanes(validated, ranks, order)
-
     if isinstance(validated, ValidatedPipeline) and validated.detail_panel is not None:
         _apply_detail_panel_bias(validated, nodes_by_rank, ranks, order)
 
@@ -120,126 +117,6 @@ def _apply_detail_panel_bias(
         for index, node_id in enumerate(rank_focus_nodes):
             order[node_id] = start_row + index
 
-
-def _apply_detail_panel_shared_source_lanes(
-    validated: ValidatedDetailPanel,
-    ranks: dict[str, int],
-    order: dict[str, int],
-) -> None:
-    group_membership = _group_membership(validated)
-    components = _weak_components(validated)
-    incoming, outgoing = _forward_neighbors(validated, ranks)
-
-    for component_nodes in components:
-        component_set = set(component_nodes)
-        shared_sources = [
-            node_id
-            for node_id in component_nodes
-            if _is_detail_panel_shared_source(
-                node_id,
-                component_set,
-                group_membership,
-                incoming,
-                outgoing,
-                order,
-            )
-        ]
-        if not shared_sources:
-            continue
-
-        shared_sources.sort(key=lambda node_id: (order[node_id], validated.node_index[node_id], node_id))
-        shared_source_ids = set(shared_sources)
-        nonshared_rows = _reorder_component_nodes(
-            validated,
-            ranks,
-            component_set - shared_source_ids,
-        )
-
-        for index, node_id in enumerate(shared_sources):
-            order[node_id] = index
-        for node_id, row in nonshared_rows.items():
-            order[node_id] = row + len(shared_sources)
-
-
-def _is_detail_panel_shared_source(
-    node_id: str,
-    component_nodes: set[str],
-    group_membership: dict[str, tuple[str, ...]],
-    incoming: dict[str, list[str]],
-    outgoing: dict[str, list[str]],
-    order: dict[str, int],
-) -> bool:
-    if group_membership.get(node_id):
-        return False
-    if incoming.get(node_id):
-        return False
-
-    targets = [target_id for target_id in outgoing.get(node_id, ()) if target_id in component_nodes]
-    if len(set(targets)) < 2:
-        return False
-
-    downstream_lanes = {
-        (
-            order[target_id],
-            group_membership.get(target_id, ()),
-        )
-        for target_id in targets
-    }
-    return len(downstream_lanes) >= 2
-
-
-def _group_membership(
-    validated: ValidatedPipeline | ValidatedDetailPanel,
-) -> dict[str, tuple[str, ...]]:
-    memberships: dict[str, list[str]] = defaultdict(list)
-    for group in validated.groups:
-        for node_id in group.node_ids:
-            memberships[node_id].append(group.id)
-    return {
-        node_id: tuple(sorted(group_ids))
-        for node_id, group_ids in memberships.items()
-    }
-
-
-def _reorder_component_nodes(
-    validated: ValidatedPipeline | ValidatedDetailPanel,
-    ranks: dict[str, int],
-    included_node_ids: set[str],
-) -> dict[str, int]:
-    if not included_node_ids:
-        return {}
-
-    nodes_by_rank: dict[int, list[str]] = defaultdict(list)
-    for node_id in included_node_ids:
-        nodes_by_rank[ranks[node_id]].append(node_id)
-
-    for rank_nodes in nodes_by_rank.values():
-        rank_nodes.sort(key=validated.node_index.__getitem__)
-
-    local_order = {
-        node_id: index
-        for rank_nodes in nodes_by_rank.values()
-        for index, node_id in enumerate(rank_nodes)
-    }
-
-    incoming, outgoing = _forward_neighbors(
-        validated,
-        ranks,
-        included_node_ids=included_node_ids,
-    )
-    ordered_ranks = sorted(nodes_by_rank)
-
-    for _ in range(4):
-        for rank in ordered_ranks[1:]:
-            _resort_rank(nodes_by_rank[rank], incoming, local_order, validated)
-            _refresh_order(nodes_by_rank[rank], local_order)
-        for rank in reversed(ordered_ranks[:-1]):
-            _resort_rank(nodes_by_rank[rank], outgoing, local_order, validated)
-            _refresh_order(nodes_by_rank[rank], local_order)
-
-    return local_order
-
-
 def _detail_focus_path_nodes(
     validated: ValidatedPipeline,
     ranks: dict[str, int],

{frameplot-0.5.3 → frameplot-0.5.5}/src/frameplot/layout/route.py

@@ -810,7 +810,9 @@ def _select_forward_route(
         target_node.node.id,
         routing_groups,
     )
-    evaluations: list[tuple[bool, tuple[int, int, int, float, float, int, float, int, float, int], CandidatePath]] = []
+    evaluations: list[
+        tuple[bool, tuple[int, int, int, int, float, float, int, float, int, float, int], CandidatePath]
+    ] = []
 
     for candidate_index, (kind, candidate) in enumerate(candidates):
         clearance_ok = _path_respects_group_clearance(
@@ -1560,7 +1562,7 @@ def _select_candidate_with_priority(
     evaluations: list[
         tuple[
             bool,
-            tuple[int, int, int, float, float, int, float, int, float, int],
+            tuple[int, int, int, int, float, float, int, float, int, float, int],
             CandidatePath,
         ]
     ],
@@ -1748,7 +1750,7 @@ def _forward_priority_key(
     theme: "Theme",
     has_relevant_groups: bool,
     interactions: InteractionMetrics,
-) -> tuple[int, int, int, float, float, int, float, int, float, int]:
+) -> tuple[int, int, int, int, float, float, int, float, int, float, int]:
     collisions, backwards, bends, length = _route_metrics(
         candidate,
         nodes=nodes,
@@ -1758,6 +1760,16 @@ def _forward_priority_key(
     return (
         interactions.edge_crossings,
         collisions,
+        _clean_direct_elbow_priority(
+            kind,
+            collisions=collisions,
+            backwards=backwards,
+            bends=bends,
+            has_relevant_groups=has_relevant_groups,
+            interactions=interactions,
+            source_node=source_node,
+            target_node=target_node,
+        ),
         _forward_side_change_penalty(kind, has_relevant_groups=has_relevant_groups),
         interactions.edge_overlap_length,
         interactions.obstacle_overlap_length,
@@ -1775,6 +1787,30 @@ def _forward_priority_key(
     )
 
 
+def _clean_direct_elbow_priority(
+    kind: str,
+    *,
+    collisions: int,
+    backwards: float,
+    bends: int,
+    has_relevant_groups: bool,
+    interactions: InteractionMetrics,
+    source_node: LayoutNode,
+    target_node: LayoutNode,
+) -> int:
+    if kind != "direct_elbow" or has_relevant_groups:
+        return 1
+    if source_node.order >= target_node.order:
+        return 1
+    if collisions != 0 or bends != 1 or backwards > EPSILON:
+        return 1
+    if interactions.edge_crossings != 0 or interactions.edge_overlap_length > EPSILON:
+        return 1
+    if interactions.obstacle_overlap_length > EPSILON or interactions.obstacle_crossings != 0:
+        return 1
+    return 0
+
+
 def _forward_kind_priority(
     kind: str,
     *,

{frameplot-0.5.3 → frameplot-0.5.5/src/frameplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frameplot
-Version: 0.5.3
+Version: 0.5.5
 Summary: Turn Python-defined pipeline graphs into presentation-ready SVG and PNG diagrams.
 Author: Small Turtle 2
 License-Expression: MIT

{frameplot-0.5.3 → frameplot-0.5.5}/tests/test_rendering.py

@@ -905,6 +905,24 @@ def test_grouped_forward_edge_can_use_right_side_direct_elbow() -> None:
     assert all(not _point_in_bounds(point, inputs) for point in bends)
 
 
+def test_generate_pipeline_script_prefers_clean_single_bend_guidance_elbow() -> None:
+    namespace = runpy.run_path("test/generate_pipeline.py")
+    pipeline = namespace["build_pipeline"]()
+    layout = build_layout(pipeline)
+    routed = {edge.edge.id: edge for edge in layout.main.edges}
+    guide = layout.main.nodes["h_feature"]
+    target = layout.main.nodes["main_blocks"]
+
+    points = routed["h_to_main"].points
+    bends = _bend_points(points)
+
+    assert len(points) == 3
+    assert bends == [points[1]]
+    assert points[0] == Point(guide.right, guide.center_y)
+    assert points[1] == Point(target.center_x, guide.center_y)
+    assert points[-1] == Point(target.center_x, target.y)
+
+
 def test_back_edge_leaves_group_before_bending() -> None:
     pipeline = Pipeline(
         nodes=[
@@ -1472,25 +1490,33 @@ def test_detail_panel_nested_groups_keep_visible_inner_gap_and_header_clearance(
     assert child.y - parent.y > pipeline.theme.subtitle_font_size * metrics.line_height_ratio
 
 
-def test_detail_panel_shared_guidance_node_stays_above_stream_groups() -> None:
+def test_detail_panel_shared_guidance_node_uses_general_lane_ordering() -> None:
     layout = build_layout(_build_generate_pipeline_fixture())
     panel_nodes = layout.detail_panel.graph.nodes
-    panel_groups = layout.detail_panel.graph.groups
     routed = {edge.edge.id: edge for edge in layout.detail_panel.graph.edges}
     h_node = panel_nodes["panel_h"]
     source_lane_one = _source_access_segment(routed["panel_h_to_nca_c"].points)
     source_lane_two = _source_access_segment(routed["panel_h_to_nca_m"].points)
 
-    assert h_node.order == 0
-    assert panel_nodes["panel_c_in"].order == panel_nodes["panel_nca_c"].order == 1
-    assert panel_nodes["panel_m_in"].order == panel_nodes["panel_nca_m"].order == 2
-    assert all(not _point_in_bounds(Point(h_node.center_x, h_node.center_y), overlay.bounds) for overlay in panel_groups)
-    assert routed["panel_h_to_nca_c"].points[0].x == h_node.right
-    assert routed["panel_h_to_nca_m"].points[0].x == h_node.right
-    assert routed["panel_h_to_nca_c"].points[0].y != routed["panel_h_to_nca_m"].points[0].y
+    assert panel_nodes["panel_c_in"].order == panel_nodes["panel_nca_c"].order == 0
+    assert h_node.order == panel_nodes["panel_nca_m"].order == 1
+    assert panel_nodes["panel_m_in"].order == 2
+    assert h_node.order != 0
     assert _collinear_overlap_length(*source_lane_one, *source_lane_two) == pytest.approx(0.0, abs=0.01)
 
 
+def test_generate_pipeline_script_detail_panel_aligns_guidance_with_candidate_lane() -> None:
+    namespace = runpy.run_path("test/generate_pipeline.py")
+    pipeline = namespace["build_pipeline"]()
+    layout = build_layout(pipeline)
+    panel_nodes = layout.detail_panel.graph.nodes
+    routed = {edge.edge.id: edge for edge in layout.detail_panel.graph.edges}
+
+    assert panel_nodes["panel_h"].order == panel_nodes["panel_local_c"].order == panel_nodes["panel_global_c"].order == 0
+    assert panel_nodes["panel_local_m"].order == panel_nodes["panel_global_m"].order == 1
+    assert routed["panel_h_to_local_c"].points[0].y == routed["panel_h_to_local_c"].points[-1].y
+
+
 def test_generate_pipeline_row_gap_no_longer_scales_with_raw_cross_row_edge_count() -> None:
     layout = build_layout(_build_generate_pipeline_fixture())
     gap = _row_gap_between_rows(layout.main.nodes, 0, 1)