yujunjun/haystack
1
0
Fork 0
mirror of https://github.com/deepset-ai/haystack.git synced 2025-08-27 01:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Pipeline.__eq__ logic (#6840)

Browse Source
This commit is contained in:
Silvano Cerza 2024-01-29 14:54:46 +01:00 committed by GitHub
parent acf4cd502f
commit b1ec32dae0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
haystack/core/pipeline/pipeline.py
View File

@ -62,20 +62,9 @@ class Pipeline:
Equal pipelines share every metadata, node and edge, but they're not required to use
the same node instances: this allows pipeline saved and then loaded back to be equal to themselves.
"""
if (
not isinstance(other, type(self))
or not getattr(self, "metadata") == getattr(other, "metadata")
or not getattr(self, "max_loops_allowed") == getattr(other, "max_loops_allowed")
or not hasattr(self, "graph")
or not hasattr(other, "graph")
):
if not isinstance(other, Pipeline):
return False
return (
self.graph.adj == other.graph.adj
and self._comparable_nodes_list(self.graph) == self._comparable_nodes_list(other.graph)
and self.graph.graph == other.graph.graph
)
return self.to_dict() == other.to_dict()
def to_dict(self) -> Dict[str, Any]:
"""
@ -172,18 +161,6 @@ class Pipeline:
return pipe
def _comparable_nodes_list(self, graph: networkx.MultiDiGraph) -> List[Dict[str, Any]]:
"""
Replaces instances of nodes with their class name in order to make sure they're comparable.
"""
nodes = []
for node in graph.nodes:
comparable_node = graph.nodes[node]
comparable_node["instance"] = comparable_node["instance"].__class__
nodes.append(comparable_node)
nodes.sort()
return nodes
def add_component(self, name: str, instance: Component) -> None:
"""
Create a component for the given component. Components are not connected to anything by default: