mirror of
https://github.com/langgenius/dify.git
synced 2024-11-16 11:42:29 +08:00
Merge f73f1c2712
into d05fee1182
This commit is contained in:
commit
03499f4a2a
|
@ -125,9 +125,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
|
||||||
app_config=app_config,
|
app_config=app_config,
|
||||||
file_upload_config=file_extra_config,
|
file_upload_config=file_extra_config,
|
||||||
conversation_id=conversation.id if conversation else None,
|
conversation_id=conversation.id if conversation else None,
|
||||||
inputs=conversation.inputs
|
inputs=self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
|
||||||
if conversation
|
|
||||||
else self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
|
|
||||||
query=query,
|
query=query,
|
||||||
files=file_objs,
|
files=file_objs,
|
||||||
parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
|
parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
|
||||||
|
|
|
@ -132,9 +132,7 @@ class AgentChatAppGenerator(MessageBasedAppGenerator):
|
||||||
model_conf=ModelConfigConverter.convert(app_config),
|
model_conf=ModelConfigConverter.convert(app_config),
|
||||||
file_upload_config=file_extra_config,
|
file_upload_config=file_extra_config,
|
||||||
conversation_id=conversation.id if conversation else None,
|
conversation_id=conversation.id if conversation else None,
|
||||||
inputs=conversation.inputs
|
inputs=self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
|
||||||
if conversation
|
|
||||||
else self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
|
|
||||||
query=query,
|
query=query,
|
||||||
files=file_objs,
|
files=file_objs,
|
||||||
parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
|
parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
|
||||||
|
|
|
@ -130,9 +130,7 @@ class ChatAppGenerator(MessageBasedAppGenerator):
|
||||||
model_conf=ModelConfigConverter.convert(app_config),
|
model_conf=ModelConfigConverter.convert(app_config),
|
||||||
file_upload_config=file_extra_config,
|
file_upload_config=file_extra_config,
|
||||||
conversation_id=conversation.id if conversation else None,
|
conversation_id=conversation.id if conversation else None,
|
||||||
inputs=conversation.inputs
|
inputs=self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
|
||||||
if conversation
|
|
||||||
else self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
|
|
||||||
query=query,
|
query=query,
|
||||||
files=file_objs,
|
files=file_objs,
|
||||||
parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
|
parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user