From 71f86e5d554568af972ab3dcd9e1f7c05fe71d2a Mon Sep 17 00:00:00 2001 From: liuhua <10215101452@stu.ecun.edu.cn> Date: Thu, 12 Sep 2024 14:34:47 +0800 Subject: [PATCH 1/2] Add a default value for do_refer in Dialog --- api/db/db_models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/api/db/db_models.py b/api/db/db_models.py index fc459389fb..39c6f9351e 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( From adbc6fc99a320fd25bc6d5def273256a24c11108 Mon Sep 17 00:00:00 2001 From: liuhua <10215101452@stu.ecun.edu.cn> Date: Thu, 12 Sep 2024 15:07:48 +0800 Subject: [PATCH 2/2] fix a query bug in api_service --- api/db/services/api_service.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/db/services/api_service.py b/api/db/services/api_service.py index cb47ea917f..24226d4425 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 @@ def stats(cls, tenant_id, from_date, to_date, source=None): 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