日志添加
This commit is contained in:
@@ -14,7 +14,9 @@ from util.utils import extract_nested_json, check_and_get_sql, get_chart_type_fr
|
|||||||
import json
|
import json
|
||||||
from template.template import get_base_template
|
from template.template import get_base_template
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
import logging
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
class OpenAICompatibleLLM(VannaBase):
|
class OpenAICompatibleLLM(VannaBase):
|
||||||
def __init__(self, client=None, config_file=None):
|
def __init__(self, client=None, config_file=None):
|
||||||
@@ -192,15 +194,14 @@ class OpenAICompatibleLLM(VannaBase):
|
|||||||
sys_temp = sql_temp['system'].format(engine=config("DB_ENGINE", default='mysql'), lang='中文',
|
sys_temp = sql_temp['system'].format(engine=config("DB_ENGINE", default='mysql'), lang='中文',
|
||||||
schema=ddl_list, documentation=doc_list,
|
schema=ddl_list, documentation=doc_list,
|
||||||
data_training=question_sql_list)
|
data_training=question_sql_list)
|
||||||
print("sys_temp", sys_temp)
|
logger.info(f"sys_temp:{sys_temp}")
|
||||||
user_temp = sql_temp['user'].format(question=question,
|
user_temp = sql_temp['user'].format(question=question,
|
||||||
current_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
|
current_time=datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
|
||||||
print("user_temp", user_temp)
|
logger.info(f"user_temp:{user_temp}")
|
||||||
llm_response = self.submit_prompt(
|
llm_response = self.submit_prompt(
|
||||||
[{'role': 'system', 'content': sys_temp}, {'role': 'user', 'content': user_temp}], **kwargs)
|
[{'role': 'system', 'content': sys_temp}, {'role': 'user', 'content': user_temp}], **kwargs)
|
||||||
print(llm_response)
|
logger.info(f"llm_response:{llm_response}")
|
||||||
result = {"resp": orjson.loads(extract_nested_json(llm_response))}
|
result = {"resp": orjson.loads(extract_nested_json(llm_response))}
|
||||||
print("result", result)
|
|
||||||
sql = check_and_get_sql(llm_response)
|
sql = check_and_get_sql(llm_response)
|
||||||
# ---------------生成图表
|
# ---------------生成图表
|
||||||
char_type = get_chart_type_from_sql_answer(llm_response)
|
char_type = get_chart_type_from_sql_answer(llm_response)
|
||||||
@@ -213,12 +214,13 @@ class OpenAICompatibleLLM(VannaBase):
|
|||||||
**kwargs)
|
**kwargs)
|
||||||
print(llm_response2)
|
print(llm_response2)
|
||||||
result['chart'] = orjson.loads(extract_nested_json(llm_response2))
|
result['chart'] = orjson.loads(extract_nested_json(llm_response2))
|
||||||
|
logger.info(f"chart_response:{result}")
|
||||||
return result
|
return result
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
def generate_rewritten_question(self, last_question: str, new_question: str, **kwargs) -> str:
|
def generate_rewritten_question(self, last_question: str, new_question: str, **kwargs) -> str:
|
||||||
print("new_question---------------", new_question)
|
logger.info(f"generate_rewritten_question---------------{new_question}")
|
||||||
if last_question is None:
|
if last_question is None:
|
||||||
return new_question
|
return new_question
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user