Feat/workflow phase2 (#4687)

api/core/workflow/entities/base_node_data_entities.py

@@ -7,3 +7,16 @@ from pydantic import BaseModel
 class BaseNodeData(ABC, BaseModel):
     title: str
     desc: Optional[str] = None
+
+class BaseIterationNodeData(BaseNodeData):
+    start_node_id: str
+
+class BaseIterationState(BaseModel):
+    iteration_node_id: str
+    index: int
+    inputs: dict
+
+    class MetaData(BaseModel):
+        pass
+
+    metadata: MetaData

api/core/workflow/entities/node_entities.py

@@ -21,7 +21,11 @@ class NodeType(Enum):
     QUESTION_CLASSIFIER = 'question-classifier'
     HTTP_REQUEST = 'http-request'
     TOOL = 'tool'
+    VARIABLE_AGGREGATOR = 'variable-aggregator'
     VARIABLE_ASSIGNER = 'variable-assigner'
+    LOOP = 'loop'
+    ITERATION = 'iteration'
+    PARAMETER_EXTRACTOR = 'parameter-extractor'
 
     @classmethod
     def value_of(cls, value: str) -> 'NodeType':
@@ -68,6 +72,8 @@ class NodeRunMetadataKey(Enum):
     TOTAL_PRICE = 'total_price'
     CURRENCY = 'currency'
     TOOL_INFO = 'tool_info'
+    ITERATION_ID = 'iteration_id'
+    ITERATION_INDEX = 'iteration_index'
 
 
 class NodeRunResult(BaseModel):

api/core/workflow/entities/variable_pool.py

@@ -90,3 +90,12 @@ class VariablePool:
                     raise ValueError(f'Invalid value type: {target_value_type.value}')
 
         return value
+
+    def clear_node_variables(self, node_id: str) -> None:
+        """
+        Clear node variables
+        :param node_id: node id
+        :return:
+        """
+        if node_id in self.variables_mapping:
+            self.variables_mapping.pop(node_id)

api/core/workflow/entities/workflow_entities.py

@@ -1,5 +1,9 @@
 from typing import Optional
 
+from pydantic import BaseModel
+
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.workflow.entities.base_node_data_entities import BaseIterationState
 from core.workflow.entities.node_entities import NodeRunResult
 from core.workflow.entities.variable_pool import VariablePool
 from core.workflow.nodes.base_node import BaseNode, UserFrom
@@ -22,6 +26,9 @@ class WorkflowRunState:
     workflow_type: WorkflowType
     user_id: str
     user_from: UserFrom
+    invoke_from: InvokeFrom
+
+    workflow_call_depth: int
 
     start_at: float
     variable_pool: VariablePool
@@ -30,20 +37,37 @@ class WorkflowRunState:
 
     workflow_nodes_and_results: list[WorkflowNodeAndResult]
 
+    class NodeRun(BaseModel):
+        node_id: str
+        iteration_node_id: str
+
+    workflow_node_runs: list[NodeRun]
+    workflow_node_steps: int
+
+    current_iteration_state: Optional[BaseIterationState]
+
     def __init__(self, workflow: Workflow,
                  start_at: float,
                  variable_pool: VariablePool,
                  user_id: str,
-                 user_from: UserFrom):
+                 user_from: UserFrom,
+                 invoke_from: InvokeFrom,
+                 workflow_call_depth: int):
         self.workflow_id = workflow.id
         self.tenant_id = workflow.tenant_id
         self.app_id = workflow.app_id
         self.workflow_type = WorkflowType.value_of(workflow.type)
         self.user_id = user_id
         self.user_from = user_from
+        self.invoke_from = invoke_from
+        self.workflow_call_depth = workflow_call_depth
 
         self.start_at = start_at
         self.variable_pool = variable_pool
 
         self.total_tokens = 0
         self.workflow_nodes_and_results = []
+
+        self.current_iteration_state = None
+        self.workflow_node_steps = 1
+        self.workflow_node_runs = []