枚举结果处理
This commit is contained in:
		| @@ -184,6 +184,7 @@ class OpenAICompatibleLLM(VannaBase): | ||||
|  | ||||
|     def generate_sql_2(self, question: str, allow_llm_to_see_data=False, **kwargs) -> dict: | ||||
|         try: | ||||
|             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) | ||||
| @@ -202,9 +203,12 @@ class OpenAICompatibleLLM(VannaBase): | ||||
|                 [{'role': 'system', 'content': sys_temp}, {'role': 'user', 'content': user_temp}], **kwargs) | ||||
|             logger.info(f"llm_response:{llm_response}") | ||||
|             result = {"resp": orjson.loads(extract_nested_json(llm_response))} | ||||
|             logger.info(f"llm_response:{llm_response}") | ||||
|             sql = check_and_get_sql(llm_response) | ||||
|             logger.info(f"sql:{sql}") | ||||
|             # ---------------生成图表 | ||||
|             char_type = get_chart_type_from_sql_answer(llm_response) | ||||
|             logger.info(f"chart type:{char_type}") | ||||
|             if char_type: | ||||
|                 sys_char_temp = char_temp['system'].format(engine=config("DB_ENGINE", default='mysql'), | ||||
|                                                            lang='中文', sql=sql, chart_type=char_type) | ||||
| @@ -215,8 +219,11 @@ class OpenAICompatibleLLM(VannaBase): | ||||
|                 print(llm_response2) | ||||
|                 result['chart'] = orjson.loads(extract_nested_json(llm_response2)) | ||||
|                 logger.info(f"chart_response:{result}") | ||||
|  | ||||
|             logger.info("Finish to generate_sql_2 in cus_vanna_srevice") | ||||
|             return result | ||||
|         except Exception as e: | ||||
|             logger.info("cus_vanna_srevice failed-------------------") | ||||
|             raise e | ||||
|  | ||||
|     def generate_rewritten_question(self, last_question: str, new_question: str, **kwargs) -> str: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 yujj128
					yujj128