15308555518/ MaxKB
1
0
Fork 0
mirror of https://github.com/1Panel-dev/MaxKB.git synced 2025-12-26 01:33:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: 处理历史数据 (#1692)

This commit is contained in:
shaohuzhang1 2024-11-26 13:29:46 +08:00 committed by GitHub
parent e978c83f02
commit 98f25c99f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/common/event/listener_manage.py
View File

@ -170,8 +170,7 @@ class ListenerManagement:
def aggregation_document_status():
sql = get_file_content(
os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'update_document_status_meta.sql'))
native_update({'document_custom_sql': QuerySet(Document).filter(id=document_id),
'default_sql': QuerySet(Document).filter(id=document_id)}, sql, with_table_name=True)
native_update({'document_custom_sql': QuerySet(Document).filter(id=document_id)}, sql, with_table_name=True)
return aggregation_document_status
@ -180,8 +179,7 @@ class ListenerManagement:
def aggregation_document_status():
sql = get_file_content(
os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'update_document_status_meta.sql'))
native_update({'document_custom_sql': QuerySet(Document).filter(dataset_id=dataset_id),
'default_sql': QuerySet(Document).filter(dataset_id=dataset_id)}, sql)
native_update({'document_custom_sql': QuerySet(Document).filter(dataset_id=dataset_id)}, sql)
return aggregation_document_status
@ -190,7 +188,7 @@ class ListenerManagement:
def aggregation_document_status():
sql = get_file_content(
os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'update_document_status_meta.sql'))
native_update({'document_custom_sql': queryset, 'default_sql': queryset}, sql)
native_update({'document_custom_sql': queryset}, sql)
return aggregation_document_status

17
apps/dataset/migrations/0011_document_status_meta_paragraph_status_meta_and_more.py
View File

@ -1,11 +1,23 @@
# Generated by Django 4.2.15 on 2024-11-22 14:44
from django.db.models import QuerySet
import dataset.models.data_set
from django.db import migrations, models
import dataset
from common.event import ListenerManagement
from dataset.models import State, TaskType
def updateDocumentStatus(apps, schema_editor):
ParagraphModel = apps.get_model('dataset', 'Paragraph')
DocumentModel = apps.get_model('dataset', 'Document')
success_list = QuerySet(DocumentModel).filter(status='2')
ListenerManagement.update_status(QuerySet(ParagraphModel).filter(document_id__in=[d.id for d in success_list]),
TaskType.EMBEDDING, State.SUCCESS)
ListenerManagement.get_aggregation_document_status_by_query_set(QuerySet(DocumentModel))()
class Migration(migrations.Migration):
dependencies = [
('dataset', '0010_file_meta'),
]
@ -31,4 +43,5 @@ class Migration(migrations.Migration):
name='status',
field=models.CharField(default=dataset.models.data_set.Status.__str__, max_length=20, verbose_name='状态'),
),
migrations.RunPython(updateDocumentStatus)
]

2
apps/dataset/sql/update_document_status_meta.sql
View File

@ -22,4 +22,4 @@ FROM
GROUP BY
document_id
) tmp
${default_sql}
WHERE "document".id="tmp".document_id

2
ui/src/utils/status.ts
View File

@ -65,4 +65,4 @@ class Status {
return r.reverse().join('')
}
}
export { Status, State, TaskType, TaskTypeInterface, StateInterface }
export { Status, State, TaskType, type TaskTypeInterface, type StateInterface }

2
ui/src/views/document/index.vue
View File

@ -381,7 +381,7 @@ const {
const { common, dataset, document } = useStore()
const storeKey = 'documents'
const getTaskState = (status, taskType) => {
const getTaskState = (status: string, taskType: number) => {
const statusList = status.split('').reverse()
return taskType - 1 > statusList.length + 1 ? 'n' : statusList[taskType - 1]
}