Merge branch 'refs/heads/main' into feat/workflow-parallel-support

# Conflicts:
#	api/core/app/apps/advanced_chat/app_generator.py
#	api/core/app/apps/advanced_chat/app_runner.py
#	api/core/app/apps/advanced_chat/generate_task_pipeline.py
#	api/core/app/apps/workflow/app_runner.py
#	api/core/app/task_pipeline/workflow_cycle_manage.py
#	api/core/workflow/entities/variable_pool.py
#	api/core/workflow/nodes/base_node.py
#	api/core/workflow/workflow_engine_manager.py

api/core/app/apps/workflow/app_generator.py

@@ -74,7 +74,8 @@ class WorkflowAppGenerator(BaseAppGenerator):
         )
 
         # get tracing instance
-        trace_manager = TraceQueueManager(app_model.id)
+        user_id = user.id if isinstance(user, Account) else user.session_id
+        trace_manager = TraceQueueManager(app_model.id, user_id)
 
         # init application generate entity
         application_generate_entity = WorkflowAppGenerateEntity(

api/core/app/apps/workflow/app_runner.py

@@ -11,6 +11,7 @@ from core.app.entities.app_invoke_entities import (
 )
 from core.workflow.callbacks.base_workflow_callback import WorkflowCallback
 from core.workflow.entities.node_entities import SystemVariable, UserFrom
+from core.workflow.entities.variable_pool import VariablePool
 from core.workflow.workflow_entry import WorkflowEntry
 from extensions.ext_database import db
 from models.model import App, EndUser
@@ -24,8 +25,7 @@ class WorkflowAppRunner:
     Workflow Application Runner
     """
 
-    def run(self, application_generate_entity: WorkflowAppGenerateEntity,
-            queue_manager: AppQueueManager) -> None:
+    def run(self, application_generate_entity: WorkflowAppGenerateEntity, queue_manager: AppQueueManager) -> None:
         """
         Run application
         :param application_generate_entity: application generate entity
@@ -45,11 +45,11 @@ class WorkflowAppRunner:
 
         app_record = db.session.query(App).filter(App.id == app_config.app_id).first()
         if not app_record:
-            raise ValueError("App not found")
+            raise ValueError('App not found')
 
         workflow = self.get_workflow(app_model=app_record, workflow_id=app_config.workflow_id)
         if not workflow:
-            raise ValueError("Workflow not initialized")
+            raise ValueError('Workflow not initialized')
 
         inputs = application_generate_entity.inputs
         files = application_generate_entity.files
@@ -58,9 +58,21 @@ class WorkflowAppRunner:
 
         workflow_callbacks: list[WorkflowCallback] = []
 
-        if bool(os.environ.get("DEBUG", 'False').lower() == 'true'):
+        if bool(os.environ.get('DEBUG', 'False').lower() == 'true'):
             workflow_callbacks.append(WorkflowLoggingCallback())
 
+        # Create a variable pool.
+        system_inputs = {
+            SystemVariable.FILES: files,
+            SystemVariable.USER_ID: user_id,
+        }
+        variable_pool = VariablePool(
+            system_variables=system_inputs,
+            user_inputs=inputs,
+            environment_variables=workflow.environment_variables,
+            conversation_variables=[],
+        )
+
         # RUN WORKFLOW
         workflow_entry = WorkflowEntry()
         workflow_entry.run(
@@ -71,26 +83,22 @@ class WorkflowAppRunner:
             else UserFrom.END_USER,
             invoke_from=application_generate_entity.invoke_from,
             callbacks=workflow_callbacks,
-            user_inputs=inputs,
-            system_inputs={
-                SystemVariable.FILES: files,
-                SystemVariable.USER_ID: user_id
-            },
-            call_depth=application_generate_entity.call_depth
+            call_depth=application_generate_entity.call_depth,
+            variable_pool=variable_pool,
         )
 
-    def single_iteration_run(self, app_id: str, workflow_id: str,
-                             queue_manager: AppQueueManager,
-                             inputs: dict, node_id: str, user_id: str) -> None:
+    def single_iteration_run(
+        self, app_id: str, workflow_id: str, queue_manager: AppQueueManager, inputs: dict, node_id: str, user_id: str
+    ) -> None:
         """
         Single iteration run
         """
-        app_record: App = db.session.query(App).filter(App.id == app_id).first()
+        app_record = db.session.query(App).filter(App.id == app_id).first()
         if not app_record:
-            raise ValueError("App not found")
-        
+            raise ValueError('App not found')
+
         if not app_record.workflow_id:
-            raise ValueError("Workflow not initialized")
+            raise ValueError('Workflow not initialized')
 
         workflow = self.get_workflow(app_model=app_record, workflow_id=workflow_id)
         if not workflow:
@@ -112,11 +120,13 @@ class WorkflowAppRunner:
         Get workflow
         """
         # fetch workflow by workflow_id
-        workflow = db.session.query(Workflow).filter(
-            Workflow.tenant_id == app_model.tenant_id,
-            Workflow.app_id == app_model.id,
-            Workflow.id == workflow_id
-        ).first()
+        workflow = (
+            db.session.query(Workflow)
+            .filter(
+                Workflow.tenant_id == app_model.tenant_id, Workflow.app_id == app_model.id, Workflow.id == workflow_id
+            )
+            .first()
+        )
 
         # return workflow
         return workflow