mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-05-26 10:47:21 +08:00
02c2587ca4
## Summary This PR fixes the iteration variable mismatch reported in #14142. Changes: - restore compatibility for `IterationItem@result` by exposing `result` alongside `item` - support bare iteration aliases like `{item}`, `{index}`, and `{result}` inside iteration child-node inputs - add focused unit/runtime tests covering both alias styles and multi-item iteration execution ## Validation ```bash pytest -q --noconftest \ test/testcases/test_web_api/test_canvas_app/test_iterationitem_unit.py \ test/testcases/test_web_api/test_canvas_app/test_iteration_runtime_unit.py \ test/testcases/test_web_api/test_canvas_app/test_invoke_component_unit.py ``` Result: `12 passed` Closes #14142
96 lines
3.0 KiB
Python
96 lines
3.0 KiB
Python
#
|
|
# Copyright 2024 The InfiniFlow Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
from abc import ABC
|
|
from agent.component.base import ComponentBase, ComponentParamBase
|
|
|
|
|
|
class IterationItemParam(ComponentParamBase):
|
|
"""
|
|
Define the IterationItem component parameters.
|
|
"""
|
|
def check(self):
|
|
return True
|
|
|
|
|
|
class IterationItem(ComponentBase, ABC):
|
|
component_name = "IterationItem"
|
|
|
|
def __init__(self, canvas, id, param: ComponentParamBase):
|
|
super().__init__(canvas, id, param)
|
|
self._idx = 0
|
|
|
|
def _invoke(self, **kwargs):
|
|
if self.check_if_canceled("IterationItem processing"):
|
|
return
|
|
|
|
parent = self.get_parent()
|
|
arr = self._canvas.get_variable_value(parent._param.items_ref)
|
|
if not isinstance(arr, list):
|
|
self._idx = -1
|
|
raise Exception(parent._param.items_ref + " must be an array, but its type is "+str(type(arr)))
|
|
|
|
if self._idx > 0:
|
|
if self.check_if_canceled("IterationItem processing"):
|
|
return
|
|
self.output_collation()
|
|
|
|
if self._idx >= len(arr):
|
|
self._idx = -1
|
|
return
|
|
|
|
if self.check_if_canceled("IterationItem processing"):
|
|
return
|
|
|
|
current_item = arr[self._idx]
|
|
self.set_output("item", current_item)
|
|
# Keep `result` as a compatibility alias because existing DSL examples
|
|
# and downstream references may still consume IterationItem via `@result`.
|
|
self.set_output("result", current_item)
|
|
self.set_output("index", self._idx)
|
|
|
|
self._idx += 1
|
|
|
|
def output_collation(self):
|
|
pid = self.get_parent()._id
|
|
for cid in self._canvas.components.keys():
|
|
obj = self._canvas.get_component_obj(cid)
|
|
p = obj.get_parent()
|
|
if not p:
|
|
continue
|
|
if p._id != pid:
|
|
continue
|
|
|
|
if p.component_name.lower() in ["categorize", "message", "switch", "userfillup", "iterationitem"]:
|
|
continue
|
|
|
|
for k, o in p._param.outputs.items():
|
|
if "ref" not in o:
|
|
continue
|
|
_cid, var = o["ref"].split("@")
|
|
if _cid != cid:
|
|
continue
|
|
res = p.output(k)
|
|
if not res:
|
|
res = []
|
|
res.append(obj.output(var))
|
|
p.set_output(k, res)
|
|
|
|
def end(self):
|
|
return self._idx == -1
|
|
|
|
def thoughts(self) -> str:
|
|
return "Next turn..."
|