Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/apps/terminology/curd/terminology.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from apps.datasource.models.datasource import CoreDatasource
from apps.system.models.system_model import AssistantModel
from apps.template.generate_chart.generator import get_base_terminology_template
from apps.terminology.models.terminology_model import Terminology, TerminologyInfo
from apps.terminology.models.terminology_model import Terminology, TerminologyInfo, TerminologyInfoResult
from common.core.config import settings
from common.core.deps import SessionDep, Trans
from common.utils.embedding_threads import run_save_terminology_embeddings
Expand Down Expand Up @@ -179,15 +179,15 @@ def build_terminology_query(session: SessionDep, oid: int, name: Optional[str] =
return stmt, total_count, total_pages, current_page, page_size


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

for row in result:
_list.append(TerminologyInfo(
_list.append(TerminologyInfoResult(
id=row.id,
word=row.word,
create_time=row.create_time,
Expand Down
13 changes: 13 additions & 0 deletions backend/apps/terminology/models/terminology_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,16 @@ class TerminologyInfo(BaseModel):
enabled: Optional[bool] = True
advanced_application: Optional[int] = None
advanced_application_name: Optional[str] = None

class TerminologyInfoResult(BaseModel):
id: Optional[int] = None
create_time: Optional[datetime] = None
word: Optional[str] = None
description: Optional[str] = None
other_words: Optional[List[str]] = []
specific_ds: Optional[bool] = False
datasource_ids: Optional[list[int]] = []
datasource_names: Optional[list[str]] = []
enabled: Optional[bool] = True
advanced_application: Optional[str] = None
advanced_application_name: Optional[str] = None
2 changes: 1 addition & 1 deletion backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.24,<0.0.6.0",
"sqlbot-xpack>=0.0.5.27,<0.0.6.0",
"fastapi-cache2>=0.2.2",
"sqlparse>=0.5.3",
"redis>=6.2.0",
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/views/system/professional/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,9 @@ const list = () => {
datasourceApi.list().then((res) => {
allDsList.value = res
})
getAdvancedApplicationList().then((res: any) => {
adv_options.value = res || []
})
}
const editHandler = (row: any) => {
pageForm.value.id = null
Expand All @@ -335,11 +338,12 @@ const editHandler = (row: any) => {
pageForm.value.other_words = ['']
}
}
console.log(pageForm.value)
list()
dialogTitle.value = row?.id
? t('professional.editing_terminology')
: t('professional.create_new_term')
dialogFormVisible.value = true
list()
}

const onFormClose = () => {
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/views/system/prompt/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,9 @@ const list = () => {
datasourceApi.list().then((res: any) => {
options.value = res || []
})
getAdvancedApplicationList().then((res: any) => {
adv_options.value = res || []
})
}

const saveHandler = () => {
Expand Down Expand Up @@ -342,6 +345,7 @@ const editHandler = (row: any) => {
if (row) {
pageForm.value = cloneDeep(row)
}
console.log(pageForm.value)
list()
dialogTitle.value = row?.id ? t('prompt.edit_prompt_word') : t('prompt.add_prompt_word')
dialogFormVisible.value = true
Expand Down
1 change: 1 addition & 0 deletions frontend/src/views/system/training/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ const editHandler = (row: any) => {
if (row) {
pageForm.value = cloneDeep(row)
}
console.log(pageForm.value)
list()

dialogTitle.value = row?.id ? t('training.edit_training_data') : t('training.add_training_data')
Expand Down
Loading