Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a default value for do_refer in Dialog #2383

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Add a default value for do_refer in Dialog #2383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71f86e5
Add a default value for do_refer in Dialog
Sep 12, 2024
adbc6fc
fix a query bug in api_service
Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/db/db_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 4 additions & 2 deletions api/db/services/api_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand All @@ -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
Expand Down