Skip to content

Commit 8dd46ee

Browse files
committed
feat: data permission
1 parent a756475 commit 8dd46ee

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

backend/apps/chat/task/llm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ def generate_filter(self, sql: str, tables: List):
497497
filters.append({"table": table.table_name, "filter": wheres})
498498

499499
filter = json.dumps(filters, ensure_ascii=False)
500-
# filter = f"""[{{"table":"{tables[0]}","filter":"省份 = '广东省' or 销售额(万元) > 10000"}}]""" # todo get filters
500+
501501
self.chat_question.sql = sql
502502
self.chat_question.filter = filter
503503
msg: List[Union[BaseMessage, dict[str, Any]]] = []
@@ -746,7 +746,7 @@ def run_task(llm_service: LLMService, in_chat: bool = True):
746746
# todo row permission
747747
sql_json_str = extract_nested_json(full_sql_text)
748748
data = orjson.loads(sql_json_str)
749-
sql_result = llm_service.generate_filter(data['sql'], data['tables'])
749+
sql_result = llm_service.generate_filter(data['sql'], data['tables']) # maybe no sql and tables
750750
print(sql_result)
751751
sql = llm_service.check_save_sql(res=sql_result)
752752
# sql = llm_service.check_save_sql(res=full_sql_text)

frontend/src/views/ds/DatasourceForm.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ const tableList = ref<any>([])
3434
const excelUploadSuccess = ref(false)
3535
const tableListLoading = ref(false)
3636
const token = wsCache.get('user.token')
37-
const headers = ref<any>({ 'X-SQLBOT-TOKEN': `Bearer ${token}` })
37+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
38+
// @ts-expect-error
39+
// eslint-disable-next-line no-undef
40+
const request_key = LicenseGenerator.generate()
41+
const headers = ref<any>({ 'X-SQLBOT-TOKEN': `Bearer ${token}`, 'X-SQLBOT-KEY': request_key })
3842
const dialogTitle = ref('')
3943
const getUploadURL = import.meta.env.VITE_API_BASE_URL + '/datasource/uploadExcel'
4044
const saveLoading = ref<boolean>(false)

0 commit comments

Comments
 (0)