Merge remote-tracking branch 'origin/main'

Author: XiaJunjie2020

backend/apps/chat/task/llm.py

@@ -532,6 +532,9 @@ def select_datasource(self):
         self.chat_question.terminologies = get_terminology_template(self.session, self.chat_question.question,
                                                                     self.ds.oid if isinstance(self.ds,
                                                                                               CoreDatasource) else 1)
+        self.chat_question.data_training = get_training_template(self.session, self.chat_question.question,
+                                                                 self.ds.id, self.ds.oid)
+
         self.init_messages()
 
         if _error:
@@ -944,8 +947,8 @@ def run_task(self, in_chat: bool = True):
                 self.chat_question.terminologies = get_terminology_template(self.session, self.chat_question.question,
                                                                             self.ds.oid if isinstance(self.ds,
                                                                                                       CoreDatasource) else 1)
-            self.chat_question.data_training = get_training_template(self.session, self.chat_question.question,
-                                                                     self.ds.id, self.ds.oid)
+                self.chat_question.data_training = get_training_template(self.session, self.chat_question.question,
+                                                                         self.ds.id, self.ds.oid)
 
             self.init_messages()