diff --git a/apps/application/serializers/application_chat_record.py b/apps/application/serializers/application_chat_record.py index 32e2f2ad..126dc6e3 100644 --- a/apps/application/serializers/application_chat_record.py +++ b/apps/application/serializers/application_chat_record.py @@ -155,21 +155,18 @@ class ApplicationChatRecordQuerySerializers(serializers.Serializer): 'padding_problem_text': chat_record.details.get('problem_padding').get( 'padding_problem_text') if 'problem_padding' in chat_record.details else None, **(show_source_dict if show_source else {}), - **(show_exec_dict if show_exec else {}) + **(show_exec_dict if show_exec else show_exec_dict) } - def page(self, current_page: int, page_size: int, with_valid=True): + def page(self, current_page: int, page_size: int, with_valid=True, show_source=None, show_exec=None): if with_valid: self.is_valid(raise_exception=True) order_by = '-create_time' if self.data.get('order_asc') is None or self.data.get( 'order_asc') else 'create_time' - application_access_token = QuerySet(ApplicationAccessToken).filter( - application_id=self.data.get('application_id')).first() - show_source = False - show_exec = False - if application_access_token is not None: - show_exec = application_access_token.show_exec - show_source = application_access_token.show_source + if show_source is None: + show_source = True + if show_exec is None: + show_exec = True page = page_search(current_page, page_size, QuerySet(ChatRecord).filter(chat_id=self.data.get('chat_id')).order_by(order_by), post_records_handler=lambda chat_record: self.reset_chat_record(chat_record, show_source, diff --git a/apps/chat/serializers/chat_record.py b/apps/chat/serializers/chat_record.py index 1e0183ec..4ed5ae90 100644 --- a/apps/chat/serializers/chat_record.py +++ b/apps/chat/serializers/chat_record.py @@ -13,7 +13,7 @@ from django.db.models import QuerySet from django.utils.translation import gettext_lazy as _, gettext from rest_framework import serializers -from application.models import VoteChoices, ChatRecord, Chat +from application.models import VoteChoices, ChatRecord, Chat, ApplicationAccessToken from application.serializers.application_chat import ChatCountSerializer from application.serializers.application_chat_record import ChatRecordSerializerModel, \ ApplicationChatRecordQuerySerializers @@ -159,6 +159,13 @@ class HistoricalConversationRecordSerializer(serializers.Serializer): def page(self, current_page, page_size): self.is_valid(raise_exception=True) + application_access_token = QuerySet(ApplicationAccessToken).filter( + application_id=self.data.get('application_id')).first() + show_source = False + show_exec = False + if application_access_token is not None: + show_exec = application_access_token.show_exec + show_source = application_access_token.show_source return ApplicationChatRecordQuerySerializers( data={'application_id': self.data.get('application_id'), 'chat_id': self.data.get('chat_id')}).page( - current_page, page_size) + current_page, page_size, show_source=show_source, show_exec=show_exec) diff --git a/ui/src/components/ai-chat/component/chat-input-operate/index.vue b/ui/src/components/ai-chat/component/chat-input-operate/index.vue index 1ad65e5a..6a05bf55 100644 --- a/ui/src/components/ai-chat/component/chat-input-operate/index.vue +++ b/ui/src/components/ai-chat/component/chat-input-operate/index.vue @@ -129,10 +129,8 @@