Merge branch 'main' into feat/plugin

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.
 

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.
 

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(
+    def generate(self, app_model: App,
-        self, app_model: App,
+                 user: Union[Account, EndUser],
-        user: Union[Account, EndUser],
+                 args: Any,
-        args: Any,
+                 invoke_from: InvokeFrom,
-        invoke_from: InvokeFrom,
+                 stream: bool = True) \
-        stream: bool = True
+            -> Union[dict, Generator[str, None, None]]:
-    ) -> Union[dict, Generator[dict, 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.
 

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[str, None, None]: ...
-    ) -> Generator[dict, 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.
 

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout.tsx

@@ -128,7 +128,7 @@ const AppDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
       if (e.status === 404)
         router.replace('/apps')
     })
-  }, [appId, isCurrentWorkspaceEditor])
+  }, [appId, isCurrentWorkspaceEditor, systemFeatures])
 
   useUnmount(() => {
     setAppDetail()

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/cardView.tsx

@@ -95,7 +95,7 @@ const CardView: FC<ICardViewProps> = ({ appId }) => {
 
     if (systemFeatures.enable_web_sso_switch_component) {
       const [sso_err] = await asyncRunSafe<AppSSO>(
-        updateAppSSO({ id: appId, enabled: params.enable_sso }) as Promise<AppSSO>,
+        updateAppSSO({ id: appId, enabled: Boolean(params.enable_sso) }) as Promise<AppSSO>,
       )
       if (sso_err) {
         handleCallbackResult(sso_err)

web/app/components/app/overview/appCard.tsx

@@ -134,8 +134,8 @@ function AppCard({
 
   return (
     <div
-      className={`shadow-xs border-[0.5px] rounded-lg border-gray-200 ${className ?? ''
+      className={
-      }`}
+        `shadow-xs border-[0.5px] rounded-lg border-gray-200 ${className ?? ''}`}
     >
       <div className={`px-6 py-5 ${customBgColor ?? bgColor} rounded-lg`}>
         <div className="mb-2.5 flex flex-row items-start justify-between">
@@ -176,7 +176,6 @@ function AppCard({
               {isApp && <ShareQRCode content={isApp ? appUrl : apiUrl} selectorId={randomString(8)} className={'hover:bg-gray-200'} />}
               <CopyFeedback
                 content={isApp ? appUrl : apiUrl}
-                selectorId={randomString(8)}
                 className={'hover:bg-gray-200'}
               />
               {/* button copy link/ button regenerate */}
@@ -202,8 +201,8 @@ function AppCard({
                     onClick={() => setShowConfirmDelete(true)}
                   >
                     <div
-                      className={`w-full h-full ${style.refreshIcon} ${genLoading ? style.generateLogo : ''
+                      className={
-                      }`}
+                        `w-full h-full ${style.refreshIcon} ${genLoading ? style.generateLogo : ''}`}
                     ></div>
                   </div>
                 </Tooltip>