refactor app generate pipeline

api/services/app_generate_service.py

@@ -1,20 +1,26 @@
 from collections.abc import Generator
 from typing import Any, Union
 
+from core.app.apps.advanced_chat.app_generator import AdvancedChatAppGenerator
 from core.app.apps.agent_chat.app_generator import AgentChatAppGenerator
 from core.app.apps.chat.app_generator import ChatAppGenerator
 from core.app.apps.completion.app_generator import CompletionAppGenerator
+from core.app.apps.workflow.app_generator import WorkflowAppGenerator
 from core.app.entities.app_invoke_entities import InvokeFrom
 from models.model import Account, App, AppMode, EndUser
+from services.workflow_service import WorkflowService
 
 
-class CompletionService:
+class AppGenerateService:
 
     @classmethod
-    def completion(cls, app_model: App, user: Union[Account, EndUser], args: Any,
-                   invoke_from: InvokeFrom, streaming: bool = True) -> Union[dict, Generator]:
+    def generate(cls, app_model: App,
+                 user: Union[Account, EndUser],
+                 args: Any,
+                 invoke_from: InvokeFrom,
+                 streaming: bool = True) -> Union[dict, Generator[dict, None, None]]:
         """
-        App Completion
+        App Content Generate
         :param app_model: app model
         :param user: user
         :param args: args
@@ -46,8 +52,28 @@ class CompletionService:
                 invoke_from=invoke_from,
                 stream=streaming
             )
+        elif app_model.mode == AppMode.ADVANCED_CHAT.value:
+            workflow = cls._get_workflow(app_model, invoke_from)
+            return AdvancedChatAppGenerator().generate(
+                app_model=app_model,
+                workflow=workflow,
+                user=user,
+                args=args,
+                invoke_from=invoke_from,
+                stream=streaming
+            )
+        elif app_model.mode == AppMode.WORKFLOW.value:
+            workflow = cls._get_workflow(app_model, invoke_from)
+            return WorkflowAppGenerator().generate(
+                app_model=app_model,
+                workflow=workflow,
+                user=user,
+                args=args,
+                invoke_from=invoke_from,
+                stream=streaming
+            )
         else:
-            raise ValueError('Invalid app mode')
+            raise ValueError(f'Invalid app mode {app_model.mode}')
 
     @classmethod
     def generate_more_like_this(cls, app_model: App, user: Union[Account, EndUser],
@@ -69,3 +95,27 @@ class CompletionService:
             invoke_from=invoke_from,
             stream=streaming
         )
+
+    @classmethod
+    def _get_workflow(cls, app_model: App, invoke_from: InvokeFrom) -> Any:
+        """
+        Get workflow
+        :param app_model: app model
+        :param invoke_from: invoke from
+        :return:
+        """
+        workflow_service = WorkflowService()
+        if invoke_from == InvokeFrom.DEBUGGER:
+            # fetch draft workflow by app_model
+            workflow = workflow_service.get_draft_workflow(app_model=app_model)
+
+            if not workflow:
+                raise ValueError('Workflow not initialized')
+        else:
+            # fetch published workflow by app_model
+            workflow = workflow_service.get_published_workflow(app_model=app_model)
+
+            if not workflow:
+                raise ValueError('Workflow not published')
+
+        return workflow

api/services/workflow_service.py

@@ -1,22 +1,17 @@
 import json
 import time
-from collections.abc import Generator
 from datetime import datetime
-from typing import Optional, Union
+from typing import Optional
 
 from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager
-from core.app.apps.advanced_chat.app_generator import AdvancedChatAppGenerator
-from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.workflow.app_config_manager import WorkflowAppConfigManager
-from core.app.apps.workflow.app_generator import WorkflowAppGenerator
-from core.app.entities.app_invoke_entities import InvokeFrom
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.workflow.entities.node_entities import NodeType
 from core.workflow.errors import WorkflowNodeRunFailedError
 from core.workflow.workflow_engine_manager import WorkflowEngineManager
 from extensions.ext_database import db
 from models.account import Account
-from models.model import App, AppMode, EndUser
+from models.model import App, AppMode
 from models.workflow import (
     CreatedByRole,
     Workflow,
@@ -167,63 +162,6 @@ class WorkflowService:
         workflow_engine_manager = WorkflowEngineManager()
         return workflow_engine_manager.get_default_config(node_type, filters)
 
-    def run_advanced_chat_draft_workflow(self, app_model: App,
-                                         user: Union[Account, EndUser],
-                                         args: dict,
-                                         invoke_from: InvokeFrom) -> Union[dict, Generator]:
-        """
-        Run advanced chatbot draft workflow
-        """
-        # fetch draft workflow by app_model
-        draft_workflow = self.get_draft_workflow(app_model=app_model)
-
-        if not draft_workflow:
-            raise ValueError('Workflow not initialized')
-
-        # run draft workflow
-        app_generator = AdvancedChatAppGenerator()
-        response = app_generator.generate(
-            app_model=app_model,
-            workflow=draft_workflow,
-            user=user,
-            args=args,
-            invoke_from=invoke_from,
-            stream=True
-        )
-
-        return response
-
-    def run_draft_workflow(self, app_model: App,
-                           user: Union[Account, EndUser],
-                           args: dict,
-                           invoke_from: InvokeFrom) -> Union[dict, Generator]:
-        # fetch draft workflow by app_model
-        draft_workflow = self.get_draft_workflow(app_model=app_model)
-
-        if not draft_workflow:
-            raise ValueError('Workflow not initialized')
-
-        # run draft workflow
-        app_generator = WorkflowAppGenerator()
-        response = app_generator.generate(
-            app_model=app_model,
-            workflow=draft_workflow,
-            user=user,
-            args=args,
-            invoke_from=invoke_from,
-            stream=True
-        )
-
-        return response
-
-    def stop_workflow_task(self, task_id: str,
-                           user: Union[Account, EndUser],
-                           invoke_from: InvokeFrom) -> None:
-        """
-        Stop workflow task
-        """
-        AppQueueManager.set_stop_flag(task_id, invoke_from, user.id)
-
     def run_draft_workflow_node(self, app_model: App,
                                 node_id: str,
                                 user_inputs: dict,