diff --git a/api/core/app/apps/agent_chat/app_generator.py b/api/core/app/apps/agent_chat/app_generator.py index cf6d829256..29c7447290 100644 --- a/api/core/app/apps/agent_chat/app_generator.py +++ b/api/core/app/apps/agent_chat/app_generator.py @@ -32,16 +32,16 @@ class AgentChatAppGenerator(MessageBasedAppGenerator): def generate( self, app_model: App, user: Union[Account, EndUser], - args: Any, + args: dict, invoke_from: InvokeFrom, stream: Literal[True] = True, - ) -> Generator[dict, None, None]: ... + ) -> Generator[str, None, None]: ... @overload def generate( self, app_model: App, user: Union[Account, EndUser], - args: Any, + args: dict, invoke_from: InvokeFrom, stream: Literal[False] = False, ) -> dict: ... @@ -51,7 +51,7 @@ class AgentChatAppGenerator(MessageBasedAppGenerator): args: Any, invoke_from: InvokeFrom, stream: bool = True) \ - -> Union[dict, Generator[dict, None, None]]: + -> Union[dict, Generator[str, None, None]]: """ Generate App response. diff --git a/api/core/app/apps/chat/app_generator.py b/api/core/app/apps/chat/app_generator.py index bf4e6083b6..ab15928b74 100644 --- a/api/core/app/apps/chat/app_generator.py +++ b/api/core/app/apps/chat/app_generator.py @@ -35,7 +35,7 @@ class ChatAppGenerator(MessageBasedAppGenerator): args: Any, invoke_from: InvokeFrom, stream: Literal[True] = True, - ) -> Generator[dict, None, None]: ... + ) -> Generator[str, None, None]: ... @overload def generate( @@ -52,7 +52,7 @@ class ChatAppGenerator(MessageBasedAppGenerator): args: Any, invoke_from: InvokeFrom, stream: bool = True, - ) -> Union[dict, Generator[dict, None, None]]: + ) -> Union[dict, Generator[str, None, None]]: """ Generate App response. diff --git a/api/core/app/apps/completion/app_generator.py b/api/core/app/apps/completion/app_generator.py index b14568480f..c0b13b40fd 100644 --- a/api/core/app/apps/completion/app_generator.py +++ b/api/core/app/apps/completion/app_generator.py @@ -34,27 +34,26 @@ class CompletionAppGenerator(MessageBasedAppGenerator): def generate( self, app_model: App, user: Union[Account, EndUser], - args: Any, + args: dict, invoke_from: InvokeFrom, stream: Literal[True] = True, - ) -> Generator[dict, None, None]: ... + ) -> Generator[str, None, None]: ... @overload def generate( self, app_model: App, user: Union[Account, EndUser], - args: Any, + args: dict, invoke_from: InvokeFrom, stream: Literal[False] = False, ) -> dict: ... - def generate( - self, app_model: App, - user: Union[Account, EndUser], - args: Any, - invoke_from: InvokeFrom, - stream: bool = True - ) -> Union[dict, Generator[dict, None, None]]: + def generate(self, app_model: App, + user: Union[Account, EndUser], + args: Any, + invoke_from: InvokeFrom, + stream: bool = True) \ + -> Union[dict, Generator[str, None, None]]: """ Generate App response. @@ -222,7 +221,7 @@ class CompletionAppGenerator(MessageBasedAppGenerator): user: Union[Account, EndUser], invoke_from: InvokeFrom, stream: bool = True) \ - -> Union[dict, Generator[dict, None, None]]: + -> Union[dict, Generator[str, None, None]]: """ Generate App response. diff --git a/api/core/app/apps/workflow/app_generator.py b/api/core/app/apps/workflow/app_generator.py index c5bf35edb6..26bb6c0f4f 100644 --- a/api/core/app/apps/workflow/app_generator.py +++ b/api/core/app/apps/workflow/app_generator.py @@ -40,8 +40,7 @@ class WorkflowAppGenerator(BaseAppGenerator): args: dict, invoke_from: InvokeFrom, stream: Literal[True] = True, - call_depth: int = 0, - ) -> Generator[dict, None, None]: ... + ) -> Generator[str, None, None]: ... @overload def generate( @@ -51,7 +50,6 @@ class WorkflowAppGenerator(BaseAppGenerator): args: dict, invoke_from: InvokeFrom, stream: Literal[False] = False, - call_depth: int = 0, ) -> dict: ... def generate( @@ -129,7 +127,7 @@ class WorkflowAppGenerator(BaseAppGenerator): application_generate_entity: WorkflowAppGenerateEntity, invoke_from: InvokeFrom, stream: bool = True, - ) -> Union[dict, Generator[dict, None, None]]: + ) -> Union[dict, Generator[str, None, None]]: """ Generate App response. diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout.tsx index 84ec157323..8723420d84 100644 --- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout.tsx +++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout.tsx @@ -128,7 +128,7 @@ const AppDetailLayout: FC = (props) => { if (e.status === 404) router.replace('/apps') }) - }, [appId, isCurrentWorkspaceEditor]) + }, [appId, isCurrentWorkspaceEditor, systemFeatures]) useUnmount(() => { setAppDetail() diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx index 3584e13733..8f3ee510b8 100644 --- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx +++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx @@ -95,7 +95,7 @@ const CardView: FC = ({ appId }) => { if (systemFeatures.enable_web_sso_switch_component) { const [sso_err] = await asyncRunSafe( - updateAppSSO({ id: appId, enabled: params.enable_sso }) as Promise, + updateAppSSO({ id: appId, enabled: Boolean(params.enable_sso) }) as Promise, ) if (sso_err) { handleCallbackResult(sso_err) diff --git a/web/app/components/app/overview/appCard.tsx b/web/app/components/app/overview/appCard.tsx index 0d0b95c0a0..f9f5c1fbff 100644 --- a/web/app/components/app/overview/appCard.tsx +++ b/web/app/components/app/overview/appCard.tsx @@ -134,8 +134,8 @@ function AppCard({ return (
@@ -176,7 +176,6 @@ function AppCard({ {isApp && } {/* button copy link/ button regenerate */} @@ -202,8 +201,8 @@ function AppCard({ onClick={() => setShowConfirmDelete(true)} >