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

fix: #8843 event: tts_message_end always return in api streaming resp… #8846

Merged
merged 15 commits into from
Sep 29, 2024
Merged

fix: #8843 event: tts_message_end always return in api streaming resp… #8846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fcf832b
fix: #8843 event: tts_message_end always return in api streaming resp…
ic-xu Sep 27, 2024
5a784a5
fix: fix check style
ic-xu Sep 27, 2024
7d57a2c
fix: fix check style
ic-xu Sep 27, 2024
0490422
fix: fix checkstyle
ic-xu Sep 27, 2024
f598126
fix: fix checkstyle
ic-xu Sep 27, 2024
bb398ef
fix: fix checkstyle
ic-xu Sep 27, 2024
1685858
fix: fix checkstyle
ic-xu Sep 27, 2024
86dc3b1
fix: fix checkstyle
ic-xu Sep 27, 2024
57d2778
fix: fix checkstyle
ic-xu Sep 27, 2024
bf4d311
fix: fix checkstyle
ic-xu Sep 27, 2024
63194cb
fix: fix checkstyle
ic-xu Sep 27, 2024
d02cdbf
fix: fix checkstyle
ic-xu Sep 27, 2024
5ae5655
fix: fix checkstyle
ic-xu Sep 27, 2024
949483c
Merge remote-tracking branch 'main/main' into filter_tts_message_end
ic-xu Sep 29, 2024
8e03824
fix: fix checkstyle
ic-xu Sep 29, 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
3 changes: 2 additions & 1 deletion api/core/app/apps/advanced_chat/generate_task_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@ def _wrapper_process_stream_response(
except Exception as e:
logger.error(e)
break
yield MessageAudioEndStreamResponse(audio="", task_id=task_id)
if tts_publisher:
yield MessageAudioEndStreamResponse(audio="", task_id=task_id)

def _process_stream_response(
self,
Expand Down
3 changes: 2 additions & 1 deletion api/core/app/apps/workflow/generate_task_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ def _wrapper_process_stream_response(
except Exception as e:
logger.error(e)
break
yield MessageAudioEndStreamResponse(audio="", task_id=task_id)
if tts_publisher:
yield MessageAudioEndStreamResponse(audio="", task_id=task_id)

def _process_stream_response(
self,
Expand Down
3 changes: 2 additions & 1 deletion api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ def _wrapper_process_stream_response(
else:
start_listener_time = time.time()
yield MessageAudioStreamResponse(audio=audio.audio, task_id=task_id)
yield MessageAudioEndStreamResponse(audio="", task_id=task_id)
if publisher:
yield MessageAudioEndStreamResponse(audio="", task_id=task_id)

def _process_stream_response(
self, publisher: AppGeneratorTTSPublisher, trace_manager: Optional[TraceQueueManager] = None
Expand Down
2 changes: 1 addition & 1 deletion api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_base_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
)

if TYPE_CHECKING:
from pydantic_core.core_schema import LiteralSchema, ModelField, ModelFieldsSchema
from pydantic_core.core_schema import ModelField

__all__ = ["BaseModel", "GenericModel"]
_BaseModelT = TypeVar("_BaseModelT", bound="BaseModel")
Expand Down