From 98f25c99f2e635950362b137b29fc81c73050fd5 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:29:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20(#1692)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/event/listener_manage.py | 8 +++----- ...tatus_meta_paragraph_status_meta_and_more.py | 17 +++++++++++++++-- .../dataset/sql/update_document_status_meta.sql | 2 +- ui/src/utils/status.ts | 2 +- ui/src/views/document/index.vue | 2 +- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/apps/common/event/listener_manage.py b/apps/common/event/listener_manage.py index 5e52aa1ef..a98b29bf1 100644 --- a/apps/common/event/listener_manage.py +++ b/apps/common/event/listener_manage.py @@ -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 diff --git a/apps/dataset/migrations/0011_document_status_meta_paragraph_status_meta_and_more.py b/apps/dataset/migrations/0011_document_status_meta_paragraph_status_meta_and_more.py index 02c9addd0..c64a4db20 100644 --- a/apps/dataset/migrations/0011_document_status_meta_paragraph_status_meta_and_more.py +++ b/apps/dataset/migrations/0011_document_status_meta_paragraph_status_meta_and_more.py @@ -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) ] diff --git a/apps/dataset/sql/update_document_status_meta.sql b/apps/dataset/sql/update_document_status_meta.sql index ced642b83..6065931ff 100644 --- a/apps/dataset/sql/update_document_status_meta.sql +++ b/apps/dataset/sql/update_document_status_meta.sql @@ -22,4 +22,4 @@ FROM GROUP BY document_id ) tmp -${default_sql} \ No newline at end of file +WHERE "document".id="tmp".document_id \ No newline at end of file diff --git a/ui/src/utils/status.ts b/ui/src/utils/status.ts index abfbd2e4e..16f98599e 100644 --- a/ui/src/utils/status.ts +++ b/ui/src/utils/status.ts @@ -65,4 +65,4 @@ class Status { return r.reverse().join('') } } -export { Status, State, TaskType, TaskTypeInterface, StateInterface } +export { Status, State, TaskType, type TaskTypeInterface, type StateInterface } diff --git a/ui/src/views/document/index.vue b/ui/src/views/document/index.vue index 86042a3fa..4777dd106 100644 --- a/ui/src/views/document/index.vue +++ b/ui/src/views/document/index.vue @@ -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] }