refactor(workflow): Rename workflow node execution models (#20458)

Signed-off-by: -LAN- <laipz8200@outlook.com>

api/services/clear_free_plan_tenant_expired_logs.py

@@ -14,7 +14,7 @@ from extensions.ext_database import db
 from extensions.ext_storage import storage
 from models.account import Tenant
 from models.model import App, Conversation, Message
-from models.workflow import WorkflowNodeExecution, WorkflowRun
+from models.workflow import WorkflowNodeExecutionModel, WorkflowRun
 from services.billing_service import BillingService
 
 logger = logging.getLogger(__name__)
@@ -108,10 +108,11 @@ class ClearFreePlanTenantExpiredLogs:
             while True:
                 with Session(db.engine).no_autoflush as session:
                     workflow_node_executions = (
-                        session.query(WorkflowNodeExecution)
+                        session.query(WorkflowNodeExecutionModel)
                         .filter(
-                            WorkflowNodeExecution.tenant_id == tenant_id,
-                            WorkflowNodeExecution.created_at < datetime.datetime.now() - datetime.timedelta(days=days),
+                            WorkflowNodeExecutionModel.tenant_id == tenant_id,
+                            WorkflowNodeExecutionModel.created_at
+                            < datetime.datetime.now() - datetime.timedelta(days=days),
                         )
                         .limit(batch)
                         .all()
@@ -135,8 +136,8 @@ class ClearFreePlanTenantExpiredLogs:
                     ]
 
                     # delete workflow node executions
-                    session.query(WorkflowNodeExecution).filter(
-                        WorkflowNodeExecution.id.in_(workflow_node_execution_ids),
+                    session.query(WorkflowNodeExecutionModel).filter(
+                        WorkflowNodeExecutionModel.id.in_(workflow_node_execution_ids),
                     ).delete(synchronize_session=False)
                     session.commit()
 

api/services/workflow_run_service.py

@@ -11,7 +11,7 @@ from models import (
     Account,
     App,
     EndUser,
-    WorkflowNodeExecution,
+    WorkflowNodeExecutionModel,
     WorkflowRun,
     WorkflowRunTriggeredFrom,
 )
@@ -125,7 +125,7 @@ class WorkflowRunService:
         app_model: App,
         run_id: str,
         user: Account | EndUser,
-    ) -> Sequence[WorkflowNodeExecution]:
+    ) -> Sequence[WorkflowNodeExecutionModel]:
         """
         Get workflow run node execution list
         """

api/services/workflow_service.py

@@ -13,7 +13,7 @@ from core.app.apps.workflow.app_config_manager import WorkflowAppConfigManager
 from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
 from core.variables import Variable
 from core.workflow.entities.node_entities import NodeRunResult
-from core.workflow.entities.workflow_node_execution import NodeExecution, WorkflowNodeExecutionStatus
+from core.workflow.entities.workflow_node_execution import WorkflowNodeExecution, WorkflowNodeExecutionStatus
 from core.workflow.errors import WorkflowNodeRunFailedError
 from core.workflow.graph_engine.entities.event import InNodeEvent
 from core.workflow.nodes import NodeType
@@ -30,7 +30,7 @@ from models.model import App, AppMode
 from models.tools import WorkflowToolProvider
 from models.workflow import (
     Workflow,
-    WorkflowNodeExecution,
+    WorkflowNodeExecutionModel,
     WorkflowNodeExecutionTriggeredFrom,
     WorkflowType,
 )
@@ -254,7 +254,7 @@ class WorkflowService:
 
     def run_draft_workflow_node(
         self, app_model: App, node_id: str, user_inputs: dict, account: Account
-    ) -> WorkflowNodeExecution:
+    ) -> WorkflowNodeExecutionModel:
         """
         Run draft workflow node
         """
@@ -296,7 +296,7 @@ class WorkflowService:
 
     def run_free_workflow_node(
         self, node_data: dict, tenant_id: str, user_id: str, node_id: str, user_inputs: dict[str, Any]
-    ) -> NodeExecution:
+    ) -> WorkflowNodeExecution:
         """
         Run draft workflow node
         """
@@ -322,7 +322,7 @@ class WorkflowService:
         invoke_node_fn: Callable[[], tuple[BaseNode, Generator[NodeEvent | InNodeEvent, None, None]]],
         start_at: float,
         node_id: str,
-    ) -> NodeExecution:
+    ) -> WorkflowNodeExecution:
         try:
             node_instance, generator = invoke_node_fn()
 
@@ -374,7 +374,7 @@ class WorkflowService:
             error = e.error
 
         # Create a NodeExecution domain model
-        node_execution = NodeExecution(
+        node_execution = WorkflowNodeExecution(
             id=str(uuid4()),
             workflow_id="",  # This is a single-step execution, so no workflow ID
             index=1,