From ba834aee2640d546b52875473bbfbaefa1e32d35 Mon Sep 17 00:00:00 2001 From: liuhua <10215101452@stu.ecnu.edu.cn> Date: Thu, 12 Sep 2024 15:11:57 +0800 Subject: [PATCH] Add a default value for do_refer in Dialog (#2383) ### What problem does this PR solve? Add a default value for do_refer in Dialog ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) --------- Co-authored-by: liuhua <10215101452@stu.ecun.edu.cn> --- api/db/db_models.py | 1 + api/db/services/api_service.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/db/db_models.py b/api/db/db_models.py index fc459389f..39c6f9351 100644 --- a/api/db/db_models.py +++ b/api/db/db_models.py @@ -830,6 +830,7 @@ class Dialog(DataBaseModel): do_refer = CharField( max_length=1, null=False, + default="1", help_text="it needs to insert reference index into answer or not") rerank_id = CharField( diff --git a/api/db/services/api_service.py b/api/db/services/api_service.py index cb47ea917..24226d442 100644 --- a/api/db/services/api_service.py +++ b/api/db/services/api_service.py @@ -14,7 +14,9 @@ # limitations under the License. # from datetime import datetime + import peewee + from api.db.db_models import DB, API4Conversation, APIToken, Dialog from api.db.services.common_service import CommonService from api.utils import current_timestamp, datetime_format @@ -41,7 +43,7 @@ class API4ConversationService(CommonService): @DB.connection_context() def append_message(cls, id, conversation): cls.update_by_id(id, conversation) - return cls.model.update(round=cls.model.round + 1).where(cls.model.id==id).execute() + return cls.model.update(round=cls.model.round + 1).where(cls.model.id == id).execute() @classmethod @DB.connection_context() @@ -61,7 +63,7 @@ class API4ConversationService(CommonService): cls.model.round).alias("round"), peewee.fn.SUM( cls.model.thumb_up).alias("thumb_up") - ).join(Dialog, on=(cls.model.dialog_id == Dialog.id & Dialog.tenant_id == tenant_id)).where( + ).join(Dialog, on=((cls.model.dialog_id == Dialog.id) & (Dialog.tenant_id == tenant_id))).where( cls.model.create_date >= from_date, cls.model.create_date <= to_date, cls.model.source == source