From 0c6d39892cf73419eaca1495196950e92f8cc565 Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <shaohu.zhang@fit2cloud.com>
Date: Wed, 13 Dec 2023 14:10:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=A0=87=E6=B3=A8id?=
 =?UTF-8?q?=20=E5=AD=98=E5=82=A8=E4=B8=BA=E6=AE=B5=E8=90=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...cord_improve_paragraph_id_list_and_more.py | 24 +++++++++++++++++++
 apps/application/models/api_key_model.py      |  2 +-
 apps/application/models/application.py        |  6 ++---
 .../serializers/chat_serializers.py           |  3 +--
 .../application/sql/list_application_chat.sql |  2 +-
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 apps/application/migrations/0010_rename_improve_problem_id_list_chatrecord_improve_paragraph_id_list_and_more.py

diff --git a/apps/application/migrations/0010_rename_improve_problem_id_list_chatrecord_improve_paragraph_id_list_and_more.py b/apps/application/migrations/0010_rename_improve_problem_id_list_chatrecord_improve_paragraph_id_list_and_more.py
new file mode 100644
index 000000000..c3d896403
--- /dev/null
+++ b/apps/application/migrations/0010_rename_improve_problem_id_list_chatrecord_improve_paragraph_id_list_and_more.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.1.10 on 2023-12-13 06:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('application', '0009_alter_chatrecord_dataset_alter_chatrecord_paragraph'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='chatrecord',
+            old_name='improve_problem_id_list',
+            new_name='improve_paragraph_id_list',
+        ),
+        migrations.AlterField(
+            model_name='applicationaccesstoken',
+            name='application',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='application.application', verbose_name='应用id'),
+        ),
+    ]
diff --git a/apps/application/models/api_key_model.py b/apps/application/models/api_key_model.py
index 672423d13..01ec568fa 100644
--- a/apps/application/models/api_key_model.py
+++ b/apps/application/models/api_key_model.py
@@ -29,7 +29,7 @@ class ApplicationAccessToken(AppModelMixin):
     """
     应用认证token
     """
-    application = models.ForeignKey(Application, primary_key=True, on_delete=models.CASCADE, verbose_name="应用id")
+    application = models.OneToOneField(Application, primary_key=True, on_delete=models.CASCADE, verbose_name="应用id")
     access_token = models.CharField(max_length=128, verbose_name="用户公开访问 认证token", unique=True)
     is_active = models.BooleanField(default=True, verbose_name="是否开启公开访问")
 
diff --git a/apps/application/models/application.py b/apps/application/models/application.py
index 1cba2ce3d..90a2efbe5 100644
--- a/apps/application/models/application.py
+++ b/apps/application/models/application.py
@@ -74,9 +74,9 @@ class ChatRecord(AppModelMixin):
     answer_tokens = models.IntegerField(verbose_name="响应token数量", default=0)
     problem_text = models.CharField(max_length=1024, verbose_name="问题")
     answer_text = models.CharField(max_length=1024, verbose_name="答案")
-    improve_problem_id_list = ArrayField(verbose_name="改进标注列表",
-                                         base_field=models.UUIDField(max_length=128, blank=True)
-                                         , default=list)
+    improve_paragraph_id_list = ArrayField(verbose_name="改进标注列表",
+                                           base_field=models.UUIDField(max_length=128, blank=True)
+                                           , default=list)
 
     index = models.IntegerField(verbose_name="对话下标")
 
diff --git a/apps/application/serializers/chat_serializers.py b/apps/application/serializers/chat_serializers.py
index 43d53fe07..ffb9a1bb0 100644
--- a/apps/application/serializers/chat_serializers.py
+++ b/apps/application/serializers/chat_serializers.py
@@ -29,7 +29,6 @@ from dataset.models import Document, Problem, Paragraph
 from embedding.models import SourceType, Embedding
 from setting.models import Model
 from setting.models_provider.constants.model_provider_constants import ModelProvideConstants
-
 from smartdoc.conf import PROJECT_DIR
 
 chat_cache = cache
@@ -292,7 +291,7 @@ class ChatRecordSerializer(serializers.Serializer):
             problem.save()
             # 插入段落
             paragraph.save()
-            chat_record.improve_problem_id_list.append(problem.id)
+            chat_record.improve_paragraph_id_list.append(paragraph.id)
             # 添加标注
             chat_record.save()
             return True
diff --git a/apps/application/sql/list_application_chat.sql b/apps/application/sql/list_application_chat.sql
index 7fcf862d6..bf269d005 100644
--- a/apps/application/sql/list_application_chat.sql
+++ b/apps/application/sql/list_application_chat.sql
@@ -7,7 +7,7 @@ FROM
 		( "id" ) AS chat_record_count,
 		SUM ( CASE WHEN "vote_status" = '0' THEN 1 ELSE 0 END ) AS star_num,
 		SUM ( CASE WHEN "vote_status" = '1' THEN 1 ELSE 0 END ) AS trample_num,
-		SUM ( CASE WHEN array_length( application_chat_record.improve_problem_id_list, 1 ) IS NULL THEN 0 ELSE array_length( application_chat_record.improve_problem_id_list, 1 ) END ) AS mark_sum,
+		SUM ( CASE WHEN array_length( application_chat_record.improve_paragraph_id_list, 1 ) IS NULL THEN 0 ELSE array_length( application_chat_record.improve_paragraph_id_list, 1 ) END ) AS mark_sum,
 		chat_id
 	FROM
 		application_chat_record