AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-20 12:29:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: convert backwards invocation into BaseBackwardsResponse

Browse Source
This commit is contained in:
Yeuoly 2024-11-19 14:03:40 +08:00
parent 97a3727962
commit 8b30099672
No known key found for this signature in database
GPG Key ID: A66E7E320FB19F61
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/core/app/apps/advanced_chat/app_generator.py
View File

@ -162,7 +162,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
def single_iteration_generate( def single_iteration_generate(
self, app_model: App, workflow: Workflow, node_id: str, user: Account | EndUser, args: dict, stream: bool = True self, app_model: App, workflow: Workflow, node_id: str, user: Account | EndUser, args: dict, stream: bool = True
) -> dict[str, Any] | Generator[str, Any, None]: ) -> dict[str, Any] | Generator[str | dict[str, Any], Any, None]:
""" """
Generate App response. Generate App response.
@ -218,7 +218,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
application_generate_entity: AdvancedChatAppGenerateEntity, application_generate_entity: AdvancedChatAppGenerateEntity,
conversation: Optional[Conversation] = None, conversation: Optional[Conversation] = None,
stream: bool = True, stream: bool = True,
) -> dict[str, Any] | Generator[str, Any, None]: ) -> dict[str, Any] | Generator[str | dict[str, Any], Any, None]:
""" """
Generate App response. Generate App response.

6
api/core/plugin/backwards_invocation/base.py
View File

@ -1,4 +1,3 @@
import json
from collections.abc import Generator from collections.abc import Generator
from typing import Generic, Optional, TypeVar from typing import Generic, Optional, TypeVar
@ -19,10 +18,7 @@ class BaseBackwardsInvocation:
error_message = BaseBackwardsInvocationResponse(error=str(e)).model_dump_json() error_message = BaseBackwardsInvocationResponse(error=str(e)).model_dump_json()
yield f"{error_message}\n\n".encode() yield f"{error_message}\n\n".encode()
else: else:
if isinstance(response, BaseModel): yield BaseBackwardsInvocationResponse(data=response).model_dump_json().encode() + b"\n\n"
yield response.model_dump_json().encode() + b"\n\n"
else:
yield json.dumps(response).encode() + b"\n\n"
T = TypeVar("T", bound=dict | str | bool | int | BaseModel) T = TypeVar("T", bound=dict | str | bool | int | BaseModel)