Files
ragflow/agent/component/fillup.py

146 lines
5.4 KiB
Python
Raw Permalink Normal View History

#
# 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.
#
import json
import re
from functools import partial
from agent.component.base import ComponentParamBase, ComponentBase
from api.db.services.file_service import FileService
_INITIAL_USER_INPUT_CONSUMED_KEY = "sys.__initial_user_input_consumed__"
class UserFillUpParam(ComponentParamBase):
def __init__(self):
super().__init__()
self.enable_tips = True
self.tips = "Please fill up the form"
2026-03-04 05:09:33 +02:00
self.layout_recognize = ""
def check(self) -> bool:
return True
class UserFillUp(ComponentBase):
component_name = "UserFillUp"
def _merge_runtime_inputs(self, runtime_inputs):
if runtime_inputs:
return runtime_inputs
fields = self.get_input_elements()
if not fields:
return {}
if self._canvas.globals.get(_INITIAL_USER_INPUT_CONSUMED_KEY):
return {}
query = self._canvas.globals.get("sys.query")
if query is None or query == "":
return {}
if isinstance(query, dict):
matched = {key: value if isinstance(value, dict) else {"value": value} for key, value in query.items() if key in fields}
if matched:
self._canvas.globals[_INITIAL_USER_INPUT_CONSUMED_KEY] = True
return matched
if len(fields) == 1:
field_name = next(iter(fields))
self._canvas.globals[_INITIAL_USER_INPUT_CONSUMED_KEY] = True
return {field_name: {"value": query}}
return {}
def _resolve_input_value(self, value, layout_recognize):
if isinstance(value, dict) and value.get("type", "").lower().find("file") >= 0:
if value.get("optional") and value.get("value", None) is None:
return None
file_value = value["value"]
files = file_value if isinstance(file_value, list) else [file_value]
return FileService.get_files(files, layout_recognize=layout_recognize)
if isinstance(value, dict):
raw = value.get("value")
if value.get("type") == "object" and isinstance(raw, str) and raw.strip():
try:
return json.loads(raw)
except Exception:
return raw
return raw
return value
def _invoke(self, **kwargs):
if self.check_if_canceled("UserFillUp processing"):
return
if self._param.enable_tips:
content = self._param.tips
for k, v in self.get_input_elements_from_text(self._param.tips).items():
v = v["value"]
ans = ""
if isinstance(v, partial):
for t in v():
ans += t
elif isinstance(v, list):
ans = ",".join([str(vv) for vv in v])
elif not isinstance(v, str):
try:
ans = json.dumps(v, ensure_ascii=False)
except Exception:
pass
else:
ans = v
if not ans:
ans = ""
content = re.sub(r"\{%s\}" % k, ans, content)
self.set_output("tips", content)
2026-03-04 05:09:33 +02:00
layout_recognize = self._param.layout_recognize or None
merged_inputs = self._merge_runtime_inputs(kwargs.get("inputs", {}))
fix(agent): Await Response pauses on every Loop iteration (#16794) ## What An **Await Response** (`UserFillUp`) node placed inside a **Loop** now pauses and waits for a fresh user response on **every** iteration, instead of only on the first one. ## Problem When a `UserFillUp` node lives inside a `Loop`, it only paused for input on the first iteration. On subsequent iterations the loop ran straight through, silently reusing the answer the user gave the first time. Root cause is in `UserFillUp._invoke` / the canvas wait-check (`agent/canvas.py`). The wait-check decides whether to pause by calling `Canvas._is_input_field_satisfied` on the node's form fields — a field counts as satisfied as soon as its `value` is not `None`: ```python @staticmethod def _is_input_field_satisfied(field): ... if value is None: return False return True ``` The same component object is reused across loop iterations, and `UserFillUp._invoke` writes the answer into `self._param.inputs[...]["value"]` via `set_input_value`. Nothing cleared those values when the node was re-entered for the next iteration, so: | Iteration | Entry (no answer yet) | Field value | Satisfied? | Result | |---|---|---|---|---| | 1 | fresh | `None` | no | pauses ✅ | | 1 | resume w/ answer | `answer` | yes | continues ✅ | | 2 | fresh | `answer` (**stale**) | yes | continues ❌ (should pause) | ## Fix When a `UserFillUp` is entered without a fresh user answer (`merged_inputs` is empty), clear the retained form values so the wait-check treats the form as unsatisfied and pauses again: ```python merged_inputs = self._merge_runtime_inputs(kwargs.get("inputs", {})) if not merged_inputs: self._clear_form_values() ``` - Fresh entry / new loop iteration → no answer supplied → values cleared → node pauses and waits. - Resume with an answer → `merged_inputs` is non-empty → values applied normally, nothing cleared. - Non-loop behavior is unchanged: the first entry already had `None` values, so clearing is a no-op there. `Begin` overrides `_invoke` and is unaffected. ## Tests Added to `test/testcases/test_web_api/test_canvas_app/test_fillup_unit.py`: - `test_user_fillup_clears_stale_values_on_reentry_without_answer` — a retained value is cleared on a fresh entry with no answer (loop re-entry). - `test_user_fillup_keeps_values_when_answer_supplied` — a supplied answer is applied and not cleared. All unit tests pass and `ruff check` is clean. ## Scope This targets the Python agent runtime (`agent/`). It is independent of any other in-flight Await Response change.
2026-07-10 18:24:04 +03:00
if not merged_inputs:
# No fresh user answer was supplied on this entry. Clear any values
# retained from a previous response so the canvas wait-check treats
# the form as unsatisfied and pauses for input again. Without this,
# an Await Response node inside a Loop would only pause on the first
# iteration and silently reuse the earlier answer afterwards.
self._clear_form_values()
for k, v in merged_inputs.items():
if self.check_if_canceled("UserFillUp processing"):
return
resolved = self._resolve_input_value(v, layout_recognize)
self.set_output(k, resolved)
self.set_input_value(k, resolved)
fix(agent): Await Response pauses on every Loop iteration (#16794) ## What An **Await Response** (`UserFillUp`) node placed inside a **Loop** now pauses and waits for a fresh user response on **every** iteration, instead of only on the first one. ## Problem When a `UserFillUp` node lives inside a `Loop`, it only paused for input on the first iteration. On subsequent iterations the loop ran straight through, silently reusing the answer the user gave the first time. Root cause is in `UserFillUp._invoke` / the canvas wait-check (`agent/canvas.py`). The wait-check decides whether to pause by calling `Canvas._is_input_field_satisfied` on the node's form fields — a field counts as satisfied as soon as its `value` is not `None`: ```python @staticmethod def _is_input_field_satisfied(field): ... if value is None: return False return True ``` The same component object is reused across loop iterations, and `UserFillUp._invoke` writes the answer into `self._param.inputs[...]["value"]` via `set_input_value`. Nothing cleared those values when the node was re-entered for the next iteration, so: | Iteration | Entry (no answer yet) | Field value | Satisfied? | Result | |---|---|---|---|---| | 1 | fresh | `None` | no | pauses ✅ | | 1 | resume w/ answer | `answer` | yes | continues ✅ | | 2 | fresh | `answer` (**stale**) | yes | continues ❌ (should pause) | ## Fix When a `UserFillUp` is entered without a fresh user answer (`merged_inputs` is empty), clear the retained form values so the wait-check treats the form as unsatisfied and pauses again: ```python merged_inputs = self._merge_runtime_inputs(kwargs.get("inputs", {})) if not merged_inputs: self._clear_form_values() ``` - Fresh entry / new loop iteration → no answer supplied → values cleared → node pauses and waits. - Resume with an answer → `merged_inputs` is non-empty → values applied normally, nothing cleared. - Non-loop behavior is unchanged: the first entry already had `None` values, so clearing is a no-op there. `Begin` overrides `_invoke` and is unaffected. ## Tests Added to `test/testcases/test_web_api/test_canvas_app/test_fillup_unit.py`: - `test_user_fillup_clears_stale_values_on_reentry_without_answer` — a retained value is cleared on a fresh entry with no answer (loop re-entry). - `test_user_fillup_keeps_values_when_answer_supplied` — a supplied answer is applied and not cleared. All unit tests pass and `ruff check` is clean. ## Scope This targets the Python agent runtime (`agent/`). It is independent of any other in-flight Await Response change.
2026-07-10 18:24:04 +03:00
def _clear_form_values(self):
for field in self.get_input_elements().values():
if not isinstance(field, dict):
continue
field_type = str(field.get("type", "")).lower()
# An optional file input is already treated as satisfied when empty
# (see Canvas._is_input_field_satisfied), so clearing it would not
# force a re-prompt and would only drop a previously uploaded file.
# Leave it untouched to avoid unexpected data loss.
if "file" in field_type and field.get("optional"):
continue
field["value"] = None
def thoughts(self) -> str:
return "Waiting for your input..."