fix: rename stream to streaming

This commit is contained in:
Yeuoly 2024-12-12 13:50:34 +08:00
parent 527c1cf608
commit c2983ecbb7
No known key found for this signature in database
GPG Key ID: A66E7E320FB19F61
2 changed files with 10 additions and 10 deletions

View File

@ -26,7 +26,7 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
stream: bool, stream: bool,
inputs: Mapping, inputs: Mapping,
files: list[dict], files: list[dict],
) -> Generator[dict | str, None, None] | dict: ) -> Generator[Mapping | str, None, None] | Mapping:
""" """
invoke app invoke app
""" """
@ -60,7 +60,7 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
stream: bool, stream: bool,
inputs: Mapping, inputs: Mapping,
files: list[dict], files: list[dict],
) -> Generator[dict | str, None, None] | dict: ) -> Generator[Mapping | str, None, None] | Mapping:
""" """
invoke chat app invoke chat app
""" """
@ -80,7 +80,7 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
"conversation_id": conversation_id, "conversation_id": conversation_id,
}, },
invoke_from=InvokeFrom.SERVICE_API, invoke_from=InvokeFrom.SERVICE_API,
stream=stream, streaming=stream,
) )
elif app.mode == AppMode.AGENT_CHAT.value: elif app.mode == AppMode.AGENT_CHAT.value:
return AgentChatAppGenerator().generate( return AgentChatAppGenerator().generate(
@ -93,7 +93,7 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
"conversation_id": conversation_id, "conversation_id": conversation_id,
}, },
invoke_from=InvokeFrom.SERVICE_API, invoke_from=InvokeFrom.SERVICE_API,
stream=stream, streaming=stream,
) )
elif app.mode == AppMode.CHAT.value: elif app.mode == AppMode.CHAT.value:
return ChatAppGenerator().generate( return ChatAppGenerator().generate(
@ -106,7 +106,7 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
"conversation_id": conversation_id, "conversation_id": conversation_id,
}, },
invoke_from=InvokeFrom.SERVICE_API, invoke_from=InvokeFrom.SERVICE_API,
stream=stream, streaming=stream,
) )
else: else:
raise ValueError("unexpected app type") raise ValueError("unexpected app type")
@ -133,7 +133,7 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
user=user, user=user,
args={"inputs": inputs, "files": files}, args={"inputs": inputs, "files": files},
invoke_from=InvokeFrom.SERVICE_API, invoke_from=InvokeFrom.SERVICE_API,
stream=stream, streaming=stream,
call_depth=1, call_depth=1,
) )
@ -154,7 +154,7 @@ class PluginAppBackwardsInvocation(BaseBackwardsInvocation):
user=user, user=user,
args={"inputs": inputs, "files": files}, args={"inputs": inputs, "files": files},
invoke_from=InvokeFrom.SERVICE_API, invoke_from=InvokeFrom.SERVICE_API,
stream=stream, streaming=stream,
) )
@classmethod @classmethod

View File

@ -1,12 +1,12 @@
from collections.abc import Generator from collections.abc import Generator
from typing import Generic, Optional, TypeVar from typing import Generic, Mapping, Optional, TypeVar
from pydantic import BaseModel from pydantic import BaseModel
class BaseBackwardsInvocation: class BaseBackwardsInvocation:
@classmethod @classmethod
def convert_to_event_stream(cls, response: Generator[BaseModel | dict | str, None, None] | BaseModel | dict): def convert_to_event_stream(cls, response: Generator[BaseModel | Mapping | str, None, None] | BaseModel | Mapping):
if isinstance(response, Generator): if isinstance(response, Generator):
try: try:
for chunk in response: for chunk in response:
@ -21,7 +21,7 @@ class BaseBackwardsInvocation:
yield BaseBackwardsInvocationResponse(data=response).model_dump_json().encode() + b"\n\n" yield BaseBackwardsInvocationResponse(data=response).model_dump_json().encode() + b"\n\n"
T = TypeVar("T", bound=dict | str | bool | int | BaseModel) T = TypeVar("T", bound=dict | Mapping | str | bool | int | BaseModel)
class BaseBackwardsInvocationResponse(BaseModel, Generic[T]): class BaseBackwardsInvocationResponse(BaseModel, Generic[T]):