Merge remote-tracking branch 'origin/main' into feat/trigger

2026-04-14 07:56:31 +08:00 · 2025-09-29 12:13:39 +08:00 · 2025-09-29 12:13:39 +08:00 · 2c3cf9a25e
commit 2c3cf9a25e
parent 67fbfc0b8f 029d5d36ac
7 changed files with 294 additions and 163 deletions
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
@ -4,7 +4,7 @@ from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden

 import services
-from controllers.console import api
+from controllers.console import console_ns
 from controllers.console.datasets.error import DatasetNameDuplicateError
 from controllers.console.wraps import (
    account_initialization_required,
@ -32,6 +32,7 @@ def _validate_description_length(description):
    return description


+@console_ns.route("/rag/pipeline/dataset")
 class CreateRagPipelineDatasetApi(Resource):
    @setup_required
    @login_required
@ -84,6 +85,7 @@ class CreateRagPipelineDatasetApi(Resource):
        return import_info, 201


+@console_ns.route("/rag/pipeline/empty-dataset")
 class CreateEmptyRagPipelineDatasetApi(Resource):
    @setup_required
    @login_required
@ -108,7 +110,3 @@ class CreateEmptyRagPipelineDatasetApi(Resource):
            ),
        )
        return marshal(dataset, dataset_detail_fields), 201
-
-
-api.add_resource(CreateRagPipelineDatasetApi, "/rag/pipeline/dataset")
-api.add_resource(CreateEmptyRagPipelineDatasetApi, "/rag/pipeline/empty-dataset")
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_draft_variable.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_draft_variable.py
@ -6,7 +6,7 @@ from flask_restx import Resource, fields, inputs, marshal, marshal_with, reqpars
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden

-from controllers.console import api
+from controllers.console import console_ns
 from controllers.console.app.error import (
    DraftWorkflowNotExist,
 )
@ -111,6 +111,7 @@ def _api_prerequisite(f):
    return wrapper


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables")
 class RagPipelineVariableCollectionApi(Resource):
    @_api_prerequisite
    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_WITHOUT_VALUE_FIELDS)
@ -168,6 +169,7 @@ def validate_node_id(node_id: str) -> NoReturn | None:
    return None


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/variables")
 class RagPipelineNodeVariableCollectionApi(Resource):
    @_api_prerequisite
    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
@ -190,6 +192,7 @@ class RagPipelineNodeVariableCollectionApi(Resource):
        return Response("", 204)


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables/<uuid:variable_id>")
 class RagPipelineVariableApi(Resource):
    _PATCH_NAME_FIELD = "name"
    _PATCH_VALUE_FIELD = "value"
@ -284,6 +287,7 @@ class RagPipelineVariableApi(Resource):
        return Response("", 204)


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables/<uuid:variable_id>/reset")
 class RagPipelineVariableResetApi(Resource):
    @_api_prerequisite
    def put(self, pipeline: Pipeline, variable_id: str):
@ -325,6 +329,7 @@ def _get_variable_list(pipeline: Pipeline, node_id) -> WorkflowDraftVariableList
    return draft_vars


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/system-variables")
 class RagPipelineSystemVariableCollectionApi(Resource):
    @_api_prerequisite
    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
@ -332,6 +337,7 @@ class RagPipelineSystemVariableCollectionApi(Resource):
        return _get_variable_list(pipeline, SYSTEM_VARIABLE_NODE_ID)


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/environment-variables")
 class RagPipelineEnvironmentVariableCollectionApi(Resource):
    @_api_prerequisite
    def get(self, pipeline: Pipeline):
@ -364,26 +370,3 @@ class RagPipelineEnvironmentVariableCollectionApi(Resource):
            )

        return {"items": env_vars_list}
-
-
-api.add_resource(
-    RagPipelineVariableCollectionApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables",
-)
-api.add_resource(
-    RagPipelineNodeVariableCollectionApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/variables",
-)
-api.add_resource(
-    RagPipelineVariableApi, "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables/<uuid:variable_id>"
-)
-api.add_resource(
-    RagPipelineVariableResetApi, "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/variables/<uuid:variable_id>/reset"
-)
-api.add_resource(
-    RagPipelineSystemVariableCollectionApi, "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/system-variables"
-)
-api.add_resource(
-    RagPipelineEnvironmentVariableCollectionApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/environment-variables",
-)
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_import.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_import.py
@ -5,7 +5,7 @@ from flask_restx import Resource, marshal_with, reqparse  # type: ignore
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden

-from controllers.console import api
+from controllers.console import console_ns
 from controllers.console.datasets.wraps import get_rag_pipeline
 from controllers.console.wraps import (
    account_initialization_required,
@ -20,6 +20,7 @@ from services.app_dsl_service import ImportStatus
 from services.rag_pipeline.rag_pipeline_dsl_service import RagPipelineDslService


+@console_ns.route("/rag/pipelines/imports")
 class RagPipelineImportApi(Resource):
    @setup_required
    @login_required
@ -66,6 +67,7 @@ class RagPipelineImportApi(Resource):
        return result.model_dump(mode="json"), 200


+@console_ns.route("/rag/pipelines/imports/<string:import_id>/confirm")
 class RagPipelineImportConfirmApi(Resource):
    @setup_required
    @login_required
@ -90,6 +92,7 @@ class RagPipelineImportConfirmApi(Resource):
        return result.model_dump(mode="json"), 200


+@console_ns.route("/rag/pipelines/imports/<string:pipeline_id>/check-dependencies")
 class RagPipelineImportCheckDependenciesApi(Resource):
    @setup_required
    @login_required
@ -107,6 +110,7 @@ class RagPipelineImportCheckDependenciesApi(Resource):
        return result.model_dump(mode="json"), 200


+@console_ns.route("/rag/pipelines/<string:pipeline_id>/exports")
 class RagPipelineExportApi(Resource):
    @setup_required
    @login_required
@ -128,22 +132,3 @@ class RagPipelineExportApi(Resource):
            )

        return {"data": result}, 200
-
-
-# Import Rag Pipeline
-api.add_resource(
-    RagPipelineImportApi,
-    "/rag/pipelines/imports",
-)
-api.add_resource(
-    RagPipelineImportConfirmApi,
-    "/rag/pipelines/imports/<string:import_id>/confirm",
-)
-api.add_resource(
-    RagPipelineImportCheckDependenciesApi,
-    "/rag/pipelines/imports/<string:pipeline_id>/check-dependencies",
-)
-api.add_resource(
-    RagPipelineExportApi,
-    "/rag/pipelines/<string:pipeline_id>/exports",
-)
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
@ -9,7 +9,7 @@ from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden, InternalServerError, NotFound

 import services
-from controllers.console import api
+from controllers.console import console_ns
 from controllers.console.app.error import (
    ConversationCompletedError,
    DraftWorkflowNotExist,
@ -50,6 +50,7 @@ from services.rag_pipeline.rag_pipeline_transform_service import RagPipelineTran
 logger = logging.getLogger(__name__)


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft")
 class DraftRagPipelineApi(Resource):
    @setup_required
    @login_required
@ -147,6 +148,7 @@ class DraftRagPipelineApi(Resource):
        }


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/iteration/nodes/<string:node_id>/run")
 class RagPipelineDraftRunIterationNodeApi(Resource):
    @setup_required
    @login_required
@ -181,6 +183,7 @@ class RagPipelineDraftRunIterationNodeApi(Resource):
            raise InternalServerError()


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/loop/nodes/<string:node_id>/run")
 class RagPipelineDraftRunLoopNodeApi(Resource):
    @setup_required
    @login_required
@ -215,6 +218,7 @@ class RagPipelineDraftRunLoopNodeApi(Resource):
            raise InternalServerError()


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/run")
 class DraftRagPipelineRunApi(Resource):
    @setup_required
    @login_required
@ -249,6 +253,7 @@ class DraftRagPipelineRunApi(Resource):
            raise InvokeRateLimitHttpError(ex.description)


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/run")
 class PublishedRagPipelineRunApi(Resource):
    @setup_required
    @login_required
@ -369,6 +374,7 @@ class PublishedRagPipelineRunApi(Resource):
 #
 #         return result
 #
+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/datasource/nodes/<string:node_id>/run")
 class RagPipelinePublishedDatasourceNodeRunApi(Resource):
    @setup_required
    @login_required
@ -411,6 +417,7 @@ class RagPipelinePublishedDatasourceNodeRunApi(Resource):
        )


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/datasource/nodes/<string:node_id>/run")
 class RagPipelineDraftDatasourceNodeRunApi(Resource):
    @setup_required
    @login_required
@ -453,6 +460,7 @@ class RagPipelineDraftDatasourceNodeRunApi(Resource):
        )


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/run")
 class RagPipelineDraftNodeRunApi(Resource):
    @setup_required
    @login_required
@ -486,6 +494,7 @@ class RagPipelineDraftNodeRunApi(Resource):
        return workflow_node_execution


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs/tasks/<string:task_id>/stop")
 class RagPipelineTaskStopApi(Resource):
    @setup_required
    @login_required
@ -504,6 +513,7 @@ class RagPipelineTaskStopApi(Resource):
        return {"result": "success"}


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/publish")
 class PublishedRagPipelineApi(Resource):
    @setup_required
    @login_required
@ -559,6 +569,7 @@ class PublishedRagPipelineApi(Resource):
        }


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/default-workflow-block-configs")
 class DefaultRagPipelineBlockConfigsApi(Resource):
    @setup_required
    @login_required
@ -577,6 +588,7 @@ class DefaultRagPipelineBlockConfigsApi(Resource):
        return rag_pipeline_service.get_default_block_configs()


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/default-workflow-block-configs/<string:block_type>")
 class DefaultRagPipelineBlockConfigApi(Resource):
    @setup_required
    @login_required
@ -608,6 +620,7 @@ class DefaultRagPipelineBlockConfigApi(Resource):
        return rag_pipeline_service.get_default_block_config(node_type=block_type, filters=filters)


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows")
 class PublishedAllRagPipelineApi(Resource):
    @setup_required
    @login_required
@ -656,6 +669,7 @@ class PublishedAllRagPipelineApi(Resource):
            }


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/<string:workflow_id>")
 class RagPipelineByIdApi(Resource):
    @setup_required
    @login_required
@ -713,6 +727,7 @@ class RagPipelineByIdApi(Resource):
        return workflow


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/processing/parameters")
 class PublishedRagPipelineSecondStepApi(Resource):
    @setup_required
    @login_required
@ -738,6 +753,7 @@ class PublishedRagPipelineSecondStepApi(Resource):
        }


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/pre-processing/parameters")
 class PublishedRagPipelineFirstStepApi(Resource):
    @setup_required
    @login_required
@ -763,6 +779,7 @@ class PublishedRagPipelineFirstStepApi(Resource):
        }


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/pre-processing/parameters")
 class DraftRagPipelineFirstStepApi(Resource):
    @setup_required
    @login_required
@ -788,6 +805,7 @@ class DraftRagPipelineFirstStepApi(Resource):
        }


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/processing/parameters")
 class DraftRagPipelineSecondStepApi(Resource):
    @setup_required
    @login_required
@ -814,6 +832,7 @@ class DraftRagPipelineSecondStepApi(Resource):
        }


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs")
 class RagPipelineWorkflowRunListApi(Resource):
    @setup_required
    @login_required
@ -835,6 +854,7 @@ class RagPipelineWorkflowRunListApi(Resource):
        return result


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs/<uuid:run_id>")
 class RagPipelineWorkflowRunDetailApi(Resource):
    @setup_required
    @login_required
@ -853,6 +873,7 @@ class RagPipelineWorkflowRunDetailApi(Resource):
        return workflow_run


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs/<uuid:run_id>/node-executions")
 class RagPipelineWorkflowRunNodeExecutionListApi(Resource):
    @setup_required
    @login_required
@ -876,6 +897,7 @@ class RagPipelineWorkflowRunNodeExecutionListApi(Resource):
        return {"data": node_executions}


+@console_ns.route("/rag/pipelines/datasource-plugins")
 class DatasourceListApi(Resource):
    @setup_required
    @login_required
@ -891,6 +913,7 @@ class DatasourceListApi(Resource):
        return jsonable_encoder(RagPipelineManageService.list_rag_pipeline_datasources(tenant_id))


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/last-run")
 class RagPipelineWorkflowLastRunApi(Resource):
    @setup_required
    @login_required
@ -912,6 +935,7 @@ class RagPipelineWorkflowLastRunApi(Resource):
        return node_exec


+@console_ns.route("/rag/pipelines/transform/datasets/<uuid:dataset_id>")
 class RagPipelineTransformApi(Resource):
    @setup_required
    @login_required
@ -929,6 +953,7 @@ class RagPipelineTransformApi(Resource):
        return result


+@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/datasource/variables-inspect")
 class RagPipelineDatasourceVariableApi(Resource):
    @setup_required
    @login_required
@ -958,6 +983,7 @@ class RagPipelineDatasourceVariableApi(Resource):
        return workflow_node_execution


+@console_ns.route("/rag/pipelines/recommended-plugins")
 class RagPipelineRecommendedPluginApi(Resource):
    @setup_required
    @login_required
@ -966,114 +992,3 @@ class RagPipelineRecommendedPluginApi(Resource):
        rag_pipeline_service = RagPipelineService()
        recommended_plugins = rag_pipeline_service.get_recommended_plugins()
        return recommended_plugins
