Skip to content

Commit d7261da

Browse files
committed
feat: support configuring terminology for specified advanced applications
1 parent 2c2960e commit d7261da

6 files changed

Lines changed: 27 additions & 5 deletions

File tree

backend/apps/terminology/curd/terminology.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from apps.datasource.models.datasource import CoreDatasource
1313
from apps.system.models.system_model import AssistantModel
1414
from apps.template.generate_chart.generator import get_base_terminology_template
15-
from apps.terminology.models.terminology_model import Terminology, TerminologyInfo
15+
from apps.terminology.models.terminology_model import Terminology, TerminologyInfo, TerminologyInfoResult
1616
from common.core.config import settings
1717
from common.core.deps import SessionDep, Trans
1818
from common.utils.embedding_threads import run_save_terminology_embeddings
@@ -179,15 +179,15 @@ def build_terminology_query(session: SessionDep, oid: int, name: Optional[str] =
179179
return stmt, total_count, total_pages, current_page, page_size
180180

181181

182-
def execute_terminology_query(session: SessionDep, stmt) -> List[TerminologyInfo]:
182+
def execute_terminology_query(session: SessionDep, stmt) -> List[TerminologyInfoResult]:
183183
"""
184184
执行查询并返回术语信息列表
185185
"""
186186
_list = []
187187
result = session.execute(stmt)
188188

189189
for row in result:
190-
_list.append(TerminologyInfo(
190+
_list.append(TerminologyInfoResult(
191191
id=row.id,
192192
word=row.word,
193193
create_time=row.create_time,

backend/apps/terminology/models/terminology_model.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,16 @@ class TerminologyInfo(BaseModel):
3535
enabled: Optional[bool] = True
3636
advanced_application: Optional[int] = None
3737
advanced_application_name: Optional[str] = None
38+
39+
class TerminologyInfoResult(BaseModel):
40+
id: Optional[int] = None
41+
create_time: Optional[datetime] = None
42+
word: Optional[str] = None
43+
description: Optional[str] = None
44+
other_words: Optional[List[str]] = []
45+
specific_ds: Optional[bool] = False
46+
datasource_ids: Optional[list[int]] = []
47+
datasource_names: Optional[list[str]] = []
48+
enabled: Optional[bool] = True
49+
advanced_application: Optional[str] = None
50+
advanced_application_name: Optional[str] = None

backend/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies = [
3939
"pyyaml (>=6.0.2,<7.0.0)",
4040
"fastapi-mcp (>=0.3.4,<0.4.0)",
4141
"tabulate>=0.9.0",
42-
"sqlbot-xpack>=0.0.5.24,<0.0.6.0",
42+
"sqlbot-xpack>=0.0.5.27,<0.0.6.0",
4343
"fastapi-cache2>=0.2.2",
4444
"sqlparse>=0.5.3",
4545
"redis>=6.2.0",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ const list = () => {
326326
datasourceApi.list().then((res) => {
327327
allDsList.value = res
328328
})
329+
getAdvancedApplicationList().then((res: any) => {
330+
adv_options.value = res || []
331+
})
329332
}
330333
const editHandler = (row: any) => {
331334
pageForm.value.id = null
@@ -335,11 +338,12 @@ const editHandler = (row: any) => {
335338
pageForm.value.other_words = ['']
336339
}
337340
}
341+
console.log(pageForm.value)
342+
list()
338343
dialogTitle.value = row?.id
339344
? t('professional.editing_terminology')
340345
: t('professional.create_new_term')
341346
dialogFormVisible.value = true
342-
list()
343347
}
344348
345349
const onFormClose = () => {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,9 @@ const list = () => {
309309
datasourceApi.list().then((res: any) => {
310310
options.value = res || []
311311
})
312+
getAdvancedApplicationList().then((res: any) => {
313+
adv_options.value = res || []
314+
})
312315
}
313316
314317
const saveHandler = () => {
@@ -342,6 +345,7 @@ const editHandler = (row: any) => {
342345
if (row) {
343346
pageForm.value = cloneDeep(row)
344347
}
348+
console.log(pageForm.value)
345349
list()
346350
dialogTitle.value = row?.id ? t('prompt.edit_prompt_word') : t('prompt.add_prompt_word')
347351
dialogFormVisible.value = true

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ const editHandler = (row: any) => {
304304
if (row) {
305305
pageForm.value = cloneDeep(row)
306306
}
307+
console.log(pageForm.value)
307308
list()
308309
309310
dialogTitle.value = row?.id ? t('training.edit_training_data') : t('training.add_training_data')

0 commit comments

Comments
 (0)