mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-05-21 08:37:05 +08:00
## Summary This PR fixes 3 bugs in agent components: ### Bug 1: `DataOperations._invoke()` dispatches `"literal_eval"` to wrong handler **File:** `agent/component/data_operations.py`, line 76 The `_invoke()` method compares `self._param.operations` against `"recursive_eval"` (line 76), but the valid value defined in `DataOperationsParam.__init__()` (line 29) and validated in `check()` (line 43) is `"literal_eval"`. This means selecting the `literal_eval` operation from the frontend would never match, and the method `_literal_eval()` would never be called. **Fix:** Change `"recursive_eval"` to `"literal_eval"` in the dispatch condition. ### Bug 2: `VariableAssigner._clear()` — `bool` branch unreachable **File:** `agent/component/variable_assigner.py`, lines 95–100 In Python, `bool` is a subclass of `int` (`True` is `isinstance(True, int) == True`). The `isinstance(variable, int)` check on line 95 catches boolean values before the `isinstance(variable, bool)` check on line 99, making the bool branch unreachable. A boolean variable would be cleared to `0` instead of `False`. **Fix:** Move the `isinstance(variable, bool)` check before `isinstance(variable, int)`. ### Bug 3: `LoopItem.evaluate_condition()` — `bool` branch unreachable **File:** `agent/component/loopitem.py`, lines 67–93 Same issue as Bug 2: `isinstance(var, (int, float))` on line 67 catches boolean values before `isinstance(var, bool)` on line 85. Boolean variables would be evaluated with numeric operators (`=`, `≠`, `>`, etc.) instead of boolean operators (`is`, `is not`). **Fix:** Move the `isinstance(var, bool)` check before `isinstance(var, (int, float))`. ## Test plan - [ ] Verify `DataOperations` with `literal_eval` operation correctly invokes `_literal_eval()` - [ ] Verify `VariableAssigner._clear()` returns `False` for boolean variables (not `0`) - [ ] Verify `LoopItem.evaluate_condition()` uses boolean operators for `True`/`False` values 🤖 Generated with [Claude Code](https://claude.com/claude-code) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Fixed operation routing logic to correctly dispatch the "literal_eval" operation to its handler. * **Refactor** * Reorganized conditional branch ordering in agent components to improve code structure and maintainability without affecting functional behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
167 lines
5.5 KiB
Python
167 lines
5.5 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 LoopItemParam(ComponentParamBase):
|
|
"""
|
|
Define the LoopItem component parameters.
|
|
"""
|
|
def check(self):
|
|
return True
|
|
|
|
class LoopItem(ComponentBase, ABC):
|
|
component_name = "LoopItem"
|
|
|
|
def __init__(self, canvas, id, param: ComponentParamBase):
|
|
super().__init__(canvas, id, param)
|
|
self._idx = 0
|
|
|
|
|
|
def _invoke(self, **kwargs):
|
|
if self.check_if_canceled("LoopItem processing"):
|
|
return
|
|
parent = self.get_parent()
|
|
maximum_loop_count = parent._param.maximum_loop_count
|
|
if self._idx >= maximum_loop_count:
|
|
self._idx = -1
|
|
return
|
|
if self._idx > 0:
|
|
if self.check_if_canceled("LoopItem processing"):
|
|
return
|
|
self._idx += 1
|
|
|
|
def evaluate_condition(self,var, operator, value):
|
|
if isinstance(var, str):
|
|
if operator == "contains":
|
|
return value in var
|
|
elif operator == "not contains":
|
|
return value not in var
|
|
elif operator == "start with":
|
|
return var.startswith(value)
|
|
elif operator == "end with":
|
|
return var.endswith(value)
|
|
elif operator == "is":
|
|
return var == value
|
|
elif operator == "is not":
|
|
return var != value
|
|
elif operator == "empty":
|
|
return var == ""
|
|
elif operator == "not empty":
|
|
return var != ""
|
|
|
|
elif isinstance(var, bool):
|
|
if operator == "is":
|
|
return var is value
|
|
elif operator == "is not":
|
|
return var is not value
|
|
elif operator == "empty":
|
|
return var is None
|
|
elif operator == "not empty":
|
|
return var is not None
|
|
|
|
elif isinstance(var, (int, float)):
|
|
if operator == "=":
|
|
return var == value
|
|
elif operator == "≠":
|
|
return var != value
|
|
elif operator == ">":
|
|
return var > value
|
|
elif operator == "<":
|
|
return var < value
|
|
elif operator == "≥":
|
|
return var >= value
|
|
elif operator == "≤":
|
|
return var <= value
|
|
elif operator == "empty":
|
|
return var is None
|
|
elif operator == "not empty":
|
|
return var is not None
|
|
|
|
elif isinstance(var, dict):
|
|
if operator == "empty":
|
|
return len(var) == 0
|
|
elif operator == "not empty":
|
|
return len(var) > 0
|
|
|
|
elif isinstance(var, list):
|
|
if operator == "contains":
|
|
return value in var
|
|
elif operator == "not contains":
|
|
return value not in var
|
|
|
|
elif operator == "is":
|
|
return var == value
|
|
elif operator == "is not":
|
|
return var != value
|
|
|
|
elif operator == "empty":
|
|
return len(var) == 0
|
|
elif operator == "not empty":
|
|
return len(var) > 0
|
|
elif var is None:
|
|
if operator == "empty":
|
|
return True
|
|
return False
|
|
|
|
raise Exception(f"Invalid operator: {operator}")
|
|
|
|
def end(self):
|
|
if self._idx == -1:
|
|
return True
|
|
parent = self.get_parent()
|
|
logical_operator = parent._param.logical_operator if hasattr(parent._param, "logical_operator") else "and"
|
|
conditions = []
|
|
for item in parent._param.loop_termination_condition:
|
|
if not item.get("variable") or not item.get("operator"):
|
|
raise ValueError("Loop condition is incomplete.")
|
|
var = self._canvas.get_variable_value(item["variable"])
|
|
operator = item["operator"]
|
|
input_mode = item.get("input_mode", "constant")
|
|
|
|
if input_mode == "variable":
|
|
value = self._canvas.get_variable_value(item.get("value", ""))
|
|
elif input_mode == "constant":
|
|
value = item.get("value", "")
|
|
else:
|
|
raise ValueError("Invalid input mode.")
|
|
conditions.append(self.evaluate_condition(var, operator, value))
|
|
should_end = (
|
|
all(conditions) if logical_operator == "and"
|
|
else any(conditions) if logical_operator == "or"
|
|
else None
|
|
)
|
|
if should_end is None:
|
|
raise ValueError("Invalid logical operator,should be 'and' or 'or'.")
|
|
|
|
if should_end:
|
|
self._idx = -1
|
|
return True
|
|
|
|
return False
|
|
|
|
def next(self):
|
|
if self._idx == -1:
|
|
self._idx = 0
|
|
else:
|
|
self._idx += 1
|
|
if self._idx >= len(self._items):
|
|
self._idx = -1
|
|
return False
|
|
|
|
def thoughts(self) -> str:
|
|
return "Next turn..." |