-
-
-api.add_resource(
-    DraftRagPipelineApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft",
-)
-api.add_resource(
-    DraftRagPipelineRunApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/run",
-)
-api.add_resource(
-    PublishedRagPipelineRunApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/published/run",
-)
-api.add_resource(
-    RagPipelineTaskStopApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflow-runs/tasks/<string:task_id>/stop",
-)
-api.add_resource(
-    RagPipelineDraftNodeRunApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/run",
-)
-api.add_resource(
-    RagPipelinePublishedDatasourceNodeRunApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/published/datasource/nodes/<string:node_id>/run",
-)
-
-api.add_resource(
-    RagPipelineDraftDatasourceNodeRunApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/datasource/nodes/<string:node_id>/run",
-)
-
-api.add_resource(
-    RagPipelineDraftRunIterationNodeApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/iteration/nodes/<string:node_id>/run",
-)
-
-api.add_resource(
-    RagPipelineDraftRunLoopNodeApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/loop/nodes/<string:node_id>/run",
-)
-
-api.add_resource(
-    PublishedRagPipelineApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/publish",
-)
-api.add_resource(
-    PublishedAllRagPipelineApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows",
-)
-api.add_resource(
-    DefaultRagPipelineBlockConfigsApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/default-workflow-block-configs",
-)
-api.add_resource(
-    DefaultRagPipelineBlockConfigApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/default-workflow-block-configs/<string:block_type>",
-)
-api.add_resource(
-    RagPipelineByIdApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/<string:workflow_id>",
-)
-api.add_resource(
-    RagPipelineWorkflowRunListApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflow-runs",
-)
-api.add_resource(
-    RagPipelineWorkflowRunDetailApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflow-runs/<uuid:run_id>",
-)
-api.add_resource(
-    RagPipelineWorkflowRunNodeExecutionListApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflow-runs/<uuid:run_id>/node-executions",
-)
-api.add_resource(
-    DatasourceListApi,
-    "/rag/pipelines/datasource-plugins",
-)
-api.add_resource(
-    PublishedRagPipelineSecondStepApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/published/processing/parameters",
-)
-api.add_resource(
-    PublishedRagPipelineFirstStepApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/published/pre-processing/parameters",
-)
-api.add_resource(
-    DraftRagPipelineSecondStepApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/processing/parameters",
-)
-api.add_resource(
-    DraftRagPipelineFirstStepApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/pre-processing/parameters",
-)
-api.add_resource(
-    RagPipelineWorkflowLastRunApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/last-run",
-)
-api.add_resource(
-    RagPipelineTransformApi,
-    "/rag/pipelines/transform/datasets/<uuid:dataset_id>",
-)
-api.add_resource(
-    RagPipelineDatasourceVariableApi,
-    "/rag/pipelines/<uuid:pipeline_id>/workflows/draft/datasource/variables-inspect",
-)
-
-api.add_resource(
-    RagPipelineRecommendedPluginApi,
-    "/rag/pipelines/recommended-plugins",
-)
--- a/api/tests/fixtures/workflow/test-answer-order.yml
+++ b/api/tests/fixtures/workflow/test-answer-order.yml
@ -0,0 +1,222 @@
+app:
+  description: 'this is a chatflow with 2 answer nodes.
+
+
+    it''s outouts should like:
+
+
+    ```
+
+    --- answer 1 ---
+
+
+    foo
+
+    --- answer 2 ---
+
+
+    <llm''s outputs>
+
+    ```'
+  icon: 🤖
+  icon_background: '#FFEAD5'
+  mode: advanced-chat
+  name: test-answer-order
+  use_icon_as_answer_icon: false
+dependencies:
+- current_identifier: null
+  type: marketplace
+  value:
+    marketplace_plugin_unique_identifier: langgenius/openai:0.2.6@e2665624a156f52160927bceac9e169bd7e5ae6b936ae82575e14c90af390e6e
+    version: null
+kind: app
+version: 0.4.0
+workflow:
+  conversation_variables: []
+  environment_variables: []
+  features:
+    file_upload:
+      allowed_file_extensions:
+      - .JPG
+      - .JPEG
+      - .PNG
+      - .GIF
+      - .WEBP
+      - .SVG
+      allowed_file_types:
+      - image
+      allowed_file_upload_methods:
+      - local_file
+      - remote_url
+      enabled: false
+      fileUploadConfig:
+        audio_file_size_limit: 50
+        batch_count_limit: 5
+        file_size_limit: 15
+        image_file_size_limit: 10
+        video_file_size_limit: 100
+        workflow_file_upload_limit: 10
+      image:
+        enabled: false
+        number_limits: 3
+        transfer_methods:
+        - local_file
+        - remote_url
+      number_limits: 3
+    opening_statement: ''
+    retriever_resource:
+      enabled: true
+    sensitive_word_avoidance:
+      enabled: false
+    speech_to_text:
+      enabled: false
+    suggested_questions: []
+    suggested_questions_after_answer:
+      enabled: false
+    text_to_speech:
+      enabled: false
+      language: ''
+      voice: ''
+  graph:
+    edges:
+    - data:
+        isInIteration: false
+        isInLoop: false
+        sourceType: answer
+        targetType: answer
+      id: 1759052466526-source-1759052469368-target
+      source: '1759052466526'
+      sourceHandle: source
+      target: '1759052469368'
+      targetHandle: target
+      type: custom
+      zIndex: 0
+    - data:
+        isInIteration: false
+        isInLoop: false
+        sourceType: start
+        targetType: llm
+      id: 1759052439553-source-1759052580454-target
+      source: '1759052439553'
+      sourceHandle: source
+      target: '1759052580454'
+      targetHandle: target
+      type: custom
+      zIndex: 0
+    - data:
+        isInIteration: false
+        isInLoop: false
+        sourceType: llm
+        targetType: answer
+      id: 1759052580454-source-1759052466526-target
+      source: '1759052580454'
+      sourceHandle: source
+      target: '1759052466526'
+      targetHandle: target
+      type: custom
+      zIndex: 0
+    nodes:
+    - data:
+        selected: false
+        title: Start
+        type: start
+        variables: []
+      height: 52
+      id: '1759052439553'
+      position:
+        x: 30
+        y: 242
+      positionAbsolute:
+        x: 30
+        y: 242
+      sourcePosition: right
+      targetPosition: left
+      type: custom
+      width: 242
+    - data:
+        answer: '--- answer 1 ---
+
+
+          foo
+
+          '
+        selected: false
+        title: Answer
+        type: answer
+        variables: []
+      height: 100
+      id: '1759052466526'
+      position:
+        x: 632
+        y: 242
+      positionAbsolute:
+        x: 632
+        y: 242
+      selected: true
+      sourcePosition: right
+      targetPosition: left
+      type: custom
+      width: 242
+    - data:
+        answer: '--- answer 2 ---
+
+
+          {{#1759052580454.text#}}
+
+          '
+        selected: false
+        title: Answer 2
+        type: answer
+        variables: []
+      height: 103
+      id: '1759052469368'
+      position:
+        x: 934
+        y: 242
+      positionAbsolute:
+        x: 934
+        y: 242
+      selected: false
+      sourcePosition: right
+      targetPosition: left
+      type: custom
+      width: 242
+    - data:
+        context:
+          enabled: false
+          variable_selector: []
+        model:
+          completion_params:
+            temperature: 0.7
+          mode: chat
+          name: gpt-4o
+          provider: langgenius/openai/openai
+        prompt_template:
+        - id: 5c1d873b-06b2-4dce-939e-672882bbd7c0
+          role: system
+          text: ''
+        - role: user
+          text: '{{#sys.query#}}'
+        selected: false
+        title: LLM
+        type: llm
+        vision:
+          enabled: false
+      height: 88
+      id: '1759052580454'
+      position:
+        x: 332
+        y: 242
+      positionAbsolute:
+        x: 332
+        y: 242
+      selected: false
+      sourcePosition: right
+      targetPosition: left
+      type: custom
+      width: 242
+    viewport:
+      x: 126.2797574512839
+      y: 289.55932160537446
+      zoom: 1.0743222672006216
+  rag_pipeline_variables: []
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_answer_order_workflow.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_answer_order_workflow.py
@ -0,0 +1,28 @@
+from .test_mock_config import MockConfigBuilder
+from .test_table_runner import TableTestRunner, WorkflowTestCase
+
+LLM_NODE_ID = "1759052580454"
+
+
+def test_answer_nodes_emit_in_order() -> None:
+    mock_config = (
+        MockConfigBuilder()
+        .with_llm_response("unused default")
+        .with_node_output(LLM_NODE_ID, {"text": "mocked llm text"})
+        .build()
+    )
+
+    expected_answer = "--- answer 1 ---\n\nfoo\n--- answer 2 ---\n\nmocked llm text\n"
+
+    case = WorkflowTestCase(
+        fixture_path="test-answer-order",
+        query="",
+        expected_outputs={"answer": expected_answer},
+        use_auto_mock=True,
+        mock_config=mock_config,
+    )
+
+    runner = TableTestRunner()
+    result = runner.run_test_case(case)
+
+    assert result.success, result.error
--- a/web/app/components/workflow/nodes/knowledge-base/node.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/node.tsx
@ -28,9 +28,9 @@ const Node: FC<NodeProps<KnowledgeBaseNodeType>> = ({ data }) => {
        </div>
        <div
          className='system-xs-medium grow truncate text-right text-text-secondary'
-          title={data.retrieval_model.search_method}
+          title={data.retrieval_model?.search_method}
        >
-          {settingsDisplay[data.retrieval_model.search_method as keyof typeof settingsDisplay]}
+          {settingsDisplay[data.retrieval_model?.search_method as keyof typeof settingsDisplay]}
        </div>
      </div>
    </div>