topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-12 12:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(Headless) Fix Python module parameter passing error (#1071)

Browse Source 
Co-authored-by: jolunoluo
This commit is contained in:
LXW
2024-06-01 14:38:20 +08:00
committed by GitHub
parent f07e80587d
commit 03cb00f4b4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/python/services/s2sql/auto_cot_run.py
View File

@@ -62,7 +62,7 @@ def transform_sql_example(question:str, current_date:str, table_name:str, field_
question_augmented = """{question} (补充信息:{prior_linking}。{current_date}。{terms_desc}) (备注: {prior_exts})""".format(question=question, prior_linking=prior_linkings_str, prior_exts=prior_exts, current_date=current_data_str) question_augmented = """{question} (补充信息:{prior_linking}。{current_date}。{terms_desc}) (备注: {prior_exts})""".format(question=question, prior_linking=prior_linkings_str, prior_exts=prior_exts, current_date=current_data_str, terms_desc=terms_desc)
return question_augmented, db_schema, sql return question_augmented, db_schema, sql

2
headless/python/services/s2sql/sql_agent.py
View File

@@ -402,7 +402,7 @@ class Text2DSLAgentAutoCoT(Text2DSLAgentBase):
fewshot_example_meta_list = self.get_examples_candidates(question, filter_condition, self.num_examples) fewshot_example_meta_list = self.get_examples_candidates(question, filter_condition, self.num_examples)
fewshot_example_list_combo = self.get_fewshot_example_combos(fewshot_example_meta_list, self.num_fewshots) fewshot_example_list_combo = self.get_fewshot_example_combos(fewshot_example_meta_list, self.num_fewshots)
schema_linking_sql_output_candidates, schema_linking_sql_prompt_list, _ = await self.generate_schema_linking_sql_tasks(question, model_name, fields_list, current_date, prior_schema_links, prior_exts, fewshot_example_list_combo, terms_list=terms_list) schema_linking_sql_output_candidates, schema_linking_sql_prompt_list, _ = await self.generate_schema_linking_sql_tasks(question, model_name, fields_list, current_date, prior_schema_links, prior_exts, fewshot_example_list_combo, llm_config=llm_config, terms_list=terms_list)
logger.debug(f'schema_linking_sql_output_candidates:{schema_linking_sql_output_candidates}') logger.debug(f'schema_linking_sql_output_candidates:{schema_linking_sql_output_candidates}')
schema_linking_output_candidate_list = [combo_schema_link_parse(schema_linking_sql_output_candidate) for schema_linking_sql_output_candidate in schema_linking_sql_output_candidates] schema_linking_output_candidate_list = [combo_schema_link_parse(schema_linking_sql_output_candidate) for schema_linking_sql_output_candidate in schema_linking_sql_output_candidates]
logger.debug(f'schema_linking_sql_output_candidate_list:{schema_linking_output_candidate_list}') logger.debug(f'schema_linking_sql_output_candidate_list:{schema_linking_output_candidate_list}')

10
headless/python/services_router/query2sql_service.py
View File

@@ -46,10 +46,10 @@ async def query2sql(query_body: Mapping[str, Any]):
else: else:
filter_condition = query_body['filterCondition'] filter_condition = query_body['filterCondition']
if 'sqlGenerationMode' not in query_body: if 'sqlGenType' not in query_body:
raise HTTPException(status_code=400, detail="sql_generation_mode is not in query_body") raise HTTPException(status_code=400, detail="sqlGenType is not in query_body")
else: else:
sql_generation_mode = query_body['sqlGenerationMode'] sqlGenType = query_body['sqlGenType']
if 'llmConfig' in query_body: if 'llmConfig' in query_body:
llm_config = ast.literal_eval(str(query_body['llmConfig'])) llm_config = ast.literal_eval(str(query_body['llmConfig']))
@@ -64,8 +64,8 @@ async def query2sql(query_body: Mapping[str, Any]):
resp = await text2sql_agent_router.async_query2sql(question=query_text, filter_condition=filter_condition, resp = await text2sql_agent_router.async_query2sql(question=query_text, filter_condition=filter_condition,
model_name=dataset_name, fields_list=fields_list, model_name=dataset_name, fields_list=fields_list,
data_date=current_date, prior_schema_links=prior_schema_links, data_date=current_date, prior_schema_links=prior_schema_links,
prior_exts=prior_exts, sql_generation_mode=sql_generation_mode, prior_exts=prior_exts, sql_generation_mode=sqlGenType,
llm_config=llm_config) llm_config=llm_config, terms_list=terms_list)
return resp return resp