-
Notifications
You must be signed in to change notification settings - Fork 4
refactor: Refactoring to adjust how cycles are detected and output to users. #216
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sdelliot
wants to merge
5
commits into
sandialabs:main
Choose a base branch
from
sdelliot:refactor-dependency-graph-errors
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
refactor: Refactoring to adjust how cycles are detected and output to users. #216
sdelliot
wants to merge
5
commits into
sandialabs:main
from
sdelliot:refactor-dependency-graph-errors
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mitchnegus
reviewed
Jan 2, 2026
Comment on lines
+166
to
+202
| def dependency_cycle_handler(self): | ||
| """ | ||
| The dependency graph had cycles so we should retrieve those cycles and alert | ||
| the user. | ||
|
|
||
| Raises: | ||
| UnsatisfiableDependenciesError: Output the cycles in the graph. | ||
| """ | ||
| all_human_cycles = self.get_cycles() | ||
| all_cycle_graphs = "" | ||
| for cycle in all_human_cycles: | ||
| cdg = nx.DiGraph() | ||
| for node in cycle: | ||
| cdg.add_node(node) | ||
|
|
||
| for i, node in enumerate(cycle[:-1]): | ||
| cdg.add_edge(node, cycle[i + 1]) | ||
| cdg.add_edge(cycle[0], cycle[-1]) | ||
|
|
||
| for line in nx.generate_network_text(cdg): | ||
| all_cycle_graphs += f"{line}\n" | ||
|
|
||
| all_cycle_graphs += "\n\n" | ||
|
|
||
| # Improving upon the default networkx diagrams | ||
| backedge: str = "╾" | ||
| all_cycle_graphs = all_cycle_graphs.replace(backedge, "◄─") | ||
| all_cycle_graphs = all_cycle_graphs.replace("╼", "►") | ||
|
|
||
| self.log.error( | ||
| "Unsatisfiable dependency graph contained %s cycles", len(all_human_cycles) | ||
| ) | ||
| raise UnsatisfiableDependenciesError( | ||
| "Unsatisfiable: Circular dependency relationship(s) found.\n" | ||
| f"Simple cycles:\n{all_cycle_graphs}" | ||
| ) | ||
|
|
Member
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're refactoring this, could we add a few more methods to make it a bit clearer and compartmentalize some of the implementation details?
Suggested change
| def dependency_cycle_handler(self): | |
| """ | |
| The dependency graph had cycles so we should retrieve those cycles and alert | |
| the user. | |
| Raises: | |
| UnsatisfiableDependenciesError: Output the cycles in the graph. | |
| """ | |
| all_human_cycles = self.get_cycles() | |
| all_cycle_graphs = "" | |
| for cycle in all_human_cycles: | |
| cdg = nx.DiGraph() | |
| for node in cycle: | |
| cdg.add_node(node) | |
| for i, node in enumerate(cycle[:-1]): | |
| cdg.add_edge(node, cycle[i + 1]) | |
| cdg.add_edge(cycle[0], cycle[-1]) | |
| for line in nx.generate_network_text(cdg): | |
| all_cycle_graphs += f"{line}\n" | |
| all_cycle_graphs += "\n\n" | |
| # Improving upon the default networkx diagrams | |
| backedge: str = "╾" | |
| all_cycle_graphs = all_cycle_graphs.replace(backedge, "◄─") | |
| all_cycle_graphs = all_cycle_graphs.replace("╼", "►") | |
| self.log.error( | |
| "Unsatisfiable dependency graph contained %s cycles", len(all_human_cycles) | |
| ) | |
| raise UnsatisfiableDependenciesError( | |
| "Unsatisfiable: Circular dependency relationship(s) found.\n" | |
| f"Simple cycles:\n{all_cycle_graphs}" | |
| ) | |
| def dependency_cycle_handler(self): | |
| """ | |
| The dependency graph had cycles so we should retrieve those cycles and alert | |
| the user. | |
| Raises: | |
| UnsatisfiableDependenciesError: Output the cycles in the graph. | |
| """ | |
| cycle_graphs = [self._build_cycle_graph(cycle) for cycle in self.get_cycles()] | |
| cycle_graph_outputs = [ | |
| self._format_cycle_graph_output(cycle_graph) | |
| for cycle_graph in cycle_graphs | |
| ] | |
| all_cycle_graphs = "\n\n".join(cycle_graph_outputs) | |
| self.log.error( | |
| "Unsatisfiable dependency graph contained %s cycles", len(cycle_graphs) | |
| ) | |
| raise UnsatisfiableDependenciesError( | |
| "Unsatisfiable: Circular dependency relationship(s) found.\n" | |
| f"Simple cycles:\n{all_cycle_graphs}" | |
| ) | |
| def _build_cycle_graph(self, cycle): | |
| cycle_graph = nx.DiGraph() | |
| # Add nodes and edges to the cycle graph | |
| for node in cycle: | |
| cycle_graph.add_node(node) | |
| for i, node in enumerate(cycle[:-1]): | |
| next_node = cycle[i + 1] | |
| cycle_graph.add_edge(node, next_node]) | |
| cycle_graph.add_edge(cycle[0], cycle[-1]) | |
| return cycle_graph | |
| def _format_cycle_graph_output(self, cycle_graph) | |
| raw_output_string = "\n".join(nx.generate_network_text(cycle_graph)) | |
| # Improve upon the default networkx diagrams | |
| backedge: str = "╾" | |
| output_string = raw_output_string.replace(backedge, "◄─").replace("╼", "►") | |
| return output_string |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactoring to adjust how cycles are detected and output to users.
Description
Discovered as part of sandialabs/firewheel_repo_base#3, this PR refactors where cycles in the dependency graph are checked and assists in clearly printing this information for users, should a cycle appear.
Related Issue
N/A
Type of Change
Please select the type of change your pull request introduces:
Checklist
Additional Notes
N/A