zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Dialogue user does not display username (#3628)

Browse Source
This commit is contained in:
shaohuzhang1 2025-07-16 15:35:33 +08:00 committed by GitHub
parent 0fc4a59e96
commit f91afd593b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/application/serializers/application_chat.py
View File

@ -167,7 +167,7 @@ class ApplicationChatQuerySerializers(serializers.Serializer):
"\n".join([ "\n".join([
f"{improve_paragraph_list[index].get('title')}\n{improve_paragraph_list[index].get('content')}" f"{improve_paragraph_list[index].get('title')}\n{improve_paragraph_list[index].get('content')}"
for index in range(len(improve_paragraph_list))]), for index in range(len(improve_paragraph_list))]),
row.get('asker').get('user_name'), row.get('asker').get('username'),
(row.get('message_tokens') or 0) + (row.get('answer_tokens') or 0), row.get('run_time'), (row.get('message_tokens') or 0) + (row.get('answer_tokens') or 0), row.get('run_time'),
str(row.get('create_time').astimezone(pytz.timezone(TIME_ZONE)).strftime('%Y-%m-%d %H:%M:%S') str(row.get('create_time').astimezone(pytz.timezone(TIME_ZONE)).strftime('%Y-%m-%d %H:%M:%S')
if row.get('create_time') is not None else None)] if row.get('create_time') is not None else None)]
@ -192,7 +192,6 @@ class ApplicationChatQuerySerializers(serializers.Serializer):
worksheet.title = 'Sheet1' worksheet.title = 'Sheet1'
headers = [gettext('Conversation ID'), gettext('summary'), gettext('User Questions'), headers = [gettext('Conversation ID'), gettext('summary'), gettext('User Questions'),
gettext('Problem after optimization'),
gettext('answer'), gettext('User feedback'), gettext('answer'), gettext('User feedback'),
gettext('Reference segment number'), gettext('Reference segment number'),
gettext('Section title + content'), gettext('Section title + content'),

4
apps/application/serializers/application_chat_record.py
View File

@ -56,8 +56,6 @@ class ChatRecordOperateSerializer(serializers.Serializer):
application_id=self.data.get('application_id')).first() application_id=self.data.get('application_id')).first()
if application_access_token is None: if application_access_token is None:
raise AppApiException(500, gettext('Application authentication information does not exist')) raise AppApiException(500, gettext('Application authentication information does not exist'))
if not application_access_token.show_source and not debug:
raise AppApiException(500, gettext('Displaying knowledge sources is not enabled'))
def get_chat_record(self): def get_chat_record(self):
chat_record_id = self.data.get('chat_record_id') chat_record_id = self.data.get('chat_record_id')
@ -83,7 +81,7 @@ class ChatRecordOperateSerializer(serializers.Serializer):
show_exec = application_access_token.show_exec show_exec = application_access_token.show_exec
show_source = application_access_token.show_source show_source = application_access_token.show_source
return ApplicationChatRecordQuerySerializers.reset_chat_record( return ApplicationChatRecordQuerySerializers.reset_chat_record(
chat_record, show_source, show_exec) chat_record, True if debug else show_source, True if debug else show_exec)
class ApplicationChatRecordQuerySerializers(serializers.Serializer): class ApplicationChatRecordQuerySerializers(serializers.Serializer):

2
apps/application/sql/export_application_chat_ee.sql
View File

@ -11,7 +11,7 @@ SELECT
application_chat_record_temp.improve_paragraph_list as improve_paragraph_list, application_chat_record_temp.improve_paragraph_list as improve_paragraph_list,
application_chat_record_temp.vote_status as vote_status, application_chat_record_temp.vote_status as vote_status,
application_chat_record_temp.create_time as create_time, application_chat_record_temp.create_time as create_time,
(CASE WHEN "chat_user".id is NULL THEN application_chat.asker ELSE jsonb_build_object('id',chat_user.id,'user_name',chat_user.username) END)::json AS asker (CASE WHEN "chat_user".id is NULL THEN application_chat.asker ELSE jsonb_build_object('id',chat_user.id,'username',chat_user.username) END)::json AS asker
FROM FROM
application_chat application_chat application_chat application_chat
left join chat_user chat_user on chat_user.id::varchar = application_chat.chat_user_id left join chat_user chat_user on chat_user.id::varchar = application_chat.chat_user_id

2
apps/application/sql/list_application_chat_ee.sql
View File

@ -1,4 +1,4 @@
select application_chat.*,(CASE WHEN "chat_user".id is NULL THEN application_chat.asker ELSE jsonb_build_object('id',chat_user.id,'user_name',chat_user.username) END)::json AS asker select application_chat.*,(CASE WHEN "chat_user".id is NULL THEN application_chat.asker ELSE jsonb_build_object('id',chat_user.id,'username',chat_user.username) END)::json AS asker
from application_chat application_chat from application_chat application_chat
left join chat_user chat_user on chat_user.id::varchar = application_chat.chat_user_id left join chat_user chat_user on chat_user.id::varchar = application_chat.chat_user_id
${default_queryset} ${default_queryset}

2
apps/chat/views/chat_record.py
View File

@ -197,4 +197,4 @@ class ChatRecordView(APIView):
'chat_record_id': chat_record_id, 'chat_record_id': chat_record_id,
'application_id': request.auth.application_id, 'application_id': request.auth.application_id,
'chat_user_id': request.auth.chat_user_id, 'chat_user_id': request.auth.chat_user_id,
}).one(True)) }).one(False))