klinsmaya/SQLBot
1
0
Fork 0
mirror of https://gh-proxy.org/https://github.com/klinsmaya/SQLBot.git synced 2026-11-08 01:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: support Elasticsearch datasource #108

Browse Source
This commit is contained in:
junjun
2025-09-16 15:35:11 +08:00
parent 7d2c972735
commit 51e511a68a
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/apps/chat/task/llm.py
+16 -18
View File
@@ -1000,26 +1000,26 @@ class LLMService:
sqlbot_temp_sql_text = None
assistant_dynamic_sql = None
# todo row permission
if ((not self.current_assistant or is_page_embedded) and is_normal_user(
self.current_user)) or use_dynamic_ds:
if (not self.current_assistant or is_page_embedded) or use_dynamic_ds:
sql, tables = self.check_sql(res=full_sql_text)
sql_result = None
if use_dynamic_ds:
dynamic_sql_result = self.generate_assistant_dynamic_sql(sql, tables)
sqlbot_temp_sql_text = dynamic_sql_result.get(
'sqlbot_temp_sql_text') if dynamic_sql_result else None
# sql_result = self.generate_assistant_filter(sql, tables)
else:
sql_result = self.generate_filter(sql, tables) # maybe no sql and tables
if is_normal_user(self.current_user):
if use_dynamic_ds:
dynamic_sql_result = self.generate_assistant_dynamic_sql(sql, tables)
sqlbot_temp_sql_text = dynamic_sql_result.get(
'sqlbot_temp_sql_text') if dynamic_sql_result else None
# sql_result = self.generate_assistant_filter(sql, tables)
else:
sql_result = self.generate_filter(sql, tables) # maybe no sql and tables
if sql_result:
SQLBotLogUtil.info(sql_result)
sql = self.check_save_sql(res=sql_result)
elif dynamic_sql_result and sqlbot_temp_sql_text:
assistant_dynamic_sql = self.check_save_sql(res=sqlbot_temp_sql_text)
else:
sql = self.check_save_sql(res=full_sql_text)
if sql_result:
SQLBotLogUtil.info(sql_result)
sql = self.check_save_sql(res=sql_result)
elif dynamic_sql_result and sqlbot_temp_sql_text:
assistant_dynamic_sql = self.check_save_sql(res=sqlbot_temp_sql_text)
else:
sql = self.check_save_sql(res=full_sql_text)
else:
sql = self.check_save_sql(res=full_sql_text)
tables = []
@@ -1040,9 +1040,7 @@ class LLMService:
subsql)
real_execute_sql = assistant_dynamic_sql
print(tables)
result = self.execute_sql(sql=real_execute_sql, tables=tables)
print(result)
self.save_sql_data(data_obj=result)
if in_chat:
yield 'data:' + orjson.dumps({'content': 'execute-success', 'type': 'sql-data'}).decode() + '\n\n'
backend/apps/db/db.py
-2
View File
@@ -420,7 +420,6 @@ def exec_sql(ds: CoreDatasource | AssistantOutDsSchema, sql: str, origin_column=
except Exception as ex:
raise ParseSQLResultError(str(ex))
elif ds.type == 'es':
print(table_name)
try:
if table_name and table_name[0]:
res, columns = get_es_data(conf, sql, table_name[0])
@@ -432,7 +431,6 @@ def exec_sql(ds: CoreDatasource | AssistantOutDsSchema, sql: str, origin_column=
enumerate(tuple_item)}
for tuple_item in res
]
print(result_list)
return {"fields": columns, "data": result_list,
"sql": bytes.decode(base64.b64encode(bytes(sql, 'utf-8')))}
except Exception as ex: