From e79eac688a3cf6a8910f094a1a45e3f75d74d352 Mon Sep 17 00:00:00 2001
From: Bowen Liang <liangbowen@gf.com.cn>
Date: Tue, 3 Dec 2024 13:26:33 +0800
Subject: [PATCH 1/8] chore(lint): sort __all__ definitions (#11243)

---
 api/.ruff.toml                                |  3 ++
 api/core/file/__init__.py                     | 12 +++---
 api/core/model_runtime/entities/__init__.py   | 24 +++++------
 .../legacy/volc_sdk/__init__.py               |  2 +-
 api/core/variables/__init__.py                | 42 +++++++++----------
 api/core/workflow/callbacks/__init__.py       |  2 +-
 api/core/workflow/nodes/answer/__init__.py    |  2 +-
 api/core/workflow/nodes/base/__init__.py      |  2 +-
 api/core/workflow/nodes/end/__init__.py       |  2 +-
 api/core/workflow/nodes/event/__init__.py     |  4 +-
 .../workflow/nodes/http_request/__init__.py   |  2 +-
 .../nodes/question_classifier/__init__.py     |  2 +-
 .../nodes/variable_assigner/__init__.py       |  2 +-
 api/models/__init__.py                        | 34 +++++++--------
 api/services/errors/__init__.py               | 16 +++----
 15 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/api/.ruff.toml b/api/.ruff.toml
index 9a6dd46f6..0f3185223 100644
--- a/api/.ruff.toml
+++ b/api/.ruff.toml
@@ -20,6 +20,8 @@ select = [
     "PLC0208", # iteration-over-set
     "PLC2801", # unnecessary-dunder-call
     "PLC0414", # useless-import-alias
+    "PLE0604", # invalid-all-object
+    "PLE0605", # invalid-all-format
     "PLR0402", # manual-from-import
     "PLR1711", # useless-return
     "PLR1714", # repeated-equality-comparison
@@ -28,6 +30,7 @@ select = [
     "RUF100", # unused-noqa
     "RUF101", # redirected-noqa
     "RUF200", # invalid-pyproject-toml
+    "RUF022", # unsorted-dunder-all
     "S506", # unsafe-yaml-load
     "SIM", # flake8-simplify rules
     "TRY400", # error-instead-of-exception
diff --git a/api/core/file/__init__.py b/api/core/file/__init__.py
index fe9e52258..44749ebec 100644
--- a/api/core/file/__init__.py
+++ b/api/core/file/__init__.py
@@ -7,13 +7,13 @@
 )
 
 __all__ = [
+    "FILE_MODEL_IDENTITY",
+    "ArrayFileAttribute",
+    "File",
+    "FileAttribute",
+    "FileBelongsTo",
+    "FileTransferMethod",
     "FileType",
     "FileUploadConfig",
-    "FileTransferMethod",
-    "FileBelongsTo",
-    "File",
     "ImageConfig",
-    "FileAttribute",
-    "ArrayFileAttribute",
-    "FILE_MODEL_IDENTITY",
 ]
diff --git a/api/core/model_runtime/entities/__init__.py b/api/core/model_runtime/entities/__init__.py
index 5e52f10b4..1c73755cf 100644
--- a/api/core/model_runtime/entities/__init__.py
+++ b/api/core/model_runtime/entities/__init__.py
@@ -18,25 +18,25 @@
 from .model_entities import ModelPropertyKey
 
 __all__ = [
+    "AssistantPromptMessage",
+    "AudioPromptMessageContent",
+    "DocumentPromptMessageContent",
     "ImagePromptMessageContent",
-    "VideoPromptMessageContent",
-    "PromptMessage",
-    "PromptMessageRole",
+    "LLMResult",
+    "LLMResultChunk",
+    "LLMResultChunkDelta",
     "LLMUsage",
     "ModelPropertyKey",
-    "AssistantPromptMessage",
+    "PromptMessage",
     "PromptMessage",
     "PromptMessageContent",
+    "PromptMessageContentType",
     "PromptMessageRole",
+    "PromptMessageRole",
+    "PromptMessageTool",
     "SystemPromptMessage",
     "TextPromptMessageContent",
-    "UserPromptMessage",
-    "PromptMessageTool",
     "ToolPromptMessage",
-    "PromptMessageContentType",
-    "LLMResult",
-    "LLMResultChunk",
-    "LLMResultChunkDelta",
-    "AudioPromptMessageContent",
-    "DocumentPromptMessageContent",
+    "UserPromptMessage",
+    "VideoPromptMessageContent",
 ]
diff --git a/api/core/model_runtime/model_providers/volcengine_maas/legacy/volc_sdk/__init__.py b/api/core/model_runtime/model_providers/volcengine_maas/legacy/volc_sdk/__init__.py
index 8b3eb157b..2a269557f 100644
--- a/api/core/model_runtime/model_providers/volcengine_maas/legacy/volc_sdk/__init__.py
+++ b/api/core/model_runtime/model_providers/volcengine_maas/legacy/volc_sdk/__init__.py
@@ -1,4 +1,4 @@
 from .common import ChatRole
 from .maas import MaasError, MaasService
 
-__all__ = ["MaasService", "ChatRole", "MaasError"]
+__all__ = ["ChatRole", "MaasError", "MaasService"]
diff --git a/api/core/variables/__init__.py b/api/core/variables/__init__.py
index 144c1b899..2b1a58f93 100644
--- a/api/core/variables/__init__.py
+++ b/api/core/variables/__init__.py
@@ -32,32 +32,32 @@
 )
 
 __all__ = [
-    "IntegerVariable",
-    "FloatVariable",
-    "ObjectVariable",
-    "SecretVariable",
-    "StringVariable",
-    "ArrayAnyVariable",
-    "Variable",
-    "SegmentType",
-    "SegmentGroup",
-    "Segment",
-    "NoneSegment",
-    "NoneVariable",
-    "IntegerSegment",
-    "FloatSegment",
-    "ObjectSegment",
     "ArrayAnySegment",
-    "StringSegment",
-    "ArrayStringVariable",
-    "ArrayNumberVariable",
-    "ArrayObjectVariable",
-    "ArraySegment",
+    "ArrayAnyVariable",
     "ArrayFileSegment",
+    "ArrayFileVariable",
     "ArrayNumberSegment",
+    "ArrayNumberVariable",
     "ArrayObjectSegment",
+    "ArrayObjectVariable",
+    "ArraySegment",
     "ArrayStringSegment",
+    "ArrayStringVariable",
     "FileSegment",
     "FileVariable",
-    "ArrayFileVariable",
+    "FloatSegment",
+    "FloatVariable",
+    "IntegerSegment",
+    "IntegerVariable",
+    "NoneSegment",
+    "NoneVariable",
+    "ObjectSegment",
+    "ObjectVariable",
+    "SecretVariable",
+    "Segment",
+    "SegmentGroup",
+    "SegmentType",
+    "StringSegment",
+    "StringVariable",
+    "Variable",
 ]
diff --git a/api/core/workflow/callbacks/__init__.py b/api/core/workflow/callbacks/__init__.py
index 403fbbaa2..fba86c1e2 100644
--- a/api/core/workflow/callbacks/__init__.py
+++ b/api/core/workflow/callbacks/__init__.py
@@ -2,6 +2,6 @@
 from .workflow_logging_callback import WorkflowLoggingCallback
 
 __all__ = [
-    "WorkflowLoggingCallback",
     "WorkflowCallback",
+    "WorkflowLoggingCallback",
 ]
diff --git a/api/core/workflow/nodes/answer/__init__.py b/api/core/workflow/nodes/answer/__init__.py
index 7a10f47ee..ee7676c7e 100644
--- a/api/core/workflow/nodes/answer/__init__.py
+++ b/api/core/workflow/nodes/answer/__init__.py
@@ -1,4 +1,4 @@
 from .answer_node import AnswerNode
 from .entities import AnswerStreamGenerateRoute
 
-__all__ = ["AnswerStreamGenerateRoute", "AnswerNode"]
+__all__ = ["AnswerNode", "AnswerStreamGenerateRoute"]
diff --git a/api/core/workflow/nodes/base/__init__.py b/api/core/workflow/nodes/base/__init__.py
index 61f727740..72d6392d4 100644
--- a/api/core/workflow/nodes/base/__init__.py
+++ b/api/core/workflow/nodes/base/__init__.py
@@ -1,4 +1,4 @@
 from .entities import BaseIterationNodeData, BaseIterationState, BaseNodeData
 from .node import BaseNode
 
-__all__ = ["BaseNode", "BaseNodeData", "BaseIterationNodeData", "BaseIterationState"]
+__all__ = ["BaseIterationNodeData", "BaseIterationState", "BaseNode", "BaseNodeData"]
diff --git a/api/core/workflow/nodes/end/__init__.py b/api/core/workflow/nodes/end/__init__.py
index adb381701..c4c00e3dd 100644
--- a/api/core/workflow/nodes/end/__init__.py
+++ b/api/core/workflow/nodes/end/__init__.py
@@ -1,4 +1,4 @@
 from .end_node import EndNode
 from .entities import EndStreamParam
 
-__all__ = ["EndStreamParam", "EndNode"]
+__all__ = ["EndNode", "EndStreamParam"]
diff --git a/api/core/workflow/nodes/event/__init__.py b/api/core/workflow/nodes/event/__init__.py
index 581def955..5e3b31e48 100644
--- a/api/core/workflow/nodes/event/__init__.py
+++ b/api/core/workflow/nodes/event/__init__.py
@@ -2,9 +2,9 @@
 from .types import NodeEvent
 
 __all__ = [
+    "ModelInvokeCompletedEvent",
+    "NodeEvent",
     "RunCompletedEvent",
     "RunRetrieverResourceEvent",
     "RunStreamChunkEvent",
-    "NodeEvent",
-    "ModelInvokeCompletedEvent",
 ]
diff --git a/api/core/workflow/nodes/http_request/__init__.py b/api/core/workflow/nodes/http_request/__init__.py
index 9408c2dde..c51c67899 100644
--- a/api/core/workflow/nodes/http_request/__init__.py
+++ b/api/core/workflow/nodes/http_request/__init__.py
@@ -1,4 +1,4 @@
 from .entities import BodyData, HttpRequestNodeAuthorization, HttpRequestNodeBody, HttpRequestNodeData
 from .node import HttpRequestNode
 
-__all__ = ["HttpRequestNodeData", "HttpRequestNodeAuthorization", "HttpRequestNodeBody", "BodyData", "HttpRequestNode"]
+__all__ = ["BodyData", "HttpRequestNode", "HttpRequestNodeAuthorization", "HttpRequestNodeBody", "HttpRequestNodeData"]
diff --git a/api/core/workflow/nodes/question_classifier/__init__.py b/api/core/workflow/nodes/question_classifier/__init__.py
index 70414c419..4d06b6bea 100644
--- a/api/core/workflow/nodes/question_classifier/__init__.py
+++ b/api/core/workflow/nodes/question_classifier/__init__.py
@@ -1,4 +1,4 @@
 from .entities import QuestionClassifierNodeData
 from .question_classifier_node import QuestionClassifierNode
 
-__all__ = ["QuestionClassifierNodeData", "QuestionClassifierNode"]
+__all__ = ["QuestionClassifierNode", "QuestionClassifierNodeData"]
diff --git a/api/core/workflow/nodes/variable_assigner/__init__.py b/api/core/workflow/nodes/variable_assigner/__init__.py
index 83da4bdc7..eedbd6d25 100644
--- a/api/core/workflow/nodes/variable_assigner/__init__.py
+++ b/api/core/workflow/nodes/variable_assigner/__init__.py
@@ -2,7 +2,7 @@
 from .node_data import VariableAssignerData, WriteMode
 
 __all__ = [
-    "VariableAssignerNode",
     "VariableAssignerData",
+    "VariableAssignerNode",
     "WriteMode",
 ]
diff --git a/api/models/__init__.py b/api/models/__init__.py
index cd6c7674d..61a38870c 100644
--- a/api/models/__init__.py
+++ b/api/models/__init__.py
@@ -24,30 +24,30 @@
 )
 
 __all__ = [
+    "Account",
+    "AccountIntegrate",
+    "ApiToken",
+    "App",
+    "AppMode",
+    "Conversation",
     "ConversationVariable",
-    "Document",
+    "DataSourceOauthBinding",
     "Dataset",
     "DatasetProcessRule",
+    "Document",
     "DocumentSegment",
-    "DataSourceOauthBinding",
-    "AppMode",
-    "Workflow",
-    "App",
-    "Message",
     "EndUser",
-    "MessageFile",
-    "UploadFile",
-    "Account",
-    "WorkflowAppLog",
-    "WorkflowRun",
-    "Site",
     "InstalledApp",
-    "RecommendedApp",
-    "ApiToken",
-    "AccountIntegrate",
     "InvitationCode",
-    "Tenant",
-    "Conversation",
+    "Message",
     "MessageAnnotation",
+    "MessageFile",
+    "RecommendedApp",
+    "Site",
+    "Tenant",
     "ToolFile",
+    "UploadFile",
+    "Workflow",
+    "WorkflowAppLog",
+    "WorkflowRun",
 ]
diff --git a/api/services/errors/__init__.py b/api/services/errors/__init__.py
index bb5711145..eb1f05570 100644
--- a/api/services/errors/__init__.py
+++ b/api/services/errors/__init__.py
@@ -14,16 +14,16 @@
 )
 
 __all__ = [
-    "base",
-    "conversation",
-    "message",
-    "index",
-    "app_model_config",
     "account",
-    "document",
-    "dataset",
     "app",
-    "completion",
+    "app_model_config",
     "audio",
+    "base",
+    "completion",
+    "conversation",
+    "dataset",
+    "document",
     "file",
+    "index",
+    "message",
 ]

From e135ffc2c1c613db374ee9749b34ee2902ee1e1b Mon Sep 17 00:00:00 2001
From: Yi Xiao <54782454+YIXIAO0@users.noreply.github.com>
Date: Tue, 3 Dec 2024 13:56:40 +0800
Subject: [PATCH 2/8] Feat: upgrade variable assigner (#11285)

Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
---
 api/controllers/console/app/workflow.py       |   6 +-
 api/core/app/apps/workflow_app_runner.py      |   5 +-
 api/core/variables/types.py                   |   9 +-
 .../workflow/graph_engine/graph_engine.py     |   5 +-
 .../answer/answer_stream_generate_router.py   |   2 +-
 api/core/workflow/nodes/base/entities.py      |   1 +
 api/core/workflow/nodes/base/node.py          |   4 +-
 api/core/workflow/nodes/enums.py              |   4 +-
 .../nodes/iteration/iteration_node.py         |   7 +-
 api/core/workflow/nodes/node_mapping.py       | 105 ++++++--
 .../nodes/variable_assigner/__init__.py       |   8 -
 .../variable_assigner/common/__init__.py      |   0
 .../nodes/variable_assigner/common/exc.py     |   4 +
 .../nodes/variable_assigner/common/helpers.py |  19 ++
 .../workflow/nodes/variable_assigner/exc.py   |   2 -
 .../nodes/variable_assigner/v1/__init__.py    |   3 +
 .../nodes/variable_assigner/{ => v1}/node.py  |  36 +--
 .../variable_assigner/{ => v1}/node_data.py   |   3 -
 .../nodes/variable_assigner/v2/__init__.py    |   3 +
 .../nodes/variable_assigner/v2/constants.py   |  11 +
 .../nodes/variable_assigner/v2/entities.py    |  20 ++
 .../nodes/variable_assigner/v2/enums.py       |  18 ++
 .../nodes/variable_assigner/v2/exc.py         |  31 +++
 .../nodes/variable_assigner/v2/helpers.py     |  91 +++++++
 .../nodes/variable_assigner/v2/node.py        | 159 ++++++++++++
 api/core/workflow/workflow_entry.py           |  11 +-
 api/factories/variable_factory.py             |  23 +-
 api/models/workflow.py                        |   8 +-
 api/services/app_dsl_service.py               |   4 +-
 api/services/workflow_service.py              |  11 +-
 .../vdb/analyticdb/test_analyticdb.py         |   2 +-
 .../core/app/segments/test_factory.py         |  22 +-
 .../v1/test_variable_assigner_v1.py}          |  12 +-
 .../variable_assigner/v2/test_helpers.py      |  24 ++
 .../models/test_conversation_variable.py      |   2 +-
 api/tests/unit_tests/models/test_workflow.py  |  32 ++-
 web/app/components/base/badge.tsx             |   2 +-
 web/app/components/base/input/index.tsx       |   4 +-
 .../base/list-empty/horizontal-line.tsx       |  21 ++
 web/app/components/base/list-empty/index.tsx  |  35 +++
 .../base/list-empty/vertical-line.tsx         |  21 ++
 web/app/components/workflow/block-icon.tsx    |   1 +
 .../components/editor/code-editor/index.tsx   |   4 +-
 .../workflow/nodes/_base/components/field.tsx |   1 -
 .../components/list-no-data-placeholder.tsx   |   2 +-
 .../variable/assigned-var-reference-popup.tsx |  39 +++
 .../variable/var-reference-picker.tsx         |  21 +-
 .../variable/var-reference-popup.tsx          |  45 +++-
 .../nodes/_base/hooks/use-one-step-run.ts     |   4 +-
 .../components/operation-selector.tsx         | 128 ++++++++++
 .../assigner/components/var-list/index.tsx    | 227 ++++++++++++++++++
 .../components/var-list/use-var-list.ts       |  39 +++
 .../workflow/nodes/assigner/default.ts        |  28 ++-
 .../workflow/nodes/assigner/hooks.ts          |  70 ++++++
 .../workflow/nodes/assigner/node.tsx          |  56 ++++-
 .../workflow/nodes/assigner/panel.tsx         |  97 +++-----
 .../workflow/nodes/assigner/types.ts          |  29 ++-
 .../workflow/nodes/assigner/use-config.ts     | 125 +++++-----
 .../workflow/nodes/assigner/utils.ts          |  78 ++++++
 .../components/node-variable-item.tsx         |  24 +-
 web/i18n/en-US/workflow.ts                    |  27 +++
 web/i18n/zh-Hans/workflow.ts                  |  29 ++-
 62 files changed, 1564 insertions(+), 300 deletions(-)
 create mode 100644 api/core/workflow/nodes/variable_assigner/common/__init__.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/common/exc.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/common/helpers.py
 delete mode 100644 api/core/workflow/nodes/variable_assigner/exc.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/v1/__init__.py
 rename api/core/workflow/nodes/variable_assigner/{ => v1}/node.py (69%)
 rename api/core/workflow/nodes/variable_assigner/{ => v1}/node_data.py (75%)
 create mode 100644 api/core/workflow/nodes/variable_assigner/v2/__init__.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/v2/constants.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/v2/entities.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/v2/enums.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/v2/exc.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/v2/helpers.py
 create mode 100644 api/core/workflow/nodes/variable_assigner/v2/node.py
 rename api/tests/unit_tests/core/workflow/nodes/{test_variable_assigner.py => variable_assigner/v1/test_variable_assigner_v1.py} (92%)
 create mode 100644 api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py
 create mode 100644 web/app/components/base/list-empty/horizontal-line.tsx
 create mode 100644 web/app/components/base/list-empty/index.tsx
 create mode 100644 web/app/components/base/list-empty/vertical-line.tsx
 create mode 100644 web/app/components/workflow/nodes/_base/components/variable/assigned-var-reference-popup.tsx
 create mode 100644 web/app/components/workflow/nodes/assigner/components/operation-selector.tsx
 create mode 100644 web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
 create mode 100644 web/app/components/workflow/nodes/assigner/components/var-list/use-var-list.ts
 create mode 100644 web/app/components/workflow/nodes/assigner/hooks.ts

diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py
index cc05a0d50..c85d55406 100644
--- a/api/controllers/console/app/workflow.py
+++ b/api/controllers/console/app/workflow.py
@@ -100,11 +100,11 @@ def post(self, app_model: App):
         try:
             environment_variables_list = args.get("environment_variables") or []
             environment_variables = [
-                variable_factory.build_variable_from_mapping(obj) for obj in environment_variables_list
+                variable_factory.build_environment_variable_from_mapping(obj) for obj in environment_variables_list
             ]
             conversation_variables_list = args.get("conversation_variables") or []
             conversation_variables = [
-                variable_factory.build_variable_from_mapping(obj) for obj in conversation_variables_list
+                variable_factory.build_conversation_variable_from_mapping(obj) for obj in conversation_variables_list
             ]
             workflow = workflow_service.sync_draft_workflow(
                 app_model=app_model,
@@ -382,7 +382,7 @@ def get(self, app_model: App, block_type: str):
         filters = None
         if args.get("q"):
             try:
-                filters = json.loads(args.get("q"))
+                filters = json.loads(args.get("q", ""))
             except json.JSONDecodeError:
                 raise ValueError("Invalid filters")
 
diff --git a/api/core/app/apps/workflow_app_runner.py b/api/core/app/apps/workflow_app_runner.py
index 1cf72ae79..3d46b8bab 100644
--- a/api/core/app/apps/workflow_app_runner.py
+++ b/api/core/app/apps/workflow_app_runner.py
@@ -43,7 +43,7 @@
 )
 from core.workflow.graph_engine.entities.graph import Graph
 from core.workflow.nodes import NodeType
-from core.workflow.nodes.node_mapping import node_type_classes_mapping
+from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
 from core.workflow.workflow_entry import WorkflowEntry
 from extensions.ext_database import db
 from models.model import App
@@ -138,7 +138,8 @@ def _get_graph_and_variable_pool_of_single_iteration(
 
         # Get node class
         node_type = NodeType(iteration_node_config.get("data", {}).get("type"))
-        node_cls = node_type_classes_mapping[node_type]
+        node_version = iteration_node_config.get("data", {}).get("version", "1")
+        node_cls = NODE_TYPE_CLASSES_MAPPING[node_type][node_version]
 
         # init variable pool
         variable_pool = VariablePool(
diff --git a/api/core/variables/types.py b/api/core/variables/types.py
index af6a2a293..4387e9693 100644
--- a/api/core/variables/types.py
+++ b/api/core/variables/types.py
@@ -2,16 +2,19 @@
 
 
 class SegmentType(StrEnum):
-    NONE = "none"
     NUMBER = "number"
     STRING = "string"
+    OBJECT = "object"
     SECRET = "secret"
+
+    FILE = "file"
+
     ARRAY_ANY = "array[any]"
     ARRAY_STRING = "array[string]"
     ARRAY_NUMBER = "array[number]"
     ARRAY_OBJECT = "array[object]"
-    OBJECT = "object"
-    FILE = "file"
     ARRAY_FILE = "array[file]"
 
+    NONE = "none"
+
     GROUP = "group"
diff --git a/api/core/workflow/graph_engine/graph_engine.py b/api/core/workflow/graph_engine/graph_engine.py
index 035c34dcf..7cffd7bc8 100644
--- a/api/core/workflow/graph_engine/graph_engine.py
+++ b/api/core/workflow/graph_engine/graph_engine.py
@@ -38,7 +38,7 @@
 from core.workflow.nodes.base import BaseNode
 from core.workflow.nodes.end.end_stream_processor import EndStreamProcessor
 from core.workflow.nodes.event import RunCompletedEvent, RunRetrieverResourceEvent, RunStreamChunkEvent
-from core.workflow.nodes.node_mapping import node_type_classes_mapping
+from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
 from extensions.ext_database import db
 from models.enums import UserFrom
 from models.workflow import WorkflowNodeExecutionStatus, WorkflowType
@@ -227,7 +227,8 @@ def _run(
 
             # convert to specific node
             node_type = NodeType(node_config.get("data", {}).get("type"))
-            node_cls = node_type_classes_mapping[node_type]
+            node_version = node_config.get("data", {}).get("version", "1")
+            node_cls = NODE_TYPE_CLASSES_MAPPING[node_type][node_version]
 
             previous_node_id = previous_route_node_state.node_id if previous_route_node_state else None
 
diff --git a/api/core/workflow/nodes/answer/answer_stream_generate_router.py b/api/core/workflow/nodes/answer/answer_stream_generate_router.py
index 96e24a7db..8c78016f0 100644
--- a/api/core/workflow/nodes/answer/answer_stream_generate_router.py
+++ b/api/core/workflow/nodes/answer/answer_stream_generate_router.py
@@ -153,7 +153,7 @@ def _recursive_fetch_answer_dependencies(
                 NodeType.IF_ELSE,
                 NodeType.QUESTION_CLASSIFIER,
                 NodeType.ITERATION,
-                NodeType.CONVERSATION_VARIABLE_ASSIGNER,
+                NodeType.VARIABLE_ASSIGNER,
             }:
                 answer_dependencies[answer_node_id].append(source_node_id)
             else:
diff --git a/api/core/workflow/nodes/base/entities.py b/api/core/workflow/nodes/base/entities.py
index 2a864dd7a..fb50fbd6e 100644
--- a/api/core/workflow/nodes/base/entities.py
+++ b/api/core/workflow/nodes/base/entities.py
@@ -7,6 +7,7 @@
 class BaseNodeData(ABC, BaseModel):
     title: str
     desc: Optional[str] = None
+    version: str = "1"
 
 
 class BaseIterationNodeData(BaseNodeData):
diff --git a/api/core/workflow/nodes/base/node.py b/api/core/workflow/nodes/base/node.py
index 1871fff61..d0fbed31c 100644
--- a/api/core/workflow/nodes/base/node.py
+++ b/api/core/workflow/nodes/base/node.py
@@ -55,7 +55,9 @@ def __init__(
             raise ValueError("Node ID is required.")
 
         self.node_id = node_id
-        self.node_data: GenericNodeData = cast(GenericNodeData, self._node_data_cls(**config.get("data", {})))
+
+        node_data = self._node_data_cls.model_validate(config.get("data", {}))
+        self.node_data = cast(GenericNodeData, node_data)
 
     @abstractmethod
     def _run(self) -> NodeRunResult | Generator[Union[NodeEvent, "InNodeEvent"], None, None]:
diff --git a/api/core/workflow/nodes/enums.py b/api/core/workflow/nodes/enums.py
index 9e9e52910..44be403ee 100644
--- a/api/core/workflow/nodes/enums.py
+++ b/api/core/workflow/nodes/enums.py
@@ -14,11 +14,11 @@ class NodeType(StrEnum):
     HTTP_REQUEST = "http-request"
     TOOL = "tool"
     VARIABLE_AGGREGATOR = "variable-aggregator"
-    VARIABLE_ASSIGNER = "variable-assigner"  # TODO: Merge this into VARIABLE_AGGREGATOR in the database.
+    LEGACY_VARIABLE_AGGREGATOR = "variable-assigner"  # TODO: Merge this into VARIABLE_AGGREGATOR in the database.
     LOOP = "loop"
     ITERATION = "iteration"
     ITERATION_START = "iteration-start"  # Fake start node for iteration.
     PARAMETER_EXTRACTOR = "parameter-extractor"
-    CONVERSATION_VARIABLE_ASSIGNER = "assigner"
+    VARIABLE_ASSIGNER = "assigner"
     DOCUMENT_EXTRACTOR = "document-extractor"
     LIST_OPERATOR = "list-operator"
diff --git a/api/core/workflow/nodes/iteration/iteration_node.py b/api/core/workflow/nodes/iteration/iteration_node.py
index e32e58b78..6079edebd 100644
--- a/api/core/workflow/nodes/iteration/iteration_node.py
+++ b/api/core/workflow/nodes/iteration/iteration_node.py
@@ -298,12 +298,13 @@ def _extract_variable_selector_to_variable_mapping(
             # variable selector to variable mapping
             try:
                 # Get node class
-                from core.workflow.nodes.node_mapping import node_type_classes_mapping
+                from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
 
                 node_type = NodeType(sub_node_config.get("data", {}).get("type"))
-                node_cls = node_type_classes_mapping.get(node_type)
-                if not node_cls:
+                if node_type not in NODE_TYPE_CLASSES_MAPPING:
                     continue
+                node_version = sub_node_config.get("data", {}).get("version", "1")
+                node_cls = NODE_TYPE_CLASSES_MAPPING[node_type][node_version]
 
                 sub_node_variable_mapping = node_cls.extract_variable_selector_to_variable_mapping(
                     graph_config=graph_config, config=sub_node_config
diff --git a/api/core/workflow/nodes/node_mapping.py b/api/core/workflow/nodes/node_mapping.py
index c13b5ff76..51fc5129c 100644
--- a/api/core/workflow/nodes/node_mapping.py
+++ b/api/core/workflow/nodes/node_mapping.py
@@ -1,3 +1,5 @@
+from collections.abc import Mapping
+
 from core.workflow.nodes.answer import AnswerNode
 from core.workflow.nodes.base import BaseNode
 from core.workflow.nodes.code import CodeNode
@@ -16,26 +18,87 @@
 from core.workflow.nodes.template_transform import TemplateTransformNode
 from core.workflow.nodes.tool import ToolNode
 from core.workflow.nodes.variable_aggregator import VariableAggregatorNode
-from core.workflow.nodes.variable_assigner import VariableAssignerNode
+from core.workflow.nodes.variable_assigner.v1 import VariableAssignerNode as VariableAssignerNodeV1
+from core.workflow.nodes.variable_assigner.v2 import VariableAssignerNode as VariableAssignerNodeV2
+
+LATEST_VERSION = "latest"
 
-node_type_classes_mapping: dict[NodeType, type[BaseNode]] = {
-    NodeType.START: StartNode,
-    NodeType.END: EndNode,
-    NodeType.ANSWER: AnswerNode,
-    NodeType.LLM: LLMNode,
-    NodeType.KNOWLEDGE_RETRIEVAL: KnowledgeRetrievalNode,
-    NodeType.IF_ELSE: IfElseNode,
-    NodeType.CODE: CodeNode,
-    NodeType.TEMPLATE_TRANSFORM: TemplateTransformNode,
-    NodeType.QUESTION_CLASSIFIER: QuestionClassifierNode,
-    NodeType.HTTP_REQUEST: HttpRequestNode,
-    NodeType.TOOL: ToolNode,
-    NodeType.VARIABLE_AGGREGATOR: VariableAggregatorNode,
-    NodeType.VARIABLE_ASSIGNER: VariableAggregatorNode,  # original name of VARIABLE_AGGREGATOR
-    NodeType.ITERATION: IterationNode,
-    NodeType.ITERATION_START: IterationStartNode,
-    NodeType.PARAMETER_EXTRACTOR: ParameterExtractorNode,
-    NodeType.CONVERSATION_VARIABLE_ASSIGNER: VariableAssignerNode,
-    NodeType.DOCUMENT_EXTRACTOR: DocumentExtractorNode,
-    NodeType.LIST_OPERATOR: ListOperatorNode,
+NODE_TYPE_CLASSES_MAPPING: Mapping[NodeType, Mapping[str, type[BaseNode]]] = {
+    NodeType.START: {
+        LATEST_VERSION: StartNode,
+        "1": StartNode,
+    },
+    NodeType.END: {
+        LATEST_VERSION: EndNode,
+        "1": EndNode,
+    },
+    NodeType.ANSWER: {
+        LATEST_VERSION: AnswerNode,
+        "1": AnswerNode,
+    },
+    NodeType.LLM: {
+        LATEST_VERSION: LLMNode,
+        "1": LLMNode,
+    },
+    NodeType.KNOWLEDGE_RETRIEVAL: {
+        LATEST_VERSION: KnowledgeRetrievalNode,
+        "1": KnowledgeRetrievalNode,
+    },
+    NodeType.IF_ELSE: {
+        LATEST_VERSION: IfElseNode,
+        "1": IfElseNode,
+    },
+    NodeType.CODE: {
+        LATEST_VERSION: CodeNode,
+        "1": CodeNode,
+    },
+    NodeType.TEMPLATE_TRANSFORM: {
+        LATEST_VERSION: TemplateTransformNode,
+        "1": TemplateTransformNode,
+    },
+    NodeType.QUESTION_CLASSIFIER: {
+        LATEST_VERSION: QuestionClassifierNode,
+        "1": QuestionClassifierNode,
+    },
+    NodeType.HTTP_REQUEST: {
+        LATEST_VERSION: HttpRequestNode,
+        "1": HttpRequestNode,
+    },
+    NodeType.TOOL: {
+        LATEST_VERSION: ToolNode,
+        "1": ToolNode,
+    },
+    NodeType.VARIABLE_AGGREGATOR: {
+        LATEST_VERSION: VariableAggregatorNode,
+        "1": VariableAggregatorNode,
+    },
+    NodeType.LEGACY_VARIABLE_AGGREGATOR: {
+        LATEST_VERSION: VariableAggregatorNode,
+        "1": VariableAggregatorNode,
+    },  # original name of VARIABLE_AGGREGATOR
+    NodeType.ITERATION: {
+        LATEST_VERSION: IterationNode,
+        "1": IterationNode,
+    },
+    NodeType.ITERATION_START: {
+        LATEST_VERSION: IterationStartNode,
+        "1": IterationStartNode,
+    },
+    NodeType.PARAMETER_EXTRACTOR: {
+        LATEST_VERSION: ParameterExtractorNode,
+        "1": ParameterExtractorNode,
+    },
+    NodeType.VARIABLE_ASSIGNER: {
+        LATEST_VERSION: VariableAssignerNodeV2,
+        "1": VariableAssignerNodeV1,
+        "2": VariableAssignerNodeV2,
+    },
+    NodeType.DOCUMENT_EXTRACTOR: {
+        LATEST_VERSION: DocumentExtractorNode,
+        "1": DocumentExtractorNode,
+    },
+    NodeType.LIST_OPERATOR: {
+        LATEST_VERSION: ListOperatorNode,
+        "1": ListOperatorNode,
+    },
 }
diff --git a/api/core/workflow/nodes/variable_assigner/__init__.py b/api/core/workflow/nodes/variable_assigner/__init__.py
index eedbd6d25..e69de29bb 100644
--- a/api/core/workflow/nodes/variable_assigner/__init__.py
+++ b/api/core/workflow/nodes/variable_assigner/__init__.py
@@ -1,8 +0,0 @@
-from .node import VariableAssignerNode
-from .node_data import VariableAssignerData, WriteMode
-
-__all__ = [
-    "VariableAssignerData",
-    "VariableAssignerNode",
-    "WriteMode",
-]
diff --git a/api/core/workflow/nodes/variable_assigner/common/__init__.py b/api/core/workflow/nodes/variable_assigner/common/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/api/core/workflow/nodes/variable_assigner/common/exc.py b/api/core/workflow/nodes/variable_assigner/common/exc.py
new file mode 100644
index 000000000..a1178fb02
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/common/exc.py
@@ -0,0 +1,4 @@
+class VariableOperatorNodeError(Exception):
+    """Base error type, don't use directly."""
+
+    pass
diff --git a/api/core/workflow/nodes/variable_assigner/common/helpers.py b/api/core/workflow/nodes/variable_assigner/common/helpers.py
new file mode 100644
index 000000000..8031b57fa
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/common/helpers.py
@@ -0,0 +1,19 @@
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from core.variables import Variable
+from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNodeError
+from extensions.ext_database import db
+from models import ConversationVariable
+
+
+def update_conversation_variable(conversation_id: str, variable: Variable):
+    stmt = select(ConversationVariable).where(
+        ConversationVariable.id == variable.id, ConversationVariable.conversation_id == conversation_id
+    )
+    with Session(db.engine) as session:
+        row = session.scalar(stmt)
+        if not row:
+            raise VariableOperatorNodeError("conversation variable not found in the database")
+        row.data = variable.model_dump_json()
+        session.commit()
diff --git a/api/core/workflow/nodes/variable_assigner/exc.py b/api/core/workflow/nodes/variable_assigner/exc.py
deleted file mode 100644
index 914be2225..000000000
--- a/api/core/workflow/nodes/variable_assigner/exc.py
+++ /dev/null
@@ -1,2 +0,0 @@
-class VariableAssignerNodeError(Exception):
-    pass
diff --git a/api/core/workflow/nodes/variable_assigner/v1/__init__.py b/api/core/workflow/nodes/variable_assigner/v1/__init__.py
new file mode 100644
index 000000000..7eb1428e5
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/v1/__init__.py
@@ -0,0 +1,3 @@
+from .node import VariableAssignerNode
+
+__all__ = ["VariableAssignerNode"]
diff --git a/api/core/workflow/nodes/variable_assigner/node.py b/api/core/workflow/nodes/variable_assigner/v1/node.py
similarity index 69%
rename from api/core/workflow/nodes/variable_assigner/node.py
rename to api/core/workflow/nodes/variable_assigner/v1/node.py
index 4e66f640d..8eb4bd5c2 100644
--- a/api/core/workflow/nodes/variable_assigner/node.py
+++ b/api/core/workflow/nodes/variable_assigner/v1/node.py
@@ -1,40 +1,36 @@
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-
 from core.variables import SegmentType, Variable
 from core.workflow.entities.node_entities import NodeRunResult
 from core.workflow.nodes.base import BaseNode, BaseNodeData
 from core.workflow.nodes.enums import NodeType
-from extensions.ext_database import db
+from core.workflow.nodes.variable_assigner.common import helpers as common_helpers
+from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNodeError
 from factories import variable_factory
-from models import ConversationVariable
 from models.workflow import WorkflowNodeExecutionStatus
 
-from .exc import VariableAssignerNodeError
 from .node_data import VariableAssignerData, WriteMode
 
 
 class VariableAssignerNode(BaseNode[VariableAssignerData]):
     _node_data_cls: type[BaseNodeData] = VariableAssignerData
-    _node_type: NodeType = NodeType.CONVERSATION_VARIABLE_ASSIGNER
+    _node_type = NodeType.VARIABLE_ASSIGNER
 
     def _run(self) -> NodeRunResult:
         # Should be String, Number, Object, ArrayString, ArrayNumber, ArrayObject
         original_variable = self.graph_runtime_state.variable_pool.get(self.node_data.assigned_variable_selector)
         if not isinstance(original_variable, Variable):
-            raise VariableAssignerNodeError("assigned variable not found")
+            raise VariableOperatorNodeError("assigned variable not found")
 
         match self.node_data.write_mode:
             case WriteMode.OVER_WRITE:
                 income_value = self.graph_runtime_state.variable_pool.get(self.node_data.input_variable_selector)
                 if not income_value:
-                    raise VariableAssignerNodeError("input value not found")
+                    raise VariableOperatorNodeError("input value not found")
                 updated_variable = original_variable.model_copy(update={"value": income_value.value})
 
             case WriteMode.APPEND:
                 income_value = self.graph_runtime_state.variable_pool.get(self.node_data.input_variable_selector)
                 if not income_value:
-                    raise VariableAssignerNodeError("input value not found")
+                    raise VariableOperatorNodeError("input value not found")
                 updated_value = original_variable.value + [income_value.value]
                 updated_variable = original_variable.model_copy(update={"value": updated_value})
 
@@ -43,7 +39,7 @@ def _run(self) -> NodeRunResult:
                 updated_variable = original_variable.model_copy(update={"value": income_value.to_object()})
 
             case _:
-                raise VariableAssignerNodeError(f"unsupported write mode: {self.node_data.write_mode}")
+                raise VariableOperatorNodeError(f"unsupported write mode: {self.node_data.write_mode}")
 
         # Over write the variable.
         self.graph_runtime_state.variable_pool.add(self.node_data.assigned_variable_selector, updated_variable)
@@ -52,8 +48,8 @@ def _run(self) -> NodeRunResult:
         # Update conversation variable.
         conversation_id = self.graph_runtime_state.variable_pool.get(["sys", "conversation_id"])
         if not conversation_id:
-            raise VariableAssignerNodeError("conversation_id not found")
-        update_conversation_variable(conversation_id=conversation_id.text, variable=updated_variable)
+            raise VariableOperatorNodeError("conversation_id not found")
+        common_helpers.update_conversation_variable(conversation_id=conversation_id.text, variable=updated_variable)
 
         return NodeRunResult(
             status=WorkflowNodeExecutionStatus.SUCCEEDED,
@@ -63,18 +59,6 @@ def _run(self) -> NodeRunResult:
         )
 
 
-def update_conversation_variable(conversation_id: str, variable: Variable):
-    stmt = select(ConversationVariable).where(
-        ConversationVariable.id == variable.id, ConversationVariable.conversation_id == conversation_id
-    )
-    with Session(db.engine) as session:
-        row = session.scalar(stmt)
-        if not row:
-            raise VariableAssignerNodeError("conversation variable not found in the database")
-        row.data = variable.model_dump_json()
-        session.commit()
-
-
 def get_zero_value(t: SegmentType):
     match t:
         case SegmentType.ARRAY_OBJECT | SegmentType.ARRAY_STRING | SegmentType.ARRAY_NUMBER:
@@ -86,4 +70,4 @@ def get_zero_value(t: SegmentType):
         case SegmentType.NUMBER:
             return variable_factory.build_segment(0)
         case _:
-            raise VariableAssignerNodeError(f"unsupported variable type: {t}")
+            raise VariableOperatorNodeError(f"unsupported variable type: {t}")
diff --git a/api/core/workflow/nodes/variable_assigner/node_data.py b/api/core/workflow/nodes/variable_assigner/v1/node_data.py
similarity index 75%
rename from api/core/workflow/nodes/variable_assigner/node_data.py
rename to api/core/workflow/nodes/variable_assigner/v1/node_data.py
index 474ecefe7..9734d6471 100644
--- a/api/core/workflow/nodes/variable_assigner/node_data.py
+++ b/api/core/workflow/nodes/variable_assigner/v1/node_data.py
@@ -1,6 +1,5 @@
 from collections.abc import Sequence
 from enum import StrEnum
-from typing import Optional
 
 from core.workflow.nodes.base import BaseNodeData
 
@@ -12,8 +11,6 @@ class WriteMode(StrEnum):
 
 
 class VariableAssignerData(BaseNodeData):
-    title: str = "Variable Assigner"
-    desc: Optional[str] = "Assign a value to a variable"
     assigned_variable_selector: Sequence[str]
     write_mode: WriteMode
     input_variable_selector: Sequence[str]
diff --git a/api/core/workflow/nodes/variable_assigner/v2/__init__.py b/api/core/workflow/nodes/variable_assigner/v2/__init__.py
new file mode 100644
index 000000000..7eb1428e5
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/v2/__init__.py
@@ -0,0 +1,3 @@
+from .node import VariableAssignerNode
+
+__all__ = ["VariableAssignerNode"]
diff --git a/api/core/workflow/nodes/variable_assigner/v2/constants.py b/api/core/workflow/nodes/variable_assigner/v2/constants.py
new file mode 100644
index 000000000..3797bfa77
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/v2/constants.py
@@ -0,0 +1,11 @@
+from core.variables import SegmentType
+
+EMPTY_VALUE_MAPPING = {
+    SegmentType.STRING: "",
+    SegmentType.NUMBER: 0,
+    SegmentType.OBJECT: {},
+    SegmentType.ARRAY_ANY: [],
+    SegmentType.ARRAY_STRING: [],
+    SegmentType.ARRAY_NUMBER: [],
+    SegmentType.ARRAY_OBJECT: [],
+}
diff --git a/api/core/workflow/nodes/variable_assigner/v2/entities.py b/api/core/workflow/nodes/variable_assigner/v2/entities.py
new file mode 100644
index 000000000..01df33b6d
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/v2/entities.py
@@ -0,0 +1,20 @@
+from collections.abc import Sequence
+from typing import Any
+
+from pydantic import BaseModel
+
+from core.workflow.nodes.base import BaseNodeData
+
+from .enums import InputType, Operation
+
+
+class VariableOperationItem(BaseModel):
+    variable_selector: Sequence[str]
+    input_type: InputType
+    operation: Operation
+    value: Any | None = None
+
+
+class VariableAssignerNodeData(BaseNodeData):
+    version: str = "2"
+    items: Sequence[VariableOperationItem]
diff --git a/api/core/workflow/nodes/variable_assigner/v2/enums.py b/api/core/workflow/nodes/variable_assigner/v2/enums.py
new file mode 100644
index 000000000..36cf68aa1
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/v2/enums.py
@@ -0,0 +1,18 @@
+from enum import StrEnum
+
+
+class Operation(StrEnum):
+    OVER_WRITE = "over-write"
+    CLEAR = "clear"
+    APPEND = "append"
+    EXTEND = "extend"
+    SET = "set"
+    ADD = "+="
+    SUBTRACT = "-="
+    MULTIPLY = "*="
+    DIVIDE = "/="
+
+
+class InputType(StrEnum):
+    VARIABLE = "variable"
+    CONSTANT = "constant"
diff --git a/api/core/workflow/nodes/variable_assigner/v2/exc.py b/api/core/workflow/nodes/variable_assigner/v2/exc.py
new file mode 100644
index 000000000..5b1ef4b04
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/v2/exc.py
@@ -0,0 +1,31 @@
+from collections.abc import Sequence
+from typing import Any
+
+from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNodeError
+
+from .enums import InputType, Operation
+
+
+class OperationNotSupportedError(VariableOperatorNodeError):
+    def __init__(self, *, operation: Operation, varialbe_type: str):
+        super().__init__(f"Operation {operation} is not supported for type {varialbe_type}")
+
+
+class InputTypeNotSupportedError(VariableOperatorNodeError):
+    def __init__(self, *, input_type: InputType, operation: Operation):
+        super().__init__(f"Input type {input_type} is not supported for operation {operation}")
+
+
+class VariableNotFoundError(VariableOperatorNodeError):
+    def __init__(self, *, variable_selector: Sequence[str]):
+        super().__init__(f"Variable {variable_selector} not found")
+
+
+class InvalidInputValueError(VariableOperatorNodeError):
+    def __init__(self, *, value: Any):
+        super().__init__(f"Invalid input value {value}")
+
+
+class ConversationIDNotFoundError(VariableOperatorNodeError):
+    def __init__(self):
+        super().__init__("conversation_id not found")
diff --git a/api/core/workflow/nodes/variable_assigner/v2/helpers.py b/api/core/workflow/nodes/variable_assigner/v2/helpers.py
new file mode 100644
index 000000000..a86c7eb94
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/v2/helpers.py
@@ -0,0 +1,91 @@
+from typing import Any
+
+from core.variables import SegmentType
+
+from .enums import Operation
+
+
+def is_operation_supported(*, variable_type: SegmentType, operation: Operation):
+    match operation:
+        case Operation.OVER_WRITE | Operation.CLEAR:
+            return True
+        case Operation.SET:
+            return variable_type in {SegmentType.OBJECT, SegmentType.STRING, SegmentType.NUMBER}
+        case Operation.ADD | Operation.SUBTRACT | Operation.MULTIPLY | Operation.DIVIDE:
+            # Only number variable can be added, subtracted, multiplied or divided
+            return variable_type == SegmentType.NUMBER
+        case Operation.APPEND | Operation.EXTEND:
+            # Only array variable can be appended or extended
+            return variable_type in {
+                SegmentType.ARRAY_ANY,
+                SegmentType.ARRAY_OBJECT,
+                SegmentType.ARRAY_STRING,
+                SegmentType.ARRAY_NUMBER,
+                SegmentType.ARRAY_FILE,
+            }
+        case _:
+            return False
+
+
+def is_variable_input_supported(*, operation: Operation):
+    if operation in {Operation.SET, Operation.ADD, Operation.SUBTRACT, Operation.MULTIPLY, Operation.DIVIDE}:
+        return False
+    return True
+
+
+def is_constant_input_supported(*, variable_type: SegmentType, operation: Operation):
+    match variable_type:
+        case SegmentType.STRING | SegmentType.OBJECT:
+            return operation in {Operation.OVER_WRITE, Operation.SET}
+        case SegmentType.NUMBER:
+            return operation in {
+                Operation.OVER_WRITE,
+                Operation.SET,
+                Operation.ADD,
+                Operation.SUBTRACT,
+                Operation.MULTIPLY,
+                Operation.DIVIDE,
+            }
+        case _:
+            return False
+
+
+def is_input_value_valid(*, variable_type: SegmentType, operation: Operation, value: Any):
+    if operation == Operation.CLEAR:
+        return True
+    match variable_type:
+        case SegmentType.STRING:
+            return isinstance(value, str)
+
+        case SegmentType.NUMBER:
+            if not isinstance(value, int | float):
+                return False
+            if operation == Operation.DIVIDE and value == 0:
+                return False
+            return True
+
+        case SegmentType.OBJECT:
+            return isinstance(value, dict)
+
+        # Array & Append
+        case SegmentType.ARRAY_ANY if operation == Operation.APPEND:
+            return isinstance(value, str | float | int | dict)
+        case SegmentType.ARRAY_STRING if operation == Operation.APPEND:
+            return isinstance(value, str)
+        case SegmentType.ARRAY_NUMBER if operation == Operation.APPEND:
+            return isinstance(value, int | float)
+        case SegmentType.ARRAY_OBJECT if operation == Operation.APPEND:
+            return isinstance(value, dict)
+
+        # Array & Extend / Overwrite
+        case SegmentType.ARRAY_ANY if operation in {Operation.EXTEND, Operation.OVER_WRITE}:
+            return isinstance(value, list) and all(isinstance(item, str | float | int | dict) for item in value)
+        case SegmentType.ARRAY_STRING if operation in {Operation.EXTEND, Operation.OVER_WRITE}:
+            return isinstance(value, list) and all(isinstance(item, str) for item in value)
+        case SegmentType.ARRAY_NUMBER if operation in {Operation.EXTEND, Operation.OVER_WRITE}:
+            return isinstance(value, list) and all(isinstance(item, int | float) for item in value)
+        case SegmentType.ARRAY_OBJECT if operation in {Operation.EXTEND, Operation.OVER_WRITE}:
+            return isinstance(value, list) and all(isinstance(item, dict) for item in value)
+
+        case _:
+            return False
diff --git a/api/core/workflow/nodes/variable_assigner/v2/node.py b/api/core/workflow/nodes/variable_assigner/v2/node.py
new file mode 100644
index 000000000..ea59a2f17
--- /dev/null
+++ b/api/core/workflow/nodes/variable_assigner/v2/node.py
@@ -0,0 +1,159 @@
+import json
+from typing import Any
+
+from core.variables import SegmentType, Variable
+from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID
+from core.workflow.entities.node_entities import NodeRunResult
+from core.workflow.nodes.base import BaseNode
+from core.workflow.nodes.enums import NodeType
+from core.workflow.nodes.variable_assigner.common import helpers as common_helpers
+from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNodeError
+from models.workflow import WorkflowNodeExecutionStatus
+
+from . import helpers
+from .constants import EMPTY_VALUE_MAPPING
+from .entities import VariableAssignerNodeData
+from .enums import InputType, Operation
+from .exc import (
+    ConversationIDNotFoundError,
+    InputTypeNotSupportedError,
+    InvalidInputValueError,
+    OperationNotSupportedError,
+    VariableNotFoundError,
+)
+
+
+class VariableAssignerNode(BaseNode[VariableAssignerNodeData]):
+    _node_data_cls = VariableAssignerNodeData
+    _node_type = NodeType.VARIABLE_ASSIGNER
+
+    def _run(self) -> NodeRunResult:
+        inputs = self.node_data.model_dump()
+        process_data = {}
+        # NOTE: This node has no outputs
+        updated_variables: list[Variable] = []
+
+        try:
+            for item in self.node_data.items:
+                variable = self.graph_runtime_state.variable_pool.get(item.variable_selector)
+
+                # ==================== Validation Part
+
+                # Check if variable exists
+                if not isinstance(variable, Variable):
+                    raise VariableNotFoundError(variable_selector=item.variable_selector)
+
+                # Check if operation is supported
+                if not helpers.is_operation_supported(variable_type=variable.value_type, operation=item.operation):
+                    raise OperationNotSupportedError(operation=item.operation, varialbe_type=variable.value_type)
+
+                # Check if variable input is supported
+                if item.input_type == InputType.VARIABLE and not helpers.is_variable_input_supported(
+                    operation=item.operation
+                ):
+                    raise InputTypeNotSupportedError(input_type=InputType.VARIABLE, operation=item.operation)
+
+                # Check if constant input is supported
+                if item.input_type == InputType.CONSTANT and not helpers.is_constant_input_supported(
+                    variable_type=variable.value_type, operation=item.operation
+                ):
+                    raise InputTypeNotSupportedError(input_type=InputType.CONSTANT, operation=item.operation)
+
+                # Get value from variable pool
+                if (
+                    item.input_type == InputType.VARIABLE
+                    and item.operation != Operation.CLEAR
+                    and item.value is not None
+                ):
+                    value = self.graph_runtime_state.variable_pool.get(item.value)
+                    if value is None:
+                        raise VariableNotFoundError(variable_selector=item.value)
+                    # Skip if value is NoneSegment
+                    if value.value_type == SegmentType.NONE:
+                        continue
+                    item.value = value.value
+
+                # If set string / bytes / bytearray to object, try convert string to object.
+                if (
+                    item.operation == Operation.SET
+                    and variable.value_type == SegmentType.OBJECT
+                    and isinstance(item.value, str | bytes | bytearray)
+                ):
+                    try:
+                        item.value = json.loads(item.value)
+                    except json.JSONDecodeError:
+                        raise InvalidInputValueError(value=item.value)
+
+                # Check if input value is valid
+                if not helpers.is_input_value_valid(
+                    variable_type=variable.value_type, operation=item.operation, value=item.value
+                ):
+                    raise InvalidInputValueError(value=item.value)
+
+                # ==================== Execution Part
+
+                updated_value = self._handle_item(
+                    variable=variable,
+                    operation=item.operation,
+                    value=item.value,
+                )
+                variable = variable.model_copy(update={"value": updated_value})
+                updated_variables.append(variable)
+        except VariableOperatorNodeError as e:
+            return NodeRunResult(
+                status=WorkflowNodeExecutionStatus.FAILED,
+                inputs=inputs,
+                process_data=process_data,
+                error=str(e),
+            )
+
+        # Update variables
+        for variable in updated_variables:
+            self.graph_runtime_state.variable_pool.add(variable.selector, variable)
+            process_data[variable.name] = variable.value
+
+            if variable.selector[0] == CONVERSATION_VARIABLE_NODE_ID:
+                conversation_id = self.graph_runtime_state.variable_pool.get(["sys", "conversation_id"])
+                if not conversation_id:
+                    raise ConversationIDNotFoundError
+                else:
+                    conversation_id = conversation_id.value
+                common_helpers.update_conversation_variable(
+                    conversation_id=conversation_id,
+                    variable=variable,
+                )
+
+        return NodeRunResult(
+            status=WorkflowNodeExecutionStatus.SUCCEEDED,
+            inputs=inputs,
+            process_data=process_data,
+        )
+
+    def _handle_item(
+        self,
+        *,
+        variable: Variable,
+        operation: Operation,
+        value: Any,
+    ):
+        match operation:
+            case Operation.OVER_WRITE:
+                return value
+            case Operation.CLEAR:
+                return EMPTY_VALUE_MAPPING[variable.value_type]
+            case Operation.APPEND:
+                return variable.value + [value]
+            case Operation.EXTEND:
+                return variable.value + value
+            case Operation.SET:
+                return value
+            case Operation.ADD:
+                return variable.value + value
+            case Operation.SUBTRACT:
+                return variable.value - value
+            case Operation.MULTIPLY:
+                return variable.value * value
+            case Operation.DIVIDE:
+                return variable.value / value
+            case _:
+                raise OperationNotSupportedError(operation=operation, varialbe_type=variable.value_type)
diff --git a/api/core/workflow/workflow_entry.py b/api/core/workflow/workflow_entry.py
index 6f7b143ad..811e40c11 100644
--- a/api/core/workflow/workflow_entry.py
+++ b/api/core/workflow/workflow_entry.py
@@ -2,7 +2,7 @@
 import time
 import uuid
 from collections.abc import Generator, Mapping, Sequence
-from typing import Any, Optional, cast
+from typing import Any, Optional
 
 from configs import dify_config
 from core.app.apps.base_app_queue_manager import GenerateTaskStoppedError
@@ -19,7 +19,7 @@
 from core.workflow.nodes import NodeType
 from core.workflow.nodes.base import BaseNode
 from core.workflow.nodes.event import NodeEvent
-from core.workflow.nodes.node_mapping import node_type_classes_mapping
+from core.workflow.nodes.node_mapping import NODE_TYPE_CLASSES_MAPPING
 from factories import file_factory
 from models.enums import UserFrom
 from models.workflow import (
@@ -145,11 +145,8 @@ def single_step_run(
 
         # Get node class
         node_type = NodeType(node_config.get("data", {}).get("type"))
-        node_cls = node_type_classes_mapping.get(node_type)
-        node_cls = cast(type[BaseNode], node_cls)
-
-        if not node_cls:
-            raise ValueError(f"Node class not found for node type {node_type}")
+        node_version = node_config.get("data", {}).get("version", "1")
+        node_cls = NODE_TYPE_CLASSES_MAPPING[node_type][node_version]
 
         # init variable pool
         variable_pool = VariablePool(environment_variables=workflow.environment_variables)
diff --git a/api/factories/variable_factory.py b/api/factories/variable_factory.py
index 5b004405b..16a578728 100644
--- a/api/factories/variable_factory.py
+++ b/api/factories/variable_factory.py
@@ -36,6 +36,7 @@
     StringVariable,
     Variable,
 )
+from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID
 
 
 class InvalidSelectorError(ValueError):
@@ -62,11 +63,25 @@ class UnsupportedSegmentTypeError(Exception):
 }
 
 
-def build_variable_from_mapping(mapping: Mapping[str, Any], /) -> Variable:
-    if (value_type := mapping.get("value_type")) is None:
-        raise VariableError("missing value type")
+def build_conversation_variable_from_mapping(mapping: Mapping[str, Any], /) -> Variable:
+    if not mapping.get("name"):
+        raise VariableError("missing name")
+    return _build_variable_from_mapping(mapping=mapping, selector=[CONVERSATION_VARIABLE_NODE_ID, mapping["name"]])
+
+
+def build_environment_variable_from_mapping(mapping: Mapping[str, Any], /) -> Variable:
     if not mapping.get("name"):
         raise VariableError("missing name")
+    return _build_variable_from_mapping(mapping=mapping, selector=[ENVIRONMENT_VARIABLE_NODE_ID, mapping["name"]])
+
+
+def _build_variable_from_mapping(*, mapping: Mapping[str, Any], selector: Sequence[str]) -> Variable:
+    """
+    This factory function is used to create the environment variable or the conversation variable,
+    not support the File type.
+    """
+    if (value_type := mapping.get("value_type")) is None:
+        raise VariableError("missing value type")
     if (value := mapping.get("value")) is None:
         raise VariableError("missing value")
     match value_type:
@@ -92,6 +107,8 @@ def build_variable_from_mapping(mapping: Mapping[str, Any], /) -> Variable:
             raise VariableError(f"not supported value type {value_type}")
     if result.size > dify_config.MAX_VARIABLE_SIZE:
         raise VariableError(f"variable size {result.size} exceeds limit {dify_config.MAX_VARIABLE_SIZE}")
+    if not result.selector:
+        result = result.model_copy(update={"selector": selector})
     return result
 
 
diff --git a/api/models/workflow.py b/api/models/workflow.py
index fd53f137f..c0e70889a 100644
--- a/api/models/workflow.py
+++ b/api/models/workflow.py
@@ -238,7 +238,9 @@ def environment_variables(self) -> Sequence[Variable]:
         tenant_id = contexts.tenant_id.get()
 
         environment_variables_dict: dict[str, Any] = json.loads(self._environment_variables)
-        results = [variable_factory.build_variable_from_mapping(v) for v in environment_variables_dict.values()]
+        results = [
+            variable_factory.build_environment_variable_from_mapping(v) for v in environment_variables_dict.values()
+        ]
 
         # decrypt secret variables value
         decrypt_func = (
@@ -303,7 +305,7 @@ def conversation_variables(self) -> Sequence[Variable]:
             self._conversation_variables = "{}"
 
         variables_dict: dict[str, Any] = json.loads(self._conversation_variables)
-        results = [variable_factory.build_variable_from_mapping(v) for v in variables_dict.values()]
+        results = [variable_factory.build_conversation_variable_from_mapping(v) for v in variables_dict.values()]
         return results
 
     @conversation_variables.setter
@@ -793,4 +795,4 @@ def from_variable(cls, *, app_id: str, conversation_id: str, variable: Variable)
 
     def to_variable(self) -> Variable:
         mapping = json.loads(self.data)
-        return variable_factory.build_variable_from_mapping(mapping)
+        return variable_factory.build_conversation_variable_from_mapping(mapping)
diff --git a/api/services/app_dsl_service.py b/api/services/app_dsl_service.py
index a4d71d542..2f202374f 100644
--- a/api/services/app_dsl_service.py
+++ b/api/services/app_dsl_service.py
@@ -387,11 +387,11 @@ def _create_or_update_app(
 
             environment_variables_list = workflow_data.get("environment_variables", [])
             environment_variables = [
-                variable_factory.build_variable_from_mapping(obj) for obj in environment_variables_list
+                variable_factory.build_environment_variable_from_mapping(obj) for obj in environment_variables_list
             ]
             conversation_variables_list = workflow_data.get("conversation_variables", [])
             conversation_variables = [
-                variable_factory.build_variable_from_mapping(obj) for obj in conversation_variables_list
+                variable_factory.build_conversation_variable_from_mapping(obj) for obj in conversation_variables_list
             ]
 
             workflow_service = WorkflowService()
diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py
index aa2babd7f..37d7d0937 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -12,7 +12,7 @@
 from core.workflow.errors import WorkflowNodeRunFailedError
 from core.workflow.nodes import NodeType
 from core.workflow.nodes.event import RunCompletedEvent
-from core.workflow.nodes.node_mapping import node_type_classes_mapping
+from core.workflow.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING
 from core.workflow.workflow_entry import WorkflowEntry
 from events.app_event import app_draft_workflow_was_synced, app_published_workflow_was_updated
 from extensions.ext_database import db
@@ -176,7 +176,8 @@ def get_default_block_configs(self) -> list[dict]:
         """
         # return default block config
         default_block_configs = []
-        for node_type, node_class in node_type_classes_mapping.items():
+        for node_class_mapping in NODE_TYPE_CLASSES_MAPPING.values():
+            node_class = node_class_mapping[LATEST_VERSION]
             default_config = node_class.get_default_config()
             if default_config:
                 default_block_configs.append(default_config)
@@ -190,13 +191,13 @@ def get_default_block_config(self, node_type: str, filters: Optional[dict] = Non
         :param filters: filter by node config parameters.
         :return:
         """
-        node_type_enum: NodeType = NodeType(node_type)
+        node_type_enum = NodeType(node_type)
 
         # return default block config
-        node_class = node_type_classes_mapping.get(node_type_enum)
-        if not node_class:
+        if node_type_enum not in NODE_TYPE_CLASSES_MAPPING:
             return None
 
+        node_class = NODE_TYPE_CLASSES_MAPPING[node_type_enum][LATEST_VERSION]
         default_config = node_class.get_default_config(filters=filters)
         if not default_config:
             return None
diff --git a/api/tests/integration_tests/vdb/analyticdb/test_analyticdb.py b/api/tests/integration_tests/vdb/analyticdb/test_analyticdb.py
index 4f44d2ffd..5dd4754e8 100644
--- a/api/tests/integration_tests/vdb/analyticdb/test_analyticdb.py
+++ b/api/tests/integration_tests/vdb/analyticdb/test_analyticdb.py
@@ -1,4 +1,4 @@
-from core.rag.datasource.vdb.analyticdb.analyticdb_vector import AnalyticdbConfig, AnalyticdbVector
+from core.rag.datasource.vdb.analyticdb.analyticdb_vector import AnalyticdbVector
 from core.rag.datasource.vdb.analyticdb.analyticdb_vector_openapi import AnalyticdbVectorOpenAPIConfig
 from core.rag.datasource.vdb.analyticdb.analyticdb_vector_sql import AnalyticdbVectorBySqlConfig
 from tests.integration_tests.vdb.test_vector_store import AbstractVectorTest, setup_mock_redis
diff --git a/api/tests/unit_tests/core/app/segments/test_factory.py b/api/tests/unit_tests/core/app/segments/test_factory.py
index 882a87239..e6e289c12 100644
--- a/api/tests/unit_tests/core/app/segments/test_factory.py
+++ b/api/tests/unit_tests/core/app/segments/test_factory.py
@@ -19,36 +19,36 @@
 
 def test_string_variable():
     test_data = {"value_type": "string", "name": "test_text", "value": "Hello, World!"}
-    result = variable_factory.build_variable_from_mapping(test_data)
+    result = variable_factory.build_conversation_variable_from_mapping(test_data)
     assert isinstance(result, StringVariable)
 
 
 def test_integer_variable():
     test_data = {"value_type": "number", "name": "test_int", "value": 42}
-    result = variable_factory.build_variable_from_mapping(test_data)
+    result = variable_factory.build_conversation_variable_from_mapping(test_data)
     assert isinstance(result, IntegerVariable)
 
 
 def test_float_variable():
     test_data = {"value_type": "number", "name": "test_float", "value": 3.14}
-    result = variable_factory.build_variable_from_mapping(test_data)
+    result = variable_factory.build_conversation_variable_from_mapping(test_data)
     assert isinstance(result, FloatVariable)
 
 
 def test_secret_variable():
     test_data = {"value_type": "secret", "name": "test_secret", "value": "secret_value"}
-    result = variable_factory.build_variable_from_mapping(test_data)
+    result = variable_factory.build_conversation_variable_from_mapping(test_data)
     assert isinstance(result, SecretVariable)
 
 
 def test_invalid_value_type():
     test_data = {"value_type": "unknown", "name": "test_invalid", "value": "value"}
     with pytest.raises(VariableError):
-        variable_factory.build_variable_from_mapping(test_data)
+        variable_factory.build_conversation_variable_from_mapping(test_data)
 
 
 def test_build_a_blank_string():
-    result = variable_factory.build_variable_from_mapping(
+    result = variable_factory.build_conversation_variable_from_mapping(
         {
             "value_type": "string",
             "name": "blank",
@@ -80,7 +80,7 @@ def test_object_variable():
             "key2": 2,
         },
     }
-    variable = variable_factory.build_variable_from_mapping(mapping)
+    variable = variable_factory.build_conversation_variable_from_mapping(mapping)
     assert isinstance(variable, ObjectSegment)
     assert isinstance(variable.value["key1"], str)
     assert isinstance(variable.value["key2"], int)
@@ -97,7 +97,7 @@ def test_array_string_variable():
             "text",
         ],
     }
-    variable = variable_factory.build_variable_from_mapping(mapping)
+    variable = variable_factory.build_conversation_variable_from_mapping(mapping)
     assert isinstance(variable, ArrayStringVariable)
     assert isinstance(variable.value[0], str)
     assert isinstance(variable.value[1], str)
@@ -114,7 +114,7 @@ def test_array_number_variable():
             2.0,
         ],
     }
-    variable = variable_factory.build_variable_from_mapping(mapping)
+    variable = variable_factory.build_conversation_variable_from_mapping(mapping)
     assert isinstance(variable, ArrayNumberVariable)
     assert isinstance(variable.value[0], int)
     assert isinstance(variable.value[1], float)
@@ -137,7 +137,7 @@ def test_array_object_variable():
             },
         ],
     }
-    variable = variable_factory.build_variable_from_mapping(mapping)
+    variable = variable_factory.build_conversation_variable_from_mapping(mapping)
     assert isinstance(variable, ArrayObjectVariable)
     assert isinstance(variable.value[0], dict)
     assert isinstance(variable.value[1], dict)
@@ -149,7 +149,7 @@ def test_array_object_variable():
 
 def test_variable_cannot_large_than_200_kb():
     with pytest.raises(VariableError):
-        variable_factory.build_variable_from_mapping(
+        variable_factory.build_conversation_variable_from_mapping(
             {
                 "id": str(uuid4()),
                 "value_type": "string",
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_variable_assigner.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
similarity index 92%
rename from api/tests/unit_tests/core/workflow/nodes/test_variable_assigner.py
rename to api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
index 096ae0ea5..9793da129 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_variable_assigner.py
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v1/test_variable_assigner_v1.py
@@ -10,7 +10,8 @@
 from core.workflow.graph_engine.entities.graph import Graph
 from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
 from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
-from core.workflow.nodes.variable_assigner import VariableAssignerNode, WriteMode
+from core.workflow.nodes.variable_assigner.v1 import VariableAssignerNode
+from core.workflow.nodes.variable_assigner.v1.node_data import WriteMode
 from models.enums import UserFrom
 from models.workflow import WorkflowType
 
@@ -84,6 +85,7 @@ def test_overwrite_string_variable():
         config={
             "id": "node_id",
             "data": {
+                "title": "test",
                 "assigned_variable_selector": ["conversation", conversation_variable.name],
                 "write_mode": WriteMode.OVER_WRITE.value,
                 "input_variable_selector": [DEFAULT_NODE_ID, input_variable.name],
@@ -91,7 +93,7 @@ def test_overwrite_string_variable():
         },
     )
 
-    with mock.patch("core.workflow.nodes.variable_assigner.node.update_conversation_variable") as mock_run:
+    with mock.patch("core.workflow.nodes.variable_assigner.common.helpers.update_conversation_variable") as mock_run:
         list(node.run())
         mock_run.assert_called_once()
 
@@ -166,6 +168,7 @@ def test_append_variable_to_array():
         config={
             "id": "node_id",
             "data": {
+                "title": "test",
                 "assigned_variable_selector": ["conversation", conversation_variable.name],
                 "write_mode": WriteMode.APPEND.value,
                 "input_variable_selector": [DEFAULT_NODE_ID, input_variable.name],
@@ -173,7 +176,7 @@ def test_append_variable_to_array():
         },
     )
 
-    with mock.patch("core.workflow.nodes.variable_assigner.node.update_conversation_variable") as mock_run:
+    with mock.patch("core.workflow.nodes.variable_assigner.common.helpers.update_conversation_variable") as mock_run:
         list(node.run())
         mock_run.assert_called_once()
 
@@ -237,6 +240,7 @@ def test_clear_array():
         config={
             "id": "node_id",
             "data": {
+                "title": "test",
                 "assigned_variable_selector": ["conversation", conversation_variable.name],
                 "write_mode": WriteMode.CLEAR.value,
                 "input_variable_selector": [],
@@ -244,7 +248,7 @@ def test_clear_array():
         },
     )
 
-    with mock.patch("core.workflow.nodes.variable_assigner.node.update_conversation_variable") as mock_run:
+    with mock.patch("core.workflow.nodes.variable_assigner.common.helpers.update_conversation_variable") as mock_run:
         list(node.run())
         mock_run.assert_called_once()
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py
new file mode 100644
index 000000000..16c137001
--- /dev/null
+++ b/api/tests/unit_tests/core/workflow/nodes/variable_assigner/v2/test_helpers.py
@@ -0,0 +1,24 @@
+import pytest
+
+from core.variables import SegmentType
+from core.workflow.nodes.variable_assigner.v2.enums import Operation
+from core.workflow.nodes.variable_assigner.v2.helpers import is_input_value_valid
+
+
+def test_is_input_value_valid_overwrite_array_string():
+    # Valid cases
+    assert is_input_value_valid(
+        variable_type=SegmentType.ARRAY_STRING, operation=Operation.OVER_WRITE, value=["hello", "world"]
+    )
+    assert is_input_value_valid(variable_type=SegmentType.ARRAY_STRING, operation=Operation.OVER_WRITE, value=[])
+
+    # Invalid cases
+    assert not is_input_value_valid(
+        variable_type=SegmentType.ARRAY_STRING, operation=Operation.OVER_WRITE, value="not an array"
+    )
+    assert not is_input_value_valid(
+        variable_type=SegmentType.ARRAY_STRING, operation=Operation.OVER_WRITE, value=[1, 2, 3]
+    )
+    assert not is_input_value_valid(
+        variable_type=SegmentType.ARRAY_STRING, operation=Operation.OVER_WRITE, value=["valid", 123, "invalid"]
+    )
diff --git a/api/tests/unit_tests/models/test_conversation_variable.py b/api/tests/unit_tests/models/test_conversation_variable.py
index b879afa3e..5d84a2ec8 100644
--- a/api/tests/unit_tests/models/test_conversation_variable.py
+++ b/api/tests/unit_tests/models/test_conversation_variable.py
@@ -6,7 +6,7 @@
 
 
 def test_from_variable_and_to_variable():
-    variable = variable_factory.build_variable_from_mapping(
+    variable = variable_factory.build_conversation_variable_from_mapping(
         {
             "id": str(uuid4()),
             "name": "name",
diff --git a/api/tests/unit_tests/models/test_workflow.py b/api/tests/unit_tests/models/test_workflow.py
index 478fa8012..fe56f18f1 100644
--- a/api/tests/unit_tests/models/test_workflow.py
+++ b/api/tests/unit_tests/models/test_workflow.py
@@ -24,10 +24,18 @@ def test_environment_variables():
     )
 
     # Create some EnvironmentVariable instances
-    variable1 = StringVariable.model_validate({"name": "var1", "value": "value1", "id": str(uuid4())})
-    variable2 = IntegerVariable.model_validate({"name": "var2", "value": 123, "id": str(uuid4())})
-    variable3 = SecretVariable.model_validate({"name": "var3", "value": "secret", "id": str(uuid4())})
-    variable4 = FloatVariable.model_validate({"name": "var4", "value": 3.14, "id": str(uuid4())})
+    variable1 = StringVariable.model_validate(
+        {"name": "var1", "value": "value1", "id": str(uuid4()), "selector": ["env", "var1"]}
+    )
+    variable2 = IntegerVariable.model_validate(
+        {"name": "var2", "value": 123, "id": str(uuid4()), "selector": ["env", "var2"]}
+    )
+    variable3 = SecretVariable.model_validate(
+        {"name": "var3", "value": "secret", "id": str(uuid4()), "selector": ["env", "var3"]}
+    )
+    variable4 = FloatVariable.model_validate(
+        {"name": "var4", "value": 3.14, "id": str(uuid4()), "selector": ["env", "var4"]}
+    )
 
     with (
         mock.patch("core.helper.encrypter.encrypt_token", return_value="encrypted_token"),
@@ -58,10 +66,18 @@ def test_update_environment_variables():
     )
 
     # Create some EnvironmentVariable instances
-    variable1 = StringVariable.model_validate({"name": "var1", "value": "value1", "id": str(uuid4())})
-    variable2 = IntegerVariable.model_validate({"name": "var2", "value": 123, "id": str(uuid4())})
-    variable3 = SecretVariable.model_validate({"name": "var3", "value": "secret", "id": str(uuid4())})
-    variable4 = FloatVariable.model_validate({"name": "var4", "value": 3.14, "id": str(uuid4())})
+    variable1 = StringVariable.model_validate(
+        {"name": "var1", "value": "value1", "id": str(uuid4()), "selector": ["env", "var1"]}
+    )
+    variable2 = IntegerVariable.model_validate(
+        {"name": "var2", "value": 123, "id": str(uuid4()), "selector": ["env", "var2"]}
+    )
+    variable3 = SecretVariable.model_validate(
+        {"name": "var3", "value": "secret", "id": str(uuid4()), "selector": ["env", "var3"]}
+    )
+    variable4 = FloatVariable.model_validate(
+        {"name": "var4", "value": 3.14, "id": str(uuid4()), "selector": ["env", "var4"]}
+    )
 
     with (
         mock.patch("core.helper.encrypter.encrypt_token", return_value="encrypted_token"),
diff --git a/web/app/components/base/badge.tsx b/web/app/components/base/badge.tsx
index c3300a1e6..722fde323 100644
--- a/web/app/components/base/badge.tsx
+++ b/web/app/components/base/badge.tsx
@@ -15,7 +15,7 @@ const Badge = ({
   return (
     <div
       className={cn(
-        'inline-flex items-center px-[5px] h-5 rounded-[5px] border border-divider-deep  leading-3 text-text-tertiary',
+        'inline-flex items-center px-[5px] h-5 rounded-[5px] border border-divider-deep leading-3 text-text-tertiary',
         uppercase ? 'system-2xs-medium-uppercase' : 'system-xs-medium',
         className,
       )}
diff --git a/web/app/components/base/input/index.tsx b/web/app/components/base/input/index.tsx
index 191dbde45..bf8efdb65 100644
--- a/web/app/components/base/input/index.tsx
+++ b/web/app/components/base/input/index.tsx
@@ -64,7 +64,9 @@ const Input = ({
           destructive && 'bg-components-input-bg-destructive border-components-input-border-destructive text-components-input-text-filled hover:bg-components-input-bg-destructive hover:border-components-input-border-destructive focus:bg-components-input-bg-destructive focus:border-components-input-border-destructive',
           className,
         )}
-        placeholder={placeholder ?? (showLeftIcon ? t('common.operation.search') ?? '' : t('common.placeholder.input'))}
+        placeholder={placeholder ?? (showLeftIcon
+          ? (t('common.operation.search') || '')
+          : (t('common.placeholder.input') || ''))}
         value={value}
         onChange={onChange}
         disabled={disabled}
diff --git a/web/app/components/base/list-empty/horizontal-line.tsx b/web/app/components/base/list-empty/horizontal-line.tsx
new file mode 100644
index 000000000..cb8edb8de
--- /dev/null
+++ b/web/app/components/base/list-empty/horizontal-line.tsx
@@ -0,0 +1,21 @@
+type HorizontalLineProps = {
+  className?: string
+}
+const HorizontalLine = ({
+  className,
+}: HorizontalLineProps) => {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="240" height="2" viewBox="0 0 240 2" fill="none" className={className}>
+      <path d="M0 1H240" stroke="url(#paint0_linear_8619_59125)"/>
+      <defs>
+        <linearGradient id="paint0_linear_8619_59125" x1="240" y1="9.99584" x2="3.95539e-05" y2="9.88094" gradientUnits="userSpaceOnUse">
+          <stop stopColor="white" stopOpacity="0.01"/>
+          <stop offset="0.9031" stopColor="#101828" stopOpacity="0.04"/>
+          <stop offset="1" stopColor="white" stopOpacity="0.01"/>
+        </linearGradient>
+      </defs>
+    </svg>
+  )
+}
+
+export default HorizontalLine
diff --git a/web/app/components/base/list-empty/index.tsx b/web/app/components/base/list-empty/index.tsx
new file mode 100644
index 000000000..e925878bc
--- /dev/null
+++ b/web/app/components/base/list-empty/index.tsx
@@ -0,0 +1,35 @@
+import React from 'react'
+import { Variable02 } from '../icons/src/vender/solid/development'
+import VerticalLine from './vertical-line'
+import HorizontalLine from './horizontal-line'
+
+type ListEmptyProps = {
+  title?: string
+  description?: React.ReactNode
+}
+
+const ListEmpty = ({
+  title,
+  description,
+}: ListEmptyProps) => {
+  return (
+    <div className='flex w-[320px] p-4 flex-col items-start gap-2 rounded-[10px] bg-workflow-process-bg'>
+      <div className='flex w-10 h-10 justify-center items-center gap-2 rounded-[10px]'>
+        <div className='flex relative p-1 justify-center items-center gap-2 grow self-stretch rounded-[10px]
+          border-[0.5px] border-components-card-border bg-components-card-bg shadow-lg'>
+          <Variable02 className='w-5 h-5 shrink-0 text-text-accent' />
+          <VerticalLine className='absolute -right-[1px] top-1/2 -translate-y-1/4'/>
+          <VerticalLine className='absolute -left-[1px] top-1/2 -translate-y-1/4'/>
+          <HorizontalLine className='absolute top-0 left-3/4 -translate-x-1/4 -translate-y-1/2'/>
+          <HorizontalLine className='absolute top-full left-3/4 -translate-x-1/4 -translate-y-1/2' />
+        </div>
+      </div>
+      <div className='flex flex-col items-start gap-1 self-stretch'>
+        <div className='text-text-secondary system-sm-medium'>{title}</div>
+        {description}
+      </div>
+    </div>
+  )
+}
+
+export default ListEmpty
diff --git a/web/app/components/base/list-empty/vertical-line.tsx b/web/app/components/base/list-empty/vertical-line.tsx
new file mode 100644
index 000000000..63e57447b
--- /dev/null
+++ b/web/app/components/base/list-empty/vertical-line.tsx
@@ -0,0 +1,21 @@
+type VerticalLineProps = {
+  className?: string
+}
+const VerticalLine = ({
+  className,
+}: VerticalLineProps) => {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="2" height="132" viewBox="0 0 2 132" fill="none" className={className}>
+      <path d="M1 0L1 132" stroke="url(#paint0_linear_8619_59128)"/>
+      <defs>
+        <linearGradient id="paint0_linear_8619_59128" x1="-7.99584" y1="132" x2="-7.96108" y2="6.4974e-07" gradientUnits="userSpaceOnUse">
+          <stop stopColor="white" stopOpacity="0.01"/>
+          <stop offset="0.877606" stopColor="#101828" stopOpacity="0.04"/>
+          <stop offset="1" stopColor="white" stopOpacity="0.01"/>
+        </linearGradient>
+      </defs>
+    </svg>
+  )
+}
+
+export default VerticalLine
diff --git a/web/app/components/workflow/block-icon.tsx b/web/app/components/workflow/block-icon.tsx
index b115a7b3c..1001e981c 100644
--- a/web/app/components/workflow/block-icon.tsx
+++ b/web/app/components/workflow/block-icon.tsx
@@ -48,6 +48,7 @@ const getIcon = (type: BlockEnum, className: string) => {
     [BlockEnum.VariableAggregator]: <VariableX className={className} />,
     [BlockEnum.Assigner]: <Assigner className={className} />,
     [BlockEnum.Tool]: <VariableX className={className} />,
+    [BlockEnum.IterationStart]: <VariableX className={className} />,
     [BlockEnum.Iteration]: <Iteration className={className} />,
     [BlockEnum.ParameterExtractor]: <ParameterExtractor className={className} />,
     [BlockEnum.DocExtractor]: <DocsExtractor className={className} />,
diff --git a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
index 28d07936d..2d75679b0 100644
--- a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
@@ -33,6 +33,7 @@ export type Props = {
   showFileList?: boolean
   onGenerated?: (value: string) => void
   showCodeGenerator?: boolean
+  className?: string
 }
 
 export const languageMap = {
@@ -67,6 +68,7 @@ const CodeEditor: FC<Props> = ({
   showFileList,
   onGenerated,
   showCodeGenerator = false,
+  className,
 }) => {
   const [isFocus, setIsFocus] = React.useState(false)
   const [isMounted, setIsMounted] = React.useState(false)
@@ -187,7 +189,7 @@ const CodeEditor: FC<Props> = ({
   )
 
   return (
-    <div className={cn(isExpand && 'h-full')}>
+    <div className={cn(isExpand && 'h-full', className)}>
       {noWrapper
         ? <div className='relative no-wrapper' style={{
           height: isExpand ? '100%' : (editorContentHeight) / 2 + CODE_EDITOR_LINE_HEIGHT, // In IDE, the last line can always be in lop line. So there is some blank space in the bottom.
diff --git a/web/app/components/workflow/nodes/_base/components/field.tsx b/web/app/components/workflow/nodes/_base/components/field.tsx
index b2f815a32..e284e91cf 100644
--- a/web/app/components/workflow/nodes/_base/components/field.tsx
+++ b/web/app/components/workflow/nodes/_base/components/field.tsx
@@ -47,7 +47,6 @@ const Field: FC<Props> = ({
               triggerClassName='w-4 h-4 ml-1'
             />
           )}
-
         </div>
         <div className='flex'>
           {operations && <div>{operations}</div>}
diff --git a/web/app/components/workflow/nodes/_base/components/list-no-data-placeholder.tsx b/web/app/components/workflow/nodes/_base/components/list-no-data-placeholder.tsx
index 4ec9d27f5..bf592deae 100644
--- a/web/app/components/workflow/nodes/_base/components/list-no-data-placeholder.tsx
+++ b/web/app/components/workflow/nodes/_base/components/list-no-data-placeholder.tsx
@@ -10,7 +10,7 @@ const ListNoDataPlaceholder: FC<Props> = ({
   children,
 }) => {
   return (
-    <div className='flex rounded-md bg-gray-50 items-center min-h-[42px] justify-center leading-[18px] text-xs font-normal text-gray-500'>
+    <div className='flex w-full rounded-[10px] bg-background-section items-center min-h-[42px] justify-center system-xs-regular text-text-tertiary'>
       {children}
     </div>
   )
diff --git a/web/app/components/workflow/nodes/_base/components/variable/assigned-var-reference-popup.tsx b/web/app/components/workflow/nodes/_base/components/variable/assigned-var-reference-popup.tsx
new file mode 100644
index 000000000..9ad5ad4a5
--- /dev/null
+++ b/web/app/components/workflow/nodes/_base/components/variable/assigned-var-reference-popup.tsx
@@ -0,0 +1,39 @@
+'use client'
+import type { FC } from 'react'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import VarReferenceVars from './var-reference-vars'
+import type { NodeOutPutVar, ValueSelector, Var } from '@/app/components/workflow/types'
+import ListEmpty from '@/app/components/base/list-empty'
+
+type Props = {
+  vars: NodeOutPutVar[]
+  onChange: (value: ValueSelector, varDetail: Var) => void
+  itemWidth?: number
+}
+const AssignedVarReferencePopup: FC<Props> = ({
+  vars,
+  onChange,
+  itemWidth,
+}) => {
+  const { t } = useTranslation()
+  // max-h-[300px] overflow-y-auto todo: use portal to handle long list
+  return (
+    <div className='p-1 bg-components-panel-bg-bur rounded-lg border-[0.5px] border-components-panel-border shadow-lg w-[352px]' >
+      {(!vars || vars.length === 0)
+        ? <ListEmpty
+          title={t('workflow.nodes.assigner.noAssignedVars') || ''}
+          description={t('workflow.nodes.assigner.assignedVarsDescription')}
+        />
+        : <VarReferenceVars
+          searchBoxClassName='mt-1'
+          vars={vars}
+          onChange={onChange}
+          itemWidth={itemWidth}
+          isSupportFileVar
+        />
+      }
+    </div >
+  )
+}
+export default React.memo(AssignedVarReferencePopup)
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
index 0c553a273..e4d354a61 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
@@ -60,6 +60,9 @@ type Props = {
   onRemove?: () => void
   typePlaceHolder?: string
   isSupportFileVar?: boolean
+  placeholder?: string
+  minWidth?: number
+  popupFor?: 'assigned' | 'toAssigned'
 }
 
 const VarReferencePicker: FC<Props> = ({
@@ -83,6 +86,9 @@ const VarReferencePicker: FC<Props> = ({
   onRemove,
   typePlaceHolder,
   isSupportFileVar = true,
+  placeholder,
+  minWidth,
+  popupFor,
 }) => {
   const { t } = useTranslation()
   const store = useStoreApi()
@@ -261,7 +267,7 @@ const VarReferencePicker: FC<Props> = ({
                   <AddButton onClick={() => { }}></AddButton>
                 </div>
               )
-              : (<div ref={!isSupportConstantValue ? triggerRef : null} className={cn((open || isFocus) ? 'border-gray-300' : 'border-gray-100', 'relative group/wrap flex items-center w-full h-8', !isSupportConstantValue && 'p-1 rounded-lg bg-gray-100 border', isInTable && 'bg-transparent border-none')}>
+              : (<div ref={!isSupportConstantValue ? triggerRef : null} className={cn((open || isFocus) ? 'border-gray-300' : 'border-gray-100', 'relative group/wrap flex items-center w-full h-8', !isSupportConstantValue && 'p-1 rounded-lg bg-gray-100 border', isInTable && 'bg-transparent border-none', readonly && 'bg-components-input-bg-disabled')}>
                 {isSupportConstantValue
                   ? <div onClick={(e) => {
                     e.stopPropagation()
@@ -285,7 +291,7 @@ const VarReferencePicker: FC<Props> = ({
                     />
                   </div>
                   : (!hasValue && <div className='ml-1.5 mr-1'>
-                    <Variable02 className='w-3.5 h-3.5 text-gray-400' />
+                    <Variable02 className={`w-4 h-4 ${readonly ? 'text-components-input-text-disabled' : 'text-components-input-text-placeholder'}`} />
                   </div>)}
                 {isConstant
                   ? (
@@ -329,17 +335,17 @@ const VarReferencePicker: FC<Props> = ({
                                     {!hasValue && <Variable02 className='w-3.5 h-3.5' />}
                                     {isEnv && <Env className='w-3.5 h-3.5 text-util-colors-violet-violet-600' />}
                                     {isChatVar && <BubbleX className='w-3.5 h-3.5 text-util-colors-teal-teal-700' />}
-                                    <div className={cn('ml-0.5 text-xs font-medium truncate', (isEnv || isChatVar) && '!text-text-secondary')} title={varName} style={{
+                                    <div className={cn('ml-0.5 text-xs font-medium truncate', isEnv && '!text-text-secondary', isChatVar && 'text-util-colors-teal-teal-700')} title={varName} style={{
                                       maxWidth: maxVarNameWidth,
                                     }}>{varName}</div>
                                   </div>
-                                  <div className='ml-0.5 text-xs font-normal text-gray-500 capitalize truncate' title={type} style={{
+                                  <div className='ml-0.5 capitalize truncate text-text-tertiary text-center system-xs-regular' title={type} style={{
                                     maxWidth: maxTypeWidth,
                                   }}>{type}</div>
                                   {!isValidVar && <RiErrorWarningFill className='ml-0.5 w-3 h-3 text-[#D92D20]' />}
                                 </>
                               )
-                              : <div className='text-[13px] font-normal text-gray-400'>{t('workflow.common.setVarValuePlaceholder')}</div>}
+                              : <div className={`overflow-hidden ${readonly ? 'text-components-input-text-disabled' : 'text-components-input-text-placeholder'} text-ellipsis system-sm-regular`}>{placeholder ?? t('workflow.common.setVarValuePlaceholder')}</div>}
                           </div>
                         </Tooltip>
                       </div>
@@ -378,12 +384,13 @@ const VarReferencePicker: FC<Props> = ({
         </WrapElem>
         <PortalToFollowElemContent style={{
           zIndex: 100,
-        }}>
+        }} className='mt-1'>
           {!isConstant && (
             <VarReferencePopup
               vars={outputVars}
+              popupFor={popupFor}
               onChange={handleVarReferenceChange}
-              itemWidth={isAddBtnTrigger ? 260 : triggerWidth}
+              itemWidth={isAddBtnTrigger ? 260 : (minWidth || triggerWidth)}
               isSupportFileVar={isSupportFileVar}
             />
           )}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
index cd03da155..d9a4d2c94 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
@@ -1,33 +1,64 @@
 'use client'
 import type { FC } from 'react'
 import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { useContext } from 'use-context-selector'
 import VarReferenceVars from './var-reference-vars'
 import type { NodeOutPutVar, ValueSelector, Var } from '@/app/components/workflow/types'
+import ListEmpty from '@/app/components/base/list-empty'
+import { LanguagesSupported } from '@/i18n/language'
+import I18n from '@/context/i18n'
 
 type Props = {
   vars: NodeOutPutVar[]
+  popupFor?: 'assigned' | 'toAssigned'
   onChange: (value: ValueSelector, varDetail: Var) => void
   itemWidth?: number
   isSupportFileVar?: boolean
 }
 const VarReferencePopup: FC<Props> = ({
   vars,
+  popupFor,
   onChange,
   itemWidth,
   isSupportFileVar = true,
 }) => {
+  const { t } = useTranslation()
+  const { locale } = useContext(I18n)
   // max-h-[300px] overflow-y-auto todo: use portal to handle long list
   return (
     <div className='p-1 bg-white rounded-lg border border-gray-200 shadow-lg space-y-1' style={{
       width: itemWidth || 228,
     }}>
-      <VarReferenceVars
-        searchBoxClassName='mt-1'
-        vars={vars}
-        onChange={onChange}
-        itemWidth={itemWidth}
-        isSupportFileVar={isSupportFileVar}
-      />
+      {((!vars || vars.length === 0) && popupFor)
+        ? (popupFor === 'toAssigned'
+          ? (
+            <ListEmpty
+              title={t('workflow.variableReference.noAvailableVars') || ''}
+              description={<div className='text-text-tertiary system-xs-regular'>
+                {t('workflow.variableReference.noVarsForOperation')}
+              </div>}
+            />
+          )
+          : (
+            <ListEmpty
+              title={t('workflow.variableReference.noAssignedVars') || ''}
+              description={<div className='text-text-tertiary system-xs-regular'>
+                {t('workflow.variableReference.assignedVarsDescription')}
+                <a target='_blank' rel='noopener noreferrer'
+                  className='text-text-accent-secondary'
+                  href={locale !== LanguagesSupported[1] ? 'https://docs.dify.ai/guides/workflow/variables#conversation-variables' : `https://docs.dify.ai/${locale.toLowerCase()}/guides/workflow/variables#hui-hua-bian-liang`}>{t('workflow.variableReference.conversationVars')}</a>
+              </div>}
+            />
+          ))
+        : <VarReferenceVars
+          searchBoxClassName='mt-1'
+          vars={vars}
+          onChange={onChange}
+          itemWidth={itemWidth}
+          isSupportFileVar={isSupportFileVar}
+        />
+      }
     </div >
   )
 }
diff --git a/web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts b/web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts
index c500f0c8c..6791a2f74 100644
--- a/web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts
+++ b/web/app/components/workflow/nodes/_base/hooks/use-one-step-run.ts
@@ -24,6 +24,7 @@ import QuestionClassifyDefault from '@/app/components/workflow/nodes/question-cl
 import HTTPDefault from '@/app/components/workflow/nodes/http/default'
 import ToolDefault from '@/app/components/workflow/nodes/tool/default'
 import VariableAssigner from '@/app/components/workflow/nodes/variable-assigner/default'
+import Assigner from '@/app/components/workflow/nodes/assigner/default'
 import ParameterExtractorDefault from '@/app/components/workflow/nodes/parameter-extractor/default'
 import IterationDefault from '@/app/components/workflow/nodes/iteration/default'
 import { ssePost } from '@/service/base'
@@ -39,6 +40,7 @@ const { checkValid: checkQuestionClassifyValid } = QuestionClassifyDefault
 const { checkValid: checkHttpValid } = HTTPDefault
 const { checkValid: checkToolValid } = ToolDefault
 const { checkValid: checkVariableAssignerValid } = VariableAssigner
+const { checkValid: checkAssignerValid } = Assigner
 const { checkValid: checkParameterExtractorValid } = ParameterExtractorDefault
 const { checkValid: checkIterationValid } = IterationDefault
 
@@ -51,7 +53,7 @@ const checkValidFns: Record<BlockEnum, Function> = {
   [BlockEnum.QuestionClassifier]: checkQuestionClassifyValid,
   [BlockEnum.HttpRequest]: checkHttpValid,
   [BlockEnum.Tool]: checkToolValid,
-  [BlockEnum.VariableAssigner]: checkVariableAssignerValid,
+  [BlockEnum.VariableAssigner]: checkAssignerValid,
   [BlockEnum.VariableAggregator]: checkVariableAssignerValid,
   [BlockEnum.ParameterExtractor]: checkParameterExtractorValid,
   [BlockEnum.Iteration]: checkIterationValid,
diff --git a/web/app/components/workflow/nodes/assigner/components/operation-selector.tsx b/web/app/components/workflow/nodes/assigner/components/operation-selector.tsx
new file mode 100644
index 000000000..8542bb482
--- /dev/null
+++ b/web/app/components/workflow/nodes/assigner/components/operation-selector.tsx
@@ -0,0 +1,128 @@
+import type { FC } from 'react'
+import { useState } from 'react'
+import {
+  RiArrowDownSLine,
+  RiCheckLine,
+} from '@remixicon/react'
+import classNames from 'classnames'
+import { useTranslation } from 'react-i18next'
+import type { WriteMode } from '../types'
+import { getOperationItems } from '../utils'
+import {
+  PortalToFollowElem,
+  PortalToFollowElemContent,
+  PortalToFollowElemTrigger,
+} from '@/app/components/base/portal-to-follow-elem'
+import type { VarType } from '@/app/components/workflow/types'
+import Divider from '@/app/components/base/divider'
+
+type Item = {
+  value: string | number
+  name: string
+}
+
+type OperationSelectorProps = {
+  value: string | number
+  onSelect: (value: Item) => void
+  placeholder?: string
+  disabled?: boolean
+  className?: string
+  popupClassName?: string
+  assignedVarType?: VarType
+  writeModeTypes?: WriteMode[]
+  writeModeTypesArr?: WriteMode[]
+  writeModeTypesNum?: WriteMode[]
+}
+
+const i18nPrefix = 'workflow.nodes.assigner'
+
+const OperationSelector: FC<OperationSelectorProps> = ({
+  value,
+  onSelect,
+  disabled = false,
+  className,
+  popupClassName,
+  assignedVarType,
+  writeModeTypes,
+  writeModeTypesArr,
+  writeModeTypesNum,
+}) => {
+  const { t } = useTranslation()
+  const [open, setOpen] = useState(false)
+
+  const items = getOperationItems(assignedVarType, writeModeTypes, writeModeTypesArr, writeModeTypesNum)
+
+  const selectedItem = items.find(item => item.value === value)
+
+  return (
+    <PortalToFollowElem
+      open={open}
+      onOpenChange={setOpen}
+      placement='bottom-start'
+      offset={4}
+    >
+      <PortalToFollowElemTrigger
+        onClick={() => !disabled && setOpen(v => !v)}
+      >
+        <div
+          className={classNames(
+            'flex items-center px-2 py-1 gap-0.5 rounded-lg bg-components-input-bg-normal',
+            disabled ? 'cursor-not-allowed !bg-components-input-bg-disabled' : 'cursor-pointer hover:bg-state-base-hover-alt',
+            open && 'bg-state-base-hover-alt',
+            className,
+          )}
+        >
+          <div className='flex p-1 items-center'>
+            <span
+              className={`truncate overflow-hidden text-ellipsis system-sm-regular
+                ${selectedItem ? 'text-components-input-text-filled' : 'text-components-input-text-disabled'}`}
+            >
+              {selectedItem?.name ? t(`${i18nPrefix}.operations.${selectedItem?.name}`) : t(`${i18nPrefix}.operations.title`)}
+            </span>
+          </div>
+          <RiArrowDownSLine className={`h-4 w-4 text-text-quaternary ${disabled && 'text-components-input-text-placeholder'} ${open && 'text-text-secondary'}`} />
+        </div>
+      </PortalToFollowElemTrigger>
+
+      <PortalToFollowElemContent className={`z-20 ${popupClassName}`}>
+        <div className='flex w-[140px] flex-col items-start rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg'>
+          <div className='flex p-1 flex-col items-start self-stretch'>
+            <div className='flex px-3 pt-1 pb-0.5 items-start self-stretch'>
+              <div className='flex grow text-text-tertiary system-xs-medium-uppercase'>{t(`${i18nPrefix}.operations.title`)}</div>
+            </div>
+            {items.map(item => (
+              item.value === 'divider'
+                ? (
+                  <Divider key="divider" className="my-1" />
+                )
+                : (
+                  <div
+                    key={item.value}
+                    className={classNames(
+                      'flex items-center px-2 py-1 gap-1 self-stretch rounded-lg',
+                      'cursor-pointer hover:bg-state-base-hover',
+                    )}
+                    onClick={() => {
+                      onSelect(item)
+                      setOpen(false)
+                    }}
+                  >
+                    <div className='flex min-h-5 px-1 items-center gap-1 grow'>
+                      <span className={'flex flex-grow text-text-secondary system-sm-medium'}>{t(`${i18nPrefix}.operations.${item.name}`)}</span>
+                    </div>
+                    {item.value === value && (
+                      <div className='flex justify-center items-center'>
+                        <RiCheckLine className='h-4 w-4 text-text-accent' />
+                      </div>
+                    )}
+                  </div>
+                )
+            ))}
+          </div>
+        </div>
+      </PortalToFollowElemContent>
+    </PortalToFollowElem>
+  )
+}
+
+export default OperationSelector
diff --git a/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx b/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
new file mode 100644
index 000000000..42ee9845d
--- /dev/null
+++ b/web/app/components/workflow/nodes/assigner/components/var-list/index.tsx
@@ -0,0 +1,227 @@
+'use client'
+import type { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+import React, { useCallback } from 'react'
+import produce from 'immer'
+import { RiDeleteBinLine } from '@remixicon/react'
+import OperationSelector from '../operation-selector'
+import { AssignerNodeInputType, WriteMode } from '../../types'
+import type { AssignerNodeOperation } from '../../types'
+import ListNoDataPlaceholder from '@/app/components/workflow/nodes/_base/components/list-no-data-placeholder'
+import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
+import type { ValueSelector, Var, VarType } from '@/app/components/workflow/types'
+import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
+import ActionButton from '@/app/components/base/action-button'
+import Input from '@/app/components/base/input'
+import Textarea from '@/app/components/base/textarea'
+import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
+
+type Props = {
+  readonly: boolean
+  nodeId: string
+  list: AssignerNodeOperation[]
+  onChange: (list: AssignerNodeOperation[], value?: ValueSelector) => void
+  onOpen?: (index: number) => void
+  filterVar?: (payload: Var, valueSelector: ValueSelector) => boolean
+  filterToAssignedVar?: (payload: Var, assignedVarType: VarType, write_mode: WriteMode) => boolean
+  getAssignedVarType?: (valueSelector: ValueSelector) => VarType
+  getToAssignedVarType?: (assignedVarType: VarType, write_mode: WriteMode) => VarType
+  writeModeTypes?: WriteMode[]
+  writeModeTypesArr?: WriteMode[]
+  writeModeTypesNum?: WriteMode[]
+}
+
+const VarList: FC<Props> = ({
+  readonly,
+  nodeId,
+  list,
+  onChange,
+  onOpen = () => { },
+  filterVar,
+  filterToAssignedVar,
+  getAssignedVarType,
+  getToAssignedVarType,
+  writeModeTypes,
+  writeModeTypesArr,
+  writeModeTypesNum,
+}) => {
+  const { t } = useTranslation()
+  const handleAssignedVarChange = useCallback((index: number) => {
+    return (value: ValueSelector | string) => {
+      const newList = produce(list, (draft) => {
+        draft[index].variable_selector = value as ValueSelector
+        draft[index].operation = WriteMode.overwrite
+        draft[index].value = undefined
+      })
+      onChange(newList, value as ValueSelector)
+    }
+  }, [list, onChange])
+
+  const handleOperationChange = useCallback((index: number) => {
+    return (item: { value: string | number }) => {
+      const newList = produce(list, (draft) => {
+        draft[index].operation = item.value as WriteMode
+        draft[index].value = '' // Clear value when operation changes
+        if (item.value === WriteMode.set || item.value === WriteMode.increment || item.value === WriteMode.decrement
+          || item.value === WriteMode.multiply || item.value === WriteMode.divide)
+          draft[index].input_type = AssignerNodeInputType.constant
+        else
+          draft[index].input_type = AssignerNodeInputType.variable
+      })
+      onChange(newList)
+    }
+  }, [list, onChange])
+
+  const handleToAssignedVarChange = useCallback((index: number) => {
+    return (value: ValueSelector | string | number) => {
+      const newList = produce(list, (draft) => {
+        draft[index].value = value as ValueSelector
+      })
+      onChange(newList, value as ValueSelector)
+    }
+  }, [list, onChange])
+
+  const handleVarRemove = useCallback((index: number) => {
+    return () => {
+      const newList = produce(list, (draft) => {
+        draft.splice(index, 1)
+      })
+      onChange(newList)
+    }
+  }, [list, onChange])
+
+  const handleOpen = useCallback((index: number) => {
+    return () => onOpen(index)
+  }, [onOpen])
+
+  const handleFilterToAssignedVar = useCallback((index: number) => {
+    return (payload: Var, valueSelector: ValueSelector) => {
+      const item = list[index]
+      const assignedVarType = item.variable_selector ? getAssignedVarType?.(item.variable_selector) : undefined
+
+      if (!filterToAssignedVar || !item.variable_selector || !assignedVarType || !item.operation)
+        return true
+
+      return filterToAssignedVar(
+        payload,
+        assignedVarType,
+        item.operation,
+      )
+    }
+  }, [list, filterToAssignedVar, getAssignedVarType])
+
+  if (list.length === 0) {
+    return (
+      <ListNoDataPlaceholder>
+        {t('workflow.nodes.assigner.noVarTip')}
+      </ListNoDataPlaceholder>
+    )
+  }
+
+  return (
+    <div className='flex flex-col items-start gap-4 self-stretch'>
+      {list.map((item, index) => {
+        const assignedVarType = item.variable_selector ? getAssignedVarType?.(item.variable_selector) : undefined
+        const toAssignedVarType = (assignedVarType && item.operation && getToAssignedVarType)
+          ? getToAssignedVarType(assignedVarType, item.operation)
+          : undefined
+
+        return (
+          <div className='flex items-start gap-1 self-stretch' key={index}>
+            <div className='flex flex-col items-start gap-1 flex-grow'>
+              <div className='flex items-center gap-1 self-stretch'>
+                <VarReferencePicker
+                  readonly={readonly}
+                  nodeId={nodeId}
+                  isShowNodeName
+                  value={item.variable_selector || []}
+                  onChange={handleAssignedVarChange(index)}
+                  onOpen={handleOpen(index)}
+                  filterVar={filterVar}
+                  placeholder={t('workflow.nodes.assigner.selectAssignedVariable') as string}
+                  minWidth={352}
+                  popupFor='assigned'
+                  className='w-full'
+                />
+                <OperationSelector
+                  value={item.operation}
+                  placeholder='Operation'
+                  disabled={!item.variable_selector || item.variable_selector.length === 0}
+                  onSelect={handleOperationChange(index)}
+                  assignedVarType={assignedVarType}
+                  writeModeTypes={writeModeTypes}
+                  writeModeTypesArr={writeModeTypesArr}
+                  writeModeTypesNum={writeModeTypesNum}
+                />
+              </div>
+              {item.operation !== WriteMode.clear && item.operation !== WriteMode.set
+                && !writeModeTypesNum?.includes(item.operation)
+                && (
+                  <VarReferencePicker
+                    readonly={readonly || !item.variable_selector || !item.operation}
+                    nodeId={nodeId}
+                    isShowNodeName
+                    value={item.value}
+                    onChange={handleToAssignedVarChange(index)}
+                    filterVar={handleFilterToAssignedVar(index)}
+                    valueTypePlaceHolder={toAssignedVarType}
+                    placeholder={t('workflow.nodes.assigner.setParameter') as string}
+                    minWidth={352}
+                    popupFor='toAssigned'
+                    className='w-full'
+                  />
+                )
+              }
+              {item.operation === WriteMode.set && assignedVarType && (
+                <>
+                  {assignedVarType === 'number' && (
+                    <Input
+                      type="number"
+                      value={item.value as number}
+                      onChange={e => handleToAssignedVarChange(index)(Number(e.target.value))}
+                      className='w-full'
+                    />
+                  )}
+                  {assignedVarType === 'string' && (
+                    <Textarea
+                      value={item.value as string}
+                      onChange={e => handleToAssignedVarChange(index)(e.target.value)}
+                      className='w-full'
+                    />
+                  )}
+                  {assignedVarType === 'object' && (
+                    <CodeEditor
+                      value={item.value as string}
+                      language={CodeLanguage.json}
+                      onChange={value => handleToAssignedVarChange(index)(value)}
+                      className='w-full'
+                      readOnly={readonly}
+                    />
+                  )}
+                </>
+              )}
+              {writeModeTypesNum?.includes(item.operation)
+                && <Input
+                  type="number"
+                  value={item.value as number}
+                  onChange={e => handleToAssignedVarChange(index)(Number(e.target.value))}
+                  placeholder="Enter number value..."
+                  className='w-full'
+                />
+              }
+            </div>
+            <ActionButton
+              size='l'
+              className='flex-shrink-0 group hover:!bg-state-destructive-hover'
+              onClick={handleVarRemove(index)}
+            >
+              <RiDeleteBinLine className='text-text-tertiary w-4 h-4 group-hover:text-text-destructive' />
+            </ActionButton>
+          </div>
+        )
+      },
+      )}
+    </div>
+  )
+}
+export default React.memo(VarList)
diff --git a/web/app/components/workflow/nodes/assigner/components/var-list/use-var-list.ts b/web/app/components/workflow/nodes/assigner/components/var-list/use-var-list.ts
new file mode 100644
index 000000000..1ae53cece
--- /dev/null
+++ b/web/app/components/workflow/nodes/assigner/components/var-list/use-var-list.ts
@@ -0,0 +1,39 @@
+import { useCallback } from 'react'
+import produce from 'immer'
+import type { AssignerNodeOperation, AssignerNodeType } from '../../types'
+import { AssignerNodeInputType, WriteMode } from '../../types'
+
+type Params = {
+  id: string
+  inputs: AssignerNodeType
+  setInputs: (newInputs: AssignerNodeType) => void
+}
+function useVarList({
+  inputs,
+  setInputs,
+}: Params) {
+  const handleVarListChange = useCallback((newList: AssignerNodeOperation[]) => {
+    const newInputs = produce(inputs, (draft) => {
+      draft.items = newList
+    })
+    setInputs(newInputs)
+  }, [inputs, setInputs])
+
+  const handleAddVariable = useCallback(() => {
+    const newInputs = produce(inputs, (draft) => {
+      draft.items.push({
+        variable_selector: [],
+        input_type: AssignerNodeInputType.constant,
+        operation: WriteMode.overwrite,
+        value: '',
+      })
+    })
+    setInputs(newInputs)
+  }, [inputs, setInputs])
+  return {
+    handleVarListChange,
+    handleAddVariable,
+  }
+}
+
+export default useVarList
diff --git a/web/app/components/workflow/nodes/assigner/default.ts b/web/app/components/workflow/nodes/assigner/default.ts
index 6a8245b6d..ba23f5b4c 100644
--- a/web/app/components/workflow/nodes/assigner/default.ts
+++ b/web/app/components/workflow/nodes/assigner/default.ts
@@ -6,9 +6,8 @@ const i18nPrefix = 'workflow.errorMsg'
 
 const nodeDefault: NodeDefault<AssignerNodeType> = {
   defaultValue: {
-    assigned_variable_selector: [],
-    write_mode: WriteMode.Overwrite,
-    input_variable_selector: [],
+    version: '2',
+    items: [],
   },
   getAvailablePrevNodes(isChatMode: boolean) {
     const nodes = isChatMode
@@ -23,18 +22,23 @@ const nodeDefault: NodeDefault<AssignerNodeType> = {
   checkValid(payload: AssignerNodeType, t: any) {
     let errorMessages = ''
     const {
-      assigned_variable_selector: assignedVarSelector,
-      write_mode: writeMode,
-      input_variable_selector: toAssignerVarSelector,
+      items: operationItems,
     } = payload
 
-    if (!errorMessages && !assignedVarSelector?.length)
-      errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t('workflow.nodes.assigner.assignedVariable') })
+    operationItems?.forEach((value) => {
+      if (!errorMessages && !value.variable_selector?.length)
+        errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t('workflow.nodes.assigner.assignedVariable') })
 
-    if (!errorMessages && writeMode !== WriteMode.Clear) {
-      if (!toAssignerVarSelector?.length)
-        errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t('workflow.nodes.assigner.variable') })
-    }
+      if (!errorMessages && value.operation !== WriteMode.clear) {
+        if (value.operation === WriteMode.set) {
+          if (!value.value && typeof value.value !== 'number')
+            errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t('workflow.nodes.assigner.variable') })
+        }
+        else if (!value.value?.length) {
+          errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t('workflow.nodes.assigner.variable') })
+        }
+      }
+    })
 
     return {
       isValid: !errorMessages,
diff --git a/web/app/components/workflow/nodes/assigner/hooks.ts b/web/app/components/workflow/nodes/assigner/hooks.ts
new file mode 100644
index 000000000..d0600e5e0
--- /dev/null
+++ b/web/app/components/workflow/nodes/assigner/hooks.ts
@@ -0,0 +1,70 @@
+import { useCallback } from 'react'
+import {
+  useNodes,
+} from 'reactflow'
+import { uniqBy } from 'lodash-es'
+import {
+  useIsChatMode,
+  useWorkflow,
+  useWorkflowVariables,
+} from '../../hooks'
+import type {
+  Node,
+  Var,
+} from '../../types'
+import { AssignerNodeInputType, WriteMode } from './types'
+
+export const useGetAvailableVars = () => {
+  const nodes: Node[] = useNodes()
+  const { getBeforeNodesInSameBranchIncludeParent } = useWorkflow()
+  const { getNodeAvailableVars } = useWorkflowVariables()
+  const isChatMode = useIsChatMode()
+  const getAvailableVars = useCallback((nodeId: string, handleId: string, filterVar: (v: Var) => boolean, hideEnv = false) => {
+    const availableNodes: Node[] = []
+    const currentNode = nodes.find(node => node.id === nodeId)!
+
+    if (!currentNode)
+      return []
+
+    const beforeNodes = getBeforeNodesInSameBranchIncludeParent(nodeId)
+    availableNodes.push(...beforeNodes)
+    const parentNode = nodes.find(node => node.id === currentNode.parentId)
+
+    if (hideEnv) {
+      return getNodeAvailableVars({
+        parentNode,
+        beforeNodes: uniqBy(availableNodes, 'id').filter(node => node.id !== nodeId),
+        isChatMode,
+        hideEnv,
+        hideChatVar: hideEnv,
+        filterVar,
+      })
+        .map(node => ({
+          ...node,
+          vars: node.isStartNode ? node.vars.filter(v => !v.variable.startsWith('sys.')) : node.vars,
+        }))
+        .filter(item => item.vars.length > 0)
+    }
+
+    return getNodeAvailableVars({
+      parentNode,
+      beforeNodes: uniqBy(availableNodes, 'id').filter(node => node.id !== nodeId),
+      isChatMode,
+      filterVar,
+    })
+  }, [nodes, getBeforeNodesInSameBranchIncludeParent, getNodeAvailableVars, isChatMode])
+
+  return getAvailableVars
+}
+
+export const useHandleAddOperationItem = () => {
+  return useCallback((list: any[]) => {
+    const newItem = {
+      variable_selector: [],
+      write_mode: WriteMode.overwrite,
+      input_type: AssignerNodeInputType.variable,
+      value: '',
+    }
+    return [...list, newItem]
+  }, [])
+}
diff --git a/web/app/components/workflow/nodes/assigner/node.tsx b/web/app/components/workflow/nodes/assigner/node.tsx
index 72745a488..516cfbcb1 100644
--- a/web/app/components/workflow/nodes/assigner/node.tsx
+++ b/web/app/components/workflow/nodes/assigner/node.tsx
@@ -15,31 +15,71 @@ const NodeComponent: FC<NodeProps<AssignerNodeType>> = ({
   const { t } = useTranslation()
 
   const nodes: Node[] = useNodes()
-  const { assigned_variable_selector: variable, write_mode: writeMode } = data
+  if (data.version === '2') {
+    const { items: operationItems } = data
+    const validOperationItems = operationItems?.filter(item =>
+      item.variable_selector && item.variable_selector.length > 0,
+    ) || []
+
+    if (validOperationItems.length === 0) {
+      return (
+        <div className='relative flex flex-col px-3 py-1 gap-0.5 items-start self-stretch'>
+          <div className='flex flex-col items-start gap-1 self-stretch'>
+            <div className='flex px-[5px] py-1 items-center gap-1 self-stretch rounded-md bg-workflow-block-parma-bg'>
+              <div className='flex-1 text-text-tertiary system-xs-medium'>{t(`${i18nPrefix}.varNotSet`)}</div>
+            </div>
+          </div>
+        </div>
+      )
+    }
+    return (
+      <div className='relative flex flex-col px-3 py-1 gap-0.5 items-start self-stretch'>
+        {operationItems.map((value, index) => {
+          const variable = value.variable_selector
+          if (!variable || variable.length === 0)
+            return null
+          const isSystem = isSystemVar(variable)
+          const isEnv = isENV(variable)
+          const isChatVar = isConversationVar(variable)
+          const node = isSystem ? nodes.find(node => node.data.type === BlockEnum.Start) : nodes.find(node => node.id === variable[0])
+          const varName = isSystem ? `sys.${variable[variable.length - 1]}` : variable.slice(1).join('.')
+          return (
+            <NodeVariableItem
+              key={index}
+              node={node as Node}
+              isEnv={isEnv}
+              isChatVar={isChatVar}
+              writeMode={value.operation}
+              varName={varName}
+              className='bg-workflow-block-parma-bg'
+            />
+          )
+        })}
+      </div>
+    )
+  }
+  // Legacy version
+  const { assigned_variable_selector: variable, write_mode: writeMode } = data as any
 
   if (!variable || variable.length === 0)
     return null
-
   const isSystem = isSystemVar(variable)
   const isEnv = isENV(variable)
   const isChatVar = isConversationVar(variable)
 
   const node = isSystem ? nodes.find(node => node.data.type === BlockEnum.Start) : nodes.find(node => node.id === variable[0])
   const varName = isSystem ? `sys.${variable[variable.length - 1]}` : variable.slice(1).join('.')
+
   return (
-    <div className='relative px-3'>
-      <div className='mb-1 system-2xs-medium-uppercase text-text-tertiary'>{t(`${i18nPrefix}.assignedVariable`)}</div>
+    <div className='relative flex flex-col px-3 py-1 gap-0.5 items-start self-stretch'>
       <NodeVariableItem
         node={node as Node}
         isEnv={isEnv}
         isChatVar={isChatVar}
         varName={varName}
+        writeMode={writeMode}
         className='bg-workflow-block-parma-bg'
       />
-      <div className='my-2 flex justify-between items-center h-[22px] px-[5px] bg-workflow-block-parma-bg radius-sm'>
-        <div className='system-xs-medium-uppercase text-text-tertiary'>{t(`${i18nPrefix}.writeMode`)}</div>
-        <div className='system-xs-medium text-text-secondary'>{t(`${i18nPrefix}.${writeMode}`)}</div>
-      </div>
     </div>
   )
 }
diff --git a/web/app/components/workflow/nodes/assigner/panel.tsx b/web/app/components/workflow/nodes/assigner/panel.tsx
index ff5a6420f..a470d9492 100644
--- a/web/app/components/workflow/nodes/assigner/panel.tsx
+++ b/web/app/components/workflow/nodes/assigner/panel.tsx
@@ -1,15 +1,15 @@
 import type { FC } from 'react'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
-
-import VarReferencePicker from '../_base/components/variable/var-reference-picker'
-import OptionCard from '../_base/components/option-card'
+import {
+  RiAddLine,
+} from '@remixicon/react'
+import VarList from './components/var-list'
 import useConfig from './use-config'
-import { WriteMode } from './types'
 import type { AssignerNodeType } from './types'
-import Field from '@/app/components/workflow/nodes/_base/components/field'
+import { useHandleAddOperationItem } from './hooks'
+import ActionButton from '@/app/components/base/action-button'
 import { type NodePanelProps } from '@/app/components/workflow/types'
-import cn from '@/utils/classnames'
 
 const i18nPrefix = 'workflow.nodes.assigner'
 
@@ -18,67 +18,48 @@ const Panel: FC<NodePanelProps<AssignerNodeType>> = ({
   data,
 }) => {
   const { t } = useTranslation()
-
+  const handleAddOperationItem = useHandleAddOperationItem()
   const {
     readOnly,
     inputs,
-    handleAssignedVarChanges,
-    isSupportAppend,
+    handleOperationListChanges,
+    getAssignedVarType,
+    getToAssignedVarType,
+    writeModeTypesNum,
+    writeModeTypesArr,
     writeModeTypes,
-    handleWriteModeChange,
     filterAssignedVar,
     filterToAssignedVar,
-    handleToAssignedVarChange,
-    toAssignedVarType,
   } = useConfig(id, data)
+  const handleAddOperation = () => {
+    const newList = handleAddOperationItem(inputs.items || [])
+    handleOperationListChanges(newList)
+  }
 
   return (
-    <div className='mt-2'>
-      <div className='px-4 pb-4 space-y-4'>
-        <Field
-          title={t(`${i18nPrefix}.assignedVariable`)}
-        >
-          <VarReferencePicker
-            readonly={readOnly}
-            nodeId={id}
-            isShowNodeName
-            value={inputs.assigned_variable_selector || []}
-            onChange={handleAssignedVarChanges}
-            filterVar={filterAssignedVar}
-          />
-        </Field>
-        <Field
-          title={t(`${i18nPrefix}.writeMode`)}
-        >
-          <div className={cn('grid gap-2 grid-cols-3')}>
-            {writeModeTypes.map(type => (
-              <OptionCard
-                key={type}
-                title={t(`${i18nPrefix}.${type}`)}
-                onSelect={handleWriteModeChange(type)}
-                selected={inputs.write_mode === type}
-                disabled={!isSupportAppend && type === WriteMode.Append}
-                tooltip={type === WriteMode.Append ? t(`${i18nPrefix}.writeModeTip`)! : undefined}
-              />
-            ))}
-          </div>
-        </Field>
-        {inputs.write_mode !== WriteMode.Clear && (
-          <Field
-            title={t(`${i18nPrefix}.setVariable`)}
-          >
-            <VarReferencePicker
-              readonly={readOnly}
-              nodeId={id}
-              isShowNodeName
-              value={inputs.input_variable_selector || []}
-              onChange={handleToAssignedVarChange}
-              filterVar={filterToAssignedVar}
-              valueTypePlaceHolder={toAssignedVarType}
-            />
-          </Field>
-        )}
-
+    <div className='flex py-2 flex-col items-start self-stretch'>
+      <div className='flex flex-col justify-center items-start gap-1 px-4 py-2 w-full self-stretch'>
+        <div className='flex items-start gap-2 self-stretch'>
+          <div className='flex flex-col justify-center items-start flex-grow text-text-secondary system-sm-semibold-uppercase'>{t(`${i18nPrefix}.variables`)}</div>
+          <ActionButton onClick={handleAddOperation}>
+            <RiAddLine className='w-4 h-4 shrink-0 text-text-tertiary' />
+          </ActionButton>
+        </div>
+        <VarList
+          readonly={readOnly}
+          nodeId={id}
+          list={inputs.items || []}
+          onChange={(newList) => {
+            handleOperationListChanges(newList)
+          }}
+          filterVar={filterAssignedVar}
+          filterToAssignedVar={filterToAssignedVar}
+          getAssignedVarType={getAssignedVarType}
+          writeModeTypes={writeModeTypes}
+          writeModeTypesArr={writeModeTypesArr}
+          writeModeTypesNum={writeModeTypesNum}
+          getToAssignedVarType={getToAssignedVarType}
+        />
       </div>
     </div>
   )
diff --git a/web/app/components/workflow/nodes/assigner/types.ts b/web/app/components/workflow/nodes/assigner/types.ts
index d152249d1..9f06f65dc 100644
--- a/web/app/components/workflow/nodes/assigner/types.ts
+++ b/web/app/components/workflow/nodes/assigner/types.ts
@@ -1,13 +1,30 @@
 import type { CommonNodeType, ValueSelector } from '@/app/components/workflow/types'
 
 export enum WriteMode {
-  Overwrite = 'over-write',
-  Append = 'append',
-  Clear = 'clear',
+  overwrite = 'over-write',
+  clear = 'clear',
+  append = 'append',
+  extend = 'extend',
+  set = 'set',
+  increment = '+=',
+  decrement = '-=',
+  multiply = '*=',
+  divide = '/=',
+}
+
+export enum AssignerNodeInputType {
+  variable = 'variable',
+  constant = 'constant',
+}
+
+export type AssignerNodeOperation = {
+  variable_selector: ValueSelector
+  input_type: AssignerNodeInputType
+  operation: WriteMode
+  value: any
 }
 
 export type AssignerNodeType = CommonNodeType & {
-  assigned_variable_selector: ValueSelector
-  write_mode: WriteMode
-  input_variable_selector: ValueSelector
+  version?: '1' | '2'
+  items: AssignerNodeOperation[]
 }
diff --git a/web/app/components/workflow/nodes/assigner/use-config.ts b/web/app/components/workflow/nodes/assigner/use-config.ts
index 76cf73754..fc41ac16c 100644
--- a/web/app/components/workflow/nodes/assigner/use-config.ts
+++ b/web/app/components/workflow/nodes/assigner/use-config.ts
@@ -1,10 +1,12 @@
 import { useCallback, useMemo } from 'react'
 import produce from 'immer'
 import { useStoreApi } from 'reactflow'
-import { isEqual } from 'lodash-es'
 import { VarType } from '../../types'
 import type { ValueSelector, Var } from '../../types'
-import { type AssignerNodeType, WriteMode } from './types'
+import { WriteMode } from './types'
+import type { AssignerNodeOperation, AssignerNodeType } from './types'
+import { useGetAvailableVars } from './hooks'
+import { convertV1ToV2 } from './utils'
 import useNodeCrud from '@/app/components/workflow/nodes/_base/hooks/use-node-crud'
 import {
   useIsChatMode,
@@ -13,9 +15,20 @@ import {
   useWorkflowVariables,
 } from '@/app/components/workflow/hooks'
 
-const useConfig = (id: string, payload: AssignerNodeType) => {
+const useConfig = (id: string, rawPayload: AssignerNodeType) => {
+  const payload = useMemo(() => convertV1ToV2(rawPayload), [rawPayload])
   const { nodesReadOnly: readOnly } = useNodesReadOnly()
   const isChatMode = useIsChatMode()
+  const getAvailableVars = useGetAvailableVars()
+  const filterVar = (varType: VarType) => {
+    return (v: Var) => {
+      if (varType === VarType.any)
+        return true
+      if (v.type === VarType.any)
+        return true
+      return v.type === varType
+    }
+  }
 
   const store = useStoreApi()
   const { getBeforeNodesInSameBranch } = useWorkflow()
@@ -30,59 +43,41 @@ const useConfig = (id: string, payload: AssignerNodeType) => {
     return getBeforeNodesInSameBranch(id)
   }, [getBeforeNodesInSameBranch, id])
   const { inputs, setInputs } = useNodeCrud<AssignerNodeType>(id, payload)
+  const newSetInputs = useCallback((newInputs: AssignerNodeType) => {
+    const finalInputs = produce(newInputs, (draft) => {
+      if (draft.version !== '2')
+        draft.version = '2'
+    })
+    setInputs(finalInputs)
+  }, [setInputs])
 
   const { getCurrentVariableType } = useWorkflowVariables()
-  const assignedVarType = getCurrentVariableType({
-    parentNode: iterationNode,
-    valueSelector: inputs.assigned_variable_selector || [],
-    availableNodes,
-    isChatMode,
-    isConstant: false,
-  })
-
-  const isSupportAppend = useCallback((varType: VarType) => {
-    return [VarType.arrayString, VarType.arrayNumber, VarType.arrayObject].includes(varType)
-  }, [])
-
-  const isCurrSupportAppend = useMemo(() => isSupportAppend(assignedVarType), [assignedVarType, isSupportAppend])
+  const getAssignedVarType = useCallback((valueSelector: ValueSelector) => {
+    return getCurrentVariableType({
+      parentNode: iterationNode,
+      valueSelector: valueSelector || [],
+      availableNodes,
+      isChatMode,
+      isConstant: false,
+    })
+  }, [getCurrentVariableType, iterationNode, availableNodes, isChatMode])
 
-  const handleAssignedVarChanges = useCallback((variable: ValueSelector | string) => {
+  const handleOperationListChanges = useCallback((items: AssignerNodeOperation[]) => {
     const newInputs = produce(inputs, (draft) => {
-      draft.assigned_variable_selector = variable as ValueSelector
-      draft.input_variable_selector = []
-
-      const newVarType = getCurrentVariableType({
-        parentNode: iterationNode,
-        valueSelector: draft.assigned_variable_selector || [],
-        availableNodes,
-        isChatMode,
-        isConstant: false,
-      })
-
-      if (inputs.write_mode === WriteMode.Append && !isSupportAppend(newVarType))
-        draft.write_mode = WriteMode.Overwrite
+      draft.items = [...items]
     })
-    setInputs(newInputs)
-  }, [inputs, setInputs, getCurrentVariableType, iterationNode, availableNodes, isChatMode, isSupportAppend])
+    newSetInputs(newInputs)
+  }, [inputs, newSetInputs])
 
-  const writeModeTypes = [WriteMode.Overwrite, WriteMode.Append, WriteMode.Clear]
+  const writeModeTypesArr = [WriteMode.overwrite, WriteMode.clear, WriteMode.append, WriteMode.extend]
+  const writeModeTypes = [WriteMode.overwrite, WriteMode.clear, WriteMode.set]
+  const writeModeTypesNum = [WriteMode.increment, WriteMode.decrement, WriteMode.multiply, WriteMode.divide]
 
-  const handleWriteModeChange = useCallback((writeMode: WriteMode) => {
-    return () => {
-      const newInputs = produce(inputs, (draft) => {
-        draft.write_mode = writeMode
-        if (inputs.write_mode === WriteMode.Clear)
-          draft.input_variable_selector = []
-      })
-      setInputs(newInputs)
-    }
-  }, [inputs, setInputs])
-
-  const toAssignedVarType = useMemo(() => {
-    const { write_mode } = inputs
-    if (write_mode === WriteMode.Overwrite)
+  const getToAssignedVarType = useCallback((assignedVarType: VarType, write_mode: WriteMode) => {
+    if (write_mode === WriteMode.overwrite || write_mode === WriteMode.increment || write_mode === WriteMode.decrement
+      || write_mode === WriteMode.multiply || write_mode === WriteMode.divide || write_mode === WriteMode.extend)
       return assignedVarType
-    if (write_mode === WriteMode.Append) {
+    if (write_mode === WriteMode.append) {
       if (assignedVarType === VarType.arrayString)
         return VarType.string
       if (assignedVarType === VarType.arrayNumber)
@@ -91,20 +86,18 @@ const useConfig = (id: string, payload: AssignerNodeType) => {
         return VarType.object
     }
     return VarType.string
-  }, [assignedVarType, inputs])
+  }, [])
 
   const filterAssignedVar = useCallback((varPayload: Var, selector: ValueSelector) => {
     return selector.join('.').startsWith('conversation')
   }, [])
 
-  const filterToAssignedVar = useCallback((varPayload: Var, selector: ValueSelector) => {
-    if (isEqual(selector, inputs.assigned_variable_selector))
-      return false
-
-    if (inputs.write_mode === WriteMode.Overwrite) {
+  const filterToAssignedVar = useCallback((varPayload: Var, assignedVarType: VarType, write_mode: WriteMode) => {
+    if (write_mode === WriteMode.overwrite || write_mode === WriteMode.extend || write_mode === WriteMode.increment
+      || write_mode === WriteMode.decrement || write_mode === WriteMode.multiply || write_mode === WriteMode.divide) {
       return varPayload.type === assignedVarType
     }
-    else if (inputs.write_mode === WriteMode.Append) {
+    else if (write_mode === WriteMode.append) {
       switch (assignedVarType) {
         case VarType.arrayString:
           return varPayload.type === VarType.string
@@ -117,27 +110,21 @@ const useConfig = (id: string, payload: AssignerNodeType) => {
       }
     }
     return true
-  }, [inputs.assigned_variable_selector, inputs.write_mode, assignedVarType])
-
-  const handleToAssignedVarChange = useCallback((value: ValueSelector | string) => {
-    const newInputs = produce(inputs, (draft) => {
-      draft.input_variable_selector = value as ValueSelector
-    })
-    setInputs(newInputs)
-  }, [inputs, setInputs])
+  }, [])
 
   return {
     readOnly,
     inputs,
-    handleAssignedVarChanges,
-    assignedVarType,
-    isSupportAppend: isCurrSupportAppend,
+    handleOperationListChanges,
+    getAssignedVarType,
+    getToAssignedVarType,
     writeModeTypes,
-    handleWriteModeChange,
+    writeModeTypesArr,
+    writeModeTypesNum,
     filterAssignedVar,
     filterToAssignedVar,
-    handleToAssignedVarChange,
-    toAssignedVarType,
+    getAvailableVars,
+    filterVar,
   }
 }
 
diff --git a/web/app/components/workflow/nodes/assigner/utils.ts b/web/app/components/workflow/nodes/assigner/utils.ts
index 72678e45f..c9fe12377 100644
--- a/web/app/components/workflow/nodes/assigner/utils.ts
+++ b/web/app/components/workflow/nodes/assigner/utils.ts
@@ -1,5 +1,83 @@
 import type { AssignerNodeType } from './types'
+import { AssignerNodeInputType, WriteMode } from './types'
 
 export const checkNodeValid = (payload: AssignerNodeType) => {
   return true
 }
+
+export const formatOperationName = (type: string) => {
+  if (type === 'over-write')
+    return 'Overwrite'
+  return type.charAt(0).toUpperCase() + type.slice(1)
+}
+
+type Item = {
+  value: string | number
+  name: string
+}
+
+export const getOperationItems = (
+  assignedVarType?: string,
+  writeModeTypes?: WriteMode[],
+  writeModeTypesArr?: WriteMode[],
+  writeModeTypesNum?: WriteMode[],
+): Item[] => {
+  if (assignedVarType?.startsWith('array') && writeModeTypesArr) {
+    return writeModeTypesArr.map(type => ({
+      value: type,
+      name: type,
+    }))
+  }
+
+  if (assignedVarType === 'number' && writeModeTypes && writeModeTypesNum) {
+    return [
+      ...writeModeTypes.map(type => ({
+        value: type,
+        name: type,
+      })),
+      { value: 'divider', name: 'divider' } as Item,
+      ...writeModeTypesNum.map(type => ({
+        value: type,
+        name: type,
+      })),
+    ]
+  }
+
+  if (writeModeTypes && ['string', 'object'].includes(assignedVarType || '')) {
+    return writeModeTypes.map(type => ({
+      value: type,
+      name: type,
+    }))
+  }
+
+  return []
+}
+
+const convertOldWriteMode = (oldMode: string): WriteMode => {
+  switch (oldMode) {
+    case 'over-write':
+      return WriteMode.overwrite
+    case 'append':
+      return WriteMode.append
+    case 'clear':
+      return WriteMode.clear
+    default:
+      return WriteMode.overwrite
+  }
+}
+
+export const convertV1ToV2 = (payload: any): AssignerNodeType => {
+  if (payload.version === '2' && payload.items)
+    return payload as AssignerNodeType
+
+  return {
+    version: '2',
+    items: [{
+      variable_selector: payload.assigned_variable_selector || [],
+      input_type: AssignerNodeInputType.variable,
+      operation: convertOldWriteMode(payload.write_mode),
+      value: payload.input_variable_selector || [],
+    }],
+    ...payload,
+  }
+}
diff --git a/web/app/components/workflow/nodes/variable-assigner/components/node-variable-item.tsx b/web/app/components/workflow/nodes/variable-assigner/components/node-variable-item.tsx
index 47a8b6267..e77046932 100644
--- a/web/app/components/workflow/nodes/variable-assigner/components/node-variable-item.tsx
+++ b/web/app/components/workflow/nodes/variable-assigner/components/node-variable-item.tsx
@@ -1,9 +1,11 @@
 import { memo } from 'react'
+import { useTranslation } from 'react-i18next'
 import cn from '@/utils/classnames'
 import { VarBlockIcon } from '@/app/components/workflow/block-icon'
 import { Line3 } from '@/app/components/base/icons/src/public/common'
 import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
 import { BubbleX, Env } from '@/app/components/base/icons/src/vender/line/others'
+import Badge from '@/app/components/base/badge'
 import type { Node } from '@/app/components/workflow/types'
 import { BlockEnum } from '@/app/components/workflow/types'
 
@@ -12,20 +14,26 @@ type NodeVariableItemProps = {
   isChatVar: boolean
   node: Node
   varName: string
+  writeMode?: string
   showBorder?: boolean
   className?: string
 }
+
+const i18nPrefix = 'workflow.nodes.assigner'
+
 const NodeVariableItem = ({
   isEnv,
   isChatVar,
   node,
   varName,
+  writeMode,
   showBorder,
   className,
 }: NodeVariableItemProps) => {
+  const { t } = useTranslation()
   return (
     <div className={cn(
-      'relative flex items-center mt-0.5 h-6 bg-gray-100 rounded-md  px-1 text-xs font-normal text-gray-700',
+      'relative flex items-center p-[3px] pl-[5px] gap-1 self-stretch rounded-md bg-workflow-block-param-bg',
       showBorder && '!bg-black/[0.02]',
       className,
     )}>
@@ -41,11 +49,19 @@ const NodeVariableItem = ({
           <Line3 className='mr-0.5'></Line3>
         </div>
       )}
-      <div className='flex items-center text-primary-600'>
+      <div className='flex items-center text-primary-600 w-full'>
         {!isEnv && !isChatVar && <Variable02 className='shrink-0 w-3.5 h-3.5 text-primary-500' />}
         {isEnv && <Env className='shrink-0 w-3.5 h-3.5 text-util-colors-violet-violet-600' />}
-        {isChatVar && <BubbleX className='w-3.5 h-3.5 text-util-colors-teal-teal-700' />}
-        <div className={cn('max-w-[75px] truncate ml-0.5 text-xs font-medium', (isEnv || isChatVar) && 'text-gray-900')} title={varName}>{varName}</div>
+        {!isChatVar && <div className={cn('max-w-[75px] truncate ml-0.5 system-xs-medium overflow-hidden text-ellipsis', isEnv && 'text-gray-900')} title={varName}>{varName}</div>}
+        {isChatVar
+          && <div className='flex items-center w-full gap-1'>
+            <div className='flex h-[18px] min-w-[18px] items-center gap-0.5 flex-1'>
+              <BubbleX className='w-3.5 h-3.5 text-util-colors-teal-teal-700' />
+              <div className='max-w-[75px] truncate ml-0.5 system-xs-medium overflow-hidden text-ellipsis text-util-colors-teal-teal-700'>{varName}</div>
+            </div>
+            {writeMode && <Badge className='shrink-0' text={t(`${i18nPrefix}.operations.${writeMode}`)} />}
+          </div>
+        }
       </div>
     </div>
   )
diff --git a/web/i18n/en-US/workflow.ts b/web/i18n/en-US/workflow.ts
index 4ed9fa88a..6f83203a4 100644
--- a/web/i18n/en-US/workflow.ts
+++ b/web/i18n/en-US/workflow.ts
@@ -260,6 +260,13 @@ const translation = {
     zoomTo100: 'Zoom to 100%',
     zoomToFit: 'Zoom to Fit',
   },
+  variableReference: {
+    noAvailableVars: 'No available variables',
+    noVarsForOperation: 'There are no variables available for assignment with the selected operation.',
+    noAssignedVars: 'No available assigned variables',
+    assignedVarsDescription: 'Assigned variables must be writable variables, such as ',
+    conversationVars: 'conversation variables',
+  },
   panel: {
     userInputField: 'User Input Field',
     changeBlock: 'Change Block',
@@ -491,6 +498,9 @@ const translation = {
     },
     assigner: {
       'assignedVariable': 'Assigned Variable',
+      'varNotSet': 'Variable NOT Set',
+      'variables': 'Variables',
+      'noVarTip': 'Click the "+" button to add variables',
       'writeMode': 'Write Mode',
       'writeModeTip': 'Append mode: Available for array variables only.',
       'over-write': 'Overwrite',
@@ -498,7 +508,24 @@ const translation = {
       'plus': 'Plus',
       'clear': 'Clear',
       'setVariable': 'Set Variable',
+      'selectAssignedVariable': 'Select assigned variable...',
+      'setParameter': 'Set parameter...',
+      'operations': {
+        'title': 'Operation',
+        'over-write': 'Overwrite',
+        'overwrite': 'Overwrite',
+        'set': 'Set',
+        'clear': 'Clear',
+        'extend': 'Extend',
+        'append': 'Append',
+        '+=': '+=',
+        '-=': '-=',
+        '*=': '*=',
+        '/=': '/=',
+      },
       'variable': 'Variable',
+      'noAssignedVars': 'No available assigned variables',
+      'assignedVarsDescription': 'Assigned variables must be writable variables, such as conversation variables.',
     },
     tool: {
       toAuthorize: 'To authorize',
diff --git a/web/i18n/zh-Hans/workflow.ts b/web/i18n/zh-Hans/workflow.ts
index 7d0747b0f..702c9350e 100644
--- a/web/i18n/zh-Hans/workflow.ts
+++ b/web/i18n/zh-Hans/workflow.ts
@@ -225,7 +225,7 @@ const translation = {
     'code': '代码执行',
     'template-transform': '模板转换',
     'http-request': 'HTTP 请求',
-    'variable-assigner': '变量聚合器',
+    'variable-assigner': '变量赋值器',
     'variable-aggregator': '变量聚合器',
     'assigner': '变量赋值',
     'iteration-start': '迭代开始',
@@ -260,6 +260,13 @@ const translation = {
     zoomTo100: '放大到 100%',
     zoomToFit: '自适应视图',
   },
+  variableReference: {
+    noAvailableVars: '没有可用变量',
+    noVarsForOperation: '当前选择的操作没有可用的变量进行赋值。',
+    noAssignedVars: '没有可用的赋值变量',
+    assignedVarsDescription: '赋值变量必须是可写入的变量，例如：',
+    conversationVars: '会话变量',
+  },
   panel: {
     userInputField: '用户输入字段',
     changeBlock: '更改节点',
@@ -491,6 +498,8 @@ const translation = {
     },
     assigner: {
       'assignedVariable': '赋值的变量',
+      'varNotSet': '未设置变量',
+      'noVarTip': '点击 "+" 按钮添加变量',
       'writeMode': '写入模式',
       'writeModeTip': '使用追加模式时，赋值的变量必须是数组类型。',
       'over-write': '覆盖',
@@ -498,7 +507,25 @@ const translation = {
       'plus': '加',
       'clear': '清空',
       'setVariable': '设置变量',
+      'selectAssignedVariable': '选择要赋值的变量...',
+      'setParameter': '设置参数...',
+      'operations': {
+        'title': '操作',
+        'over-write': '覆盖',
+        'overwrite': '覆盖',
+        'set': '设置',
+        'clear': '清空',
+        'extend': '扩展',
+        'append': '追加',
+        '+=': '+=',
+        '-=': '-=',
+        '*=': '*=',
+        '/=': '/=',
+      },
       'variable': '变量',
+      'variables': '变量',
+      'noAssignedVars': '没有可用的赋值变量',
+      'assignedVarsDescription': '赋值变量必须是可写入的变量，例如会话变量。',
     },
     tool: {
       toAuthorize: '授权',

From e39e776d0371725f1b29bb073ed23f41bc11740b Mon Sep 17 00:00:00 2001
From: yihong <zouzou0208@gmail.com>
Date: Tue, 3 Dec 2024 13:57:16 +0800
Subject: [PATCH 3/8] fix: better wenxin rerank handler, close #11252 (#11283)

Signed-off-by: yihong0618 <zouzou0208@gmail.com>
---
 .../model_providers/wenxin/rerank/rerank.py     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/api/core/model_runtime/model_providers/wenxin/rerank/rerank.py b/api/core/model_runtime/model_providers/wenxin/rerank/rerank.py
index 9e6a7dd99..1c7b94901 100644
--- a/api/core/model_runtime/model_providers/wenxin/rerank/rerank.py
+++ b/api/core/model_runtime/model_providers/wenxin/rerank/rerank.py
@@ -17,7 +17,13 @@ class WenxinRerank(_CommonWenxin):
     def rerank(self, model: str, query: str, docs: list[str], top_n: Optional[int] = None):
         access_token = self._get_access_token()
         url = f"{self.api_bases[model]}?access_token={access_token}"
-
+        # For issue #11252
+        # for wenxin Rerank model top_n length should be equal or less than docs length
+        if top_n is not None and top_n > len(docs):
+            top_n = len(docs)
+        # for wenxin Rerank model, query should not be an empty string
+        if query == "":
+            query = " "  # FIXME: this is a workaround for wenxin rerank model for better user experience.
         try:
             response = httpx.post(
                 url,
@@ -25,7 +31,11 @@ def rerank(self, model: str, query: str, docs: list[str], top_n: Optional[int] =
                 headers={"Content-Type": "application/json"},
             )
             response.raise_for_status()
-            return response.json()
+            data = response.json()
+            # wenxin error handling
+            if "error_code" in data:
+                raise InternalServerError(data["error_msg"])
+            return data
         except httpx.HTTPStatusError as e:
             raise InternalServerError(str(e))
 
@@ -69,6 +79,9 @@ def _invoke(
             results = wenxin_rerank.rerank(model, query, docs, top_n)
 
             rerank_documents = []
+            if "results" not in results:
+                raise ValueError("results key not found in response")
+
             for result in results["results"]:
                 index = result["index"]
                 if "document" in result:

From a679079a1d0848e49859379ee8e7c04b5d632fc6 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Tue, 3 Dec 2024 14:21:59 +0800
Subject: [PATCH 4/8] fix: auto translate fail (#11286)

---
 web/i18n/auto-gen-i18n.js    | 14 +++++++++++---
 web/i18n/de-DE/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/es-ES/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/fa-IR/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/fr-FR/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/hi-IN/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/it-IT/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/ja-JP/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/ko-KR/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/pl-PL/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/pt-BR/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/ro-RO/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/ru-RU/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/sl-SI/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/th-TH/app-log.ts    |  1 +
 web/i18n/th-TH/share-app.ts  |  1 +
 web/i18n/th-TH/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/tr-TR/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/uk-UA/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/vi-VN/workflow.ts   | 27 +++++++++++++++++++++++++++
 web/i18n/zh-Hant/workflow.ts | 27 +++++++++++++++++++++++++++
 21 files changed, 499 insertions(+), 3 deletions(-)

diff --git a/web/i18n/auto-gen-i18n.js b/web/i18n/auto-gen-i18n.js
index c51bc53af..6b9c5e52f 100644
--- a/web/i18n/auto-gen-i18n.js
+++ b/web/i18n/auto-gen-i18n.js
@@ -29,9 +29,17 @@ async function translateMissingKeyDeeply(sourceObj, targetObject, toLanguage) {
         await translateMissingKeyDeeply(sourceObj[key], targetObject[key], toLanguage)
       }
       else {
-        const { translation } = await translate(sourceObj[key], null, languageKeyMap[toLanguage])
-        targetObject[key] = translation
-        // console.log(translation)
+        try {
+          if (!sourceObj[key]) {
+            targetObject[key] = ''
+            return
+          }
+          const { translation } = await translate(sourceObj[key], null, languageKeyMap[toLanguage])
+          targetObject[key] = translation
+        }
+        catch (e) {
+          console.error(`Error translating ${sourceObj[key]}(${key}) to ${toLanguage}`)
+        }
       }
     }
     else if (typeof sourceObj[key] === 'object') {
diff --git a/web/i18n/de-DE/workflow.ts b/web/i18n/de-DE/workflow.ts
index 01b6cc653..55d758b7a 100644
--- a/web/i18n/de-DE/workflow.ts
+++ b/web/i18n/de-DE/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Löschen',
       'setVariable': 'Variable setzen',
       'variable': 'Variable',
+      'operations': {
+        'title': 'Operation',
+        'clear': 'Klar',
+        'over-write': 'Überschreiben',
+        'set': 'Garnitur',
+        '-=': '-=',
+        '+=': '+=',
+        '/=': '/=',
+        'append': 'Anfügen',
+        'extend': 'Ausdehnen',
+        '*=': '*=',
+        'overwrite': 'Überschreiben',
+      },
+      'setParameter': 'Parameter setzen...',
+      'noVarTip': 'Klicken Sie auf die Schaltfläche "+", um Variablen hinzuzufügen',
+      'variables': 'Variablen',
+      'noAssignedVars': 'Keine verfügbaren zugewiesenen Variablen',
+      'selectAssignedVariable': 'Zugewiesene Variable auswählen...',
+      'varNotSet': 'Variable NICHT gesetzt',
+      'assignedVarsDescription': 'Zugewiesene Variablen müssen beschreibbare Variablen sein, z. B. Konversationsvariablen.',
     },
     tool: {
       toAuthorize: 'Autorisieren',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'Gestoppt von {{user}}',
   },
+  variableReference: {
+    noAvailableVars: 'Keine verfügbaren Variablen',
+    conversationVars: 'Konversations-Variablen',
+    noAssignedVars: 'Keine verfügbaren zugewiesenen Variablen',
+    noVarsForOperation: 'Es stehen keine Variablen für die Zuweisung mit der ausgewählten Operation zur Verfügung.',
+    assignedVarsDescription: 'Zugewiesene Variablen müssen beschreibbare Variablen sein, z. B.',
+  },
 }
 
 export default translation
diff --git a/web/i18n/es-ES/workflow.ts b/web/i18n/es-ES/workflow.ts
index 1772d4c2e..7f4eb724a 100644
--- a/web/i18n/es-ES/workflow.ts
+++ b/web/i18n/es-ES/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Limpiar',
       'setVariable': 'Establecer Variable',
       'variable': 'Variable',
+      'operations': {
+        'clear': 'Claro',
+        '*=': '*=',
+        '-=': '-=',
+        'title': 'Operación',
+        'extend': 'Extender',
+        'append': 'Añadir',
+        '+=': '+=',
+        'over-write': 'Sobrescribir',
+        'overwrite': 'Sobrescribir',
+        '/=': '/=',
+        'set': 'Poner',
+      },
+      'variables': 'Variables',
+      'setParameter': 'Establecer parámetro...',
+      'noVarTip': 'Haga clic en el botón "+" para agregar variables',
+      'varNotSet': 'Variable NO establecida',
+      'noAssignedVars': 'No hay variables asignadas disponibles',
+      'selectAssignedVariable': 'Seleccione la variable asignada...',
+      'assignedVarsDescription': 'Las variables asignadas deben ser variables grabables, como las variables de conversación.',
     },
     tool: {
       toAuthorize: 'Para autorizar',
@@ -634,6 +654,13 @@ const translation = {
   tracing: {
     stopBy: 'Pásate por {{usuario}}',
   },
+  variableReference: {
+    noAvailableVars: 'No hay variables disponibles',
+    assignedVarsDescription: 'Las variables asignadas deben ser variables grabables, como',
+    noVarsForOperation: 'No hay variables disponibles para la asignación con la operación seleccionada.',
+    noAssignedVars: 'No hay variables asignadas disponibles',
+    conversationVars: 'Variables de conversación',
+  },
 }
 
 export default translation
diff --git a/web/i18n/fa-IR/workflow.ts b/web/i18n/fa-IR/workflow.ts
index 1ffb9c856..e44a0729f 100644
--- a/web/i18n/fa-IR/workflow.ts
+++ b/web/i18n/fa-IR/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'پاک کردن',
       'setVariable': 'تنظیم متغیر',
       'variable': 'متغیر',
+      'operations': {
+        'clear': 'روشن',
+        'over-write': 'بازنویسی',
+        'set': 'مجموعه',
+        '*=': '*=',
+        'overwrite': 'بازنویسی',
+        '+=': '+=',
+        'title': 'عملیات',
+        'extend': 'گسترش',
+        '-=': '-=',
+        'append': 'الحاق',
+        '/=': '/=',
+      },
+      'noVarTip': 'برای افزودن متغیرها روی دکمه "+" کلیک کنید',
+      'selectAssignedVariable': 'متغیر اختصاص داده شده را انتخاب کنید...',
+      'noAssignedVars': 'هیچ متغیر اختصاص داده شده در دسترس نیست',
+      'setParameter': 'پارامتر را تنظیم کنید...',
+      'assignedVarsDescription': 'متغیرهای اختصاص داده شده باید متغیرهای قابل نوشتن مانند متغیرهای مکالمه باشند.',
+      'variables': 'متغیرهای',
+      'varNotSet': 'متغیر NOT Set',
     },
     tool: {
       toAuthorize: 'برای مجوز دادن',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'متوقف شده توسط {{user}}',
   },
+  variableReference: {
+    noAvailableVars: 'هیچ متغیری در دسترس نیست',
+    conversationVars: 'متغیرهای مکالمه',
+    noVarsForOperation: 'هیچ متغیری برای تخصیص با عملیات انتخاب شده در دسترس نیست.',
+    assignedVarsDescription: 'متغیرهای اختصاص داده شده باید متغیرهای قابل نوشتن باشند، مانند',
+    noAssignedVars: 'هیچ متغیر اختصاص داده شده در دسترس نیست',
+  },
 }
 
 export default translation
diff --git a/web/i18n/fr-FR/workflow.ts b/web/i18n/fr-FR/workflow.ts
index 85b0ad0db..eeed6cc44 100644
--- a/web/i18n/fr-FR/workflow.ts
+++ b/web/i18n/fr-FR/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Effacer',
       'setVariable': 'Définir Variable',
       'variable': 'Variable',
+      'operations': {
+        'clear': 'Clair',
+        '*=': '*=',
+        '-=': '-=',
+        'extend': 'Étendre',
+        '+=': '+=',
+        'over-write': 'Écraser',
+        'set': 'Poser',
+        'append': 'Ajouter',
+        'title': 'Opération',
+        '/=': '/=',
+        'overwrite': 'Écraser',
+      },
+      'assignedVarsDescription': 'Les variables affectées doivent être accessibles en écriture, telles que des variables de conversation.',
+      'noVarTip': 'Cliquez sur le bouton « + » pour ajouter des variables',
+      'variables': 'Variables',
+      'setParameter': 'Définir le paramètre...',
+      'noAssignedVars': 'Aucune variable affectée disponible',
+      'varNotSet': 'Variable NON définie',
+      'selectAssignedVariable': 'Sélectionner la variable affectée...',
     },
     tool: {
       toAuthorize: 'Autoriser',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'Arrêté par {{user}}',
   },
+  variableReference: {
+    noAssignedVars: 'Aucune variable affectée disponible',
+    noVarsForOperation: 'Aucune variable n’est disponible pour l’affectation avec l’opération sélectionnée.',
+    noAvailableVars: 'Aucune variable disponible',
+    assignedVarsDescription: 'Les variables affectées doivent être des variables accessibles en écriture, telles que',
+    conversationVars: 'Variables de conversation',
+  },
 }
 
 export default translation
diff --git a/web/i18n/hi-IN/workflow.ts b/web/i18n/hi-IN/workflow.ts
index cf4475e99..d8ceae2fe 100644
--- a/web/i18n/hi-IN/workflow.ts
+++ b/web/i18n/hi-IN/workflow.ts
@@ -516,6 +516,26 @@ const translation = {
       'clear': 'साफ़ करें',
       'setVariable': 'चर सेट करें',
       'variable': 'चर',
+      'operations': {
+        'clear': 'स्पष्ट',
+        '/=': '/=',
+        '*=': '*=',
+        'over-write': 'अधिलेखित',
+        'title': 'परिचालन',
+        '+=': '+=',
+        'overwrite': 'अधिलेखित',
+        'set': 'अस्त हो',
+        'extend': 'पसार',
+        '-=': '-=',
+        'append': 'संलग्न',
+      },
+      'setParameter': 'पैरामीटर सेट करें...',
+      'noVarTip': 'चर जोड़ने के लिए "+" बटन पर क्लिक करें',
+      'variables': 'चर',
+      'selectAssignedVariable': 'असाइन किए गए चर का चयन करें...',
+      'varNotSet': 'चर सेट नहीं',
+      'assignedVarsDescription': 'असाइन किए गए चर लिखने योग्य चर होने चाहिए, जैसे वार्तालाप चर।',
+      'noAssignedVars': 'कोई उपलब्ध असाइन किए गए चर नहीं',
     },
     tool: {
       toAuthorize: 'अधिकृत करने के लिए',
@@ -651,6 +671,13 @@ const translation = {
   tracing: {
     stopBy: '{{user}} द्वारा रोका गया',
   },
+  variableReference: {
+    conversationVars: 'बातचीत चर',
+    noAvailableVars: 'कोई उपलब्ध चर नहीं',
+    assignedVarsDescription: 'असाइन किए गए चर लिखने योग्य चर होने चाहिए, जैसे',
+    noVarsForOperation: 'चयनित कार्रवाई के साथ असाइनमेंट के लिए कोई चर उपलब्ध नहीं हैं.',
+    noAssignedVars: 'कोई उपलब्ध असाइन किए गए चर नहीं',
+  },
 }
 
 export default translation
diff --git a/web/i18n/it-IT/workflow.ts b/web/i18n/it-IT/workflow.ts
index a142b5b34..9798b60cf 100644
--- a/web/i18n/it-IT/workflow.ts
+++ b/web/i18n/it-IT/workflow.ts
@@ -520,6 +520,26 @@ const translation = {
       'clear': 'Cancellare',
       'setVariable': 'Imposta Variabile',
       'variable': 'Variabile',
+      'operations': {
+        '-=': '-=',
+        'overwrite': 'Sovrascrivere',
+        '+=': '+=',
+        '*=': '*=',
+        'append': 'Aggiungere',
+        'set': 'Mettere',
+        'title': 'Operazione',
+        '/=': '/=',
+        'over-write': 'Sovrascrivere',
+        'extend': 'Estendere',
+        'clear': 'Chiaro',
+      },
+      'setParameter': 'Imposta parametro...',
+      'variables': 'Variabili',
+      'noAssignedVars': 'Nessuna variabile assegnata disponibile',
+      'assignedVarsDescription': 'Le variabili assegnate devono essere variabili scrivibili, ad esempio variabili di conversazione.',
+      'varNotSet': 'Variabile NON impostata',
+      'selectAssignedVariable': 'Seleziona variabile assegnata...',
+      'noVarTip': 'Fare clic sul pulsante "+" per aggiungere variabili',
     },
     tool: {
       toAuthorize: 'Per autorizzare',
@@ -658,6 +678,13 @@ const translation = {
   tracing: {
     stopBy: 'Interrotto da {{user}}',
   },
+  variableReference: {
+    noAvailableVars: 'Nessuna variabile disponibile',
+    noAssignedVars: 'Nessuna variabile assegnata disponibile',
+    noVarsForOperation: 'Non ci sono variabili disponibili per l\'assegnazione con l\'operazione selezionata.',
+    assignedVarsDescription: 'Le variabili assegnate devono essere variabili scrivibili, ad esempio',
+    conversationVars: 'Variabili di conversazione',
+  },
 }
 
 export default translation
diff --git a/web/i18n/ja-JP/workflow.ts b/web/i18n/ja-JP/workflow.ts
index 998b0b782..df694810f 100644
--- a/web/i18n/ja-JP/workflow.ts
+++ b/web/i18n/ja-JP/workflow.ts
@@ -501,6 +501,26 @@ const translation = {
       'clear': 'クリア',
       'setVariable': '変数を設定する',
       'variable': '変数',
+      'operations': {
+        'title': '操作',
+        'set': 'セット',
+        'clear': 'クリア',
+        'overwrite': '上書き',
+        'append': '追加',
+        '-=': '-=',
+        '/=': '/=',
+        '+=': '+=',
+        'over-write': '上書き',
+        'extend': '延ばす',
+        '*=': '*=',
+      },
+      'setParameter': 'パラメータを設定...',
+      'selectAssignedVariable': '代入変数を選択...',
+      'varNotSet': '変数が設定されていません',
+      'variables': '変数',
+      'noVarTip': '「+」ボタンをクリックして変数を追加します',
+      'noAssignedVars': '使用可能な代入変数がありません',
+      'assignedVarsDescription': '代入される変数は、会話変数などの書き込み可能な変数である必要があります。',
     },
     tool: {
       toAuthorize: '承認するには',
@@ -632,6 +652,13 @@ const translation = {
   tracing: {
     stopBy: '{{user}}によって停止',
   },
+  variableReference: {
+    noVarsForOperation: '選択した操作で代入できる変数はありません。',
+    noAvailableVars: '使用可能な変数がありません',
+    noAssignedVars: '使用可能な代入変数がありません',
+    assignedVarsDescription: '代入変数は、次のような書き込み可能な変数である必要があります。',
+    conversationVars: '会話変数',
+  },
 }
 
 export default translation
diff --git a/web/i18n/ko-KR/workflow.ts b/web/i18n/ko-KR/workflow.ts
index e5db1e4b3..728756460 100644
--- a/web/i18n/ko-KR/workflow.ts
+++ b/web/i18n/ko-KR/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': '지우기',
       'setVariable': '변수 설정',
       'variable': '변수',
+      'operations': {
+        '*=': '*=',
+        'overwrite': '덮어쓸',
+        '-=': '-=',
+        'append': '덧붙이다',
+        'over-write': '덮어쓸',
+        '+=': '+=',
+        'title': '수술',
+        'extend': '뻗치다',
+        'clear': '맑다',
+        '/=': '/=',
+        'set': '집합',
+      },
+      'variables': '변수',
+      'noAssignedVars': '사용 가능한 할당된 변수가 없습니다.',
+      'noVarTip': '"+" 버튼을 클릭하여 변수를 추가합니다.',
+      'setParameter': '매개 변수 설정...',
+      'assignedVarsDescription': '할당된 변수는 대화 변수와 같은 쓰기 가능한 변수여야 합니다.',
+      'selectAssignedVariable': '할당된 변수 선택...',
+      'varNotSet': '변수가 설정되지 않음',
     },
     tool: {
       toAuthorize: '승인하기',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: '{{user}}에 의해 중지됨',
   },
+  variableReference: {
+    noAvailableVars: '사용 가능한 변수 없음',
+    conversationVars: '대화 변수',
+    noVarsForOperation: '선택한 작업에 할당할 수 있는 변수가 없습니다.',
+    noAssignedVars: '사용 가능한 할당된 변수가 없습니다.',
+    assignedVarsDescription: '할당된 변수는 다음과 같이 쓰기 가능한 변수여야 합니다.',
+  },
 }
 
 export default translation
diff --git a/web/i18n/pl-PL/workflow.ts b/web/i18n/pl-PL/workflow.ts
index 086389c18..760d45ad7 100644
--- a/web/i18n/pl-PL/workflow.ts
+++ b/web/i18n/pl-PL/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Wyczyść',
       'setVariable': 'Ustaw Zmienną',
       'variable': 'Zmienna',
+      'operations': {
+        'over-write': 'Zastąpić',
+        'set': 'Zbiór',
+        'title': 'Operacja',
+        'overwrite': 'Zastąpić',
+        '*=': '*=',
+        '/=': '/=',
+        '-=': '-=',
+        'extend': 'Rozszerzyć',
+        '+=': '+=',
+        'clear': 'Jasny',
+        'append': 'Dołączyć',
+      },
+      'variables': 'Zmiennych',
+      'selectAssignedVariable': 'Wybierz przypisaną zmienną...',
+      'varNotSet': 'Zmienna NIE jest ustawiona',
+      'noAssignedVars': 'Brak dostępnych przypisanych zmiennych',
+      'assignedVarsDescription': 'Przypisane zmienne muszą być zmiennymi zapisywalnymi, takimi jak zmienne konwersacji.',
+      'setParameter': 'Ustaw parametr...',
+      'noVarTip': 'Kliknij przycisk "+", aby dodać zmienne',
     },
     tool: {
       toAuthorize: 'Do autoryzacji',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'Zatrzymane przez {{user}}',
   },
+  variableReference: {
+    conversationVars: 'Zmienne konwersacji',
+    assignedVarsDescription: 'Przypisane zmienne muszą być zmiennymi zapisywalnymi, takimi jak',
+    noVarsForOperation: 'Nie ma dostępnych zmiennych do przypisania do wybranej operacji.',
+    noAssignedVars: 'Brak dostępnych przypisanych zmiennych',
+    noAvailableVars: 'Brak dostępnych zmiennych',
+  },
 }
 
 export default translation
diff --git a/web/i18n/pt-BR/workflow.ts b/web/i18n/pt-BR/workflow.ts
index 51e4b4d5d..422c273fb 100644
--- a/web/i18n/pt-BR/workflow.ts
+++ b/web/i18n/pt-BR/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Limpar',
       'setVariable': 'Definir Variável',
       'variable': 'Variável',
+      'operations': {
+        'clear': 'Claro',
+        'title': 'Operação',
+        'over-write': 'Sobrescrever',
+        '-=': '-=',
+        '/=': '/=',
+        '*=': '*=',
+        'extend': 'Estender',
+        'append': 'Acrescentar',
+        '+=': '+=',
+        'set': 'Pôr',
+        'overwrite': 'Sobrescrever',
+      },
+      'selectAssignedVariable': 'Selecione a variável atribuída...',
+      'setParameter': 'Definir parâmetro...',
+      'noVarTip': 'Clique no botão "+" para adicionar variáveis',
+      'assignedVarsDescription': 'As variáveis atribuídas devem ser variáveis graváveis, como variáveis de conversação.',
+      'varNotSet': 'Variável NÃO definida',
+      'noAssignedVars': 'Nenhuma variável atribuída disponível',
+      'variables': 'Variáveis',
     },
     tool: {
       toAuthorize: 'Autorizar',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'Parado por {{user}}',
   },
+  variableReference: {
+    noAssignedVars: 'Nenhuma variável atribuída disponível',
+    noVarsForOperation: 'Não há variáveis disponíveis para atribuição com a operação selecionada.',
+    conversationVars: 'variáveis de conversação',
+    assignedVarsDescription: 'As variáveis atribuídas devem ser variáveis graváveis, como',
+    noAvailableVars: 'Nenhuma variável disponível',
+  },
 }
 
 export default translation
diff --git a/web/i18n/ro-RO/workflow.ts b/web/i18n/ro-RO/workflow.ts
index 73014df2a..9a76e87ec 100644
--- a/web/i18n/ro-RO/workflow.ts
+++ b/web/i18n/ro-RO/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Șterge',
       'setVariable': 'Setează Variabila',
       'variable': 'Variabilă',
+      'operations': {
+        'append': 'Adăugaţi',
+        'extend': 'Prelungi',
+        'title': 'Operație',
+        '+=': '+=',
+        'set': 'Apus',
+        '*=': '*=',
+        'overwrite': 'Suprascrie',
+        'clear': 'Clar',
+        'over-write': 'Suprascrie',
+        '/=': '/=',
+        '-=': '-=',
+      },
+      'selectAssignedVariable': 'Selectați variabila atribuită...',
+      'varNotSet': 'Variabila NU este setată',
+      'noVarTip': 'Faceți clic pe butonul "+" pentru a adăuga variabile',
+      'noAssignedVars': 'Nu există variabile atribuite disponibile',
+      'setParameter': 'Setați parametrul...',
+      'assignedVarsDescription': 'Variabilele atribuite trebuie să fie variabile inscripționabile, cum ar fi variabilele de conversație.',
+      'variables': 'Variabile',
     },
     tool: {
       toAuthorize: 'Autorizați',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'Oprit de {{user}}',
   },
+  variableReference: {
+    noAvailableVars: 'Nu există variabile disponibile',
+    noVarsForOperation: 'Nu există variabile disponibile pentru atribuire cu operațiunea selectată.',
+    conversationVars: 'Variabile de conversație',
+    assignedVarsDescription: 'Variabilele atribuite trebuie să fie variabile inscripționabile, cum ar fi',
+    noAssignedVars: 'Nu există variabile atribuite disponibile',
+  },
 }
 
 export default translation
diff --git a/web/i18n/ru-RU/workflow.ts b/web/i18n/ru-RU/workflow.ts
index e56be960b..ce2a5992e 100644
--- a/web/i18n/ru-RU/workflow.ts
+++ b/web/i18n/ru-RU/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Очистить',
       'setVariable': 'Установить переменную',
       'variable': 'Переменная',
+      'operations': {
+        '-=': '-=',
+        '+=': '+=',
+        'clear': 'Ясный',
+        'extend': 'Вытягивать',
+        'set': 'Набор',
+        'overwrite': 'Перезаписать',
+        '/=': '/=',
+        '*=': '*=',
+        'title': 'Операция',
+        'over-write': 'Перезаписать',
+        'append': 'Прибавлять',
+      },
+      'variables': 'Переменные',
+      'noAssignedVars': 'Нет доступных назначенных переменных',
+      'noVarTip': 'Нажмите кнопку "+", чтобы добавить переменные',
+      'setParameter': 'Установите параметр...',
+      'assignedVarsDescription': 'Назначаемые переменные должны быть доступными для записи, например переменными беседы.',
+      'varNotSet': 'Переменная НЕ установлена',
+      'selectAssignedVariable': 'Выберите назначенную переменную...',
     },
     tool: {
       toAuthorize: 'Авторизовать',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'Остановлено {{user}}',
   },
+  variableReference: {
+    assignedVarsDescription: 'Назначаемые переменные должны быть доступными для записи, такими как',
+    noAssignedVars: 'Нет доступных назначенных переменных',
+    noVarsForOperation: 'Переменные для присвоения выбранной операции отсутствуют.',
+    conversationVars: 'Переменные беседы',
+    noAvailableVars: 'Нет доступных переменных',
+  },
 }
 
 export default translation
diff --git a/web/i18n/sl-SI/workflow.ts b/web/i18n/sl-SI/workflow.ts
index b054e9b92..4783fab8d 100644
--- a/web/i18n/sl-SI/workflow.ts
+++ b/web/i18n/sl-SI/workflow.ts
@@ -936,6 +936,26 @@ const translation = {
       'setVariable': 'Nastavi spremenljivko',
       'over-write': 'Prepisati',
       'writeModeTip': 'Način dodajanja: Na voljo samo za spremenljivke polja.',
+      'operations': {
+        '+=': '+=',
+        'overwrite': 'Prepisati',
+        '*=': '*=',
+        'extend': 'Razširiti',
+        'append': 'Dodaj',
+        '-=': '-=',
+        'title': 'Operacija',
+        '/=': '/=',
+        'set': 'Nastaviti',
+        'clear': 'Jasen',
+        'over-write': 'Prepisati',
+      },
+      'variables': 'Spremenljivke',
+      'selectAssignedVariable': 'Izberite dodeljeno spremenljivko ...',
+      'assignedVarsDescription': 'Dodeljene spremenljivke morajo biti zapisljive, kot so spremenljivke pogovora.',
+      'noVarTip': 'Kliknite gumb »+«, da dodate spremenljivke',
+      'noAssignedVars': 'Ni razpoložljivih dodeljenih spremenljivk',
+      'varNotSet': 'Spremenljivka NI nastavljena',
+      'setParameter': 'Nastavi parameter ...',
     },
     tool: {
       outputVars: {
@@ -1064,6 +1084,13 @@ const translation = {
       filterConditionComparisonValue: 'Vrednost pogoja filtra',
     },
   },
+  variableReference: {
+    noVarsForOperation: 'Spremenljivk ni na voljo za dodelitev z izbrano operacijo.',
+    conversationVars: 'Spremenljivke pogovora',
+    noAssignedVars: 'Ni razpoložljivih dodeljenih spremenljivk',
+    noAvailableVars: 'Ni spremenljivk, ki so na voljo',
+    assignedVarsDescription: 'Dodeljene spremenljivke morajo biti zapisljive, kot so:',
+  },
 }
 
 export default translation
diff --git a/web/i18n/th-TH/app-log.ts b/web/i18n/th-TH/app-log.ts
index fb7600f8b..4cc6d8a8f 100644
--- a/web/i18n/th-TH/app-log.ts
+++ b/web/i18n/th-TH/app-log.ts
@@ -51,6 +51,7 @@ const translation = {
     },
     variables: 'ตัว แปร',
     uploadImages: 'รูปภาพที่อัปโหลด',
+    timeConsuming: '',
   },
   filter: {
     period: {
diff --git a/web/i18n/th-TH/share-app.ts b/web/i18n/th-TH/share-app.ts
index 97920a916..290a8cc3f 100644
--- a/web/i18n/th-TH/share-app.ts
+++ b/web/i18n/th-TH/share-app.ts
@@ -2,6 +2,7 @@ const translation = {
   common: {
     appUnavailable: 'แอพไม่พร้อมใช้งาน',
     appUnknownError: 'แอพไม่พร้อมใช้งาน',
+    welcome: '',
   },
   chat: {
     newChat: 'แชทใหม่',
diff --git a/web/i18n/th-TH/workflow.ts b/web/i18n/th-TH/workflow.ts
index 71d82b98e..2971591e2 100644
--- a/web/i18n/th-TH/workflow.ts
+++ b/web/i18n/th-TH/workflow.ts
@@ -499,6 +499,26 @@ const translation = {
       'clear': 'ใส',
       'setVariable': 'ตั้งค่าตัวแปร',
       'variable': 'ตัวแปร',
+      'operations': {
+        'set': 'ชุด',
+        'append': 'ผนวก',
+        '-=': '-=',
+        '*=': '*=',
+        'overwrite': 'เขียน ทับ',
+        'extend': 'ขยาย',
+        'title': 'การผ่าตัด',
+        'clear': 'ใส',
+        'over-write': 'เขียน ทับ',
+        '+=': '+=',
+        '/=': '/=',
+      },
+      'noAssignedVars': 'ไม่มีตัวแปรที่กําหนด',
+      'selectAssignedVariable': 'เลือกตัวแปรที่กําหนด...',
+      'variables': 'ตัว แปร',
+      'varNotSet': 'ตัวแปรไม่ได้ตั้งค่า',
+      'assignedVarsDescription': 'ตัวแปรที่กําหนดต้องเป็นตัวแปรที่เขียนได้ เช่น ตัวแปรการสนทนา',
+      'noVarTip': 'คลิกปุ่ม "+" เพื่อเพิ่มตัวแปร',
+      'setParameter': 'ตั้งค่าพารามิเตอร์...',
     },
     tool: {
       toAuthorize: 'เพื่ออนุญาต',
@@ -630,6 +650,13 @@ const translation = {
   tracing: {
     stopBy: 'แวะที่ {{user}}',
   },
+  variableReference: {
+    conversationVars: 'ตัวแปรการสนทนา',
+    noVarsForOperation: 'ไม่มีตัวแปรที่พร้อมใช้งานสําหรับการกําหนดด้วยการดําเนินการที่เลือก',
+    noAvailableVars: 'ไม่มีตัวแปรที่ใช้ได้',
+    assignedVarsDescription: 'ตัวแปรที่กําหนดต้องเป็นตัวแปรที่เขียนได้ เช่น',
+    noAssignedVars: 'ไม่มีตัวแปรที่กําหนด',
+  },
 }
 
 export default translation
diff --git a/web/i18n/tr-TR/workflow.ts b/web/i18n/tr-TR/workflow.ts
index e01e8ed4e..f34a1b735 100644
--- a/web/i18n/tr-TR/workflow.ts
+++ b/web/i18n/tr-TR/workflow.ts
@@ -501,6 +501,26 @@ const translation = {
       'clear': 'Temizle',
       'setVariable': 'Değişken Ayarla',
       'variable': 'Değişken',
+      'operations': {
+        'extend': 'Uzatmak',
+        'overwrite': 'Üzerine',
+        'over-write': 'Üzerine',
+        'title': 'İşlem',
+        '+=': '+=',
+        'clear': 'Berrak',
+        'append': 'Ekleme',
+        '/=': '/=',
+        '-=': '-=',
+        '*=': '*=',
+        'set': 'Ayarlamak',
+      },
+      'variables': 'Değişken',
+      'selectAssignedVariable': 'Atanan değişkeni seçin...',
+      'setParameter': 'Parametreyi ayarla...',
+      'varNotSet': 'Değişken NOT Set',
+      'assignedVarsDescription': 'Atanan değişkenler, konuşma değişkenleri gibi yazılabilir değişkenler olmalıdır.',
+      'noVarTip': 'Değişken eklemek için "+" düğmesini tıklayın',
+      'noAssignedVars': 'Kullanılabilir atanmış değişken yok',
     },
     tool: {
       toAuthorize: 'Yetkilendirmek için',
@@ -632,6 +652,13 @@ const translation = {
   tracing: {
     stopBy: '{{user}} tarafından durduruldu',
   },
+  variableReference: {
+    assignedVarsDescription: 'Atanan değişkenler, örneğin yazılabilir değişkenler olmalıdır',
+    noAvailableVars: 'Kullanılabilir değişken yok',
+    conversationVars: 'Konuşma değişkenleri',
+    noVarsForOperation: 'Seçilen işlemle atanabilecek değişken yok.',
+    noAssignedVars: 'Kullanılabilir atanmış değişken yok',
+  },
 }
 
 export default translation
diff --git a/web/i18n/uk-UA/workflow.ts b/web/i18n/uk-UA/workflow.ts
index 4fc074c83..d0c9fcd76 100644
--- a/web/i18n/uk-UA/workflow.ts
+++ b/web/i18n/uk-UA/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Очистити',
       'setVariable': 'Встановити Змінну',
       'variable': 'Змінна',
+      'operations': {
+        'clear': 'Ясний',
+        'set': 'Встановити',
+        'title': 'Операція',
+        'append': 'Додати',
+        '-=': '-=',
+        'over-write': 'Перезаписати',
+        'overwrite': 'Перезаписати',
+        '/=': '/=',
+        '+=': '+=',
+        '*=': '*=',
+        'extend': 'Розширити',
+      },
+      'selectAssignedVariable': 'Виберіть призначену змінну...',
+      'noAssignedVars': 'Немає доступних призначених змінних',
+      'noVarTip': 'Натисніть кнопку «+», щоб додати змінні',
+      'assignedVarsDescription': 'Призначені змінні мають бути доступними для запису, такими як змінні розмови.',
+      'variables': 'Змінні',
+      'varNotSet': 'Змінна НЕ встановлена',
+      'setParameter': 'Встановити параметр...',
     },
     tool: {
       toAuthorize: 'Авторизувати',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'Зупинено користувачем {{user}}',
   },
+  variableReference: {
+    conversationVars: 'Змінні розмови',
+    noVarsForOperation: 'Немає доступних змінних для призначення з обраною операцією.',
+    assignedVarsDescription: 'Призначені змінні мають бути доступними для запису, такими як',
+    noAssignedVars: 'Немає доступних призначених змінних',
+    noAvailableVars: 'Немає доступних змінних',
+  },
 }
 
 export default translation
diff --git a/web/i18n/vi-VN/workflow.ts b/web/i18n/vi-VN/workflow.ts
index f897910ab..19d33145f 100644
--- a/web/i18n/vi-VN/workflow.ts
+++ b/web/i18n/vi-VN/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': 'Xóa',
       'setVariable': 'Đặt Biến',
       'variable': 'Biến',
+      'operations': {
+        '-=': '-=',
+        'over-write': 'Ghi đè lên',
+        'clear': 'Trong',
+        'append': 'Thêm',
+        'title': 'Hoạt động',
+        '*=': '*=',
+        '/=': '/=',
+        'extend': 'Mở rộng',
+        '+=': '+=',
+        'set': 'Cài',
+        'overwrite': 'Ghi đè lên',
+      },
+      'setParameter': 'Đặt tham số...',
+      'selectAssignedVariable': 'Chọn biến được gán...',
+      'noVarTip': 'Nhấp vào nút "+" để thêm biến',
+      'assignedVarsDescription': 'Các biến được gán phải là các biến có thể ghi, chẳng hạn như các biến hội thoại.',
+      'varNotSet': 'Biến KHÔNG được đặt',
+      'noAssignedVars': 'Không có biến được gán sẵn có',
+      'variables': 'Biến',
     },
     tool: {
       toAuthorize: 'Ủy quyền',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: 'Dừng bởi {{user}}',
   },
+  variableReference: {
+    noAssignedVars: 'Không có biến được gán sẵn có',
+    noAvailableVars: 'Không có biến khả dụng',
+    assignedVarsDescription: 'Các biến được gán phải là các biến có thể ghi, chẳng hạn như',
+    conversationVars: 'Biến cuộc trò chuyện',
+    noVarsForOperation: 'Không có biến nào có sẵn để gán với hoạt động đã chọn.',
+  },
 }
 
 export default translation
diff --git a/web/i18n/zh-Hant/workflow.ts b/web/i18n/zh-Hant/workflow.ts
index 0598593ed..4653e6425 100644
--- a/web/i18n/zh-Hant/workflow.ts
+++ b/web/i18n/zh-Hant/workflow.ts
@@ -500,6 +500,26 @@ const translation = {
       'clear': '清除',
       'setVariable': '設定變數',
       'variable': '變數',
+      'operations': {
+        'overwrite': '改寫',
+        '/=': '/=',
+        'title': '操作',
+        '*=': '*=',
+        'extend': '擴展',
+        '+=': '+=',
+        'set': '設置',
+        'over-write': '改寫',
+        '-=': '-=',
+        'append': '附加',
+        'clear': '清楚',
+      },
+      'noAssignedVars': '沒有可用的已分配變數',
+      'variables': '變數',
+      'selectAssignedVariable': '選擇配置的變數...',
+      'setParameter': '設定參數...',
+      'noVarTip': '點擊 「+」 按鈕添加變數',
+      'assignedVarsDescription': '分配的變數必須是可寫變數，例如對話變數。',
+      'varNotSet': '未設置變數',
     },
     tool: {
       toAuthorize: '授權',
@@ -631,6 +651,13 @@ const translation = {
   tracing: {
     stopBy: '由{{user}}終止',
   },
+  variableReference: {
+    noAvailableVars: '無可用變數',
+    noAssignedVars: '沒有可用的已分配變數',
+    noVarsForOperation: '所選操作沒有可用於賦值的變數。',
+    assignedVarsDescription: '分配的變數必須是可寫變數，例如',
+    conversationVars: '對話變數',
+  },
 }
 
 export default translation

From 7a962b9f032c15f72f5023ea920935ae5db31937 Mon Sep 17 00:00:00 2001
From: -LAN- <laipz8200@outlook.com>
Date: Tue, 3 Dec 2024 16:01:12 +0800
Subject: [PATCH 5/8] chore: bump version to 0.13.0 (#11284)

Signed-off-by: -LAN- <laipz8200@outlook.com>
---
 api/configs/packaging/__init__.py | 2 +-
 api/services/app_dsl_service.py   | 2 +-
 docker-legacy/docker-compose.yaml | 6 +++---
 docker/docker-compose.yaml        | 6 +++---
 web/package.json                  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/configs/packaging/__init__.py b/api/configs/packaging/__init__.py
index 5d2a0231b..08f872814 100644
--- a/api/configs/packaging/__init__.py
+++ b/api/configs/packaging/__init__.py
@@ -9,7 +9,7 @@ class PackagingInfo(BaseSettings):
 
     CURRENT_VERSION: str = Field(
         description="Dify version",
-        default="0.12.1",
+        default="0.13.0",
     )
 
     COMMIT_SHA: str = Field(
diff --git a/api/services/app_dsl_service.py b/api/services/app_dsl_service.py
index 2f202374f..8180c3b40 100644
--- a/api/services/app_dsl_service.py
+++ b/api/services/app_dsl_service.py
@@ -22,7 +22,7 @@
 
 IMPORT_INFO_REDIS_KEY_PREFIX = "app_import_info:"
 IMPORT_INFO_REDIS_EXPIRY = 180  # 3 minutes
-CURRENT_DSL_VERSION = "0.1.3"
+CURRENT_DSL_VERSION = "0.1.4"
 
 
 class ImportMode(StrEnum):
diff --git a/docker-legacy/docker-compose.yaml b/docker-legacy/docker-compose.yaml
index f684c9f1a..ea9f5fc49 100644
--- a/docker-legacy/docker-compose.yaml
+++ b/docker-legacy/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3'
 services:
   # API service
   api:
-    image: langgenius/dify-api:0.12.1
+    image: langgenius/dify-api:0.13.0
     restart: always
     environment:
       # Startup mode, 'api' starts the API server.
@@ -227,7 +227,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:0.12.1
+    image: langgenius/dify-api:0.13.0
     restart: always
     environment:
       CONSOLE_WEB_URL: ''
@@ -397,7 +397,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:0.12.1
+    image: langgenius/dify-web:0.13.0
     restart: always
     environment:
       # The base URL of console application api server, refers to the Console base URL of WEB service if console domain is
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 268f77ba2..d0ec9e597 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -292,7 +292,7 @@ x-shared-env: &shared-api-worker-env
 services:
   # API service
   api:
-    image: langgenius/dify-api:0.12.1
+    image: langgenius/dify-api:0.13.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -312,7 +312,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:0.12.1
+    image: langgenius/dify-api:0.13.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -331,7 +331,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:0.12.1
+    image: langgenius/dify-web:0.13.0
     restart: always
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
diff --git a/web/package.json b/web/package.json
index 6ef42acd7..a872feb2b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dify-web",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "private": true,
   "engines": {
     "node": ">=18.17.0"

From c58d2fce89c0f8d198b4d8fe8b558bd1b93874af Mon Sep 17 00:00:00 2001
From: Jyong <76649700+JohnJyong@users.noreply.github.com>
Date: Tue, 3 Dec 2024 17:34:56 +0800
Subject: [PATCH 6/8] roll back rerank topn setting (#11297)

---
 api/.env.example                             | 1 -
 api/configs/feature/__init__.py              | 2 --
 api/core/rag/datasource/retrieval_service.py | 7 +++----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/api/.env.example b/api/.env.example
index 00b6c28a9..52cdd9ecb 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -413,4 +413,3 @@ RESET_PASSWORD_TOKEN_EXPIRY_MINUTES=5
 
 CREATE_TIDB_SERVICE_JOB_ENABLED=false
 
-RETRIEVAL_TOP_N=0
diff --git a/api/configs/feature/__init__.py b/api/configs/feature/__init__.py
index e88eb9805..f1cb3efda 100644
--- a/api/configs/feature/__init__.py
+++ b/api/configs/feature/__init__.py
@@ -626,8 +626,6 @@ class DataSetConfig(BaseSettings):
         default=30,
     )
 
-    RETRIEVAL_TOP_N: int = Field(description="number of retrieval top_n", default=0)
-
 
 class WorkspaceConfig(BaseSettings):
     """
diff --git a/api/core/rag/datasource/retrieval_service.py b/api/core/rag/datasource/retrieval_service.py
index 759166da4..b2141396d 100644
--- a/api/core/rag/datasource/retrieval_service.py
+++ b/api/core/rag/datasource/retrieval_service.py
@@ -3,7 +3,6 @@
 
 from flask import Flask, current_app
 
-from configs import DifyConfig
 from core.rag.data_post_processor.data_post_processor import DataPostProcessor
 from core.rag.datasource.keyword.keyword_factory import Keyword
 from core.rag.datasource.vdb.vector_factory import Vector
@@ -114,7 +113,7 @@ def retrieve(
                 query=query,
                 documents=all_documents,
                 score_threshold=score_threshold,
-                top_n=DifyConfig.RETRIEVAL_TOP_N or top_k,
+                top_n=top_k,
             )
 
         return all_documents
@@ -186,7 +185,7 @@ def embedding_search(
                                 query=query,
                                 documents=documents,
                                 score_threshold=score_threshold,
-                                top_n=DifyConfig.RETRIEVAL_TOP_N or len(documents),
+                                top_n=len(documents),
                             )
                         )
                     else:
@@ -231,7 +230,7 @@ def full_text_index_search(
                                 query=query,
                                 documents=documents,
                                 score_threshold=score_threshold,
-                                top_n=DifyConfig.RETRIEVAL_TOP_N or len(documents),
+                                top_n=len(documents),
                             )
                         )
                     else:

From ff2a4a6fcd556541cebd6afc0c42bb13934e1636 Mon Sep 17 00:00:00 2001
From: KVOJJJin <jzongcode@gmail.com>
Date: Tue, 3 Dec 2024 21:17:55 +0800
Subject: [PATCH 7/8] Fix: model params in logs (#11298)

---
 web/app/components/app/log/list.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/components/app/log/list.tsx b/web/app/components/app/log/list.tsx
index 9a8cca437..978e83737 100644
--- a/web/app/components/app/log/list.tsx
+++ b/web/app/components/app/log/list.tsx
@@ -318,7 +318,7 @@ function DetailPanel({ detail, onFeedback }: IDetailPanel) {
   const targetTone = TONE_LIST.find((item: any) => {
     let res = true
     validatedParams.forEach((param) => {
-      res = item.config?.[param] === detail.model_config?.configs?.completion_params?.[param]
+      res = item.config?.[param] === detail?.model_config.model?.completion_params?.[param]
     })
     return res
   })?.name ?? 'custom'

From 1cb5a12abb43836563b1423697e5cdf1866b3e78 Mon Sep 17 00:00:00 2001
From: DDDDD12138 <43703884+DDDDD12138@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:29:42 +0800
Subject: [PATCH 8/8] fix: resolve scrolling issue in workflow-log table
 (#11302)

---
 web/app/components/app/workflow-log/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/components/app/workflow-log/index.tsx b/web/app/components/app/workflow-log/index.tsx
index 5a8fa41a1..453f2cd75 100644
--- a/web/app/components/app/workflow-log/index.tsx
+++ b/web/app/components/app/workflow-log/index.tsx
@@ -76,7 +76,7 @@ const Logs: FC<ILogsProps> = ({ appDetail }) => {
     <div className='flex flex-col h-full'>
       <h1 className='text-text-primary system-xl-semibold'>{t('appLog.workflowTitle')}</h1>
       <p className='text-text-tertiary system-sm-regular'>{t('appLog.workflowSubtitle')}</p>
-      <div className='flex flex-col py-4 flex-1'>
+      <div className='flex flex-col py-4 flex-1 max-h-[calc(100%-16px)]'>
         <Filter queryParams={queryParams} setQueryParams={setQueryParams} />
         {/* workflow log */}
         {total === undefined