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

# Conflicts:
#	main_service.py

main_service.py

@@ -39,9 +39,11 @@ def load_train_data_ddl(vn: CustomVanna):
 
 
 def create_vana():
-    print("----------------create---------")
+    logger.info("----------------create vana ---------")
+    q_client = QdrantClient(":memory:") if config('QDRANT_TYPE', default='memory') == 'memory' else QdrantClient(
+        url=config('QDRANT_DB_HOST', default=''), port=config('QDRANT_DB_PORT', default=6333))
     vn = CustomVanna(
-        vector_store_config={"client": QdrantClient(":memory:")},
+        vector_store_config={"client": q_client},
         llm_config={
             "api_key": config('CHAT_MODEL_API_KEY', default=''),
             "api_base": config('CHAT_MODEL_BASE_URL', default=''),
@@ -52,7 +54,7 @@ def create_vana():
 
 
 def init_vn(vn):
-    print("--------------init vn-----connect----")
+    logger.info("--------------init vana-----connect to datasouce db----")
     connect_database(vn)
     load_ddl_doc.add_ddl(vn)
     load_ddl_doc.add_documentation(vn)
@@ -103,6 +105,7 @@ def generate_sql_2():
         logger.info("Generate sql result is {0}".format(data))
         data['id'] = id
         sql = data["resp"]["sql"]
+        logger.info("generate sql is : "+ sql)
         cache.set(id=id, field="question", value=question)
         cache.set(id=id, field="sql", value=sql)
         data["type"]="success"