Skip to content

Commit c7a9a4d

Browse files
authored
fix: Floating window image cannot be displayed (#3634)
* fix: After modifying the voice playback settings in the application, save the unpublished settings, and the conversation page should display the settings before modification * fix: Floating window image cannot be displayed
1 parent c249f75 commit c7a9a4d

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

apps/application/serializers/application.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -913,23 +913,31 @@ def save_application_knowledge_mapping(application_knowledge_id_list, knowledge_
913913
[ApplicationKnowledgeMapping(application_id=application_id, knowledge_id=knowledge_id) for knowledge_id in
914914
knowledge_id_list]) if len(knowledge_id_list) > 0 else None
915915

916-
def speech_to_text(self, instance, with_valid=True):
916+
def speech_to_text(self, instance, debug=True, with_valid=True):
917917
if with_valid:
918918
self.is_valid(raise_exception=True)
919919
SpeechToTextRequest(data=instance).is_valid(raise_exception=True)
920920
application_id = self.data.get('application_id')
921-
application = QuerySet(Application).filter(id=application_id).first()
921+
if debug:
922+
application = QuerySet(Application).filter(id=application_id).first()
923+
else:
924+
application = QuerySet(ApplicationVersion).filter(application_id=application_id).order_by(
925+
'-create_time').first()
922926
if application.stt_model_enable:
923927
model = get_model_instance_by_model_workspace_id(application.stt_model_id, application.workspace_id)
924928
text = model.speech_to_text(instance.get('file'))
925929
return text
926930

927-
def text_to_speech(self, instance, with_valid=True):
931+
def text_to_speech(self, instance, debug=True, with_valid=True):
928932
if with_valid:
929933
self.is_valid(raise_exception=True)
930934
TextToSpeechRequest(data=instance).is_valid(raise_exception=True)
931935
application_id = self.data.get('application_id')
932-
application = QuerySet(Application).filter(id=application_id).first()
936+
if debug:
937+
application = QuerySet(Application).filter(id=application_id).first()
938+
else:
939+
application = QuerySet(ApplicationVersion).filter(application_id=application_id).order_by(
940+
'-create_time').first()
933941
if application.tts_model_enable:
934942
model = get_model_instance_by_model_workspace_id(application.tts_model_id, application.workspace_id,
935943
**application.tts_model_params_setting)

apps/chat/serializers/chat.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,10 @@ class TextToSpeechSerializers(serializers.Serializer):
462462
def text_to_speech(self, instance):
463463
self.is_valid(raise_exception=True)
464464
application_id = self.data.get('application_id')
465-
application = QuerySet(Application).filter(id=application_id).first()
465+
application = QuerySet(ApplicationVersion).filter(id=application_id).order_by('-create_time').first()
466466
return ApplicationOperateSerializer(
467467
data={'application_id': application_id,
468-
'user_id': application.user_id}).text_to_speech(instance)
468+
'user_id': application.user_id}).text_to_speech(instance, False)
469469

470470

471471
class SpeechToTextSerializers(serializers.Serializer):
@@ -477,4 +477,4 @@ def speech_to_text(self, instance):
477477
application = QuerySet(Application).filter(id=application_id).first()
478478
return ApplicationOperateSerializer(
479479
data={'application_id': application_id,
480-
'user_id': application.user_id}).speech_to_text(instance)
480+
'user_id': application.user_id}).speech_to_text(instance, False)

apps/chat/serializers/chat_embed_serializers.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ def get_embed(self, with_valid=True, params=None):
5353
if application_setting is not None:
5454
is_draggable = 'true' if application_setting.draggable else 'false'
5555
if application_setting.float_icon is not None and len(application_setting.float_icon) > 0:
56-
float_icon = f"{self.data.get('protocol')}://{self.data.get('host')}{CONFIG.get_chat_path()}{application_setting.float_icon}"
56+
float_icon = application_setting.float_icon[1:] if application_setting.float_icon.startswith(
57+
'.') else application_setting.float_icon
58+
float_icon = f"{self.data.get('protocol')}://{self.data.get('host')}{CONFIG.get_chat_path()}{float_icon}"
5759
show_guide = 'true' if application_setting.show_guide else 'false'
5860
if application_setting.float_location is not None:
5961
float_location = application_setting.float_location

0 commit comments

Comments
 (0)