Fix coverage

Author: dmontagu

pydantic_graph/pydantic_graph/beta/graph.py

@@ -7,8 +7,6 @@
 
 from __future__ import annotations as _annotations
 
-import inspect
-import types
 import uuid
 from collections.abc import AsyncGenerator, AsyncIterable, AsyncIterator, Iterable, Sequence
 from contextlib import AbstractContextManager, ExitStack, asynccontextmanager, contextmanager
@@ -188,7 +186,7 @@ async def run(
         """
         if infer_name and self.name is None:
             inferred_name = infer_obj_name(self, depth=2)
-            if inferred_name is not None:
+            if inferred_name is not None:  # pragma: no branch
                 self.name = inferred_name
 
         async with self.iter(state=state, deps=deps, inputs=inputs, span=span, infer_name=False) as graph_run:
@@ -229,9 +227,9 @@ async def iter(
             A GraphRun instance that can be iterated for step-by-step execution
         """
         if infer_name and self.name is None:
-            # f_back because `asynccontextmanager` adds one frame
-            if frame := inspect.currentframe():  # pragma: no branch
-                self._infer_name(frame.f_back)
+            inferred_name = infer_obj_name(self, depth=3)  # depth=3 because asynccontextmanager adds one
+            if inferred_name is not None:  # pragma: no branch
+                self.name = inferred_name
 
         with ExitStack() as stack:
             entered_span: AbstractSpan | None = None
@@ -277,26 +275,6 @@ def __str__(self) -> str:
         """
         return self.render()
 
-    def _infer_name(self, function_frame: types.FrameType | None) -> None:
-        """Infer the agent name from the call frame.
-
-        Usage should be `self._infer_name(inspect.currentframe())`.
-
-        Copied from `Agent`.
-        """
-        assert self.name is None, 'Name already set'
-        if function_frame is not None and (parent_frame := function_frame.f_back):  # pragma: no branch
-            for name, item in parent_frame.f_locals.items():
-                if item is self:
-                    self.name = name
-                    return
-            if parent_frame.f_locals != parent_frame.f_globals:  # pragma: no branch
-                # if we couldn't find the agent in locals and globals are a different dict, try globals
-                for name, item in parent_frame.f_globals.items():  # pragma: no branch
-                    if item is self:
-                        self.name = name
-                        return
-
 
 @dataclass
 class GraphTask:

pydantic_graph/pydantic_graph/beta/graph_builder.py

@@ -641,7 +641,7 @@ def build(self, validate_graph_structure: bool = True) -> Graph[StateT, DepsT, G
 
         Args:
             validate_graph_structure: whether to perform validation of the graph structure
-            See the docstring of `_validate_graph_structure` below for more details.
+                See the docstring of _validate_graph_structure below for more details.
 
         Returns:
             A complete Graph instance ready for execution

tests/graph/beta/test_graph_builder.py

@@ -411,7 +411,7 @@ async def test_validation_unreachable_nodes():
 
     @g.step
     async def reachable_step(ctx: StepContext[None, None, None]) -> int:
-        return 10
+        return 10  # pragma: no cover
 
     @g.step
     async def unreachable_step(ctx: StepContext[None, None, int]) -> int:

tests/graph/beta/test_parent_forks.py

@@ -271,3 +271,34 @@ def test_parent_fork_explicit_fail_with_cycle():
         match="There is a cycle in the graph passing through 'J' that does not include 'F'. Parent forks of a join must be a part of any cycles involving that join.",
     ):
         finder.find_parent_fork(join_id, parent_fork_id='F')
+
+
+def test_parent_fork_ancestor_fork_with_cycle():
+    """Test early return when ancestor fork has cycle but descendant fork is valid.
+
+    This test covers the case where:
+    - F2 is a valid parent fork (part of the cycle, so skipped during backwards walk)
+    - F1 is an ancestor of F2 but invalid (cycle to J bypasses F1)
+    - Should return F2 as the parent fork when walking up the dominator chain
+    """
+    join_id = 'J'
+    nodes = {'start', 'F1', 'F2', 'A', 'J', 'end'}
+    start_ids = {'start'}
+    fork_ids = {'F1', 'F2'}
+    # J -> F2 creates a cycle, but F2 is part of it so it's valid.
+    # F1 is an ancestor but the cycle bypasses it.
+    edges = {
+        'start': ['F1'],
+        'F1': ['F2'],
+        'F2': ['A'],
+        'A': ['J'],
+        'J': ['F2', 'end'],  # Cycle back to F2
+    }
+
+    finder = ParentForkFinder(nodes, start_ids, fork_ids, edges)
+    parent_fork = finder.find_parent_fork(join_id)
+
+    # Should find F2 as valid parent, then hit F1 which has a cycle,
+    # and return F2 (hitting the early return path with assert False)
+    assert parent_fork is not None
+    assert parent_fork.fork_id == 'F2'