pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2025-12-08 20:42:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Resolved a bug where sibling components in Canvas were not restricted to fetching data from the upstream when parallel components were present. (#6315)

Browse Source 
### What problem does this PR solve?

Fix: Resolved a bug where sibling components in Canvas were not
restricted to fetching data from the upstream when parallel components
were present.
Issue: When parallel components existed in Canvas, sibling components
incorrectly fetched data without being limited to the upstream scope,
causing data retrieval issues.
Solution: Adjusted the data fetching logic to ensure sibling components
only retrieve data from the upstream scope.
### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
科幻大脑
2025-03-20 15:06:18 +08:00
committed by GitHub
parent 95497b4aab
commit 6784e0dfee
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
agent/component/base.py
View File

@ -463,6 +463,8 @@ class ComponentBase(ABC):
if len(self._canvas.path) > 1: if len(self._canvas.path) > 1:
reversed_cpnts.extend(self._canvas.path[-2]) reversed_cpnts.extend(self._canvas.path[-2])
reversed_cpnts.extend(self._canvas.path[-1]) reversed_cpnts.extend(self._canvas.path[-1])
up_cpns = self.get_upstream()
reversed_up_cpnts = [cpn for cpn in reversed_cpnts if cpn in up_cpns]
if self._param.query: if self._param.query:
self._param.inputs = [] self._param.inputs = []
@ -505,7 +507,7 @@ class ComponentBase(ABC):
upstream_outs = [] upstream_outs = []
for u in reversed_cpnts[::-1]: for u in reversed_up_cpnts[::-1]:
if self.get_component_name(u) in ["switch", "concentrator"]: if self.get_component_name(u) in ["switch", "concentrator"]:
continue continue
if self.component_name.lower() == "generate" and self.get_component_name(u) == "retrieval": if self.component_name.lower() == "generate" and self.get_component_name(u) == "retrieval":
@ -565,8 +567,10 @@ class ComponentBase(ABC):
if len(self._canvas.path) > 1: if len(self._canvas.path) > 1:
reversed_cpnts.extend(self._canvas.path[-2]) reversed_cpnts.extend(self._canvas.path[-2])
reversed_cpnts.extend(self._canvas.path[-1]) reversed_cpnts.extend(self._canvas.path[-1])
up_cpns = self.get_upstream()
reversed_up_cpnts = [cpn for cpn in reversed_cpnts if cpn in up_cpns]
for u in reversed_cpnts[::-1]: for u in reversed_up_cpnts[::-1]:
if self.get_component_name(u) in ["switch", "answer"]: if self.get_component_name(u) in ["switch", "answer"]:
continue continue
return self._canvas.get_component(u)["obj"].output()[1] return self._canvas.get_component(u)["obj"].output()[1]
@ -584,3 +588,7 @@ class ComponentBase(ABC):
def get_parent(self): def get_parent(self):
pid = self._canvas.get_component(self._id)["parent_id"] pid = self._canvas.get_component(self._id)["parent_id"]
return self._canvas.get_component(pid)["obj"] return self._canvas.get_component(pid)["obj"]
def get_upstream(self):
cpn_nms = self._canvas.get_component(self._id)['upstream']
return cpn_nms