Skip to content

Commit 6f78351

Browse files
committed
revert: code revert
1 parent 84afbe4 commit 6f78351

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

backend/apps/chat/task/llm.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,26 +1000,26 @@ def run_task(self, in_chat: bool = True):
10001000
sqlbot_temp_sql_text = None
10011001
assistant_dynamic_sql = None
10021002
# todo row permission
1003-
if (not self.current_assistant or is_page_embedded) or use_dynamic_ds:
1003+
if ((not self.current_assistant or is_page_embedded) and is_normal_user(
1004+
self.current_user)) or use_dynamic_ds:
10041005
sql, tables = self.check_sql(res=full_sql_text)
10051006
sql_result = None
10061007

1007-
if is_normal_user(self.current_user):
1008-
if use_dynamic_ds:
1009-
dynamic_sql_result = self.generate_assistant_dynamic_sql(sql, tables)
1010-
sqlbot_temp_sql_text = dynamic_sql_result.get(
1011-
'sqlbot_temp_sql_text') if dynamic_sql_result else None
1012-
# sql_result = self.generate_assistant_filter(sql, tables)
1013-
else:
1014-
sql_result = self.generate_filter(sql, tables) # maybe no sql and tables
1015-
1016-
if sql_result:
1017-
SQLBotLogUtil.info(sql_result)
1018-
sql = self.check_save_sql(res=sql_result)
1019-
elif dynamic_sql_result and sqlbot_temp_sql_text:
1020-
assistant_dynamic_sql = self.check_save_sql(res=sqlbot_temp_sql_text)
1021-
else:
1022-
sql = self.check_save_sql(res=full_sql_text)
1008+
if use_dynamic_ds:
1009+
dynamic_sql_result = self.generate_assistant_dynamic_sql(sql, tables)
1010+
sqlbot_temp_sql_text = dynamic_sql_result.get(
1011+
'sqlbot_temp_sql_text') if dynamic_sql_result else None
1012+
# sql_result = self.generate_assistant_filter(sql, tables)
1013+
else:
1014+
sql_result = self.generate_filter(sql, tables) # maybe no sql and tables
1015+
1016+
if sql_result:
1017+
SQLBotLogUtil.info(sql_result)
1018+
sql = self.check_save_sql(res=sql_result)
1019+
elif dynamic_sql_result and sqlbot_temp_sql_text:
1020+
assistant_dynamic_sql = self.check_save_sql(res=sqlbot_temp_sql_text)
1021+
else:
1022+
sql = self.check_save_sql(res=full_sql_text)
10231023
else:
10241024
sql = self.check_save_sql(res=full_sql_text)
10251025
tables = []

0 commit comments

Comments
 (0)