feat: support filter search in SQL sample and terminology list

#1281

Author: ulleo

backend/apps/data_training/api/data_training.py

@@ -29,10 +29,12 @@
 @router.get("/page/{current_page}/{page_size}", summary=f"{PLACEHOLDER_PREFIX}get_dt_page")
 @require_permissions(permission=SqlbotPermission(role=['ws_admin']))
 async def pager(session: SessionDep, current_user: CurrentUser, current_page: int, page_size: int,
-                question: Optional[str] = Query(None, description="搜索问题(可选)")):
+                question: Optional[str] = Query(None, description="搜索问题(可选)"),
+                ds_list: Optional[list[int]] = Query(None, description="数据集ID集合(可选)"),
+                adv_list: Optional[list[int]] = Query(None, description="高级应用ID集合(可选)")):
     current_page, page_size, total_count, total_pages, _list = page_data_training(session, current_page, page_size,
                                                                                   question,
-                                                                                  current_user.oid)
+                                                                                  current_user.oid, ds_list, adv_list)
 
     return {
         "current_page": current_page,

backend/apps/data_training/curd/data_training.py

@@ -37,12 +37,32 @@ def get_data_training_base_query(oid: int, name: Optional[str] = None):
 
 
 def build_data_training_query(session: SessionDep, oid: int, name: Optional[str] = None,
-                              paginate: bool = True, current_page: int = 1, page_size: int = 10):
+                              paginate: bool = True, current_page: int = 1, page_size: int = 10,
+                              ds_list: Optional[list[int]] = None, adv_list: Optional[list[int]] = None):
     """
     构建数据训练查询的通用方法
     """
     parent_ids_subquery = get_data_training_base_query(oid, name)
 
+    # 添加数据源/高级应用筛选条件（ds_list 与 adv_list 为或的关系）
+    ds_filter_condition = None
+    adv_filter_condition = None
+
+    if ds_list is not None and len(ds_list) > 0:
+        ds_filter_condition = DataTraining.datasource.in_(ds_list)
+
+    if adv_list is not None and len(adv_list) > 0:
+        adv_filter_condition = DataTraining.advanced_application.in_(adv_list)
+
+    if ds_filter_condition is not None and adv_filter_condition is not None:
+        parent_ids_subquery = parent_ids_subquery.where(
+            or_(ds_filter_condition, adv_filter_condition)
+        )
+    elif ds_filter_condition is not None:
+        parent_ids_subquery = parent_ids_subquery.where(ds_filter_condition)
+    elif adv_filter_condition is not None:
+        parent_ids_subquery = parent_ids_subquery.where(adv_filter_condition)
+
     # 计算总数
     count_stmt = select(func.count()).select_from(parent_ids_subquery.subquery())
     total_count = session.execute(count_stmt).scalar()
@@ -121,12 +141,13 @@ def execute_data_training_query(session: SessionDep, stmt) -> List[DataTrainingI
 
 
 def page_data_training(session: SessionDep, current_page: int = 1, page_size: int = 10,
-                       name: Optional[str] = None, oid: Optional[int] = 1):
+                       name: Optional[str] = None, oid: Optional[int] = 1, ds_list: Optional[list[int]] = None,
+                       adv_list: Optional[list[int]] = None):
     """
     分页查询数据训练（原方法保持不变）
     """
     stmt, total_count, total_pages, current_page, page_size = build_data_training_query(
-        session, oid, name, True, current_page, page_size
+        session, oid, name, True, current_page, page_size, ds_list, adv_list
     )
     _list = execute_data_training_query(session, stmt)
 
