Merge branch 'dev' of gitlab-devt.yced.com.cn:lei_y601/sqlbot_agent into dev

# Conflicts:
#	util/train_ddl.py

service/cus_vanna_srevice.py

@@ -15,7 +15,7 @@ import json
 from template.template import get_base_template
 from datetime import datetime
 import logging
-
+from util import  train_ddl
 logger = logging.getLogger(__name__)
 
 class OpenAICompatibleLLM(VannaBase):
@@ -187,13 +187,13 @@ class OpenAICompatibleLLM(VannaBase):
             logger.info("Start to generate_sql_2 in cus_vanna_srevice")
             question_sql_list = self.get_similar_question_sql(question, **kwargs)
             ddl_list = self.get_related_ddl(question, **kwargs)
-            doc_list = self.get_related_documentation(question, **kwargs)
+            #doc_list = self.get_related_documentation(question, **kwargs)
             template = get_base_template()
             sql_temp = template['template']['sql']
             char_temp = template['template']['chart']
             # --------基于提示词，生成sql以及图表类型
             sys_temp = sql_temp['system'].format(engine=config("DB_ENGINE", default='mysql'), lang='中文',
-                                                 schema=ddl_list, documentation=doc_list,
+                                                 schema=ddl_list, documentation=[train_ddl.train_document],
                                                  data_training=question_sql_list)
             logger.info(f"sys_temp:{sys_temp}")
             user_temp = sql_temp['user'].format(question=question,

util/load_ddl_doc.py

@@ -2,7 +2,7 @@ from service.cus_vanna_srevice import CustomVanna
 from util import train_ddl
 
 table_ddls = [
-    train_ddl.ddl_sql,
+    train_ddl.ddl_sql,train_ddl.attendance_ddl
 ]
 list_documentions = [
     train_ddl.train_document,