mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-19 14:11:04 +08:00
27d091b5b6
### What problem does this PR solve? Await Response incorrectly consumed the initial `sys.query` as its input, so the first user interaction was skipped. This change makes Await Response wait for actual user input while preserving the existing initial-query behavior for the Begin node. ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
75 lines
2.4 KiB
Python
75 lines
2.4 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 agent.component.fillup import UserFillUpParam, UserFillUp
|
|
|
|
|
|
class BeginParam(UserFillUpParam):
|
|
"""
|
|
Define the Begin component parameters.
|
|
"""
|
|
|
|
def __init__(self):
|
|
super().__init__()
|
|
self.mode = "conversational"
|
|
self.prologue = "Hi! I'm your smart assistant. What can I do for you?"
|
|
|
|
def check(self):
|
|
self.check_valid_value(self.mode, "The 'mode' should be either `conversational` or `task`", ["conversational", "task", "Webhook"])
|
|
|
|
def get_input_form(self) -> dict[str, dict]:
|
|
return getattr(self, "inputs")
|
|
|
|
|
|
class Begin(UserFillUp):
|
|
component_name = "Begin"
|
|
|
|
def _merge_runtime_inputs(self, runtime_inputs):
|
|
if runtime_inputs:
|
|
return runtime_inputs
|
|
|
|
fields = self.get_input_elements()
|
|
query = self._canvas.globals.get("sys.query")
|
|
if not fields or query is None or query == "":
|
|
return {}
|
|
|
|
if isinstance(query, dict):
|
|
return {
|
|
key: value if isinstance(value, dict) else {"value": value}
|
|
for key, value in query.items()
|
|
if key in fields
|
|
}
|
|
|
|
if len(fields) == 1:
|
|
return {next(iter(fields)): {"value": query}}
|
|
|
|
return {}
|
|
|
|
def _invoke(self, **kwargs):
|
|
if self.check_if_canceled("Begin processing"):
|
|
return
|
|
|
|
layout_recognize = self._param.layout_recognize or None
|
|
merged_inputs = self._merge_runtime_inputs(kwargs.get("inputs", {}))
|
|
for k, v in merged_inputs.items():
|
|
if self.check_if_canceled("Begin processing"):
|
|
return
|
|
v = self._resolve_input_value(v, layout_recognize)
|
|
self.set_output(k, v)
|
|
self.set_input_value(k, v)
|
|
|
|
def thoughts(self) -> str:
|
|
return ""
|