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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

api/Dockerfile

@@ -73,8 +73,7 @@ COPY --from=packages ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 
 # Download nltk data
-RUN mkdir -p /usr/local/share/nltk_data && NLTK_DATA=/usr/local/share/nltk_data python -c "import nltk; nltk.download('punkt'); nltk.download('averaged_perceptron_tagger'); nltk.download('stopwords')" \
-    && chmod -R 755 /usr/local/share/nltk_data
+RUN python -c "import nltk; nltk.download('punkt'); nltk.download('averaged_perceptron_tagger')"
 
 ENV TIKTOKEN_CACHE_DIR=/app/api/.tiktoken_cache
 
@@ -87,15 +86,7 @@ COPY . /app/api/
 COPY docker/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
-# Create non-root user and set permissions
-RUN groupadd -r -g 1001 dify && \
-    useradd -r -u 1001 -g 1001 -s /bin/bash dify && \
-    mkdir -p /home/dify && \
-    chown -R 1001:1001 /app /home/dify ${TIKTOKEN_CACHE_DIR} /entrypoint.sh
-
 ARG COMMIT_SHA
 ENV COMMIT_SHA=${COMMIT_SHA}
-ENV NLTK_DATA=/usr/local/share/nltk_data
-USER 1001
 
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

api/controllers/console/app/advanced_prompt_template.py

@@ -5,20 +5,18 @@ from controllers.console.wraps import account_initialization_required, setup_req
 from libs.login import login_required
 from services.advanced_prompt_template_service import AdvancedPromptTemplateService
 
-parser = (
-    reqparse.RequestParser()
-    .add_argument("app_mode", type=str, required=True, location="args", help="Application mode")
-    .add_argument("model_mode", type=str, required=True, location="args", help="Model mode")
-    .add_argument("has_context", type=str, required=False, default="true", location="args", help="Whether has context")
-    .add_argument("model_name", type=str, required=True, location="args", help="Model name")
-)
-
 
 @console_ns.route("/app/prompt-templates")
 class AdvancedPromptTemplateList(Resource):
     @api.doc("get_advanced_prompt_templates")
     @api.doc(description="Get advanced prompt templates based on app mode and model configuration")
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("app_mode", type=str, required=True, location="args", help="Application mode")
+        .add_argument("model_mode", type=str, required=True, location="args", help="Model mode")
+        .add_argument("has_context", type=str, default="true", location="args", help="Whether has context")
+        .add_argument("model_name", type=str, required=True, location="args", help="Model name")
+    )
     @api.response(
         200, "Prompt templates retrieved successfully", fields.List(fields.Raw(description="Prompt template data"))
     )
@@ -27,6 +25,13 @@ class AdvancedPromptTemplateList(Resource):
     @login_required
     @account_initialization_required
     def get(self):
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("app_mode", type=str, required=True, location="args")
+            .add_argument("model_mode", type=str, required=True, location="args")
+            .add_argument("has_context", type=str, required=False, default="true", location="args")
+            .add_argument("model_name", type=str, required=True, location="args")
+        )
         args = parser.parse_args()
 
         return AdvancedPromptTemplateService.get_prompt(args)

api/controllers/console/app/agent.py

@@ -8,19 +8,17 @@ from libs.login import login_required
 from models.model import AppMode
 from services.agent_service import AgentService
 
-parser = (
-    reqparse.RequestParser()
-    .add_argument("message_id", type=uuid_value, required=True, location="args", help="Message UUID")
-    .add_argument("conversation_id", type=uuid_value, required=True, location="args", help="Conversation UUID")
-)
-
 
 @console_ns.route("/apps/<uuid:app_id>/agent/logs")
 class AgentLogApi(Resource):
     @api.doc("get_agent_logs")
     @api.doc(description="Get agent execution logs for an application")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("message_id", type=str, required=True, location="args", help="Message UUID")
+        .add_argument("conversation_id", type=str, required=True, location="args", help="Conversation UUID")
+    )
     @api.response(200, "Agent logs retrieved successfully", fields.List(fields.Raw(description="Agent log entries")))
     @api.response(400, "Invalid request parameters")
     @setup_required
@@ -29,6 +27,12 @@ class AgentLogApi(Resource):
     @get_app_model(mode=[AppMode.AGENT_CHAT])
     def get(self, app_model):
         """Get agent logs"""
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("message_id", type=uuid_value, required=True, location="args")
+            .add_argument("conversation_id", type=uuid_value, required=True, location="args")
+        )
+
         args = parser.parse_args()
 
         return AgentService.get_agent_logs(app_model, args["conversation_id"], args["message_id"])

api/controllers/console/app/annotation.py

@@ -251,13 +251,6 @@ class AnnotationExportApi(Resource):
         return response, 200
 
 
-parser = (
-    reqparse.RequestParser()
-    .add_argument("question", required=True, type=str, location="json")
-    .add_argument("answer", required=True, type=str, location="json")
-)
-
-
 @console_ns.route("/apps/<uuid:app_id>/annotations/<uuid:annotation_id>")
 class AnnotationUpdateDeleteApi(Resource):
     @api.doc("update_delete_annotation")
@@ -266,7 +259,6 @@ class AnnotationUpdateDeleteApi(Resource):
     @api.response(200, "Annotation updated successfully", annotation_fields)
     @api.response(204, "Annotation deleted successfully")
     @api.response(403, "Insufficient permissions")
-    @api.expect(parser)
     @setup_required
     @login_required
     @account_initialization_required
@@ -276,6 +268,11 @@ class AnnotationUpdateDeleteApi(Resource):
     def post(self, app_id, annotation_id):
         app_id = str(app_id)
         annotation_id = str(annotation_id)
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("question", required=True, type=str, location="json")
+            .add_argument("answer", required=True, type=str, location="json")
+        )
         args = parser.parse_args()
         annotation = AppAnnotationService.update_app_annotation_directly(args, app_id, annotation_id)
         return annotation

api/controllers/console/app/app.py

@@ -353,15 +353,12 @@ class AppExportApi(Resource):
         }
 
 
-parser = reqparse.RequestParser().add_argument("name", type=str, required=True, location="json", help="Name to check")
-
-
 @console_ns.route("/apps/<uuid:app_id>/name")
 class AppNameApi(Resource):
     @api.doc("check_app_name")
     @api.doc(description="Check if app name is available")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(api.parser().add_argument("name", type=str, required=True, location="args", help="Name to check"))
     @api.response(200, "Name availability checked")
     @setup_required
     @login_required
@@ -370,6 +367,7 @@ class AppNameApi(Resource):
     @marshal_with(app_detail_fields)
     @edit_permission_required
     def post(self, app_model):
+        parser = reqparse.RequestParser().add_argument("name", type=str, required=True, location="json")
         args = parser.parse_args()
 
         app_service = AppService()

api/controllers/console/app/app_import.py

@@ -1,7 +1,6 @@
 from flask_restx import Resource, marshal_with, reqparse
 from sqlalchemy.orm import Session
 
-from controllers.console import api
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import (
     account_initialization_required,
@@ -19,23 +18,9 @@ from services.feature_service import FeatureService
 
 from .. import console_ns
 
-parser = (
-    reqparse.RequestParser()
-    .add_argument("mode", type=str, required=True, location="json")
-    .add_argument("yaml_content", type=str, location="json")
-    .add_argument("yaml_url", type=str, location="json")
-    .add_argument("name", type=str, location="json")
-    .add_argument("description", type=str, location="json")
-    .add_argument("icon_type", type=str, location="json")
-    .add_argument("icon", type=str, location="json")
-    .add_argument("icon_background", type=str, location="json")
-    .add_argument("app_id", type=str, location="json")
-)
-
 
 @console_ns.route("/apps/imports")
 class AppImportApi(Resource):
-    @api.expect(parser)
     @setup_required
     @login_required
     @account_initialization_required
@@ -45,6 +30,18 @@ class AppImportApi(Resource):
     def post(self):
         # Check user role first
         current_user, _ = current_account_with_tenant()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("mode", type=str, required=True, location="json")
+            .add_argument("yaml_content", type=str, location="json")
+            .add_argument("yaml_url", type=str, location="json")
+            .add_argument("name", type=str, location="json")
+            .add_argument("description", type=str, location="json")
+            .add_argument("icon_type", type=str, location="json")
+            .add_argument("icon", type=str, location="json")
+            .add_argument("icon_background", type=str, location="json")
+            .add_argument("app_id", type=str, location="json")
+        )
         args = parser.parse_args()
 
         # Create service with session

api/controllers/console/app/statistic.py

@@ -80,19 +80,16 @@ WHERE
         return jsonify({"data": response_data})
 
 
-parser = (
-    reqparse.RequestParser()
-    .add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args", help="Start date (YYYY-MM-DD HH:MM)")
-    .add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args", help="End date (YYYY-MM-DD HH:MM)")
-)
-
-
 @console_ns.route("/apps/<uuid:app_id>/statistics/daily-conversations")
 class DailyConversationStatistic(Resource):
     @api.doc("get_daily_conversation_statistics")
     @api.doc(description="Get daily conversation statistics for an application")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("start", type=str, location="args", help="Start date (YYYY-MM-DD HH:MM)")
+        .add_argument("end", type=str, location="args", help="End date (YYYY-MM-DD HH:MM)")
+    )
     @api.response(
         200,
         "Daily conversation statistics retrieved successfully",
@@ -105,6 +102,11 @@ class DailyConversationStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+            .add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+        )
         args = parser.parse_args()
         assert account.timezone is not None
 
@@ -146,7 +148,11 @@ class DailyTerminalsStatistic(Resource):
     @api.doc("get_daily_terminals_statistics")
     @api.doc(description="Get daily terminal/end-user statistics for an application")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("start", type=str, location="args", help="Start date (YYYY-MM-DD HH:MM)")
+        .add_argument("end", type=str, location="args", help="End date (YYYY-MM-DD HH:MM)")
+    )
     @api.response(
         200,
         "Daily terminal statistics retrieved successfully",
@@ -159,6 +165,11 @@ class DailyTerminalsStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+            .add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+        )
         args = parser.parse_args()
 
         sql_query = """SELECT
@@ -202,7 +213,11 @@ class DailyTokenCostStatistic(Resource):
     @api.doc("get_daily_token_cost_statistics")
     @api.doc(description="Get daily token cost statistics for an application")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("start", type=str, location="args", help="Start date (YYYY-MM-DD HH:MM)")
+        .add_argument("end", type=str, location="args", help="End date (YYYY-MM-DD HH:MM)")
+    )
     @api.response(
         200,
         "Daily token cost statistics retrieved successfully",
@@ -215,6 +230,11 @@ class DailyTokenCostStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+            .add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+        )
         args = parser.parse_args()
 
         sql_query = """SELECT
@@ -261,7 +281,11 @@ class AverageSessionInteractionStatistic(Resource):
     @api.doc("get_average_session_interaction_statistics")
     @api.doc(description="Get average session interaction statistics for an application")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("start", type=str, location="args", help="Start date (YYYY-MM-DD HH:MM)")
+        .add_argument("end", type=str, location="args", help="End date (YYYY-MM-DD HH:MM)")
+    )
     @api.response(
         200,
         "Average session interaction statistics retrieved successfully",
@@ -274,6 +298,11 @@ class AverageSessionInteractionStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+            .add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+        )
         args = parser.parse_args()
 
         sql_query = """SELECT
@@ -336,7 +365,11 @@ class UserSatisfactionRateStatistic(Resource):
     @api.doc("get_user_satisfaction_rate_statistics")
     @api.doc(description="Get user satisfaction rate statistics for an application")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("start", type=str, location="args", help="Start date (YYYY-MM-DD HH:MM)")
+        .add_argument("end", type=str, location="args", help="End date (YYYY-MM-DD HH:MM)")
+    )
     @api.response(
         200,
         "User satisfaction rate statistics retrieved successfully",
@@ -349,6 +382,11 @@ class UserSatisfactionRateStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+            .add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+        )
         args = parser.parse_args()
 
         sql_query = """SELECT
@@ -401,7 +439,11 @@ class AverageResponseTimeStatistic(Resource):
     @api.doc("get_average_response_time_statistics")
     @api.doc(description="Get average response time statistics for an application")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("start", type=str, location="args", help="Start date (YYYY-MM-DD HH:MM)")
+        .add_argument("end", type=str, location="args", help="End date (YYYY-MM-DD HH:MM)")
+    )
     @api.response(
         200,
         "Average response time statistics retrieved successfully",
@@ -414,6 +456,11 @@ class AverageResponseTimeStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+            .add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+        )
         args = parser.parse_args()
 
         sql_query = """SELECT
@@ -457,7 +504,11 @@ class TokensPerSecondStatistic(Resource):
     @api.doc("get_tokens_per_second_statistics")
     @api.doc(description="Get tokens per second statistics for an application")
     @api.doc(params={"app_id": "Application ID"})
-    @api.expect(parser)
+    @api.expect(
+        api.parser()
+        .add_argument("start", type=str, location="args", help="Start date (YYYY-MM-DD HH:MM)")
+        .add_argument("end", type=str, location="args", help="End date (YYYY-MM-DD HH:MM)")
+    )
     @api.response(
         200,
         "Tokens per second statistics retrieved successfully",
@@ -469,6 +520,12 @@ class TokensPerSecondStatistic(Resource):
     @account_initialization_required
     def get(self, app_model):
         account, _ = current_account_with_tenant()
+
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+            .add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
+        )
         args = parser.parse_args()
 
         sql_query = """SELECT

api/controllers/console/app/workflow.py

@@ -586,13 +586,6 @@ class DraftWorkflowNodeRunApi(Resource):
         return workflow_node_execution
 
 
-parser_publish = (
-    reqparse.RequestParser()
-    .add_argument("marked_name", type=str, required=False, default="", location="json")
-    .add_argument("marked_comment", type=str, required=False, default="", location="json")
-)
-
-
 @console_ns.route("/apps/<uuid:app_id>/workflows/publish")
 class PublishedWorkflowApi(Resource):
     @api.doc("get_published_workflow")
@@ -617,7 +610,6 @@ class PublishedWorkflowApi(Resource):
         # return workflow, if not found, return None
         return workflow
 
-    @api.expect(parser_publish)
     @setup_required
     @login_required
     @account_initialization_required
@@ -628,8 +620,12 @@ class PublishedWorkflowApi(Resource):
         Publish workflow
         """
         current_user, _ = current_account_with_tenant()
-
-        args = parser_publish.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("marked_name", type=str, required=False, default="", location="json")
+            .add_argument("marked_comment", type=str, required=False, default="", location="json")
+        )
+        args = parser.parse_args()
 
         # Validate name and comment length
         if args.marked_name and len(args.marked_name) > 20:
@@ -684,9 +680,6 @@ class DefaultBlockConfigsApi(Resource):
         return workflow_service.get_default_block_configs()
 
 
-parser_block = reqparse.RequestParser().add_argument("q", type=str, location="args")
-
-
 @console_ns.route("/apps/<uuid:app_id>/workflows/default-workflow-block-configs/<string:block_type>")
 class DefaultBlockConfigApi(Resource):
     @api.doc("get_default_block_config")
@@ -694,7 +687,6 @@ class DefaultBlockConfigApi(Resource):
     @api.doc(params={"app_id": "Application ID", "block_type": "Block type"})
     @api.response(200, "Default block configuration retrieved successfully")
     @api.response(404, "Block type not found")
-    @api.expect(parser_block)
     @setup_required
     @login_required
     @account_initialization_required
@@ -704,7 +696,8 @@ class DefaultBlockConfigApi(Resource):
         """
         Get default block config
         """
-        args = parser_block.parse_args()
+        parser = reqparse.RequestParser().add_argument("q", type=str, location="args")
+        args = parser.parse_args()
 
         q = args.get("q")
 
@@ -720,18 +713,8 @@ class DefaultBlockConfigApi(Resource):
         return workflow_service.get_default_block_config(node_type=block_type, filters=filters)
 
 
-parser_convert = (
-    reqparse.RequestParser()
-    .add_argument("name", type=str, required=False, nullable=True, location="json")
-    .add_argument("icon_type", type=str, required=False, nullable=True, location="json")
-    .add_argument("icon", type=str, required=False, nullable=True, location="json")
-    .add_argument("icon_background", type=str, required=False, nullable=True, location="json")
-)
-
-
 @console_ns.route("/apps/<uuid:app_id>/convert-to-workflow")
 class ConvertToWorkflowApi(Resource):
-    @api.expect(parser_convert)
     @api.doc("convert_to_workflow")
     @api.doc(description="Convert application to workflow mode")
     @api.doc(params={"app_id": "Application ID"})
@@ -752,7 +735,14 @@ class ConvertToWorkflowApi(Resource):
         current_user, _ = current_account_with_tenant()
 
         if request.data:
-            args = parser_convert.parse_args()
+            parser = (
+                reqparse.RequestParser()
+                .add_argument("name", type=str, required=False, nullable=True, location="json")
+                .add_argument("icon_type", type=str, required=False, nullable=True, location="json")
+                .add_argument("icon", type=str, required=False, nullable=True, location="json")
+                .add_argument("icon_background", type=str, required=False, nullable=True, location="json")
+            )
+            args = parser.parse_args()
         else:
             args = {}
 
@@ -766,18 +756,8 @@ class ConvertToWorkflowApi(Resource):
         }
 
 
-parser_workflows = (
-    reqparse.RequestParser()
-    .add_argument("page", type=inputs.int_range(1, 99999), required=False, default=1, location="args")
-    .add_argument("limit", type=inputs.int_range(1, 100), required=False, default=10, location="args")
-    .add_argument("user_id", type=str, required=False, location="args")
-    .add_argument("named_only", type=inputs.boolean, required=False, default=False, location="args")
-)
-
-
 @console_ns.route("/apps/<uuid:app_id>/workflows")
 class PublishedAllWorkflowApi(Resource):
-    @api.expect(parser_workflows)
     @api.doc("get_all_published_workflows")
     @api.doc(description="Get all published workflows for an application")
     @api.doc(params={"app_id": "Application ID"})
@@ -794,9 +774,16 @@ class PublishedAllWorkflowApi(Resource):
         """
         current_user, _ = current_account_with_tenant()
 
-        args = parser_workflows.parse_args()
-        page = args["page"]
-        limit = args["limit"]
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("page", type=inputs.int_range(1, 99999), required=False, default=1, location="args")
+            .add_argument("limit", type=inputs.int_range(1, 100), required=False, default=20, location="args")
+            .add_argument("user_id", type=str, required=False, location="args")
+            .add_argument("named_only", type=inputs.boolean, required=False, default=False, location="args")
+        )
+        args = parser.parse_args()
+        page = int(args.get("page", 1))
+        limit = int(args.get("limit", 10))
         user_id = args.get("user_id")
         named_only = args.get("named_only", False)
 

api/controllers/console/app/workflow_run.py

@@ -30,25 +30,23 @@ def _parse_workflow_run_list_args():
     Returns:
         Parsed arguments containing last_id, limit, status, and triggered_from filters
     """
-    parser = (
-        reqparse.RequestParser()
-        .add_argument("last_id", type=uuid_value, location="args")
-        .add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
-        .add_argument(
-            "status",
-            type=str,
-            choices=WORKFLOW_RUN_STATUS_CHOICES,
-            location="args",
-            required=False,
-        )
-        .add_argument(
-            "triggered_from",
-            type=str,
-            choices=["debugging", "app-run"],
-            location="args",
-            required=False,
-            help="Filter by trigger source: debugging or app-run",
-        )
+    parser = reqparse.RequestParser()
+    parser.add_argument("last_id", type=uuid_value, location="args")
+    parser.add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
+    parser.add_argument(
+        "status",
+        type=str,
+        choices=WORKFLOW_RUN_STATUS_CHOICES,
+        location="args",
+        required=False,
+    )
+    parser.add_argument(
+        "triggered_from",
+        type=str,
+        choices=["debugging", "app-run"],
+        location="args",
+        required=False,
+        help="Filter by trigger source: debugging or app-run",
     )
     return parser.parse_args()
 
@@ -60,30 +58,28 @@ def _parse_workflow_run_count_args():
     Returns:
         Parsed arguments containing status, time_range, and triggered_from filters
     """
