From 04d49ec8dca05b20bc4a13771972883f09483459 Mon Sep 17 00:00:00 2001
From: ytqh <yutianqiuhao@gmail.com>
Date: Sat, 12 Apr 2025 21:57:16 +0800
Subject: [PATCH] feat: force AdvancedChat alwasy use latest inputs instead of
 conversation inputs

---
 .../app/apps/advanced_chat/app_generator.py     | 17 +++++++++--------
 api/models/model.py                             | 15 +++++++++++++++
 api/services/app_generate_service.py            |  3 +++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py
index 36f71fd478..61ff5e53cb 100644
--- a/api/core/app/apps/advanced_chat/app_generator.py
+++ b/api/core/app/apps/advanced_chat/app_generator.py
@@ -5,9 +5,6 @@ import uuid
 from collections.abc import Generator, Mapping
 from typing import Any, Literal, Optional, Union, overload
 
-from flask import Flask, current_app
-from pydantic import ValidationError
-
 import contexts
 from configs import dify_config
 from constants import UUID_NIL
@@ -26,9 +23,11 @@ from core.ops.ops_trace_manager import TraceQueueManager
 from core.prompt.utils.get_thread_messages_length import get_thread_messages_length
 from extensions.ext_database import db
 from factories import file_factory
+from flask import Flask, current_app
 from models.account import Account
 from models.model import App, Conversation, EndUser, Message
 from models.workflow import Workflow
+from pydantic import ValidationError
 from services.errors.message import MessageNotExistsError
 
 logger = logging.getLogger(__name__)
@@ -134,17 +133,19 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
             app_config.additional_features.show_retrieve_source = True
 
         workflow_run_id = str(uuid.uuid4())
+
+        # FIXME: ytqh this is force use the latest inputs instead of the inputs in the conversation(original implementation). may change the behavior of the app
+        inputs = self._prepare_user_inputs(
+            user_inputs=inputs, variables=app_config.variables, tenant_id=app_model.tenant_id
+        )
+
         # init application generate entity
         application_generate_entity = AdvancedChatAppGenerateEntity(
             task_id=str(uuid.uuid4()),
             app_config=app_config,
             file_upload_config=file_extra_config,
             conversation_id=conversation.id if conversation else None,
-            inputs=conversation.inputs
-            if conversation
-            else self._prepare_user_inputs(
-                user_inputs=inputs, variables=app_config.variables, tenant_id=app_model.tenant_id
-            ),
+            inputs=inputs,
             query=query,
             files=list(file_objs),
             parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
diff --git a/api/models/model.py b/api/models/model.py
index 34ac2c3f01..47dd99743e 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -1392,6 +1392,21 @@ class EndUser(UserMixin, db.Model):  # type: ignore[name-defined]
     created_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_at = db.Column(db.DateTime, nullable=False, server_default=func.current_timestamp())
 
+    @property
+    def recent_messages(self):
+        try:
+            messages = (
+                db.session.query(Message)
+                .filter(Message.from_end_user_id == self.id)
+                .filter(Message.organization_id == self.organization_id)
+                .order_by(Message.created_at.desc())
+                .limit(20)
+                .all()
+            )
+            return "".join([f"user: {message.query}\n\nassistant: {message.answer}\n\n" for message in messages[::-1]])
+        except Exception as e:
+            return ""
+
     @property
     def memory(self):
         if self.extra_profile is None:
diff --git a/api/services/app_generate_service.py b/api/services/app_generate_service.py
index 651c3cb669..c4da777079 100644
--- a/api/services/app_generate_service.py
+++ b/api/services/app_generate_service.py
@@ -42,12 +42,15 @@ class AppGenerateService:
         # extract user_memory from user if it is an EndUser
         if isinstance(user, EndUser):
             user_memory = user.memory
+            recent_messages = user.recent_messages
         else:
             user_memory = None
+            recent_messages = None
 
         # add user_memory to args
         new_args = dict(args)
         new_args["inputs"]["user_memory"] = user_memory
+        new_args["inputs"]["recent_messages"] = recent_messages
 
         try:
             request_id = rate_limit.enter(request_id)