@@ -305,7 +326,8 @@ def batch_create_training(session: SessionDep, info_list: List[DataTrainingInfo]
 
     assistant_name_to_id = {}
 
-    assistant_stmt = select(AssistantModel.id, AssistantModel.name).where(and_(AssistantModel.type == 1, AssistantModel.oid == oid))
+    assistant_stmt = select(AssistantModel.id, AssistantModel.name).where(
+        and_(AssistantModel.type == 1, AssistantModel.oid == oid))
     assistant_result = session.execute(assistant_stmt).all()
     for assistant in assistant_result:
         assistant_name_to_id[assistant.name.strip()] = assistant.id

backend/apps/terminology/api/terminology.py

@@ -29,9 +29,10 @@
 @require_permissions(permission=SqlbotPermission(role=['ws_admin']))
 async def pager(session: SessionDep, current_user: CurrentUser, current_page: int, page_size: int,
                 word: Optional[str] = Query(None, description="搜索术语(可选)"),
-                dslist: Optional[list[int]] = Query(None, description="数据集ID集合(可选)")):
+                ds_list: Optional[list[int]] = Query(None, description="数据集ID集合(可选)"),
+                adv_list: Optional[list[int]] = Query(None, description="高级应用ID集合(可选)")):
     current_page, page_size, total_count, total_pages, _list = page_terminology(session, current_page, page_size, word,
-                                                                                current_user.oid, dslist)
+                                                                                current_user.oid, ds_list, adv_list)
 
     return {
         "current_page": current_page,

backend/apps/terminology/curd/terminology.py

@@ -57,30 +57,42 @@ def get_terminology_base_query(oid: int, name: Optional[str] = None):
 
 def build_terminology_query(session: SessionDep, oid: int, name: Optional[str] = None,
                             paginate: bool = True, current_page: int = 1, page_size: int = 10,
-                            dslist: Optional[list[int]] = None):
+                            ds_list: Optional[list[int]] = None, adv_list: Optional[list[int]] = None):
     """
     构建术语查询的通用方法
     """
     parent_ids_subquery, child = get_terminology_base_query(oid, name)
 
-    # 添加数据源筛选条件
-    if dslist is not None and len(dslist) > 0:
+    # 添加数据源/高级应用筛选条件（ds_list 与 adv_list 为或的关系）
+    ds_filter_condition = None
+    adv_filter_condition = None
+
+    if ds_list is not None and len(ds_list) > 0:
         datasource_conditions = []
-        # datasource_ids 与 dslist 中的任一元素有交集
-        for ds_id in dslist:
-            # 使用 JSONB 包含操作符，但需要确保类型正确
+        for ds_id in ds_list:
             datasource_conditions.append(
                 Terminology.datasource_ids.contains([ds_id])
             )
 
-        # datasource_ids 为空数组
-        empty_array_condition = Terminology.datasource_ids == []
-
         ds_filter_condition = or_(
-            *datasource_conditions,
-            empty_array_condition
+            Terminology.specific_ds == False,
+            and_(
+                Terminology.specific_ds == True,
+                *datasource_conditions
+            )
+        )
+
+    if adv_list is not None and len(adv_list) > 0:
+        adv_filter_condition = Terminology.advanced_application.in_(adv_list)
+
+    if ds_filter_condition is not None and adv_filter_condition is not None:
+        parent_ids_subquery = parent_ids_subquery.where(
+            or_(ds_filter_condition, adv_filter_condition)
         )
+    elif ds_filter_condition is not None:
         parent_ids_subquery = parent_ids_subquery.where(ds_filter_condition)
+    elif adv_filter_condition is not None:
+        parent_ids_subquery = parent_ids_subquery.where(adv_filter_condition)
 
     # 计算总数
     count_stmt = select(func.count()).select_from(parent_ids_subquery.subquery())
@@ -205,12 +217,13 @@ def execute_terminology_query(session: SessionDep, stmt) -> List[TerminologyInfo
 
 
 def page_terminology(session: SessionDep, current_page: int = 1, page_size: int = 10,
-                     name: Optional[str] = None, oid: Optional[int] = 1, dslist: Optional[list[int]] = None):
+                     name: Optional[str] = None, oid: Optional[int] = 1, ds_list: Optional[list[int]] = None,
+                     adv_list: Optional[list[int]] = None):
     """
     分页查询术语（原方法保持不变）
     """
     stmt, total_count, total_pages, current_page, page_size = build_terminology_query(
-        session, oid, name, True, current_page, page_size, dslist
+        session, oid, name, True, current_page, page_size, ds_list, adv_list
     )
     _list = execute_terminology_query(session, stmt)
 

backend/pyproject.toml

@@ -39,7 +39,7 @@ dependencies = [
     "pyyaml (>=6.0.2,<7.0.0)",
     "fastapi-mcp (>=0.3.4,<0.4.0)",
     "tabulate>=0.9.0",
-    "sqlbot-xpack>=0.0.5.32,<0.0.6.0",
+    "sqlbot-xpack>=0.0.5.33,<0.0.6.0",
     "fastapi-cache2>=0.2.2",
     "sqlparse>=0.5.3",
     "redis>=6.2.0",

frontend/src/api/prompt.ts

@@ -2,7 +2,7 @@ import { request } from '@/utils/request'
 
 export const promptApi = {
   getList: (pageNum: any, pageSize: any, type: any, params: any) =>
-    request.get(`/system/custom_prompt/${type}/page/${pageNum}/${pageSize}${params}`),
+    request.post(`/system/custom_prompt/${type}/page/${pageNum}/${pageSize}`, params),
   updateEmbedded: (data: any) => request.put(`/system/custom_prompt`, data),
   deleteEmbedded: (params: any) => request.delete('/system/custom_prompt', { data: params }),
   getOne: (id: any) => request.get(`/system/custom_prompt/${id}`),

frontend/src/api/training.ts

@@ -2,9 +2,7 @@ import { request } from '@/utils/request'
 
 export const trainingApi = {
   getList: (pageNum: any, pageSize: any, params: any) =>
-    request.get(`/system/data-training/page/${pageNum}/${pageSize}`, {
-      params,
-    }),
+    request.get(`/system/data-training/page/${pageNum}/${pageSize}${params}`),
   updateEmbedded: (data: any) => request.put('/system/data-training', data),
   deleteEmbedded: (params: any) => request.delete('/system/data-training', { data: params }),
   getOne: (id: any) => request.get(`/system/data-training/${id}`),

frontend/src/views/system/professional/index.vue

@@ -46,6 +46,7 @@ onMounted(() => {
   })
   getAdvancedApplicationList().then((res: any) => {
     adv_options.value = res || []
+    filterOption.value[1].option = [...adv_options.value]
   })
   search()
 })
@@ -381,11 +382,19 @@ const filterOption = ref<any[]>([
   {
     type: 'select',
     option: [],
-    field: 'dslist',
+    field: 'ds_list',
     title: t('ds.title'),
     operate: 'in',
     property: { placeholder: t('common.empty') + t('ds.title') },
   },
+  {
+    type: 'select',
+    option: [],
+    field: 'adv_list',
+    title: t('embedded.advanced_application'),
+    operate: 'in',
+    property: { placeholder: t('common.empty') + t('embedded.advanced_application') },
+  },
 ])
 
 const fillFilterText = () => {

frontend/src/views/system/prompt/index.vue

@@ -55,6 +55,7 @@ onMounted(() => {
   })
   getAdvancedApplicationList().then((res: any) => {
     adv_options.value = res || []
+    filterOption.value[1].option = [...adv_options.value]
   })
   search()
 })
@@ -389,31 +390,36 @@ const typeChange = (val: any) => {
 }
 
 const configParams = () => {
-  let str = ''
+  let _data: any = {}
   if (keywords.value) {
-    str += `name=${keywords.value}`
+    _data['name'] = keywords.value
   }
 
+  console.log(state.conditions)
+
   state.conditions.forEach((ele: any) => {
-    ele.value.forEach((itx: any) => {
-      str += str ? `_${itx}` : `${ele.field}=${itx}`
-    })
+    _data[ele.field] = ele.value
   })
 
-  if (str.length) {
-    str = `?${str}`
-  }
-  return str
+  return _data
 }
 const filterOption = ref<any[]>([
   {
     type: 'select',
     option: [],
-    field: 'dslist',
+    field: 'ds_list',
     title: t('ds.title'),
     operate: 'in',
     property: { placeholder: t('common.empty') + t('ds.title') },
   },
+  {
+    type: 'select',
+    option: [],
+    field: 'adv_list',
+    title: t('embedded.advanced_application'),
+    operate: 'in',
+    property: { placeholder: t('common.empty') + t('embedded.advanced_application') },
+  },
 ])
 
 const fillFilterText = () => {