-    parser = (
-        reqparse.RequestParser()
-        .add_argument(
-            "status",
-            type=str,
-            choices=WORKFLOW_RUN_STATUS_CHOICES,
-            location="args",
-            required=False,
-        )
-        .add_argument(
-            "time_range",
-            type=time_duration,
-            location="args",
-            required=False,
-            help="Time range filter (e.g., 7d, 4h, 30m, 30s)",
-        )
-        .add_argument(
-            "triggered_from",
-            type=str,
-            choices=["debugging", "app-run"],
-            location="args",
-            required=False,
-            help="Filter by trigger source: debugging or app-run",
-        )
+    parser = reqparse.RequestParser()
+    parser.add_argument(
+        "status",
+        type=str,
+        choices=WORKFLOW_RUN_STATUS_CHOICES,
+        location="args",
+        required=False,
+    )
+    parser.add_argument(
+        "time_range",
+        type=time_duration,
+        location="args",
+        required=False,
+        help="Time range filter (e.g., 7d, 4h, 30m, 30s)",
+    )
+    parser.add_argument(
+        "triggered_from",
+        type=str,
+        choices=["debugging", "app-run"],
+        location="args",
+        required=False,
+        help="Filter by trigger source: debugging or app-run",
     )
     return parser.parse_args()
 

api/controllers/console/datasets/rag_pipeline/datasource_auth.py

@@ -3,7 +3,7 @@ from flask_restx import Resource, reqparse
 from werkzeug.exceptions import Forbidden, NotFound
 
 from configs import dify_config
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.utils.encoders import jsonable_encoder
@@ -121,16 +121,8 @@ class DatasourceOAuthCallback(Resource):
         return redirect(f"{dify_config.CONSOLE_WEB_URL}/oauth-callback")
 
 
-parser_datasource = (
-    reqparse.RequestParser()
-    .add_argument("name", type=StrLen(max_length=100), required=False, nullable=True, location="json", default=None)
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/auth/plugin/datasource/<path:provider_id>")
 class DatasourceAuth(Resource):
-    @api.expect(parser_datasource)
     @setup_required
     @login_required
     @account_initialization_required
@@ -138,7 +130,14 @@ class DatasourceAuth(Resource):
     def post(self, provider_id: str):
         _, current_tenant_id = current_account_with_tenant()
 
-        args = parser_datasource.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument(
+                "name", type=StrLen(max_length=100), required=False, nullable=True, location="json", default=None
+            )
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
         datasource_provider_id = DatasourceProviderID(provider_id)
         datasource_provider_service = DatasourceProviderService()
 
@@ -169,14 +168,8 @@ class DatasourceAuth(Resource):
         return {"result": datasources}, 200
 
 
-parser_datasource_delete = reqparse.RequestParser().add_argument(
-    "credential_id", type=str, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/auth/plugin/datasource/<path:provider_id>/delete")
 class DatasourceAuthDeleteApi(Resource):
-    @api.expect(parser_datasource_delete)
     @setup_required
     @login_required
     @account_initialization_required
@@ -188,7 +181,10 @@ class DatasourceAuthDeleteApi(Resource):
         plugin_id = datasource_provider_id.plugin_id
         provider_name = datasource_provider_id.provider_name
 
-        args = parser_datasource_delete.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "credential_id", type=str, required=True, nullable=False, location="json"
+        )
+        args = parser.parse_args()
         datasource_provider_service = DatasourceProviderService()
         datasource_provider_service.remove_datasource_credentials(
             tenant_id=current_tenant_id,
@@ -199,17 +195,8 @@ class DatasourceAuthDeleteApi(Resource):
         return {"result": "success"}, 200
 
 
-parser_datasource_update = (
-    reqparse.RequestParser()
-    .add_argument("credentials", type=dict, required=False, nullable=True, location="json")
-    .add_argument("name", type=StrLen(max_length=100), required=False, nullable=True, location="json")
-    .add_argument("credential_id", type=str, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/auth/plugin/datasource/<path:provider_id>/update")
 class DatasourceAuthUpdateApi(Resource):
-    @api.expect(parser_datasource_update)
     @setup_required
     @login_required
     @account_initialization_required
@@ -218,7 +205,13 @@ class DatasourceAuthUpdateApi(Resource):
         _, current_tenant_id = current_account_with_tenant()
 
         datasource_provider_id = DatasourceProviderID(provider_id)
-        args = parser_datasource_update.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("credentials", type=dict, required=False, nullable=True, location="json")
+            .add_argument("name", type=StrLen(max_length=100), required=False, nullable=True, location="json")
+            .add_argument("credential_id", type=str, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
 
         datasource_provider_service = DatasourceProviderService()
         datasource_provider_service.update_datasource_credentials(
@@ -258,16 +251,8 @@ class DatasourceHardCodeAuthListApi(Resource):
         return {"result": jsonable_encoder(datasources)}, 200
 
 
-parser_datasource_custom = (
-    reqparse.RequestParser()
-    .add_argument("client_params", type=dict, required=False, nullable=True, location="json")
-    .add_argument("enable_oauth_custom_client", type=bool, required=False, nullable=True, location="json")
-)
-
-
 @console_ns.route("/auth/plugin/datasource/<path:provider_id>/custom-client")
 class DatasourceAuthOauthCustomClient(Resource):
-    @api.expect(parser_datasource_custom)
     @setup_required
     @login_required
     @account_initialization_required
@@ -275,7 +260,12 @@ class DatasourceAuthOauthCustomClient(Resource):
     def post(self, provider_id: str):
         _, current_tenant_id = current_account_with_tenant()
 
-        args = parser_datasource_custom.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("client_params", type=dict, required=False, nullable=True, location="json")
+            .add_argument("enable_oauth_custom_client", type=bool, required=False, nullable=True, location="json")
+        )
+        args = parser.parse_args()
         datasource_provider_id = DatasourceProviderID(provider_id)
         datasource_provider_service = DatasourceProviderService()
         datasource_provider_service.setup_oauth_custom_client_params(
@@ -301,12 +291,8 @@ class DatasourceAuthOauthCustomClient(Resource):
         return {"result": "success"}, 200
 
 
-parser_default = reqparse.RequestParser().add_argument("id", type=str, required=True, nullable=False, location="json")
-
-
 @console_ns.route("/auth/plugin/datasource/<path:provider_id>/default")
 class DatasourceAuthDefaultApi(Resource):
-    @api.expect(parser_default)
     @setup_required
     @login_required
     @account_initialization_required
@@ -314,7 +300,8 @@ class DatasourceAuthDefaultApi(Resource):
     def post(self, provider_id: str):
         _, current_tenant_id = current_account_with_tenant()
 
-        args = parser_default.parse_args()
+        parser = reqparse.RequestParser().add_argument("id", type=str, required=True, nullable=False, location="json")
+        args = parser.parse_args()
         datasource_provider_id = DatasourceProviderID(provider_id)
         datasource_provider_service = DatasourceProviderService()
         datasource_provider_service.set_default_datasource_provider(
@@ -325,16 +312,8 @@ class DatasourceAuthDefaultApi(Resource):
         return {"result": "success"}, 200
 
 
-parser_update_name = (
-    reqparse.RequestParser()
-    .add_argument("name", type=StrLen(max_length=100), required=True, nullable=False, location="json")
-    .add_argument("credential_id", type=str, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/auth/plugin/datasource/<path:provider_id>/update-name")
 class DatasourceUpdateProviderNameApi(Resource):
-    @api.expect(parser_update_name)
     @setup_required
     @login_required
     @account_initialization_required
@@ -342,7 +321,12 @@ class DatasourceUpdateProviderNameApi(Resource):
     def post(self, provider_id: str):
         _, current_tenant_id = current_account_with_tenant()
 
-        args = parser_update_name.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("name", type=StrLen(max_length=100), required=True, nullable=False, location="json")
+            .add_argument("credential_id", type=str, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
         datasource_provider_id = DatasourceProviderID(provider_id)
         datasource_provider_service = DatasourceProviderService()
         datasource_provider_service.update_datasource_provider_name(

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, console_ns
+from controllers.console import console_ns
 from controllers.console.app.error import (
     ConversationCompletedError,
     DraftWorkflowNotExist,
@@ -148,12 +148,8 @@ class DraftRagPipelineApi(Resource):
         }
 
 
-parser_run = reqparse.RequestParser().add_argument("inputs", type=dict, location="json")
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/iteration/nodes/<string:node_id>/run")
 class RagPipelineDraftRunIterationNodeApi(Resource):
-    @api.expect(parser_run)
     @setup_required
     @login_required
     @account_initialization_required
@@ -166,7 +162,8 @@ class RagPipelineDraftRunIterationNodeApi(Resource):
         # The role of the current user in the ta table must be admin, owner, or editor
         current_user, _ = current_account_with_tenant()
 
-        args = parser_run.parse_args()
+        parser = reqparse.RequestParser().add_argument("inputs", type=dict, location="json")
+        args = parser.parse_args()
 
         try:
             response = PipelineGenerateService.generate_single_iteration(
@@ -187,7 +184,6 @@ class RagPipelineDraftRunIterationNodeApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/loop/nodes/<string:node_id>/run")
 class RagPipelineDraftRunLoopNodeApi(Resource):
-    @api.expect(parser_run)
     @setup_required
     @login_required
     @account_initialization_required
@@ -201,7 +197,8 @@ class RagPipelineDraftRunLoopNodeApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_run.parse_args()
+        parser = reqparse.RequestParser().add_argument("inputs", type=dict, location="json")
+        args = parser.parse_args()
 
         try:
             response = PipelineGenerateService.generate_single_loop(
@@ -220,18 +217,8 @@ class RagPipelineDraftRunLoopNodeApi(Resource):
             raise InternalServerError()
 
 
-parser_draft_run = (
-    reqparse.RequestParser()
-    .add_argument("inputs", type=dict, required=True, nullable=False, location="json")
-    .add_argument("datasource_type", type=str, required=True, location="json")
-    .add_argument("datasource_info_list", type=list, required=True, location="json")
-    .add_argument("start_node_id", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/run")
 class DraftRagPipelineRunApi(Resource):
-    @api.expect(parser_draft_run)
     @setup_required
     @login_required
     @account_initialization_required
@@ -245,7 +232,14 @@ class DraftRagPipelineRunApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_draft_run.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("inputs", type=dict, required=True, nullable=False, location="json")
+            .add_argument("datasource_type", type=str, required=True, location="json")
+            .add_argument("datasource_info_list", type=list, required=True, location="json")
+            .add_argument("start_node_id", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         try:
             response = PipelineGenerateService.generate(
@@ -261,21 +255,8 @@ class DraftRagPipelineRunApi(Resource):
             raise InvokeRateLimitHttpError(ex.description)
 
 
-parser_published_run = (
-    reqparse.RequestParser()
-    .add_argument("inputs", type=dict, required=True, nullable=False, location="json")
-    .add_argument("datasource_type", type=str, required=True, location="json")
-    .add_argument("datasource_info_list", type=list, required=True, location="json")
-    .add_argument("start_node_id", type=str, required=True, location="json")
-    .add_argument("is_preview", type=bool, required=True, location="json", default=False)
-    .add_argument("response_mode", type=str, required=True, location="json", default="streaming")
-    .add_argument("original_document_id", type=str, required=False, location="json")
-)
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/run")
 class PublishedRagPipelineRunApi(Resource):
-    @api.expect(parser_published_run)
     @setup_required
     @login_required
     @account_initialization_required
@@ -289,7 +270,17 @@ class PublishedRagPipelineRunApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_published_run.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("inputs", type=dict, required=True, nullable=False, location="json")
+            .add_argument("datasource_type", type=str, required=True, location="json")
+            .add_argument("datasource_info_list", type=list, required=True, location="json")
+            .add_argument("start_node_id", type=str, required=True, location="json")
+            .add_argument("is_preview", type=bool, required=True, location="json", default=False)
+            .add_argument("response_mode", type=str, required=True, location="json", default="streaming")
+            .add_argument("original_document_id", type=str, required=False, location="json")
+        )
+        args = parser.parse_args()
 
         streaming = args["response_mode"] == "streaming"
 
@@ -390,17 +381,8 @@ class PublishedRagPipelineRunApi(Resource):
 #
 #         return result
 #
-parser_rag_run = (
-    reqparse.RequestParser()
-    .add_argument("inputs", type=dict, required=True, nullable=False, location="json")
-    .add_argument("datasource_type", type=str, required=True, location="json")
-    .add_argument("credential_id", type=str, required=False, location="json")
-)
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/datasource/nodes/<string:node_id>/run")
 class RagPipelinePublishedDatasourceNodeRunApi(Resource):
-    @api.expect(parser_rag_run)
     @setup_required
     @login_required
     @account_initialization_required
@@ -414,7 +396,13 @@ class RagPipelinePublishedDatasourceNodeRunApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_rag_run.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("inputs", type=dict, required=True, nullable=False, location="json")
+            .add_argument("datasource_type", type=str, required=True, location="json")
+            .add_argument("credential_id", type=str, required=False, location="json")
+        )
+        args = parser.parse_args()
 
         inputs = args.get("inputs")
         if inputs is None:
@@ -441,7 +429,6 @@ class RagPipelinePublishedDatasourceNodeRunApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/datasource/nodes/<string:node_id>/run")
 class RagPipelineDraftDatasourceNodeRunApi(Resource):
-    @api.expect(parser_rag_run)
     @setup_required
     @login_required
     @account_initialization_required
@@ -455,7 +442,13 @@ class RagPipelineDraftDatasourceNodeRunApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_rag_run.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("inputs", type=dict, required=True, nullable=False, location="json")
+            .add_argument("datasource_type", type=str, required=True, location="json")
+            .add_argument("credential_id", type=str, required=False, location="json")
+        )
+        args = parser.parse_args()
 
         inputs = args.get("inputs")
         if inputs is None:
@@ -480,14 +473,8 @@ class RagPipelineDraftDatasourceNodeRunApi(Resource):
         )
 
 
-parser_run_api = reqparse.RequestParser().add_argument(
-    "inputs", type=dict, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/run")
 class RagPipelineDraftNodeRunApi(Resource):
-    @api.expect(parser_run_api)
     @setup_required
     @login_required
     @account_initialization_required
@@ -502,7 +489,10 @@ class RagPipelineDraftNodeRunApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_run_api.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "inputs", type=dict, required=True, nullable=False, location="json"
+        )
+        args = parser.parse_args()
 
         inputs = args.get("inputs")
         if inputs == None:
@@ -617,12 +607,8 @@ class DefaultRagPipelineBlockConfigsApi(Resource):
         return rag_pipeline_service.get_default_block_configs()
 
 
-parser_default = reqparse.RequestParser().add_argument("q", type=str, location="args")
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/default-workflow-block-configs/<string:block_type>")
 class DefaultRagPipelineBlockConfigApi(Resource):
-    @api.expect(parser_default)
     @setup_required
     @login_required
     @account_initialization_required
@@ -636,7 +622,8 @@ class DefaultRagPipelineBlockConfigApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_default.parse_args()
+        parser = reqparse.RequestParser().add_argument("q", type=str, location="args")
+        args = parser.parse_args()
 
         q = args.get("q")
 
@@ -652,18 +639,8 @@ class DefaultRagPipelineBlockConfigApi(Resource):
         return rag_pipeline_service.get_default_block_config(node_type=block_type, filters=filters)
 
 
-parser_wf = (
-    reqparse.RequestParser()
-    .add_argument("page", type=inputs.int_range(1, 99999), required=False, default=1, location="args")
-    .add_argument("limit", type=inputs.int_range(1, 100), required=False, default=10, location="args")
-    .add_argument("user_id", type=str, required=False, location="args")
-    .add_argument("named_only", type=inputs.boolean, required=False, default=False, location="args")
-)
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows")
 class PublishedAllRagPipelineApi(Resource):
-    @api.expect(parser_wf)
     @setup_required
     @login_required
     @account_initialization_required
@@ -677,9 +654,16 @@ class PublishedAllRagPipelineApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_wf.parse_args()
-        page = args["page"]
-        limit = args["limit"]
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("page", type=inputs.int_range(1, 99999), required=False, default=1, location="args")
+            .add_argument("limit", type=inputs.int_range(1, 100), required=False, default=20, location="args")
+            .add_argument("user_id", type=str, required=False, location="args")
+            .add_argument("named_only", type=inputs.boolean, required=False, default=False, location="args")
+        )
+        args = parser.parse_args()
+        page = int(args.get("page", 1))
+        limit = int(args.get("limit", 10))
         user_id = args.get("user_id")
         named_only = args.get("named_only", False)
 
@@ -707,16 +691,8 @@ class PublishedAllRagPipelineApi(Resource):
             }
 
 
-parser_wf_id = (
-    reqparse.RequestParser()
-    .add_argument("marked_name", type=str, required=False, location="json")
-    .add_argument("marked_comment", type=str, required=False, location="json")
-)
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/<string:workflow_id>")
 class RagPipelineByIdApi(Resource):
-    @api.expect(parser_wf_id)
     @setup_required
     @login_required
     @account_initialization_required
@@ -731,13 +707,19 @@ class RagPipelineByIdApi(Resource):
         if not current_user.has_edit_permission:
             raise Forbidden()
 
-        args = parser_wf_id.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("marked_name", type=str, required=False, location="json")
+            .add_argument("marked_comment", type=str, required=False, location="json")
+        )
+        args = parser.parse_args()
 
         # Validate name and comment length
         if args.marked_name and len(args.marked_name) > 20:
             raise ValueError("Marked name cannot exceed 20 characters")
         if args.marked_comment and len(args.marked_comment) > 100:
             raise ValueError("Marked comment cannot exceed 100 characters")
+        args = parser.parse_args()
 
         # Prepare update data
         update_data = {}
@@ -770,12 +752,8 @@ class RagPipelineByIdApi(Resource):
         return workflow
 
 
-parser_parameters = reqparse.RequestParser().add_argument("node_id", type=str, required=True, location="args")
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/processing/parameters")
 class PublishedRagPipelineSecondStepApi(Resource):
-    @api.expect(parser_parameters)
     @setup_required
     @login_required
     @account_initialization_required
@@ -785,7 +763,8 @@ class PublishedRagPipelineSecondStepApi(Resource):
         """
         Get second step parameters of rag pipeline
         """
-        args = parser_parameters.parse_args()
+        parser = reqparse.RequestParser().add_argument("node_id", type=str, required=True, location="args")
+        args = parser.parse_args()
         node_id = args.get("node_id")
         if not node_id:
             raise ValueError("Node ID is required")
@@ -798,7 +777,6 @@ class PublishedRagPipelineSecondStepApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/pre-processing/parameters")
 class PublishedRagPipelineFirstStepApi(Resource):
-    @api.expect(parser_parameters)
     @setup_required
     @login_required
     @account_initialization_required
@@ -808,7 +786,8 @@ class PublishedRagPipelineFirstStepApi(Resource):
         """
         Get first step parameters of rag pipeline
         """
-        args = parser_parameters.parse_args()
+        parser = reqparse.RequestParser().add_argument("node_id", type=str, required=True, location="args")
+        args = parser.parse_args()
         node_id = args.get("node_id")
         if not node_id:
             raise ValueError("Node ID is required")
@@ -821,7 +800,6 @@ class PublishedRagPipelineFirstStepApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/pre-processing/parameters")
 class DraftRagPipelineFirstStepApi(Resource):
-    @api.expect(parser_parameters)
     @setup_required
     @login_required
     @account_initialization_required
@@ -831,7 +809,8 @@ class DraftRagPipelineFirstStepApi(Resource):
         """
         Get first step parameters of rag pipeline
         """
-        args = parser_parameters.parse_args()
+        parser = reqparse.RequestParser().add_argument("node_id", type=str, required=True, location="args")
+        args = parser.parse_args()
         node_id = args.get("node_id")
         if not node_id:
             raise ValueError("Node ID is required")
@@ -844,7 +823,6 @@ class DraftRagPipelineFirstStepApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/processing/parameters")
 class DraftRagPipelineSecondStepApi(Resource):
-    @api.expect(parser_parameters)
     @setup_required
     @login_required
     @account_initialization_required
@@ -854,7 +832,8 @@ class DraftRagPipelineSecondStepApi(Resource):
         """
         Get second step parameters of rag pipeline
         """
-        args = parser_parameters.parse_args()
+        parser = reqparse.RequestParser().add_argument("node_id", type=str, required=True, location="args")
+        args = parser.parse_args()
         node_id = args.get("node_id")
         if not node_id:
             raise ValueError("Node ID is required")
@@ -866,16 +845,8 @@ class DraftRagPipelineSecondStepApi(Resource):
         }
 
 
-parser_wf_run = (
-    reqparse.RequestParser()
-    .add_argument("last_id", type=uuid_value, location="args")
-    .add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
-)
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs")
 class RagPipelineWorkflowRunListApi(Resource):
-    @api.expect(parser_wf_run)
     @setup_required
     @login_required
     @account_initialization_required
@@ -885,7 +856,12 @@ class RagPipelineWorkflowRunListApi(Resource):
         """
         Get workflow run list
         """
-        args = parser_wf_run.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("last_id", type=uuid_value, location="args")
+            .add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
+        )
+        args = parser.parse_args()
 
         rag_pipeline_service = RagPipelineService()
         result = rag_pipeline_service.get_rag_pipeline_paginate_workflow_runs(pipeline=pipeline, args=args)
@@ -985,18 +961,8 @@ class RagPipelineTransformApi(Resource):
         return result
 
 
-parser_var = (
-    reqparse.RequestParser()
-    .add_argument("datasource_type", type=str, required=True, location="json")
-    .add_argument("datasource_info", type=dict, required=True, location="json")
-    .add_argument("start_node_id", type=str, required=True, location="json")
-    .add_argument("start_node_title", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/datasource/variables-inspect")
 class RagPipelineDatasourceVariableApi(Resource):
-    @api.expect(parser_var)
     @setup_required
     @login_required
     @account_initialization_required
@@ -1008,7 +974,14 @@ class RagPipelineDatasourceVariableApi(Resource):
         Set datasource variables
         """
         current_user, _ = current_account_with_tenant()
-        args = parser_var.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("datasource_type", type=str, required=True, location="json")
+            .add_argument("datasource_info", type=dict, required=True, location="json")
+            .add_argument("start_node_id", type=str, required=True, location="json")
+            .add_argument("start_node_title", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         rag_pipeline_service = RagPipelineService()
         workflow_node_execution = rag_pipeline_service.set_datasource_variables(

api/controllers/console/explore/recommended_app.py

@@ -1,7 +1,7 @@
 from flask_restx import Resource, fields, marshal_with, reqparse
 
 from constants.languages import languages
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required
 from libs.helper import AppIconUrlField
 from libs.login import current_user, login_required
@@ -35,18 +35,15 @@ recommended_app_list_fields = {
 }
 
 
-parser_apps = reqparse.RequestParser().add_argument("language", type=str, location="args")
-
-
 @console_ns.route("/explore/apps")
 class RecommendedAppListApi(Resource):
-    @api.expect(parser_apps)
     @login_required
     @account_initialization_required
     @marshal_with(recommended_app_list_fields)
     def get(self):
         # language args
-        args = parser_apps.parse_args()
+        parser = reqparse.RequestParser().add_argument("language", type=str, location="args")
+        args = parser.parse_args()
 
         language = args.get("language")
         if language and language in languages:

api/controllers/console/remote_files.py

@@ -10,7 +10,6 @@ from controllers.common.errors import (
     RemoteFileUploadError,
     UnsupportedFileTypeError,
 )
-from controllers.console import api
 from core.file import helpers as file_helpers
 from core.helper import ssrf_proxy
 from extensions.ext_database import db
@@ -37,15 +36,12 @@ class RemoteFileInfoApi(Resource):
         }
 
 
-parser_upload = reqparse.RequestParser().add_argument("url", type=str, required=True, help="URL is required")
-
-
 @console_ns.route("/remote-files/upload")
 class RemoteFileUploadApi(Resource):
-    @api.expect(parser_upload)
     @marshal_with(file_fields_with_signed_url)
     def post(self):
-        args = parser_upload.parse_args()
+        parser = reqparse.RequestParser().add_argument("url", type=str, required=True, help="URL is required")
+        args = parser.parse_args()
 
         url = args["url"]
 

api/controllers/console/setup.py

@@ -49,7 +49,6 @@ class SetupApi(Resource):
                 "email": fields.String(required=True, description="Admin email address"),
                 "name": fields.String(required=True, description="Admin name (max 30 characters)"),
                 "password": fields.String(required=True, description="Admin password"),
-                "language": fields.String(required=False, description="Admin language"),
             },
         )
     )

api/controllers/console/tag/tags.py

@@ -2,7 +2,7 @@ from flask import request
 from flask_restx import Resource, marshal_with, reqparse
 from werkzeug.exceptions import Forbidden
 
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, setup_required
 from fields.tag_fields import dataset_tag_fields
 from libs.login import current_account_with_tenant, login_required
@@ -16,19 +16,6 @@ def _validate_name(name):
     return name
 
 
-parser_tags = (
-    reqparse.RequestParser()
-    .add_argument(
-        "name",
-        nullable=False,
-        required=True,
-        help="Name must be between 1 to 50 characters.",
-        type=_validate_name,
-    )
-    .add_argument("type", type=str, location="json", choices=Tag.TAG_TYPE_LIST, nullable=True, help="Invalid tag type.")
-)
-
-
 @console_ns.route("/tags")
 class TagListApi(Resource):
     @setup_required
@@ -43,7 +30,6 @@ class TagListApi(Resource):
 
         return tags, 200
 
-    @api.expect(parser_tags)
     @setup_required
     @login_required
     @account_initialization_required
@@ -53,7 +39,20 @@ class TagListApi(Resource):
         if not (current_user.has_edit_permission or current_user.is_dataset_editor):
             raise Forbidden()
 
-        args = parser_tags.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument(
+                "name",
+                nullable=False,
+                required=True,
+                help="Name must be between 1 to 50 characters.",
+                type=_validate_name,
+            )
+            .add_argument(
+                "type", type=str, location="json", choices=Tag.TAG_TYPE_LIST, nullable=True, help="Invalid tag type."
+            )
+        )
+        args = parser.parse_args()
         tag = TagService.save_tags(args)
 
         response = {"id": tag.id, "name": tag.name, "type": tag.type, "binding_count": 0}
@@ -61,14 +60,8 @@ class TagListApi(Resource):
         return response, 200
 
 
-parser_tag_id = reqparse.RequestParser().add_argument(
-    "name", nullable=False, required=True, help="Name must be between 1 to 50 characters.", type=_validate_name
-)
-
-
 @console_ns.route("/tags/<uuid:tag_id>")
 class TagUpdateDeleteApi(Resource):
-    @api.expect(parser_tag_id)
     @setup_required
     @login_required
     @account_initialization_required
@@ -79,7 +72,10 @@ class TagUpdateDeleteApi(Resource):
         if not (current_user.has_edit_permission or current_user.is_dataset_editor):
             raise Forbidden()
 
-        args = parser_tag_id.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "name", nullable=False, required=True, help="Name must be between 1 to 50 characters.", type=_validate_name
+        )
+        args = parser.parse_args()
         tag = TagService.update_tags(args, tag_id)
 
         binding_count = TagService.get_tag_binding_count(tag_id)
@@ -103,17 +99,8 @@ class TagUpdateDeleteApi(Resource):
         return 204
 
 
-parser_create = (
-    reqparse.RequestParser()
-    .add_argument("tag_ids", type=list, nullable=False, required=True, location="json", help="Tag IDs is required.")
-    .add_argument("target_id", type=str, nullable=False, required=True, location="json", help="Target ID is required.")
-    .add_argument("type", type=str, location="json", choices=Tag.TAG_TYPE_LIST, nullable=True, help="Invalid tag type.")
-)
-
-
 @console_ns.route("/tag-bindings/create")
 class TagBindingCreateApi(Resource):
-    @api.expect(parser_create)
     @setup_required
     @login_required
     @account_initialization_required
@@ -123,23 +110,26 @@ class TagBindingCreateApi(Resource):
         if not (current_user.has_edit_permission or current_user.is_dataset_editor):
             raise Forbidden()
 
-        args = parser_create.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument(
+                "tag_ids", type=list, nullable=False, required=True, location="json", help="Tag IDs is required."
+            )
+            .add_argument(
+                "target_id", type=str, nullable=False, required=True, location="json", help="Target ID is required."
+            )
+            .add_argument(
+                "type", type=str, location="json", choices=Tag.TAG_TYPE_LIST, nullable=True, help="Invalid tag type."
+            )
+        )
+        args = parser.parse_args()
         TagService.save_tag_binding(args)
 
         return {"result": "success"}, 200
 
 
-parser_remove = (
-    reqparse.RequestParser()
-    .add_argument("tag_id", type=str, nullable=False, required=True, help="Tag ID is required.")
-    .add_argument("target_id", type=str, nullable=False, required=True, help="Target ID is required.")
-    .add_argument("type", type=str, location="json", choices=Tag.TAG_TYPE_LIST, nullable=True, help="Invalid tag type.")
-)
-
-
 @console_ns.route("/tag-bindings/remove")
 class TagBindingDeleteApi(Resource):
-    @api.expect(parser_remove)
     @setup_required
     @login_required
     @account_initialization_required
@@ -149,7 +139,15 @@ class TagBindingDeleteApi(Resource):
         if not (current_user.has_edit_permission or current_user.is_dataset_editor):
             raise Forbidden()
 
-        args = parser_remove.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("tag_id", type=str, nullable=False, required=True, help="Tag ID is required.")
+            .add_argument("target_id", type=str, nullable=False, required=True, help="Target ID is required.")
+            .add_argument(
+                "type", type=str, location="json", choices=Tag.TAG_TYPE_LIST, nullable=True, help="Invalid tag type."
+            )
+        )
+        args = parser.parse_args()
         TagService.delete_tag_binding(args)
 
         return {"result": "success"}, 200

api/controllers/console/version.py

@@ -11,16 +11,16 @@ from . import api, console_ns
 
 logger = logging.getLogger(__name__)
 
-parser = reqparse.RequestParser().add_argument(
-    "current_version", type=str, required=True, location="args", help="Current application version"
-)
-
 
 @console_ns.route("/version")
 class VersionApi(Resource):
     @api.doc("check_version_update")
     @api.doc(description="Check for application version updates")
-    @api.expect(parser)
+    @api.expect(
+        api.parser().add_argument(
+            "current_version", type=str, required=True, location="args", help="Current application version"
+        )
+    )
     @api.response(
         200,
         "Success",
@@ -37,6 +37,7 @@ class VersionApi(Resource):
     )
     def get(self):
         """Check for application version updates"""
+        parser = reqparse.RequestParser().add_argument("current_version", type=str, required=True, location="args")
         args = parser.parse_args()
         check_update_url = dify_config.CHECK_UPDATE_URL
 

api/controllers/console/workspace/account.py

@@ -8,7 +8,7 @@ from sqlalchemy.orm import Session
 
 from configs import dify_config
 from constants.languages import supported_language
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.auth.error import (
     EmailAlreadyInUseError,
     EmailChangeLimitError,
@@ -43,19 +43,8 @@ from services.billing_service import BillingService
 from services.errors.account import CurrentPasswordIncorrectError as ServiceCurrentPasswordIncorrectError
 
 
-def _init_parser():
-    parser = reqparse.RequestParser()
-    if dify_config.EDITION == "CLOUD":
-        parser.add_argument("invitation_code", type=str, location="json")
-    parser.add_argument("interface_language", type=supported_language, required=True, location="json").add_argument(
-        "timezone", type=timezone, required=True, location="json"
-    )
-    return parser
-
-
 @console_ns.route("/account/init")
 class AccountInitApi(Resource):
-    @api.expect(_init_parser())
     @setup_required
     @login_required
     def post(self):
@@ -64,7 +53,14 @@ class AccountInitApi(Resource):
         if account.status == "active":
             raise AccountAlreadyInitedError()
 
-        args = _init_parser().parse_args()
+        parser = reqparse.RequestParser()
+
+        if dify_config.EDITION == "CLOUD":
+            parser.add_argument("invitation_code", type=str, location="json")
+        parser.add_argument("interface_language", type=supported_language, required=True, location="json").add_argument(
+            "timezone", type=timezone, required=True, location="json"
+        )
+        args = parser.parse_args()
 
         if dify_config.EDITION == "CLOUD":
             if not args["invitation_code"]:
@@ -110,19 +106,16 @@ class AccountProfileApi(Resource):
         return current_user
 
 
-parser_name = reqparse.RequestParser().add_argument("name", type=str, required=True, location="json")
-
-
 @console_ns.route("/account/name")
 class AccountNameApi(Resource):
-    @api.expect(parser_name)
     @setup_required
     @login_required
     @account_initialization_required
     @marshal_with(account_fields)
     def post(self):
         current_user, _ = current_account_with_tenant()
-        args = parser_name.parse_args()
+        parser = reqparse.RequestParser().add_argument("name", type=str, required=True, location="json")
+        args = parser.parse_args()
 
         # Validate account name length
         if len(args["name"]) < 3 or len(args["name"]) > 30:
@@ -133,80 +126,68 @@ class AccountNameApi(Resource):
         return updated_account
 
 
-parser_avatar = reqparse.RequestParser().add_argument("avatar", type=str, required=True, location="json")
-
-
 @console_ns.route("/account/avatar")
 class AccountAvatarApi(Resource):
-    @api.expect(parser_avatar)
     @setup_required
     @login_required
     @account_initialization_required
     @marshal_with(account_fields)
     def post(self):
         current_user, _ = current_account_with_tenant()
-        args = parser_avatar.parse_args()
+        parser = reqparse.RequestParser().add_argument("avatar", type=str, required=True, location="json")
+        args = parser.parse_args()
 
         updated_account = AccountService.update_account(current_user, avatar=args["avatar"])
 
         return updated_account
 
 
-parser_interface = reqparse.RequestParser().add_argument(
-    "interface_language", type=supported_language, required=True, location="json"
-)
-
-
 @console_ns.route("/account/interface-language")
 class AccountInterfaceLanguageApi(Resource):
-    @api.expect(parser_interface)
     @setup_required
     @login_required
     @account_initialization_required
     @marshal_with(account_fields)
     def post(self):
         current_user, _ = current_account_with_tenant()
-        args = parser_interface.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "interface_language", type=supported_language, required=True, location="json"
+        )
+        args = parser.parse_args()
 
         updated_account = AccountService.update_account(current_user, interface_language=args["interface_language"])
 
         return updated_account
 
 
-parser_theme = reqparse.RequestParser().add_argument(
-    "interface_theme", type=str, choices=["light", "dark"], required=True, location="json"
-)
-
-
 @console_ns.route("/account/interface-theme")
 class AccountInterfaceThemeApi(Resource):
-    @api.expect(parser_theme)
     @setup_required
     @login_required
     @account_initialization_required
     @marshal_with(account_fields)
     def post(self):
         current_user, _ = current_account_with_tenant()
-        args = parser_theme.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "interface_theme", type=str, choices=["light", "dark"], required=True, location="json"
+        )
+        args = parser.parse_args()
 
         updated_account = AccountService.update_account(current_user, interface_theme=args["interface_theme"])
 
         return updated_account
 
 
-parser_timezone = reqparse.RequestParser().add_argument("timezone", type=str, required=True, location="json")
-
-
 @console_ns.route("/account/timezone")
 class AccountTimezoneApi(Resource):
-    @api.expect(parser_timezone)
     @setup_required
     @login_required
     @account_initialization_required
     @marshal_with(account_fields)
     def post(self):
         current_user, _ = current_account_with_tenant()
-        args = parser_timezone.parse_args()
+        parser = reqparse.RequestParser().add_argument("timezone", type=str, required=True, location="json")
+        args = parser.parse_args()
 
         # Validate timezone string, e.g. America/New_York, Asia/Shanghai
         if args["timezone"] not in pytz.all_timezones:
@@ -217,24 +198,21 @@ class AccountTimezoneApi(Resource):
         return updated_account
 
 
-parser_pw = (
-    reqparse.RequestParser()
-    .add_argument("password", type=str, required=False, location="json")
-    .add_argument("new_password", type=str, required=True, location="json")
-    .add_argument("repeat_new_password", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/account/password")
 class AccountPasswordApi(Resource):
-    @api.expect(parser_pw)
     @setup_required
     @login_required
     @account_initialization_required
     @marshal_with(account_fields)
     def post(self):
         current_user, _ = current_account_with_tenant()
-        args = parser_pw.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("password", type=str, required=False, location="json")
+            .add_argument("new_password", type=str, required=True, location="json")
+            .add_argument("repeat_new_password", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         if args["new_password"] != args["repeat_new_password"]:
             raise RepeatPasswordNotMatchError()
@@ -316,23 +294,20 @@ class AccountDeleteVerifyApi(Resource):
         return {"result": "success", "data": token}
 
 
-parser_delete = (
-    reqparse.RequestParser()
-    .add_argument("token", type=str, required=True, location="json")
-    .add_argument("code", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/account/delete")
 class AccountDeleteApi(Resource):
-    @api.expect(parser_delete)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
         account, _ = current_account_with_tenant()
 
-        args = parser_delete.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("token", type=str, required=True, location="json")
+            .add_argument("code", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         if not AccountService.verify_account_deletion_code(args["token"], args["code"]):
             raise InvalidAccountDeletionCodeError()
@@ -342,19 +317,16 @@ class AccountDeleteApi(Resource):
         return {"result": "success"}
 
 
-parser_feedback = (
-    reqparse.RequestParser()
-    .add_argument("email", type=str, required=True, location="json")
-    .add_argument("feedback", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/account/delete/feedback")
 class AccountDeleteUpdateFeedbackApi(Resource):
-    @api.expect(parser_feedback)
     @setup_required
     def post(self):
-        args = parser_feedback.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("email", type=str, required=True, location="json")
+            .add_argument("feedback", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         BillingService.update_account_deletion_feedback(args["email"], args["feedback"])
 
@@ -379,14 +351,6 @@ class EducationVerifyApi(Resource):
         return BillingService.EducationIdentity.verify(account.id, account.email)
 
 
-parser_edu = (
-    reqparse.RequestParser()
-    .add_argument("token", type=str, required=True, location="json")
-    .add_argument("institution", type=str, required=True, location="json")
-    .add_argument("role", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/account/education")
 class EducationApi(Resource):
     status_fields = {
@@ -396,7 +360,6 @@ class EducationApi(Resource):
         "allow_refresh": fields.Boolean,
     }
 
-    @api.expect(parser_edu)
     @setup_required
     @login_required
     @account_initialization_required
@@ -405,7 +368,13 @@ class EducationApi(Resource):
     def post(self):
         account, _ = current_account_with_tenant()
 
-        args = parser_edu.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("token", type=str, required=True, location="json")
+            .add_argument("institution", type=str, required=True, location="json")
+            .add_argument("role", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         return BillingService.EducationIdentity.activate(account, args["token"], args["institution"], args["role"])
 
@@ -425,14 +394,6 @@ class EducationApi(Resource):
         return res
 
 
-parser_autocomplete = (
-    reqparse.RequestParser()
-    .add_argument("keywords", type=str, required=True, location="args")
-    .add_argument("page", type=int, required=False, location="args", default=0)
-    .add_argument("limit", type=int, required=False, location="args", default=20)
-)
-
-
 @console_ns.route("/account/education/autocomplete")
 class EducationAutoCompleteApi(Resource):
     data_fields = {
@@ -441,7 +402,6 @@ class EducationAutoCompleteApi(Resource):
         "has_next": fields.Boolean,
     }
 
-    @api.expect(parser_autocomplete)
     @setup_required
     @login_required
     @account_initialization_required
@@ -449,30 +409,33 @@ class EducationAutoCompleteApi(Resource):
     @cloud_edition_billing_enabled
     @marshal_with(data_fields)
     def get(self):
-        args = parser_autocomplete.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("keywords", type=str, required=True, location="args")
+            .add_argument("page", type=int, required=False, location="args", default=0)
+            .add_argument("limit", type=int, required=False, location="args", default=20)
+        )
+        args = parser.parse_args()
 
         return BillingService.EducationIdentity.autocomplete(args["keywords"], args["page"], args["limit"])
 
 
-parser_change_email = (
-    reqparse.RequestParser()
-    .add_argument("email", type=email, required=True, location="json")
-    .add_argument("language", type=str, required=False, location="json")
-    .add_argument("phase", type=str, required=False, location="json")
-    .add_argument("token", type=str, required=False, location="json")
-)
-
-
 @console_ns.route("/account/change-email")
 class ChangeEmailSendEmailApi(Resource):
-    @api.expect(parser_change_email)
     @enable_change_email
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
         current_user, _ = current_account_with_tenant()
-        args = parser_change_email.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("email", type=email, required=True, location="json")
+            .add_argument("language", type=str, required=False, location="json")
+            .add_argument("phase", type=str, required=False, location="json")
+            .add_argument("token", type=str, required=False, location="json")
+        )
+        args = parser.parse_args()
 
         ip_address = extract_remote_ip(request)
         if AccountService.is_email_send_ip_limit(ip_address):
@@ -507,23 +470,20 @@ class ChangeEmailSendEmailApi(Resource):
         return {"result": "success", "data": token}
 
 
-parser_validity = (
-    reqparse.RequestParser()
-    .add_argument("email", type=email, required=True, location="json")
-    .add_argument("code", type=str, required=True, location="json")
-    .add_argument("token", type=str, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/account/change-email/validity")
 class ChangeEmailCheckApi(Resource):
-    @api.expect(parser_validity)
     @enable_change_email
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
-        args = parser_validity.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("email", type=email, required=True, location="json")
+            .add_argument("code", type=str, required=True, location="json")
+            .add_argument("token", type=str, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
 
         user_email = args["email"]
 
@@ -554,23 +514,20 @@ class ChangeEmailCheckApi(Resource):
         return {"is_valid": True, "email": token_data.get("email"), "token": new_token}
 
 
-parser_reset = (
-    reqparse.RequestParser()
-    .add_argument("new_email", type=email, required=True, location="json")
-    .add_argument("token", type=str, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/account/change-email/reset")
 class ChangeEmailResetApi(Resource):
-    @api.expect(parser_reset)
     @enable_change_email
     @setup_required
     @login_required
     @account_initialization_required
     @marshal_with(account_fields)
     def post(self):
-        args = parser_reset.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("new_email", type=email, required=True, location="json")
+            .add_argument("token", type=str, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
 
         if AccountService.is_account_in_freeze(args["new_email"]):
             raise AccountInFreezeError()
@@ -598,15 +555,12 @@ class ChangeEmailResetApi(Resource):
         return updated_account
 
 
-parser_check = reqparse.RequestParser().add_argument("email", type=email, required=True, location="json")
-
-
 @console_ns.route("/account/change-email/check-email-unique")
 class CheckEmailUnique(Resource):
-    @api.expect(parser_check)
     @setup_required
     def post(self):
-        args = parser_check.parse_args()
+        parser = reqparse.RequestParser().add_argument("email", type=email, required=True, location="json")
+        args = parser.parse_args()
         if AccountService.is_account_in_freeze(args["email"]):
             raise AccountInFreezeError()
         if not AccountService.check_email_unique(args["email"]):

api/controllers/console/workspace/members.py

@@ -5,7 +5,7 @@ from flask_restx import Resource, marshal_with, reqparse
 
 import services
 from configs import dify_config
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.auth.error import (
     CannotTransferOwnerToSelfError,
     EmailCodeError,
@@ -48,25 +48,22 @@ class MemberListApi(Resource):
         return {"result": "success", "accounts": members}, 200
 
 
-parser_invite = (
-    reqparse.RequestParser()
-    .add_argument("emails", type=list, required=True, location="json")
-    .add_argument("role", type=str, required=True, default="admin", location="json")
-    .add_argument("language", type=str, required=False, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/members/invite-email")
 class MemberInviteEmailApi(Resource):
     """Invite a new member by email."""
 
-    @api.expect(parser_invite)
     @setup_required
     @login_required
     @account_initialization_required
     @cloud_edition_billing_resource_check("members")
     def post(self):
-        args = parser_invite.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("emails", type=list, required=True, location="json")
+            .add_argument("role", type=str, required=True, default="admin", location="json")
+            .add_argument("language", type=str, required=False, location="json")
+        )
+        args = parser.parse_args()
 
         invitee_emails = args["emails"]
         invitee_role = args["role"]
@@ -146,19 +143,16 @@ class MemberCancelInviteApi(Resource):
         }, 200
 
 
-parser_update = reqparse.RequestParser().add_argument("role", type=str, required=True, location="json")
-
-
 @console_ns.route("/workspaces/current/members/<uuid:member_id>/update-role")
 class MemberUpdateRoleApi(Resource):
     """Update member role."""
 
-    @api.expect(parser_update)
     @setup_required
     @login_required
     @account_initialization_required
     def put(self, member_id):
-        args = parser_update.parse_args()
+        parser = reqparse.RequestParser().add_argument("role", type=str, required=True, location="json")
+        args = parser.parse_args()
         new_role = args["role"]
 
         if not TenantAccountRole.is_valid_role(new_role):
@@ -197,20 +191,17 @@ class DatasetOperatorMemberListApi(Resource):
         return {"result": "success", "accounts": members}, 200
 
 
-parser_send = reqparse.RequestParser().add_argument("language", type=str, required=False, location="json")
-
-
 @console_ns.route("/workspaces/current/members/send-owner-transfer-confirm-email")
 class SendOwnerTransferEmailApi(Resource):
     """Send owner transfer email."""
 
-    @api.expect(parser_send)
     @setup_required
     @login_required
     @account_initialization_required
     @is_allow_transfer_owner
     def post(self):
-        args = parser_send.parse_args()
+        parser = reqparse.RequestParser().add_argument("language", type=str, required=False, location="json")
+        args = parser.parse_args()
         ip_address = extract_remote_ip(request)
         if AccountService.is_email_send_ip_limit(ip_address):
             raise EmailSendIpLimitError()
@@ -238,22 +229,19 @@ class SendOwnerTransferEmailApi(Resource):
         return {"result": "success", "data": token}
 
 
-parser_owner = (
-    reqparse.RequestParser()
-    .add_argument("code", type=str, required=True, location="json")
-    .add_argument("token", type=str, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/members/owner-transfer-check")
 class OwnerTransferCheckApi(Resource):
-    @api.expect(parser_owner)
     @setup_required
     @login_required
     @account_initialization_required
     @is_allow_transfer_owner
     def post(self):
-        args = parser_owner.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("code", type=str, required=True, location="json")
+            .add_argument("token", type=str, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
         # check if the current user is the owner of the workspace
         current_user, _ = current_account_with_tenant()
         if not current_user.current_tenant:
@@ -288,20 +276,17 @@ class OwnerTransferCheckApi(Resource):
         return {"is_valid": True, "email": token_data.get("email"), "token": new_token}
 
 
-parser_owner_transfer = reqparse.RequestParser().add_argument(
-    "token", type=str, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/members/<uuid:member_id>/owner-transfer")
 class OwnerTransfer(Resource):
-    @api.expect(parser_owner_transfer)
     @setup_required
     @login_required
     @account_initialization_required
     @is_allow_transfer_owner
     def post(self, member_id):
-        args = parser_owner_transfer.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "token", type=str, required=True, nullable=False, location="json"
+        )
+        args = parser.parse_args()
 
         # check if the current user is the owner of the workspace
         current_user, _ = current_account_with_tenant()

api/controllers/console/workspace/model_providers.py

@@ -4,7 +4,7 @@ from flask import send_file
 from flask_restx import Resource, reqparse
 from werkzeug.exceptions import Forbidden
 
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, setup_required
 from core.model_runtime.entities.model_entities import ModelType
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
@@ -14,19 +14,9 @@ from libs.login import current_account_with_tenant, login_required
 from services.billing_service import BillingService
 from services.model_provider_service import ModelProviderService
 
-parser_model = reqparse.RequestParser().add_argument(
-    "model_type",
-    type=str,
-    required=False,
-    nullable=True,
-    choices=[mt.value for mt in ModelType],
-    location="args",
-)
-
 
 @console_ns.route("/workspaces/current/model-providers")
 class ModelProviderListApi(Resource):
-    @api.expect(parser_model)
     @setup_required
     @login_required
     @account_initialization_required
@@ -34,7 +24,15 @@ class ModelProviderListApi(Resource):
         _, current_tenant_id = current_account_with_tenant()
         tenant_id = current_tenant_id
 
-        args = parser_model.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "model_type",
+            type=str,
+            required=False,
+            nullable=True,
+            choices=[mt.value for mt in ModelType],
+            location="args",
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         provider_list = model_provider_service.get_provider_list(tenant_id=tenant_id, model_type=args.get("model_type"))
@@ -42,30 +40,8 @@ class ModelProviderListApi(Resource):
         return jsonable_encoder({"data": provider_list})
 
 
-parser_cred = reqparse.RequestParser().add_argument(
-    "credential_id", type=uuid_value, required=False, nullable=True, location="args"
-)
-parser_post_cred = (
-    reqparse.RequestParser()
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-    .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
-)
-
-parser_put_cred = (
-    reqparse.RequestParser()
-    .add_argument("credential_id", type=uuid_value, required=True, nullable=False, location="json")
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-    .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
-)
-
-parser_delete_cred = reqparse.RequestParser().add_argument(
-    "credential_id", type=uuid_value, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/credentials")
 class ModelProviderCredentialApi(Resource):
-    @api.expect(parser_cred)
     @setup_required
     @login_required
     @account_initialization_required
@@ -73,7 +49,10 @@ class ModelProviderCredentialApi(Resource):
         _, current_tenant_id = current_account_with_tenant()
         tenant_id = current_tenant_id
         # if credential_id is not provided, return current used credential
-        args = parser_cred.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "credential_id", type=uuid_value, required=False, nullable=True, location="args"
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         credentials = model_provider_service.get_provider_credential(
@@ -82,7 +61,6 @@ class ModelProviderCredentialApi(Resource):
 
         return {"credentials": credentials}
 
-    @api.expect(parser_post_cred)
     @setup_required
     @login_required
     @account_initialization_required
@@ -91,7 +69,12 @@ class ModelProviderCredentialApi(Resource):
         if not current_user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_post_cred.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+            .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
 
@@ -107,7 +90,6 @@ class ModelProviderCredentialApi(Resource):
 
         return {"result": "success"}, 201
 
-    @api.expect(parser_put_cred)
     @setup_required
     @login_required
     @account_initialization_required
@@ -116,7 +98,13 @@ class ModelProviderCredentialApi(Resource):
         if not current_user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_put_cred.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("credential_id", type=uuid_value, required=True, nullable=False, location="json")
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+            .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
 
@@ -133,7 +121,6 @@ class ModelProviderCredentialApi(Resource):
 
         return {"result": "success"}
 
-    @api.expect(parser_delete_cred)
     @setup_required
     @login_required
     @account_initialization_required
@@ -141,8 +128,10 @@ class ModelProviderCredentialApi(Resource):
         current_user, current_tenant_id = current_account_with_tenant()
         if not current_user.is_admin_or_owner:
             raise Forbidden()
-
-        args = parser_delete_cred.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "credential_id", type=uuid_value, required=True, nullable=False, location="json"
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         model_provider_service.remove_provider_credential(
@@ -152,14 +141,8 @@ class ModelProviderCredentialApi(Resource):
         return {"result": "success"}, 204
 
 
-parser_switch = reqparse.RequestParser().add_argument(
-    "credential_id", type=str, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/credentials/switch")
 class ModelProviderCredentialSwitchApi(Resource):
-    @api.expect(parser_switch)
     @setup_required
     @login_required
     @account_initialization_required
@@ -167,7 +150,10 @@ class ModelProviderCredentialSwitchApi(Resource):
         current_user, current_tenant_id = current_account_with_tenant()
         if not current_user.is_admin_or_owner:
             raise Forbidden()
-        args = parser_switch.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "credential_id", type=str, required=True, nullable=False, location="json"
+        )
+        args = parser.parse_args()
 
         service = ModelProviderService()
         service.switch_active_provider_credential(
@@ -178,20 +164,17 @@ class ModelProviderCredentialSwitchApi(Resource):
         return {"result": "success"}
 
 
-parser_validate = reqparse.RequestParser().add_argument(
-    "credentials", type=dict, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/credentials/validate")
 class ModelProviderValidateApi(Resource):
-    @api.expect(parser_validate)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self, provider: str):
         _, current_tenant_id = current_account_with_tenant()
-        args = parser_validate.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "credentials", type=dict, required=True, nullable=False, location="json"
+        )
+        args = parser.parse_args()
 
         tenant_id = current_tenant_id
 
@@ -235,19 +218,8 @@ class ModelProviderIconApi(Resource):
         return send_file(io.BytesIO(icon), mimetype=mimetype)
 
 
-parser_preferred = reqparse.RequestParser().add_argument(
-    "preferred_provider_type",
-    type=str,
-    required=True,
-    nullable=False,
-    choices=["system", "custom"],
-    location="json",
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/preferred-provider-type")
 class PreferredProviderTypeUpdateApi(Resource):
-    @api.expect(parser_preferred)
     @setup_required
     @login_required
     @account_initialization_required
@@ -258,7 +230,15 @@ class PreferredProviderTypeUpdateApi(Resource):
 
         tenant_id = current_tenant_id
 
-        args = parser_preferred.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "preferred_provider_type",
+            type=str,
+            required=True,
+            nullable=False,
+            choices=["system", "custom"],
+            location="json",
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         model_provider_service.switch_preferred_provider(

api/controllers/console/workspace/models.py

@@ -3,7 +3,7 @@ import logging
 from flask_restx import Resource, reqparse
 from werkzeug.exceptions import Forbidden
 
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, setup_required
 from core.model_runtime.entities.model_entities import ModelType
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
@@ -16,29 +16,23 @@ from services.model_provider_service import ModelProviderService
 logger = logging.getLogger(__name__)
 
 
-parser_get_default = reqparse.RequestParser().add_argument(
-    "model_type",
-    type=str,
-    required=True,
-    nullable=False,
-    choices=[mt.value for mt in ModelType],
-    location="args",
-)
-parser_post_default = reqparse.RequestParser().add_argument(
-    "model_settings", type=list, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/default-model")
 class DefaultModelApi(Resource):
-    @api.expect(parser_get_default)
     @setup_required
     @login_required
     @account_initialization_required
     def get(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_get_default.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "model_type",
+            type=str,
+            required=True,
+            nullable=False,
+            choices=[mt.value for mt in ModelType],
+            location="args",
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         default_model_entity = model_provider_service.get_default_model_of_model_type(
@@ -47,7 +41,6 @@ class DefaultModelApi(Resource):
 
         return jsonable_encoder({"data": default_model_entity})
 
-    @api.expect(parser_post_default)
     @setup_required
     @login_required
     @account_initialization_required
@@ -57,7 +50,10 @@ class DefaultModelApi(Resource):
         if not current_user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_post_default.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "model_settings", type=list, required=True, nullable=False, location="json"
+        )
+        args = parser.parse_args()
         model_provider_service = ModelProviderService()
         model_settings = args["model_settings"]
         for model_setting in model_settings:
@@ -88,35 +84,6 @@ class DefaultModelApi(Resource):
         return {"result": "success"}
 
 
-parser_post_models = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="json")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="json",
-    )
-    .add_argument("load_balancing", type=dict, required=False, nullable=True, location="json")
-    .add_argument("config_from", type=str, required=False, nullable=True, location="json")
-    .add_argument("credential_id", type=uuid_value, required=False, nullable=True, location="json")
-)
-parser_delete_models = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="json")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="json",
-    )
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/models")
 class ModelProviderModelApi(Resource):
     @setup_required
@@ -130,7 +97,6 @@ class ModelProviderModelApi(Resource):
 
         return jsonable_encoder({"data": models})
 
-    @api.expect(parser_post_models)
     @setup_required
     @login_required
     @account_initialization_required
@@ -140,7 +106,23 @@ class ModelProviderModelApi(Resource):
 
         if not current_user.is_admin_or_owner:
             raise Forbidden()
-        args = parser_post_models.parse_args()
+
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+            .add_argument("load_balancing", type=dict, required=False, nullable=True, location="json")
+            .add_argument("config_from", type=str, required=False, nullable=True, location="json")
+            .add_argument("credential_id", type=uuid_value, required=False, nullable=True, location="json")
+        )
+        args = parser.parse_args()
 
         if args.get("config_from", "") == "custom-model":
             if not args.get("credential_id"):
@@ -178,7 +160,6 @@ class ModelProviderModelApi(Resource):
 
         return {"result": "success"}, 200
 
-    @api.expect(parser_delete_models)
     @setup_required
     @login_required
     @account_initialization_required
@@ -188,7 +169,19 @@ class ModelProviderModelApi(Resource):
         if not current_user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_delete_models.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         model_provider_service.remove_model(
@@ -198,76 +191,29 @@ class ModelProviderModelApi(Resource):
         return {"result": "success"}, 204
 
 
-parser_get_credentials = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="args")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="args",
-    )
-    .add_argument("config_from", type=str, required=False, nullable=True, location="args")
-    .add_argument("credential_id", type=uuid_value, required=False, nullable=True, location="args")
-)
-
-
-parser_post_cred = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="json")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="json",
-    )
-    .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-)
-parser_put_cred = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="json")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="json",
-    )
-    .add_argument("credential_id", type=uuid_value, required=True, nullable=False, location="json")
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-    .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
-)
-parser_delete_cred = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="json")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="json",
-    )
-    .add_argument("credential_id", type=uuid_value, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/models/credentials")
 class ModelProviderModelCredentialApi(Resource):
-    @api.expect(parser_get_credentials)
     @setup_required
     @login_required
     @account_initialization_required
     def get(self, provider: str):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_get_credentials.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="args")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="args",
+            )
+            .add_argument("config_from", type=str, required=False, nullable=True, location="args")
+            .add_argument("credential_id", type=uuid_value, required=False, nullable=True, location="args")
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         current_credential = model_provider_service.get_model_credential(
@@ -311,7 +257,6 @@ class ModelProviderModelCredentialApi(Resource):
             }
         )
 
-    @api.expect(parser_post_cred)
     @setup_required
     @login_required
     @account_initialization_required
@@ -321,7 +266,21 @@ class ModelProviderModelCredentialApi(Resource):
         if not current_user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_post_cred.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+            .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
 
@@ -345,7 +304,6 @@ class ModelProviderModelCredentialApi(Resource):
 
         return {"result": "success"}, 201
 
-    @api.expect(parser_put_cred)
     @setup_required
     @login_required
     @account_initialization_required
@@ -355,7 +313,22 @@ class ModelProviderModelCredentialApi(Resource):
         if not current_user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_put_cred.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+            .add_argument("credential_id", type=uuid_value, required=True, nullable=False, location="json")
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+            .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
 
@@ -374,7 +347,6 @@ class ModelProviderModelCredentialApi(Resource):
 
         return {"result": "success"}
 
-    @api.expect(parser_delete_cred)
     @setup_required
     @login_required
     @account_initialization_required
@@ -383,7 +355,20 @@ class ModelProviderModelCredentialApi(Resource):
 
         if not current_user.is_admin_or_owner:
             raise Forbidden()
-        args = parser_delete_cred.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+            .add_argument("credential_id", type=uuid_value, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         model_provider_service.remove_model_credential(
@@ -397,24 +382,8 @@ class ModelProviderModelCredentialApi(Resource):
         return {"result": "success"}, 204
 
 
-parser_switch = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="json")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="json",
-    )
-    .add_argument("credential_id", type=str, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/models/credentials/switch")
 class ModelProviderModelCredentialSwitchApi(Resource):
-    @api.expect(parser_switch)
     @setup_required
     @login_required
     @account_initialization_required
@@ -423,7 +392,20 @@ class ModelProviderModelCredentialSwitchApi(Resource):
 
         if not current_user.is_admin_or_owner:
             raise Forbidden()
-        args = parser_switch.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+            .add_argument("credential_id", type=str, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
 
         service = ModelProviderService()
         service.add_model_credential_to_model_list(
@@ -436,32 +418,29 @@ class ModelProviderModelCredentialSwitchApi(Resource):
         return {"result": "success"}
 
 
-parser_model_enable_disable = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="json")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="json",
-    )
-)
-
-
 @console_ns.route(
     "/workspaces/current/model-providers/<path:provider>/models/enable", endpoint="model-provider-model-enable"
 )
 class ModelProviderModelEnableApi(Resource):
-    @api.expect(parser_model_enable_disable)
     @setup_required
     @login_required
     @account_initialization_required
     def patch(self, provider: str):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_model_enable_disable.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         model_provider_service.enable_model(
@@ -475,14 +454,25 @@ class ModelProviderModelEnableApi(Resource):
     "/workspaces/current/model-providers/<path:provider>/models/disable", endpoint="model-provider-model-disable"
 )
 class ModelProviderModelDisableApi(Resource):
-    @api.expect(parser_model_enable_disable)
     @setup_required
     @login_required
     @account_initialization_required
     def patch(self, provider: str):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_model_enable_disable.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
         model_provider_service.disable_model(
@@ -492,31 +482,28 @@ class ModelProviderModelDisableApi(Resource):
         return {"result": "success"}
 
 
-parser_validate = (
-    reqparse.RequestParser()
-    .add_argument("model", type=str, required=True, nullable=False, location="json")
-    .add_argument(
-        "model_type",
-        type=str,
-        required=True,
-        nullable=False,
-        choices=[mt.value for mt in ModelType],
-        location="json",
-    )
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/models/credentials/validate")
 class ModelProviderModelValidateApi(Resource):
-    @api.expect(parser_validate)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self, provider: str):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_validate.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("model", type=str, required=True, nullable=False, location="json")
+            .add_argument(
+                "model_type",
+                type=str,
+                required=True,
+                nullable=False,
+                choices=[mt.value for mt in ModelType],
+                location="json",
+            )
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
 
         model_provider_service = ModelProviderService()
 
@@ -543,19 +530,16 @@ class ModelProviderModelValidateApi(Resource):
         return response
 
 
-parser_parameter = reqparse.RequestParser().add_argument(
-    "model", type=str, required=True, nullable=False, location="args"
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/models/parameter-rules")
 class ModelProviderModelParameterRuleApi(Resource):
-    @api.expect(parser_parameter)
     @setup_required
     @login_required
     @account_initialization_required
     def get(self, provider: str):
-        args = parser_parameter.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "model", type=str, required=True, nullable=False, location="args"
+        )
+        args = parser.parse_args()
         _, tenant_id = current_account_with_tenant()
 
         model_provider_service = ModelProviderService()

api/controllers/console/workspace/plugin.py

@@ -5,7 +5,7 @@ from flask_restx import Resource, reqparse
 from werkzeug.exceptions import Forbidden
 
 from configs import dify_config
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.workspace import plugin_permission_required
 from controllers.console.wraps import account_initialization_required, setup_required
 from core.model_runtime.utils.encoders import jsonable_encoder
@@ -37,22 +37,19 @@ class PluginDebuggingKeyApi(Resource):
             raise ValueError(e)
 
 
-parser_list = (
-    reqparse.RequestParser()
-    .add_argument("page", type=int, required=False, location="args", default=1)
-    .add_argument("page_size", type=int, required=False, location="args", default=256)
-)
-
-
 @console_ns.route("/workspaces/current/plugin/list")
 class PluginListApi(Resource):
-    @api.expect(parser_list)
     @setup_required
     @login_required
     @account_initialization_required
     def get(self):
         _, tenant_id = current_account_with_tenant()
-        args = parser_list.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("page", type=int, required=False, location="args", default=1)
+            .add_argument("page_size", type=int, required=False, location="args", default=256)
+        )
+        args = parser.parse_args()
         try:
             plugins_with_total = PluginService.list_with_total(tenant_id, args["page"], args["page_size"])
         except PluginDaemonClientSideError as e:
@@ -61,17 +58,14 @@ class PluginListApi(Resource):
         return jsonable_encoder({"plugins": plugins_with_total.list, "total": plugins_with_total.total})
 
 
-parser_latest = reqparse.RequestParser().add_argument("plugin_ids", type=list, required=True, location="json")
-
-
 @console_ns.route("/workspaces/current/plugin/list/latest-versions")
 class PluginListLatestVersionsApi(Resource):
-    @api.expect(parser_latest)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
-        args = parser_latest.parse_args()
+        req = reqparse.RequestParser().add_argument("plugin_ids", type=list, required=True, location="json")
+        args = req.parse_args()
 
         try:
             versions = PluginService.list_latest_versions(args["plugin_ids"])
@@ -81,19 +75,16 @@ class PluginListLatestVersionsApi(Resource):
         return jsonable_encoder({"versions": versions})
 
 
-parser_ids = reqparse.RequestParser().add_argument("plugin_ids", type=list, required=True, location="json")
-
-
 @console_ns.route("/workspaces/current/plugin/list/installations/ids")
 class PluginListInstallationsFromIdsApi(Resource):
-    @api.expect(parser_ids)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_ids.parse_args()
+        parser = reqparse.RequestParser().add_argument("plugin_ids", type=list, required=True, location="json")
+        args = parser.parse_args()
 
         try:
             plugins = PluginService.list_installations_from_ids(tenant_id, args["plugin_ids"])
@@ -103,19 +94,16 @@ class PluginListInstallationsFromIdsApi(Resource):
         return jsonable_encoder({"plugins": plugins})
 
 
-parser_icon = (
-    reqparse.RequestParser()
-    .add_argument("tenant_id", type=str, required=True, location="args")
-    .add_argument("filename", type=str, required=True, location="args")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/icon")
 class PluginIconApi(Resource):
-    @api.expect(parser_icon)
     @setup_required
     def get(self):
-        args = parser_icon.parse_args()
+        req = (
+            reqparse.RequestParser()
+            .add_argument("tenant_id", type=str, required=True, location="args")
+            .add_argument("filename", type=str, required=True, location="args")
+        )
+        args = req.parse_args()
 
         try:
             icon_bytes, mimetype = PluginService.get_asset(args["tenant_id"], args["filename"])
@@ -169,17 +157,8 @@ class PluginUploadFromPkgApi(Resource):
         return jsonable_encoder(response)
 
 
-parser_github = (
-    reqparse.RequestParser()
-    .add_argument("repo", type=str, required=True, location="json")
-    .add_argument("version", type=str, required=True, location="json")
-    .add_argument("package", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/upload/github")
 class PluginUploadFromGithubApi(Resource):
-    @api.expect(parser_github)
     @setup_required
     @login_required
     @account_initialization_required
@@ -187,7 +166,13 @@ class PluginUploadFromGithubApi(Resource):
     def post(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_github.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("repo", type=str, required=True, location="json")
+            .add_argument("version", type=str, required=True, location="json")
+            .add_argument("package", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         try:
             response = PluginService.upload_pkg_from_github(tenant_id, args["repo"], args["version"], args["package"])
@@ -221,21 +206,19 @@ class PluginUploadFromBundleApi(Resource):
         return jsonable_encoder(response)
 
 
-parser_pkg = reqparse.RequestParser().add_argument(
-    "plugin_unique_identifiers", type=list, required=True, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/plugin/install/pkg")
 class PluginInstallFromPkgApi(Resource):
-    @api.expect(parser_pkg)
     @setup_required
     @login_required
     @account_initialization_required
     @plugin_permission_required(install_required=True)
     def post(self):
         _, tenant_id = current_account_with_tenant()
-        args = parser_pkg.parse_args()
+
+        parser = reqparse.RequestParser().add_argument(
+            "plugin_unique_identifiers", type=list, required=True, location="json"
+        )
+        args = parser.parse_args()
 
         # check if all plugin_unique_identifiers are valid string
         for plugin_unique_identifier in args["plugin_unique_identifiers"]:
@@ -250,18 +233,8 @@ class PluginInstallFromPkgApi(Resource):
         return jsonable_encoder(response)
 
 
-parser_githubapi = (
-    reqparse.RequestParser()
-    .add_argument("repo", type=str, required=True, location="json")
-    .add_argument("version", type=str, required=True, location="json")
-    .add_argument("package", type=str, required=True, location="json")
-    .add_argument("plugin_unique_identifier", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/install/github")
 class PluginInstallFromGithubApi(Resource):
-    @api.expect(parser_githubapi)
     @setup_required
     @login_required
     @account_initialization_required
@@ -269,7 +242,14 @@ class PluginInstallFromGithubApi(Resource):
     def post(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_githubapi.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("repo", type=str, required=True, location="json")
+            .add_argument("version", type=str, required=True, location="json")
+            .add_argument("package", type=str, required=True, location="json")
+            .add_argument("plugin_unique_identifier", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         try:
             response = PluginService.install_from_github(
@@ -285,14 +265,8 @@ class PluginInstallFromGithubApi(Resource):
         return jsonable_encoder(response)
 
 
-parser_marketplace = reqparse.RequestParser().add_argument(
-    "plugin_unique_identifiers", type=list, required=True, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/plugin/install/marketplace")
 class PluginInstallFromMarketplaceApi(Resource):
-    @api.expect(parser_marketplace)
     @setup_required
     @login_required
     @account_initialization_required
@@ -300,7 +274,10 @@ class PluginInstallFromMarketplaceApi(Resource):
     def post(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_marketplace.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "plugin_unique_identifiers", type=list, required=True, location="json"
+        )
+        args = parser.parse_args()
 
         # check if all plugin_unique_identifiers are valid string
         for plugin_unique_identifier in args["plugin_unique_identifiers"]:
@@ -315,21 +292,19 @@ class PluginInstallFromMarketplaceApi(Resource):
         return jsonable_encoder(response)
 
 
-parser_pkgapi = reqparse.RequestParser().add_argument(
-    "plugin_unique_identifier", type=str, required=True, location="args"
-)
-
-
 @console_ns.route("/workspaces/current/plugin/marketplace/pkg")
 class PluginFetchMarketplacePkgApi(Resource):
-    @api.expect(parser_pkgapi)
     @setup_required
     @login_required
     @account_initialization_required
     @plugin_permission_required(install_required=True)
     def get(self):
         _, tenant_id = current_account_with_tenant()
-        args = parser_pkgapi.parse_args()
+
+        parser = reqparse.RequestParser().add_argument(
+            "plugin_unique_identifier", type=str, required=True, location="args"
+        )
+        args = parser.parse_args()
 
         try:
             return jsonable_encoder(
@@ -344,14 +319,8 @@ class PluginFetchMarketplacePkgApi(Resource):
             raise ValueError(e)
 
 
-parser_fetch = reqparse.RequestParser().add_argument(
-    "plugin_unique_identifier", type=str, required=True, location="args"
-)
-
-
 @console_ns.route("/workspaces/current/plugin/fetch-manifest")
 class PluginFetchManifestApi(Resource):
-    @api.expect(parser_fetch)
     @setup_required
     @login_required
     @account_initialization_required
@@ -359,7 +328,10 @@ class PluginFetchManifestApi(Resource):
     def get(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_fetch.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "plugin_unique_identifier", type=str, required=True, location="args"
+        )
+        args = parser.parse_args()
 
         try:
             return jsonable_encoder(
@@ -373,16 +345,8 @@ class PluginFetchManifestApi(Resource):
             raise ValueError(e)
 
 
-parser_tasks = (
-    reqparse.RequestParser()
-    .add_argument("page", type=int, required=True, location="args")
-    .add_argument("page_size", type=int, required=True, location="args")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/tasks")
 class PluginFetchInstallTasksApi(Resource):
-    @api.expect(parser_tasks)
     @setup_required
     @login_required
     @account_initialization_required
@@ -390,7 +354,12 @@ class PluginFetchInstallTasksApi(Resource):
     def get(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_tasks.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("page", type=int, required=True, location="args")
+            .add_argument("page_size", type=int, required=True, location="args")
+        )
+        args = parser.parse_args()
 
         try:
             return jsonable_encoder(
@@ -460,16 +429,8 @@ class PluginDeleteInstallTaskItemApi(Resource):
             raise ValueError(e)
 
 
-parser_marketplace_api = (
-    reqparse.RequestParser()
-    .add_argument("original_plugin_unique_identifier", type=str, required=True, location="json")
-    .add_argument("new_plugin_unique_identifier", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/upgrade/marketplace")
 class PluginUpgradeFromMarketplaceApi(Resource):
-    @api.expect(parser_marketplace_api)
     @setup_required
     @login_required
     @account_initialization_required
@@ -477,7 +438,12 @@ class PluginUpgradeFromMarketplaceApi(Resource):
     def post(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_marketplace_api.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("original_plugin_unique_identifier", type=str, required=True, location="json")
+            .add_argument("new_plugin_unique_identifier", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         try:
             return jsonable_encoder(
@@ -489,19 +455,8 @@ class PluginUpgradeFromMarketplaceApi(Resource):
             raise ValueError(e)
 
 
-parser_github_post = (
-    reqparse.RequestParser()
-    .add_argument("original_plugin_unique_identifier", type=str, required=True, location="json")
-    .add_argument("new_plugin_unique_identifier", type=str, required=True, location="json")
-    .add_argument("repo", type=str, required=True, location="json")
-    .add_argument("version", type=str, required=True, location="json")
-    .add_argument("package", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/upgrade/github")
 class PluginUpgradeFromGithubApi(Resource):
-    @api.expect(parser_github_post)
     @setup_required
     @login_required
     @account_initialization_required
@@ -509,7 +464,15 @@ class PluginUpgradeFromGithubApi(Resource):
     def post(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_github_post.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("original_plugin_unique_identifier", type=str, required=True, location="json")
+            .add_argument("new_plugin_unique_identifier", type=str, required=True, location="json")
+            .add_argument("repo", type=str, required=True, location="json")
+            .add_argument("version", type=str, required=True, location="json")
+            .add_argument("package", type=str, required=True, location="json")
+        )
+        args = parser.parse_args()
 
         try:
             return jsonable_encoder(
@@ -526,20 +489,15 @@ class PluginUpgradeFromGithubApi(Resource):
             raise ValueError(e)
 
 
-parser_uninstall = reqparse.RequestParser().add_argument(
-    "plugin_installation_id", type=str, required=True, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/plugin/uninstall")
 class PluginUninstallApi(Resource):
-    @api.expect(parser_uninstall)
     @setup_required
     @login_required
     @account_initialization_required
     @plugin_permission_required(install_required=True)
     def post(self):
-        args = parser_uninstall.parse_args()
+        req = reqparse.RequestParser().add_argument("plugin_installation_id", type=str, required=True, location="json")
+        args = req.parse_args()
 
         _, tenant_id = current_account_with_tenant()
 
@@ -549,16 +507,8 @@ class PluginUninstallApi(Resource):
             raise ValueError(e)
 
 
-parser_change_post = (
-    reqparse.RequestParser()
-    .add_argument("install_permission", type=str, required=True, location="json")
-    .add_argument("debug_permission", type=str, required=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/permission/change")
 class PluginChangePermissionApi(Resource):
-    @api.expect(parser_change_post)
     @setup_required
     @login_required
     @account_initialization_required
@@ -568,7 +518,12 @@ class PluginChangePermissionApi(Resource):
         if not user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_change_post.parse_args()
+        req = (
+            reqparse.RequestParser()
+            .add_argument("install_permission", type=str, required=True, location="json")
+            .add_argument("debug_permission", type=str, required=True, location="json")
+        )
+        args = req.parse_args()
 
         install_permission = TenantPluginPermission.InstallPermission(args["install_permission"])
         debug_permission = TenantPluginPermission.DebugPermission(args["debug_permission"])
@@ -603,20 +558,8 @@ class PluginFetchPermissionApi(Resource):
         )
 
 
-parser_dynamic = (
-    reqparse.RequestParser()
-    .add_argument("plugin_id", type=str, required=True, location="args")
-    .add_argument("provider", type=str, required=True, location="args")
-    .add_argument("action", type=str, required=True, location="args")
-    .add_argument("parameter", type=str, required=True, location="args")
-    .add_argument("credential_id", type=str, required=False, location="args")
-    .add_argument("provider_type", type=str, required=True, location="args")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/parameters/dynamic-options")
 class PluginFetchDynamicSelectOptionsApi(Resource):
-    @api.expect(parser_dynamic)
     @setup_required
     @login_required
     @account_initialization_required
@@ -628,7 +571,16 @@ class PluginFetchDynamicSelectOptionsApi(Resource):
 
         user_id = current_user.id
 
-        args = parser_dynamic.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("plugin_id", type=str, required=True, location="args")
+            .add_argument("provider", type=str, required=True, location="args")
+            .add_argument("action", type=str, required=True, location="args")
+            .add_argument("parameter", type=str, required=True, location="args")
+            .add_argument("credential_id", type=str, required=False, location="args")
+            .add_argument("provider_type", type=str, required=True, location="args")
+        )
+        args = parser.parse_args()
 
         try:
             options = PluginParameterService.get_dynamic_select_options(
@@ -647,16 +599,8 @@ class PluginFetchDynamicSelectOptionsApi(Resource):
         return jsonable_encoder({"options": options})
 
 
-parser_change = (
-    reqparse.RequestParser()
-    .add_argument("permission", type=dict, required=True, location="json")
-    .add_argument("auto_upgrade", type=dict, required=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/plugin/preferences/change")
 class PluginChangePreferencesApi(Resource):
-    @api.expect(parser_change)
     @setup_required
     @login_required
     @account_initialization_required
@@ -665,7 +609,12 @@ class PluginChangePreferencesApi(Resource):
         if not user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_change.parse_args()
+        req = (
+            reqparse.RequestParser()
+            .add_argument("permission", type=dict, required=True, location="json")
+            .add_argument("auto_upgrade", type=dict, required=True, location="json")
+        )
+        args = req.parse_args()
 
         permission = args["permission"]
 
@@ -745,12 +694,8 @@ class PluginFetchPreferencesApi(Resource):
         return jsonable_encoder({"permission": permission_dict, "auto_upgrade": auto_upgrade_dict})
 
 
-parser_exclude = reqparse.RequestParser().add_argument("plugin_id", type=str, required=True, location="json")
-
-
 @console_ns.route("/workspaces/current/plugin/preferences/autoupgrade/exclude")
 class PluginAutoUpgradeExcludePluginApi(Resource):
-    @api.expect(parser_exclude)
     @setup_required
     @login_required
     @account_initialization_required
@@ -758,7 +703,8 @@ class PluginAutoUpgradeExcludePluginApi(Resource):
         # exclude one single plugin
         _, tenant_id = current_account_with_tenant()
 
-        args = parser_exclude.parse_args()
+        req = reqparse.RequestParser().add_argument("plugin_id", type=str, required=True, location="json")
+        args = req.parse_args()
 
         return jsonable_encoder({"success": PluginAutoUpgradeService.exclude_plugin(tenant_id, args["plugin_id"])})
 

api/controllers/console/workspace/tool_providers.py

@@ -10,7 +10,7 @@ from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden
 
 from configs import dify_config
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.wraps import (
     account_initialization_required,
     enterprise_license_required,
@@ -52,19 +52,8 @@ def is_valid_url(url: str) -> bool:
         return False
 
 
-parser_tool = reqparse.RequestParser().add_argument(
-    "type",
-    type=str,
-    choices=["builtin", "model", "api", "workflow", "mcp"],
-    required=False,
-    nullable=True,
-    location="args",
-)
-
-
 @console_ns.route("/workspaces/current/tool-providers")
 class ToolProviderListApi(Resource):
-    @api.expect(parser_tool)
     @setup_required
     @login_required
     @account_initialization_required
@@ -73,7 +62,15 @@ class ToolProviderListApi(Resource):
 
         user_id = user.id
 
-        args = parser_tool.parse_args()
+        req = reqparse.RequestParser().add_argument(
+            "type",
+            type=str,
+            choices=["builtin", "model", "api", "workflow", "mcp"],
+            required=False,
+            nullable=True,
+            location="args",
+        )
+        args = req.parse_args()
 
         return ToolCommonService.list_tool_providers(user_id, tenant_id, args.get("type", None))
 
@@ -105,14 +102,8 @@ class ToolBuiltinProviderInfoApi(Resource):
         return jsonable_encoder(BuiltinToolManageService.get_builtin_tool_provider_info(tenant_id, provider))
 
 
-parser_delete = reqparse.RequestParser().add_argument(
-    "credential_id", type=str, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/builtin/<path:provider>/delete")
 class ToolBuiltinProviderDeleteApi(Resource):
-    @api.expect(parser_delete)
     @setup_required
     @login_required
     @account_initialization_required
@@ -121,7 +112,10 @@ class ToolBuiltinProviderDeleteApi(Resource):
         if not user.is_admin_or_owner:
             raise Forbidden()
 
-        args = parser_delete.parse_args()
+        req = reqparse.RequestParser().add_argument(
+            "credential_id", type=str, required=True, nullable=False, location="json"
+        )
+        args = req.parse_args()
 
         return BuiltinToolManageService.delete_builtin_tool_provider(
             tenant_id,
@@ -130,17 +124,8 @@ class ToolBuiltinProviderDeleteApi(Resource):
         )
 
 
-parser_add = (
-    reqparse.RequestParser()
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-    .add_argument("name", type=StrLen(30), required=False, nullable=False, location="json")
-    .add_argument("type", type=str, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/builtin/<path:provider>/add")
 class ToolBuiltinProviderAddApi(Resource):
-    @api.expect(parser_add)
     @setup_required
     @login_required
     @account_initialization_required
@@ -149,7 +134,13 @@ class ToolBuiltinProviderAddApi(Resource):
 
         user_id = user.id
 
-        args = parser_add.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+            .add_argument("name", type=StrLen(30), required=False, nullable=False, location="json")
+            .add_argument("type", type=str, required=True, nullable=False, location="json")
+        )
+        args = parser.parse_args()
 
         if args["type"] not in CredentialType.values():
             raise ValueError(f"Invalid credential type: {args['type']}")
@@ -164,17 +155,8 @@ class ToolBuiltinProviderAddApi(Resource):
         )
 
 
-parser_update = (
-    reqparse.RequestParser()
-    .add_argument("credential_id", type=str, required=True, nullable=False, location="json")
-    .add_argument("credentials", type=dict, required=False, nullable=True, location="json")
-    .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/builtin/<path:provider>/update")
 class ToolBuiltinProviderUpdateApi(Resource):
-    @api.expect(parser_update)
     @setup_required
     @login_required
     @account_initialization_required
@@ -186,7 +168,14 @@ class ToolBuiltinProviderUpdateApi(Resource):
 
         user_id = user.id
 
-        args = parser_update.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("credential_id", type=str, required=True, nullable=False, location="json")
+            .add_argument("credentials", type=dict, required=False, nullable=True, location="json")
+            .add_argument("name", type=StrLen(30), required=False, nullable=True, location="json")
+        )
+
+        args = parser.parse_args()
 
         result = BuiltinToolManageService.update_builtin_tool_provider(
             user_id=user_id,
@@ -224,22 +213,8 @@ class ToolBuiltinProviderIconApi(Resource):
         return send_file(io.BytesIO(icon_bytes), mimetype=mimetype, max_age=icon_cache_max_age)
 
 
-parser_api_add = (
-    reqparse.RequestParser()
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-    .add_argument("schema_type", type=str, required=True, nullable=False, location="json")
-    .add_argument("schema", type=str, required=True, nullable=False, location="json")
-    .add_argument("provider", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon", type=dict, required=True, nullable=False, location="json")
-    .add_argument("privacy_policy", type=str, required=False, nullable=True, location="json")
-    .add_argument("labels", type=list[str], required=False, nullable=True, location="json", default=[])
-    .add_argument("custom_disclaimer", type=str, required=False, nullable=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/api/add")
 class ToolApiProviderAddApi(Resource):
-    @api.expect(parser_api_add)
     @setup_required
     @login_required
     @account_initialization_required
@@ -251,7 +226,19 @@ class ToolApiProviderAddApi(Resource):
 
         user_id = user.id
 
-        args = parser_api_add.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+            .add_argument("schema_type", type=str, required=True, nullable=False, location="json")
+            .add_argument("schema", type=str, required=True, nullable=False, location="json")
+            .add_argument("provider", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon", type=dict, required=True, nullable=False, location="json")
+            .add_argument("privacy_policy", type=str, required=False, nullable=True, location="json")
+            .add_argument("labels", type=list[str], required=False, nullable=True, location="json", default=[])
+            .add_argument("custom_disclaimer", type=str, required=False, nullable=True, location="json")
+        )
+
+        args = parser.parse_args()
 
         return ApiToolManageService.create_api_tool_provider(
             user_id,
@@ -267,12 +254,8 @@ class ToolApiProviderAddApi(Resource):
         )
 
 
-parser_remote = reqparse.RequestParser().add_argument("url", type=str, required=True, nullable=False, location="args")
-
-
 @console_ns.route("/workspaces/current/tool-provider/api/remote")
 class ToolApiProviderGetRemoteSchemaApi(Resource):
-    @api.expect(parser_remote)
     @setup_required
     @login_required
     @account_initialization_required
@@ -281,7 +264,9 @@ class ToolApiProviderGetRemoteSchemaApi(Resource):
 
         user_id = user.id
 
-        args = parser_remote.parse_args()
+        parser = reqparse.RequestParser().add_argument("url", type=str, required=True, nullable=False, location="args")
+
+        args = parser.parse_args()
 
         return ApiToolManageService.get_api_tool_provider_remote_schema(
             user_id,
@@ -290,14 +275,8 @@ class ToolApiProviderGetRemoteSchemaApi(Resource):
         )
 
 
-parser_tools = reqparse.RequestParser().add_argument(
-    "provider", type=str, required=True, nullable=False, location="args"
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/api/tools")
 class ToolApiProviderListToolsApi(Resource):
-    @api.expect(parser_tools)
     @setup_required
     @login_required
     @account_initialization_required
@@ -306,7 +285,11 @@ class ToolApiProviderListToolsApi(Resource):
 
         user_id = user.id
 
-        args = parser_tools.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "provider", type=str, required=True, nullable=False, location="args"
+        )
+
+        args = parser.parse_args()
 
         return jsonable_encoder(
             ApiToolManageService.list_api_tool_provider_tools(
@@ -317,23 +300,8 @@ class ToolApiProviderListToolsApi(Resource):
         )
 
 
-parser_api_update = (
-    reqparse.RequestParser()
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-    .add_argument("schema_type", type=str, required=True, nullable=False, location="json")
-    .add_argument("schema", type=str, required=True, nullable=False, location="json")
-    .add_argument("provider", type=str, required=True, nullable=False, location="json")
-    .add_argument("original_provider", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon", type=dict, required=True, nullable=False, location="json")
-    .add_argument("privacy_policy", type=str, required=True, nullable=True, location="json")
-    .add_argument("labels", type=list[str], required=False, nullable=True, location="json")
-    .add_argument("custom_disclaimer", type=str, required=True, nullable=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/api/update")
 class ToolApiProviderUpdateApi(Resource):
-    @api.expect(parser_api_update)
     @setup_required
     @login_required
     @account_initialization_required
@@ -345,7 +313,20 @@ class ToolApiProviderUpdateApi(Resource):
 
         user_id = user.id
 
-        args = parser_api_update.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+            .add_argument("schema_type", type=str, required=True, nullable=False, location="json")
+            .add_argument("schema", type=str, required=True, nullable=False, location="json")
+            .add_argument("provider", type=str, required=True, nullable=False, location="json")
+            .add_argument("original_provider", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon", type=dict, required=True, nullable=False, location="json")
+            .add_argument("privacy_policy", type=str, required=True, nullable=True, location="json")
+            .add_argument("labels", type=list[str], required=False, nullable=True, location="json")
+            .add_argument("custom_disclaimer", type=str, required=True, nullable=True, location="json")
+        )
+
+        args = parser.parse_args()
 
         return ApiToolManageService.update_api_tool_provider(
             user_id,
@@ -362,14 +343,8 @@ class ToolApiProviderUpdateApi(Resource):
         )
 
 
-parser_api_delete = reqparse.RequestParser().add_argument(
-    "provider", type=str, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/api/delete")
 class ToolApiProviderDeleteApi(Resource):
-    @api.expect(parser_api_delete)
     @setup_required
     @login_required
     @account_initialization_required
@@ -381,7 +356,11 @@ class ToolApiProviderDeleteApi(Resource):
 
         user_id = user.id
 
-        args = parser_api_delete.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "provider", type=str, required=True, nullable=False, location="json"
+        )
+
+        args = parser.parse_args()
 
         return ApiToolManageService.delete_api_tool_provider(
             user_id,
@@ -390,12 +369,8 @@ class ToolApiProviderDeleteApi(Resource):
         )
 
 
-parser_get = reqparse.RequestParser().add_argument("provider", type=str, required=True, nullable=False, location="args")
-
-
 @console_ns.route("/workspaces/current/tool-provider/api/get")
 class ToolApiProviderGetApi(Resource):
-    @api.expect(parser_get)
     @setup_required
     @login_required
     @account_initialization_required
@@ -404,7 +379,11 @@ class ToolApiProviderGetApi(Resource):
 
         user_id = user.id
 
-        args = parser_get.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "provider", type=str, required=True, nullable=False, location="args"
+        )
+
+        args = parser.parse_args()
 
         return ApiToolManageService.get_api_tool_provider(
             user_id,
@@ -428,44 +407,40 @@ class ToolBuiltinProviderCredentialsSchemaApi(Resource):
         )
 
 
-parser_schema = reqparse.RequestParser().add_argument(
-    "schema", type=str, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/api/schema")
 class ToolApiProviderSchemaApi(Resource):
-    @api.expect(parser_schema)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
-        args = parser_schema.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "schema", type=str, required=True, nullable=False, location="json"
+        )
+
+        args = parser.parse_args()
 
         return ApiToolManageService.parser_api_schema(
             schema=args["schema"],
         )
 
 
-parser_pre = (
-    reqparse.RequestParser()
-    .add_argument("tool_name", type=str, required=True, nullable=False, location="json")
-    .add_argument("provider_name", type=str, required=False, nullable=False, location="json")
-    .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
-    .add_argument("parameters", type=dict, required=True, nullable=False, location="json")
-    .add_argument("schema_type", type=str, required=True, nullable=False, location="json")
-    .add_argument("schema", type=str, required=True, nullable=False, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/api/test/pre")
 class ToolApiProviderPreviousTestApi(Resource):
-    @api.expect(parser_pre)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
-        args = parser_pre.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("tool_name", type=str, required=True, nullable=False, location="json")
+            .add_argument("provider_name", type=str, required=False, nullable=False, location="json")
+            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+            .add_argument("parameters", type=dict, required=True, nullable=False, location="json")
+            .add_argument("schema_type", type=str, required=True, nullable=False, location="json")
+            .add_argument("schema", type=str, required=True, nullable=False, location="json")
+        )
+
+        args = parser.parse_args()
         _, current_tenant_id = current_account_with_tenant()
         return ApiToolManageService.test_api_tool_preview(
             current_tenant_id,
@@ -478,22 +453,8 @@ class ToolApiProviderPreviousTestApi(Resource):
         )
 
 
-parser_create = (
-    reqparse.RequestParser()
-    .add_argument("workflow_app_id", type=uuid_value, required=True, nullable=False, location="json")
-    .add_argument("name", type=alphanumeric, required=True, nullable=False, location="json")
-    .add_argument("label", type=str, required=True, nullable=False, location="json")
-    .add_argument("description", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon", type=dict, required=True, nullable=False, location="json")
-    .add_argument("parameters", type=list[dict], required=True, nullable=False, location="json")
-    .add_argument("privacy_policy", type=str, required=False, nullable=True, location="json", default="")
-    .add_argument("labels", type=list[str], required=False, nullable=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/workflow/create")
 class ToolWorkflowProviderCreateApi(Resource):
-    @api.expect(parser_create)
     @setup_required
     @login_required
     @account_initialization_required
@@ -505,7 +466,19 @@ class ToolWorkflowProviderCreateApi(Resource):
 
         user_id = user.id
 
-        args = parser_create.parse_args()
+        reqparser = (
+            reqparse.RequestParser()
+            .add_argument("workflow_app_id", type=uuid_value, required=True, nullable=False, location="json")
+            .add_argument("name", type=alphanumeric, required=True, nullable=False, location="json")
+            .add_argument("label", type=str, required=True, nullable=False, location="json")
+            .add_argument("description", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon", type=dict, required=True, nullable=False, location="json")
+            .add_argument("parameters", type=list[dict], required=True, nullable=False, location="json")
+            .add_argument("privacy_policy", type=str, required=False, nullable=True, location="json", default="")
+            .add_argument("labels", type=list[str], required=False, nullable=True, location="json")
+        )
+
+        args = reqparser.parse_args()
 
         return WorkflowToolManageService.create_workflow_tool(
             user_id=user_id,
@@ -521,22 +494,8 @@ class ToolWorkflowProviderCreateApi(Resource):
         )
 
 
-parser_workflow_update = (
-    reqparse.RequestParser()
-    .add_argument("workflow_tool_id", type=uuid_value, required=True, nullable=False, location="json")
-    .add_argument("name", type=alphanumeric, required=True, nullable=False, location="json")
-    .add_argument("label", type=str, required=True, nullable=False, location="json")
-    .add_argument("description", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon", type=dict, required=True, nullable=False, location="json")
-    .add_argument("parameters", type=list[dict], required=True, nullable=False, location="json")
-    .add_argument("privacy_policy", type=str, required=False, nullable=True, location="json", default="")
-    .add_argument("labels", type=list[str], required=False, nullable=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/workflow/update")
 class ToolWorkflowProviderUpdateApi(Resource):
-    @api.expect(parser_workflow_update)
     @setup_required
     @login_required
     @account_initialization_required
@@ -548,7 +507,19 @@ class ToolWorkflowProviderUpdateApi(Resource):
 
         user_id = user.id
 
-        args = parser_workflow_update.parse_args()
+        reqparser = (
+            reqparse.RequestParser()
+            .add_argument("workflow_tool_id", type=uuid_value, required=True, nullable=False, location="json")
+            .add_argument("name", type=alphanumeric, required=True, nullable=False, location="json")
+            .add_argument("label", type=str, required=True, nullable=False, location="json")
+            .add_argument("description", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon", type=dict, required=True, nullable=False, location="json")
+            .add_argument("parameters", type=list[dict], required=True, nullable=False, location="json")
+            .add_argument("privacy_policy", type=str, required=False, nullable=True, location="json", default="")
+            .add_argument("labels", type=list[str], required=False, nullable=True, location="json")
+        )
+
+        args = reqparser.parse_args()
 
         if not args["workflow_tool_id"]:
             raise ValueError("incorrect workflow_tool_id")
@@ -567,14 +538,8 @@ class ToolWorkflowProviderUpdateApi(Resource):
         )
 
 
-parser_workflow_delete = reqparse.RequestParser().add_argument(
-    "workflow_tool_id", type=uuid_value, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/workflow/delete")
 class ToolWorkflowProviderDeleteApi(Resource):
-    @api.expect(parser_workflow_delete)
     @setup_required
     @login_required
     @account_initialization_required
@@ -586,7 +551,11 @@ class ToolWorkflowProviderDeleteApi(Resource):
 
         user_id = user.id
 
-        args = parser_workflow_delete.parse_args()
+        reqparser = reqparse.RequestParser().add_argument(
+            "workflow_tool_id", type=uuid_value, required=True, nullable=False, location="json"
+        )
+
+        args = reqparser.parse_args()
 
         return WorkflowToolManageService.delete_workflow_tool(
             user_id,
@@ -595,16 +564,8 @@ class ToolWorkflowProviderDeleteApi(Resource):
         )
 
 
-parser_wf_get = (
-    reqparse.RequestParser()
-    .add_argument("workflow_tool_id", type=uuid_value, required=False, nullable=True, location="args")
-    .add_argument("workflow_app_id", type=uuid_value, required=False, nullable=True, location="args")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/workflow/get")
 class ToolWorkflowProviderGetApi(Resource):
-    @api.expect(parser_wf_get)
     @setup_required
     @login_required
     @account_initialization_required
@@ -613,7 +574,13 @@ class ToolWorkflowProviderGetApi(Resource):
 
         user_id = user.id
 
-        args = parser_wf_get.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("workflow_tool_id", type=uuid_value, required=False, nullable=True, location="args")
+            .add_argument("workflow_app_id", type=uuid_value, required=False, nullable=True, location="args")
+        )
+
+        args = parser.parse_args()
 
         if args.get("workflow_tool_id"):
             tool = WorkflowToolManageService.get_workflow_tool_by_tool_id(
@@ -633,14 +600,8 @@ class ToolWorkflowProviderGetApi(Resource):
         return jsonable_encoder(tool)
 
 
-parser_wf_tools = reqparse.RequestParser().add_argument(
-    "workflow_tool_id", type=uuid_value, required=True, nullable=False, location="args"
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/workflow/tools")
 class ToolWorkflowProviderListToolApi(Resource):
-    @api.expect(parser_wf_tools)
     @setup_required
     @login_required
     @account_initialization_required
@@ -649,7 +610,11 @@ class ToolWorkflowProviderListToolApi(Resource):
 
         user_id = user.id
 
-        args = parser_wf_tools.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "workflow_tool_id", type=uuid_value, required=True, nullable=False, location="args"
+        )
+
+        args = parser.parse_args()
 
         return jsonable_encoder(
             WorkflowToolManageService.list_single_workflow_tools(
@@ -825,40 +790,32 @@ class ToolOAuthCallback(Resource):
         return redirect(f"{dify_config.CONSOLE_WEB_URL}/oauth-callback")
 
 
-parser_default_cred = reqparse.RequestParser().add_argument(
-    "id", type=str, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/builtin/<path:provider>/default-credential")
 class ToolBuiltinProviderSetDefaultApi(Resource):
-    @api.expect(parser_default_cred)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self, provider):
         current_user, current_tenant_id = current_account_with_tenant()
-        args = parser_default_cred.parse_args()
+        parser = reqparse.RequestParser().add_argument("id", type=str, required=True, nullable=False, location="json")
+        args = parser.parse_args()
         return BuiltinToolManageService.set_default_provider(
             tenant_id=current_tenant_id, user_id=current_user.id, provider=provider, id=args["id"]
         )
 
 
-parser_custom = (
-    reqparse.RequestParser()
-    .add_argument("client_params", type=dict, required=False, nullable=True, location="json")
-    .add_argument("enable_oauth_custom_client", type=bool, required=False, nullable=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/builtin/<path:provider>/oauth/custom-client")
 class ToolOAuthCustomClient(Resource):
-    @api.expect(parser_custom)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self, provider):
-        args = parser_custom.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("client_params", type=dict, required=False, nullable=True, location="json")
+            .add_argument("enable_oauth_custom_client", type=bool, required=False, nullable=True, location="json")
+        )
+        args = parser.parse_args()
 
         user, tenant_id = current_account_with_tenant()
 
@@ -921,44 +878,25 @@ class ToolBuiltinProviderGetCredentialInfoApi(Resource):
         )
 
 
-parser_mcp = (
-    reqparse.RequestParser()
-    .add_argument("server_url", type=str, required=True, nullable=False, location="json")
-    .add_argument("name", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon_type", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon_background", type=str, required=False, nullable=True, location="json", default="")
-    .add_argument("server_identifier", type=str, required=True, nullable=False, location="json")
-    .add_argument("configuration", type=dict, required=False, nullable=True, location="json", default={})
-    .add_argument("headers", type=dict, required=False, nullable=True, location="json", default={})
-    .add_argument("authentication", type=dict, required=False, nullable=True, location="json", default={})
-)
-parser_mcp_put = (
-    reqparse.RequestParser()
-    .add_argument("server_url", type=str, required=True, nullable=False, location="json")
-    .add_argument("name", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon_type", type=str, required=True, nullable=False, location="json")
-    .add_argument("icon_background", type=str, required=False, nullable=True, location="json")
-    .add_argument("provider_id", type=str, required=True, nullable=False, location="json")
-    .add_argument("server_identifier", type=str, required=True, nullable=False, location="json")
-    .add_argument("configuration", type=dict, required=False, nullable=True, location="json", default={})
-    .add_argument("headers", type=dict, required=False, nullable=True, location="json", default={})
-    .add_argument("authentication", type=dict, required=False, nullable=True, location="json", default={})
-)
-parser_mcp_delete = reqparse.RequestParser().add_argument(
-    "provider_id", type=str, required=True, nullable=False, location="json"
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/mcp")
 class ToolProviderMCPApi(Resource):
-    @api.expect(parser_mcp)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
-        args = parser_mcp.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("server_url", type=str, required=True, nullable=False, location="json")
+            .add_argument("name", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon_type", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon_background", type=str, required=False, nullable=True, location="json", default="")
+            .add_argument("server_identifier", type=str, required=True, nullable=False, location="json")
+            .add_argument("configuration", type=dict, required=False, nullable=True, location="json", default={})
+            .add_argument("headers", type=dict, required=False, nullable=True, location="json", default={})
+            .add_argument("authentication", type=dict, required=False, nullable=True, location="json", default={})
+        )
+        args = parser.parse_args()
         user, tenant_id = current_account_with_tenant()
 
         # Parse and validate models
@@ -983,12 +921,24 @@ class ToolProviderMCPApi(Resource):
             )
             return jsonable_encoder(result)
 
-    @api.expect(parser_mcp_put)
     @setup_required
     @login_required
     @account_initialization_required
     def put(self):
-        args = parser_mcp_put.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("server_url", type=str, required=True, nullable=False, location="json")
+            .add_argument("name", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon_type", type=str, required=True, nullable=False, location="json")
+            .add_argument("icon_background", type=str, required=False, nullable=True, location="json")
+            .add_argument("provider_id", type=str, required=True, nullable=False, location="json")
+            .add_argument("server_identifier", type=str, required=True, nullable=False, location="json")
+            .add_argument("configuration", type=dict, required=False, nullable=True, location="json", default={})
+            .add_argument("headers", type=dict, required=False, nullable=True, location="json", default={})
+            .add_argument("authentication", type=dict, required=False, nullable=True, location="json", default={})
+        )
+        args = parser.parse_args()
         configuration = MCPConfiguration.model_validate(args["configuration"])
         authentication = MCPAuthentication.model_validate(args["authentication"]) if args["authentication"] else None
         _, current_tenant_id = current_account_with_tenant()
@@ -1022,12 +972,14 @@ class ToolProviderMCPApi(Resource):
             )
             return {"result": "success"}
 
-    @api.expect(parser_mcp_delete)
     @setup_required
     @login_required
     @account_initialization_required
     def delete(self):
-        args = parser_mcp_delete.parse_args()
+        parser = reqparse.RequestParser().add_argument(
+            "provider_id", type=str, required=True, nullable=False, location="json"
+        )
+        args = parser.parse_args()
         _, current_tenant_id = current_account_with_tenant()
 
         with Session(db.engine) as session, session.begin():
@@ -1036,21 +988,18 @@ class ToolProviderMCPApi(Resource):
             return {"result": "success"}
 
 
-parser_auth = (
-    reqparse.RequestParser()
-    .add_argument("provider_id", type=str, required=True, nullable=False, location="json")
-    .add_argument("authorization_code", type=str, required=False, nullable=True, location="json")
-)
-
-
 @console_ns.route("/workspaces/current/tool-provider/mcp/auth")
 class ToolMCPAuthApi(Resource):
-    @api.expect(parser_auth)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
-        args = parser_auth.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("provider_id", type=str, required=True, nullable=False, location="json")
+            .add_argument("authorization_code", type=str, required=False, nullable=True, location="json")
+        )
+        args = parser.parse_args()
         provider_id = args["provider_id"]
         _, tenant_id = current_account_with_tenant()
 
@@ -1148,18 +1097,15 @@ class ToolMCPUpdateApi(Resource):
             return jsonable_encoder(tools)
 
 
-parser_cb = (
-    reqparse.RequestParser()
-    .add_argument("code", type=str, required=True, nullable=False, location="args")
-    .add_argument("state", type=str, required=True, nullable=False, location="args")
-)
-
-
 @console_ns.route("/mcp/oauth/callback")
 class ToolMCPCallbackApi(Resource):
-    @api.expect(parser_cb)
     def get(self):
-        args = parser_cb.parse_args()
+        parser = (
+            reqparse.RequestParser()
+            .add_argument("code", type=str, required=True, nullable=False, location="args")
+            .add_argument("state", type=str, required=True, nullable=False, location="args")
+        )
+        args = parser.parse_args()
         state_key = args["state"]
         authorization_code = args["code"]
 

api/controllers/console/workspace/workspace.py

@@ -13,7 +13,7 @@ from controllers.common.errors import (
     TooManyFilesError,
     UnsupportedFileTypeError,
 )
-from controllers.console import api, console_ns
+from controllers.console import console_ns
 from controllers.console.admin import admin_required
 from controllers.console.error import AccountNotLinkTenantError
 from controllers.console.wraps import (
@@ -150,18 +150,15 @@ class TenantApi(Resource):
         return WorkspaceService.get_tenant_info(tenant), 200
 
 
-parser_switch = reqparse.RequestParser().add_argument("tenant_id", type=str, required=True, location="json")
-
-
 @console_ns.route("/workspaces/switch")
 class SwitchWorkspaceApi(Resource):
-    @api.expect(parser_switch)
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
         current_user, _ = current_account_with_tenant()
-        args = parser_switch.parse_args()
+        parser = reqparse.RequestParser().add_argument("tenant_id", type=str, required=True, location="json")
+        args = parser.parse_args()
 
         # check if tenant_id is valid, 403 if not
         try:
@@ -245,19 +242,16 @@ class WebappLogoWorkspaceApi(Resource):
         return {"id": upload_file.id}, 201
 
 
-parser_info = reqparse.RequestParser().add_argument("name", type=str, required=True, location="json")
-
-
 @console_ns.route("/workspaces/info")
 class WorkspaceInfoApi(Resource):
-    @api.expect(parser_info)
     @setup_required
     @login_required
     @account_initialization_required
     # Change workspace name
     def post(self):
         _, current_tenant_id = current_account_with_tenant()
-        args = parser_info.parse_args()
+        parser = reqparse.RequestParser().add_argument("name", type=str, required=True, location="json")
+        args = parser.parse_args()
 
         if not current_tenant_id:
             raise ValueError("No current tenant")

api/controllers/web/audio.py

@@ -88,6 +88,12 @@ class AudioApi(WebApiResource):
 
 @web_ns.route("/text-to-audio")
 class TextApi(WebApiResource):
+    text_to_audio_response_fields = {
+        "audio_url": fields.String,
+        "duration": fields.Float,
+    }
+
+    @marshal_with(text_to_audio_response_fields)
     @web_ns.doc("Text to Audio")
     @web_ns.doc(description="Convert text to audio using text-to-speech service.")
     @web_ns.doc(

api/core/rag/datasource/vdb/oracle/oraclevector.py

@@ -302,7 +302,8 @@ class OracleVector(BaseVector):
                     nltk.data.find("tokenizers/punkt")
                     nltk.data.find("corpora/stopwords")
                 except LookupError:
-                    raise LookupError("Unable to find the required NLTK data package: punkt and stopwords")
+                    nltk.download("punkt")
+                    nltk.download("stopwords")
                 e_str = re.sub(r"[^\w ]", "", query)
                 all_tokens = nltk.word_tokenize(e_str)
                 stop_words = stopwords.words("english")

api/services/workflow_service.py

@@ -10,17 +10,20 @@ from sqlalchemy.orm import Session, sessionmaker
 from core.app.app_config.entities import VariableEntityType
 from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager
 from core.app.apps.workflow.app_config_manager import WorkflowAppConfigManager
+from core.app.entities.app_invoke_entities import InvokeFrom
 from core.file import File
 from core.repositories import DifyCoreRepositoryFactory
 from core.variables import Variable
 from core.variables.variables import VariableUnion
-from core.workflow.entities import VariablePool, WorkflowNodeExecution
+from core.workflow.entities import GraphInitParams, GraphRuntimeState, VariablePool, WorkflowNodeExecution
 from core.workflow.enums import ErrorStrategy, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from core.workflow.errors import WorkflowNodeRunFailedError
+from core.workflow.graph.graph import Graph
 from core.workflow.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunSucceededEvent
 from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes import NodeType
 from core.workflow.nodes.base.node import Node
+from core.workflow.nodes.node_factory import DifyNodeFactory
 from core.workflow.nodes.node_mapping import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING
 from core.workflow.nodes.start.entities import StartNodeData
 from core.workflow.system_variable import SystemVariable
@@ -31,6 +34,7 @@ from extensions.ext_storage import storage
 from factories.file_factory import build_from_mapping, build_from_mappings
 from libs.datetime_utils import naive_utc_now
 from models import Account
+from models.enums import UserFrom
 from models.model import App, AppMode
 from models.tools import WorkflowToolProvider
 from models.workflow import Workflow, WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom, WorkflowType
@@ -211,7 +215,7 @@ class WorkflowService:
         self.validate_features_structure(app_model=app_model, features=features)
 
         # validate graph structure
-        self.validate_graph_structure(graph=graph)
+        self.validate_graph_structure(user_id=account.id, app_model=app_model, graph=graph)
 
         # create draft workflow if not found
         if not workflow:
@@ -270,7 +274,7 @@ class WorkflowService:
             self._validate_workflow_credentials(draft_workflow)
 
         # validate graph structure
-        self.validate_graph_structure(graph=draft_workflow.graph_dict)
+        self.validate_graph_structure(user_id=account.id, app_model=app_model, graph=draft_workflow.graph_dict)
 
         # create new workflow
         workflow = Workflow.new(
@@ -901,30 +905,42 @@ class WorkflowService:
 
         return new_app
 
-    def validate_graph_structure(self, graph: Mapping[str, Any]):
+    def validate_graph_structure(self, user_id: str, app_model: App, graph: Mapping[str, Any]):
         """
-        Validate workflow graph structure.
+        Validate workflow graph structure by instantiating the Graph object.
 
-        This performs a lightweight validation on the graph, checking for structural
-        inconsistencies such as the coexistence of start and trigger nodes.
+        This leverages the built-in graph validators (including trigger/UserInput exclusivity)
+        and raises any structural errors before persisting the workflow.
         """
         node_configs = graph.get("nodes", [])
-        node_configs = cast(list[dict[str, Any]], node_configs)
+        node_configs = cast(list[dict[str, object]], node_configs)
 
         # is empty graph
         if not node_configs:
             return
 
-        node_types: set[NodeType] = set()
-        for node in node_configs:
-            node_type = node.get("data", {}).get("type")
-            if node_type:
-                node_types.add(NodeType(node_type))
-
-        # start node and trigger node cannot coexist
-        if NodeType.START in node_types:
-            if any(nt.is_trigger_node for nt in node_types):
-                raise ValueError("Start node and trigger nodes cannot coexist in the same workflow")
+        workflow_id = app_model.workflow_id or "UNKNOWN"
+        Graph.init(
+            graph_config=graph,
+            # TODO(Mairuis): Add root node id
+            root_node_id=None,
+            node_factory=DifyNodeFactory(
+                graph_init_params=GraphInitParams(
+                    tenant_id=app_model.tenant_id,
+                    app_id=app_model.id,
+                    workflow_id=workflow_id,
+                    graph_config=graph,
+                    user_id=user_id,
+                    user_from=UserFrom.ACCOUNT,
+                    invoke_from=InvokeFrom.VALIDATION,
+                    call_depth=0,
+                ),
+                graph_runtime_state=GraphRuntimeState(
+                    variable_pool=VariablePool(),
+                    start_at=time.perf_counter(),
+                ),
+            ),
+        )
 
     def validate_features_structure(self, app_model: App, features: dict):
         if app_model.mode == AppMode.ADVANCED_CHAT:

web/app/components/tools/edit-custom-collection-modal/index.tsx

@@ -24,7 +24,6 @@ import Toast from '@/app/components/base/toast'
 
 type Props = {
   positionLeft?: boolean
-  dialogClassName?: string
   payload: any
   onHide: () => void
   onAdd?: (payload: CustomCollectionBackend) => void
@@ -34,7 +33,6 @@ type Props = {
 // Add and Edit
 const EditCustomCollectionModal: FC<Props> = ({
   positionLeft,
-  dialogClassName = '',
   payload,
   onHide,
   onAdd,
@@ -188,7 +186,6 @@ const EditCustomCollectionModal: FC<Props> = ({
         positionCenter={isAdd && !positionLeft}
         onHide={onHide}
         title={t(`tools.createTool.${isAdd ? 'title' : 'editTitle'}`)!}
-        dialogClassName={dialogClassName}
         panelClassName='mt-2 !w-[640px]'
         maxWidthClassName='!max-w-[640px]'
         height='calc(100vh - 16px)'

web/app/components/tools/edit-custom-collection-modal/modal.tsx

@@ -0,0 +1,361 @@
+'use client'
+import type { FC } from 'react'
+import React, { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useDebounce, useGetState } from 'ahooks'
+import { produce } from 'immer'
+import { LinkExternal02, Settings01 } from '../../base/icons/src/vender/line/general'
+import type { Credential, CustomCollectionBackend, CustomParamSchema, Emoji } from '../types'
+import { AuthHeaderPrefix, AuthType } from '../types'
+import GetSchema from './get-schema'
+import ConfigCredentials from './config-credentials'
+import TestApi from './test-api'
+import cn from '@/utils/classnames'
+import Input from '@/app/components/base/input'
+import Textarea from '@/app/components/base/textarea'
+import EmojiPicker from '@/app/components/base/emoji-picker'
+import AppIcon from '@/app/components/base/app-icon'
+import { parseParamsSchema } from '@/service/tools'
+import LabelSelector from '@/app/components/tools/labels/selector'
+import Toast from '@/app/components/base/toast'
+import Modal from '../../base/modal'
+import Button from '@/app/components/base/button'
+
+type Props = {
+  positionLeft?: boolean
+  payload: any
+  onHide: () => void
+  onAdd?: (payload: CustomCollectionBackend) => void
+  onRemove?: () => void
+  onEdit?: (payload: CustomCollectionBackend) => void
+}
+// Add and Edit
+const EditCustomCollectionModal: FC<Props> = ({
+  payload,
+  onHide,
+  onAdd,
+  onEdit,
+  onRemove,
+}) => {
+  const { t } = useTranslation()
+  const isAdd = !payload
+  const isEdit = !!payload
+
+  const [editFirst, setEditFirst] = useState(!isAdd)
+  const [paramsSchemas, setParamsSchemas] = useState<CustomParamSchema[]>(payload?.tools || [])
+  const [customCollection, setCustomCollection, getCustomCollection] = useGetState<CustomCollectionBackend>(isAdd
+    ? {
+      provider: '',
+      credentials: {
+        auth_type: AuthType.none,
+        api_key_header: 'Authorization',
+        api_key_header_prefix: AuthHeaderPrefix.basic,
+      },
+      icon: {
+        content: '🕵️',
+        background: '#FEF7C3',
+      },
+      schema_type: '',
+      schema: '',
+    }
+    : payload)
+
+  const originalProvider = isEdit ? payload.provider : ''
+
+  const [showEmojiPicker, setShowEmojiPicker] = useState(false)
+  const emoji = customCollection.icon
+  const setEmoji = (emoji: Emoji) => {
+    const newCollection = produce(customCollection, (draft) => {
+      draft.icon = emoji
+    })
+    setCustomCollection(newCollection)
+  }
+  const schema = customCollection.schema
+  const debouncedSchema = useDebounce(schema, { wait: 500 })
+  const setSchema = (schema: any) => {
+    const newCollection = produce(customCollection, (draft) => {
+      draft.schema = schema
+    })
+    setCustomCollection(newCollection)
+  }
+
+  useEffect(() => {
+    if (!debouncedSchema)
+      return
+    if (isEdit && editFirst) {
+      setEditFirst(false)
+      return
+    }
+    (async () => {
+      try {
+        const { parameters_schema, schema_type } = await parseParamsSchema(debouncedSchema)
+        const customCollection = getCustomCollection()
+        const newCollection = produce(customCollection, (draft) => {
+          draft.schema_type = schema_type
+        })
+        setCustomCollection(newCollection)
+        setParamsSchemas(parameters_schema)
+      }
+      catch {
+        const customCollection = getCustomCollection()
+        const newCollection = produce(customCollection, (draft) => {
+          draft.schema_type = ''
+        })
+        setCustomCollection(newCollection)
+        setParamsSchemas([])
+      }
+    })()
+  }, [debouncedSchema])
+
+  const [credentialsModalShow, setCredentialsModalShow] = useState(false)
+  const credential = customCollection.credentials
+  const setCredential = (credential: Credential) => {
+    const newCollection = produce(customCollection, (draft) => {
+      draft.credentials = credential
+    })
+    setCustomCollection(newCollection)
+  }
+
+  const [currTool, setCurrTool] = useState<CustomParamSchema | null>(null)
+  const [isShowTestApi, setIsShowTestApi] = useState(false)
+
+  const [labels, setLabels] = useState<string[]>(payload?.labels || [])
+  const handleLabelSelect = (value: string[]) => {
+    setLabels(value)
+  }
+
+  const handleSave = () => {
+    // const postData = clone(customCollection)
+    const postData = produce(customCollection, (draft) => {
+      delete draft.tools
+
+      if (draft.credentials.auth_type === AuthType.none) {
+        delete draft.credentials.api_key_header
+        delete draft.credentials.api_key_header_prefix
+        delete draft.credentials.api_key_value
+      }
+
+      draft.labels = labels
+    })
+
+    let errorMessage = ''
+    if (!postData.provider)
+      errorMessage = t('common.errorMsg.fieldRequired', { field: t('tools.createTool.name') })
+
+    if (!postData.schema)
+      errorMessage = t('common.errorMsg.fieldRequired', { field: t('tools.createTool.schema') })
+
+    if (errorMessage) {
+      Toast.notify({
+        type: 'error',
+        message: errorMessage,
+      })
+      return
+    }
+
+    if (isAdd) {
+      onAdd?.(postData)
+      return
+    }
+
+    onEdit?.({
+      ...postData,
+      original_provider: originalProvider,
+    })
+  }
+
+  const getPath = (url: string) => {
+    if (!url)
+      return ''
+
+    try {
+      const path = decodeURI(new URL(url).pathname)
+      return path || ''
+    }
+    catch {
+      return url
+    }
+  }
+
+  return (
+    <>
+      <Modal
+        isShow
+        onClose={onHide}
+        closable
+        className='!h-[calc(100vh-16px)] !max-w-[630px] !p-0'
+        wrapperClassName='z-[1000]'
+      >
+        <div className='flex h-full flex-col'>
+          <div className='ml-6 mt-6 text-base font-semibold text-text-primary'>
+            {t('tools.createTool.title')}
+          </div>
+          <div className='h-0 grow space-y-4 overflow-y-auto px-6 py-3'>
+            <div>
+              <div className='system-sm-medium py-2 text-text-primary'>{t('tools.createTool.name')} <span className='ml-1 text-red-500'>*</span></div>
+              <div className='flex items-center justify-between gap-3'>
+                <AppIcon size='large' onClick={() => { setShowEmojiPicker(true) }} className='cursor-pointer' icon={emoji.content} background={emoji.background} />
+                <Input
+                  className='h-10 grow' placeholder={t('tools.createTool.toolNamePlaceHolder')!}
+                  value={customCollection.provider}
+                  onChange={(e) => {
+                    const newCollection = produce(customCollection, (draft) => {
+                      draft.provider = e.target.value
+                    })
+                    setCustomCollection(newCollection)
+                  }}
+                />
+              </div>
+            </div>
+
+            {/* Schema */}
+            <div className='select-none'>
+              <div className='flex items-center justify-between'>
+                <div className='flex items-center'>
+                  <div className='system-sm-medium py-2 text-text-primary'>{t('tools.createTool.schema')}<span className='ml-1 text-red-500'>*</span></div>
+                  <div className='mx-2 h-3 w-px bg-divider-regular'></div>
+                  <a
+                    href="https://swagger.io/specification/"
+                    target='_blank' rel='noopener noreferrer'
+                    className='flex h-[18px] items-center space-x-1  text-text-accent'
+                  >
+                    <div className='text-xs font-normal'>{t('tools.createTool.viewSchemaSpec')}</div>
+                    <LinkExternal02 className='h-3 w-3' />
+                  </a>
+                </div>
+                <GetSchema onChange={setSchema} />
+
+              </div>
+              <Textarea
+                className='h-[240px] resize-none'
+                value={schema}
+                onChange={e => setSchema(e.target.value)}
+                placeholder={t('tools.createTool.schemaPlaceHolder')!}
+              />
+            </div>
+
+            {/* Available Tools  */}
+            <div>
+              <div className='system-sm-medium py-2 text-text-primary'>{t('tools.createTool.availableTools.title')}</div>
+              <div className='w-full overflow-x-auto rounded-lg border border-divider-regular'>
+                <table className='system-xs-regular w-full text-text-secondary'>
+                  <thead className='uppercase text-text-tertiary'>
+                    <tr className={cn(paramsSchemas.length > 0 && 'border-b', 'border-divider-regular')}>
+                      <th className="p-2 pl-3 font-medium">{t('tools.createTool.availableTools.name')}</th>
+                      <th className="w-[236px] p-2 pl-3 font-medium">{t('tools.createTool.availableTools.description')}</th>
+                      <th className="p-2 pl-3 font-medium">{t('tools.createTool.availableTools.method')}</th>
+                      <th className="p-2 pl-3 font-medium">{t('tools.createTool.availableTools.path')}</th>
+                      <th className="w-[54px] p-2 pl-3 font-medium">{t('tools.createTool.availableTools.action')}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {paramsSchemas.map((item, index) => (
+                      <tr key={index} className='border-b border-divider-regular last:border-0'>
+                        <td className="p-2 pl-3">{item.operation_id}</td>
+                        <td className="w-[236px] p-2 pl-3">{item.summary}</td>
+                        <td className="p-2 pl-3">{item.method}</td>
+                        <td className="p-2 pl-3">{getPath(item.server_url)}</td>
+                        <td className="w-[62px] p-2 pl-3">
+                          <Button
+                            size='small'
+                            onClick={() => {
+                              setCurrTool(item)
+                              setIsShowTestApi(true)
+                            }}
+                          >
+                            {t('tools.createTool.availableTools.test')}
+                          </Button>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+            </div>
+
+            {/* Authorization method */}
+            <div>
+              <div className='system-sm-medium py-2 text-text-primary'>{t('tools.createTool.authMethod.title')}</div>
+              <div className='flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2.5' onClick={() => setCredentialsModalShow(true)}>
+                <div className='system-xs-regular text-text-primary'>{t(`tools.createTool.authMethod.types.${credential.auth_type}`)}</div>
+                <Settings01 className='h-4 w-4 text-text-secondary' />
+              </div>
+            </div>
+
+            {/* Labels */}
+            <div>
+              <div className='system-sm-medium py-2 text-text-primary'>{t('tools.createTool.toolInput.label')}</div>
+              <LabelSelector value={labels} onChange={handleLabelSelect} />
+            </div>
+
+            {/* Privacy Policy */}
+            <div>
+              <div className='system-sm-medium py-2 text-text-primary'>{t('tools.createTool.privacyPolicy')}</div>
+              <Input
+                value={customCollection.privacy_policy}
+                onChange={(e) => {
+                  const newCollection = produce(customCollection, (draft) => {
+                    draft.privacy_policy = e.target.value
+                  })
+                  setCustomCollection(newCollection)
+                }}
+                className='h-10 grow' placeholder={t('tools.createTool.privacyPolicyPlaceholder') || ''} />
+            </div>
+
+            <div>
+              <div className='system-sm-medium py-2 text-text-primary'>{t('tools.createTool.customDisclaimer')}</div>
+              <Input
+                value={customCollection.custom_disclaimer}
+                onChange={(e) => {
+                  const newCollection = produce(customCollection, (draft) => {
+                    draft.custom_disclaimer = e.target.value
+                  })
+                  setCustomCollection(newCollection)
+                }}
+                className='h-10 grow' placeholder={t('tools.createTool.customDisclaimerPlaceholder') || ''} />
+            </div>
+
+          </div>
+          <div className={cn(isEdit ? 'justify-between' : 'justify-end', 'mt-2 flex shrink-0 rounded-b-[10px] border-t border-divider-regular bg-background-section-burn px-6 py-4')} >
+            {
+              isEdit && (
+                <Button variant='warning' onClick={onRemove}>{t('common.operation.delete')}</Button>
+              )
+            }
+            <div className='flex space-x-2 '>
+              <Button onClick={onHide}>{t('common.operation.cancel')}</Button>
+              <Button variant='primary' onClick={handleSave}>{t('common.operation.save')}</Button>
+            </div>
+          </div>
+          {showEmojiPicker && <EmojiPicker
+            onSelect={(icon, icon_background) => {
+              setEmoji({ content: icon, background: icon_background })
+              setShowEmojiPicker(false)
+            }}
+            onClose={() => {
+              setShowEmojiPicker(false)
+            }}
+          />}
+          {credentialsModalShow && (
+            <ConfigCredentials
+              positionCenter={isAdd}
+              credential={credential}
+              onChange={setCredential}
+              onHide={() => setCredentialsModalShow(false)}
+            />)
+          }
+          {isShowTestApi && (
+            <TestApi
+              positionCenter={isAdd}
+              tool={currTool as CustomParamSchema}
+              customCollection={customCollection}
+              onHide={() => setIsShowTestApi(false)}
+            />
+          )}
+        </div>
+      </Modal>
+    </>
+
+  )
+}
+export default React.memo(EditCustomCollectionModal)

web/app/components/workflow/block-selector/tool-picker.tsx

@@ -17,7 +17,7 @@ import type { BlockEnum, OnSelectBlock } from '@/app/components/workflow/types'
 import SearchBox from '@/app/components/plugins/marketplace/search-box'
 import { useTranslation } from 'react-i18next'
 import { useBoolean } from 'ahooks'
-import EditCustomToolModal from '@/app/components/tools/edit-custom-collection-modal'
+import EditCustomToolModal from '@/app/components/tools/edit-custom-collection-modal/modal'
 import {
   createCustomCollection,
 } from '@/service/tools'
@@ -149,7 +149,7 @@ const ToolPicker: FC<Props> = ({
   if (isShowEditCollectionToolModal) {
     return (
       <EditCustomToolModal
-        dialogClassName='bg-background-overlay'
+        positionLeft
         payload={null}
         onHide={hideEditCustomCollectionModal}
         onAdd={doCreateCustomToolCollection}