From 1523e1db742b4005ac00735b6e5455bbef956977 Mon Sep 17 00:00:00 2001
From: stream <stream@dify.ai>
Date: Fri, 18 Jul 2025 17:00:17 +0800
Subject: [PATCH] fix: error handling

---
 api/controllers/console/app/generator.py | 25 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/api/controllers/console/app/generator.py b/api/controllers/console/app/generator.py
index 90c70d1ef8..1902471a0a 100644
--- a/api/controllers/console/app/generator.py
+++ b/api/controllers/console/app/generator.py
@@ -3,7 +3,6 @@ from collections.abc import Sequence
 
 from flask_login import current_user
 from flask_restful import Resource, reqparse
-from opik.rest_api import BadRequestError
 
 from controllers.console import api
 from controllers.console.app.error import (
@@ -136,13 +135,23 @@ class InstructionGenerateApi(Resource):
                 from models import App, db
                 from services.workflow_service import WorkflowService
                 app = db.session.query(App).filter(App.id == args["flow_id"]).first()
+                if not app:
+                    return { "error": f"app {args['flow_id']} not found" }, 400
                 workflow = WorkflowService().get_draft_workflow(app_model=app)
                 nodes:Sequence = workflow.graph_dict["nodes"]
-                node: dict = [node for node in nodes if node["id"] == args["node_id"]][0]
-                if not node:
-                    raise BadRequestError(f"node {args['node_id']} not found")
-                match node_type:=node["data"]["type"]:
-                    case "llm", "agent":
+                node = [node for node in nodes if node["id"] == args["node_id"]]
+                if len(node) == 0:
+                    return { "error": f"node {args['node_id']} not found" }, 400
+                node_type=node[0]["data"]["type"]
+                match node_type:
+                    case "llm":
+                        return LLMGenerator.generate_rule_config(
+                            current_user.current_tenant_id,
+                            instruction=args["instruction"],
+                            model_config=args["model_config"],
+                            no_variable=True
+                        )
+                    case "agent":
                         return LLMGenerator.generate_rule_config(
                             current_user.current_tenant_id,
                             instruction=args["instruction"],
@@ -157,7 +166,7 @@ class InstructionGenerateApi(Resource):
                             code_language=args["language"],
                         )
                     case _:
-                        raise BadRequestError(f"invalid node type: {node_type}")
+                        return { "error": f"invalid node type: {node_type}"}
             if args["node_id"] == "" and args["current"] != "": # For legacy app without a workflow
                 return LLMGenerator.instruction_modify_legacy(
                     tenant_id=current_user.current_tenant_id,
@@ -177,7 +186,7 @@ class InstructionGenerateApi(Resource):
                     model_config=args["model_config"],
                     ideal_output=args["ideal_output"],
                 )
-            raise BadRequestError("incompatible parameters")
+            return { "error": "incompatible parameters" }, 400
         except ProviderTokenNotInitError as ex:
             raise ProviderNotInitializeError(ex.description)
         except QuotaExceededError: