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

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

.devcontainer/post_create_command.sh

@@ -6,10 +6,11 @@ cd web && pnpm install
 pipx install uv
 
 echo "alias start-api=\"cd $WORKSPACE_ROOT/api && uv run python -m flask run --host 0.0.0.0 --port=5001 --debug\"" >> ~/.bashrc
-echo "alias start-worker=\"cd $WORKSPACE_ROOT/api && uv run python -m celery -A app.celery worker -P threads -c 1 --loglevel INFO -Q dataset,priority_dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor\"" >> ~/.bashrc
+echo "alias start-worker=\"cd $WORKSPACE_ROOT/api && uv run python -m celery -A app.celery worker -P threads -c 1 --loglevel INFO -Q dataset,generation,mail,ops_trace,app_deletion,plugin,workflow_storage\"" >> ~/.bashrc
 echo "alias start-web=\"cd $WORKSPACE_ROOT/web && pnpm dev\"" >> ~/.bashrc
 echo "alias start-web-prod=\"cd $WORKSPACE_ROOT/web && pnpm build && pnpm start\"" >> ~/.bashrc
 echo "alias start-containers=\"cd $WORKSPACE_ROOT/docker && docker-compose -f docker-compose.middleware.yaml -p dify --env-file middleware.env up -d\"" >> ~/.bashrc
 echo "alias stop-containers=\"cd $WORKSPACE_ROOT/docker && docker-compose -f docker-compose.middleware.yaml -p dify --env-file middleware.env down\"" >> ~/.bashrc
 
 source /home/vscode/.bashrc
+

.github/workflows/api-tests.yml

@@ -62,7 +62,7 @@ jobs:
           compose-file: |
             docker/docker-compose.middleware.yaml
           services: |
-            db_postgres
+            db
             redis
             sandbox
             ssrf_proxy

.github/workflows/autofix.yml

@@ -28,11 +28,6 @@ jobs:
           # Format code
           uv run ruff format ..
 
-      - name: count migration progress
-        run: |
-          cd api
-          ./cnt_base.sh
-
       - name: ast-grep
         run: |
           uvx --from ast-grep-cli sg --pattern 'db.session.query($WHATEVER).filter($HERE)' --rewrite 'db.session.query($WHATEVER).where($HERE)' -l py --update-all

.github/workflows/db-migration-test.yml

@@ -8,7 +8,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  db-migration-test-postgres:
+  db-migration-test:
     runs-on: ubuntu-latest
 
     steps:
@@ -45,7 +45,7 @@ jobs:
           compose-file: |
             docker/docker-compose.middleware.yaml
           services: |
-            db_postgres
+            db
             redis
 
       - name: Prepare configs
@@ -57,60 +57,3 @@ jobs:
         env:
           DEBUG: true
         run: uv run --directory api flask upgrade-db
-
-  db-migration-test-mysql:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Setup UV and Python
-        uses: astral-sh/setup-uv@v6
-        with:
-          enable-cache: true
-          python-version: "3.12"
-          cache-dependency-glob: api/uv.lock
-
-      - name: Install dependencies
-        run: uv sync --project api
-      - name: Ensure Offline migration are supported
-        run: |
-          # upgrade
-          uv run --directory api flask db upgrade 'base:head' --sql
-          # downgrade
-          uv run --directory api flask db downgrade 'head:base' --sql
-
-      - name: Prepare middleware env for MySQL
-        run: |
-          cd docker
-          cp middleware.env.example middleware.env
-          sed -i 's/DB_TYPE=postgresql/DB_TYPE=mysql/' middleware.env
-          sed -i 's/DB_HOST=db_postgres/DB_HOST=db_mysql/' middleware.env
-          sed -i 's/DB_PORT=5432/DB_PORT=3306/' middleware.env
-          sed -i 's/DB_USERNAME=postgres/DB_USERNAME=mysql/' middleware.env
-
-      - name: Set up Middlewares
-        uses: hoverkraft-tech/compose-action@v2.0.2
-        with:
-          compose-file: |
-            docker/docker-compose.middleware.yaml
-          services: |
-            db_mysql
-            redis
-
-      - name: Prepare configs for MySQL
-        run: |
-          cd api
-          cp .env.example .env
-          sed -i 's/DB_TYPE=postgresql/DB_TYPE=mysql/' .env
-          sed -i 's/DB_PORT=5432/DB_PORT=3306/' .env
-          sed -i 's/DB_USERNAME=postgres/DB_USERNAME=root/' .env
-
-      - name: Run DB Migration
-        env:
-          DEBUG: true
-        run: uv run --directory api flask upgrade-db

.github/workflows/vdb-tests.yml

@@ -51,13 +51,13 @@ jobs:
       - name: Expose Service Ports
         run: sh .github/workflows/expose_service_ports.sh
 
-#      - name: Set up Vector Store (TiDB)
-#        uses: hoverkraft-tech/compose-action@v2.0.2
-#        with:
-#          compose-file: docker/tidb/docker-compose.yaml
-#          services: |
-#            tidb
-#            tiflash
+      - name: Set up Vector Store (TiDB)
+        uses: hoverkraft-tech/compose-action@v2.0.2
+        with:
+          compose-file: docker/tidb/docker-compose.yaml
+          services: |
+            tidb
+            tiflash
 
       - name: Set up Vector Stores (Weaviate, Qdrant, PGVector, Milvus, PgVecto-RS, Chroma, MyScale, ElasticSearch, Couchbase, OceanBase)
         uses: hoverkraft-tech/compose-action@v2.0.2
@@ -83,8 +83,8 @@ jobs:
           ls -lah .
           cp api/tests/integration_tests/.env.example api/tests/integration_tests/.env
 
-#      - name: Check VDB Ready (TiDB)
-#        run: uv run --project api python api/tests/integration_tests/vdb/tidb_vector/check_tiflash_ready.py
+      - name: Check VDB Ready (TiDB)
+        run: uv run --project api python api/tests/integration_tests/vdb/tidb_vector/check_tiflash_ready.py
 
       - name: Test Vector Stores
         run: uv run --project api bash dev/pytest/pytest_vdb.sh

.gitignore

@@ -186,8 +186,6 @@ docker/volumes/couchbase/*
 docker/volumes/oceanbase/*
 docker/volumes/plugin_daemon/*
 docker/volumes/matrixone/*
-docker/volumes/mysql/*
-docker/volumes/seekdb/*
 !docker/volumes/oceanbase/init.d
 
 docker/nginx/conf.d/default.conf

Makefile

@@ -70,11 +70,6 @@ type-check:
 	@uv run --directory api --dev basedpyright
 	@echo "✅ Type check complete"
 
-test:
-	@echo "🧪 Running backend unit tests..."
-	@uv run --project api --dev dev/pytest/pytest_unit_tests.sh
-	@echo "✅ Tests complete"
-
 # Build Docker images
 build-web:
 	@echo "Building web Docker image: $(WEB_IMAGE):$(VERSION)..."
@@ -124,7 +119,6 @@ help:
 	@echo "  make check          - Check code with ruff"
 	@echo "  make lint           - Format and fix code with ruff"
 	@echo "  make type-check     - Run type checking with basedpyright"
-	@echo "  make test           - Run backend unit tests"
 	@echo ""
 	@echo "Docker Build Targets:"
 	@echo "  make build-web      - Build web Docker image"
@@ -134,4 +128,4 @@ help:
 	@echo "  make build-push-all - Build and push all Docker images"
 
 # Phony targets
-.PHONY: build-web build-api push-web push-api build-all push-all build-push-all dev-setup prepare-docker prepare-web prepare-api dev-clean help format check lint type-check test
+.PHONY: build-web build-api push-web push-api build-all push-all build-push-all dev-setup prepare-docker prepare-web prepare-api dev-clean help format check lint type-check

api/.env.example

@@ -72,15 +72,12 @@ REDIS_CLUSTERS_PASSWORD=
 # celery configuration
 CELERY_BROKER_URL=redis://:difyai123456@localhost:${REDIS_PORT}/1
 CELERY_BACKEND=redis
-
-# Database configuration
-DB_TYPE=postgresql
+# PostgreSQL database configuration
 DB_USERNAME=postgres
 DB_PASSWORD=difyai123456
 DB_HOST=localhost
 DB_PORT=5432
 DB_DATABASE=dify
-
 SQLALCHEMY_POOL_PRE_PING=true
 SQLALCHEMY_POOL_TIMEOUT=30
 
@@ -162,11 +159,12 @@ SUPABASE_URL=your-server-url
 # CORS configuration
 WEB_API_CORS_ALLOW_ORIGINS=http://localhost:3000,*
 CONSOLE_CORS_ALLOW_ORIGINS=http://localhost:3000,*
-# When the frontend and backend run on different subdomains, set COOKIE_DOMAIN to the site’s top-level domain (e.g., `example.com`). Leading dots are optional.
+# Set COOKIE_DOMAIN when the console frontend and API are on different subdomains.
+# Provide the registrable domain (e.g. example.com); leading dots are optional.
 COOKIE_DOMAIN=
 
 # Vector database configuration
-# Supported values are `weaviate`, `oceanbase`, `qdrant`, `milvus`, `myscale`, `relyt`, `pgvector`, `pgvecto-rs`, `chroma`, `opensearch`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`,  `opengauss`, `tablestore`,`vastbase`,`tidb`,`tidb_on_qdrant`,`baidu`,`lindorm`,`huawei_cloud`,`upstash`, `matrixone`.
+# Supported values are `weaviate`, `qdrant`, `milvus`, `myscale`, `relyt`, `pgvector`, `pgvecto-rs`, `chroma`, `opensearch`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`, `oceanbase`, `opengauss`, `tablestore`,`vastbase`,`tidb`,`tidb_on_qdrant`,`baidu`,`lindorm`,`huawei_cloud`,`upstash`, `matrixone`.
 VECTOR_STORE=weaviate
 # Prefix used to create collection name in vector database
 VECTOR_INDEX_NAME_PREFIX=Vector_index
@@ -177,17 +175,6 @@ WEAVIATE_API_KEY=WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih
 WEAVIATE_GRPC_ENABLED=false
 WEAVIATE_BATCH_SIZE=100
 
-# OceanBase Vector configuration
-OCEANBASE_VECTOR_HOST=127.0.0.1
-OCEANBASE_VECTOR_PORT=2881
-OCEANBASE_VECTOR_USER=root@test
-OCEANBASE_VECTOR_PASSWORD=difyai123456
-OCEANBASE_VECTOR_DATABASE=test
-OCEANBASE_MEMORY_LIMIT=6G
-OCEANBASE_ENABLE_HYBRID_SEARCH=false
-OCEANBASE_FULLTEXT_PARSER=ik
-SEEKDB_MEMORY_LIMIT=2G
-
 # Qdrant configuration, use `http://localhost:6333` for local mode or `https://your-qdrant-cluster-url.qdrant.io` for remote mode
 QDRANT_URL=http://localhost:6333
 QDRANT_API_KEY=difyai123456
@@ -353,6 +340,15 @@ LINDORM_PASSWORD=admin
 LINDORM_USING_UGC=True
 LINDORM_QUERY_TIMEOUT=1
 
+# OceanBase Vector configuration
+OCEANBASE_VECTOR_HOST=127.0.0.1
+OCEANBASE_VECTOR_PORT=2881
+OCEANBASE_VECTOR_USER=root@test
+OCEANBASE_VECTOR_PASSWORD=difyai123456
+OCEANBASE_VECTOR_DATABASE=test
+OCEANBASE_MEMORY_LIMIT=6G
+OCEANBASE_ENABLE_HYBRID_SEARCH=false
+
 # AlibabaCloud MySQL Vector configuration
 ALIBABACLOUD_MYSQL_HOST=127.0.0.1
 ALIBABACLOUD_MYSQL_PORT=3306

api/README.md

@@ -15,8 +15,8 @@
    ```bash
    cd ../docker
    cp middleware.env.example middleware.env
-   # change the profile to mysql if you are not using postgres,change the profile to other vector database if you are not using weaviate
-   docker compose -f docker-compose.middleware.yaml --profile postgresql --profile weaviate -p dify up -d
+   # change the profile to other vector database if you are not using weaviate
+   docker compose -f docker-compose.middleware.yaml --profile weaviate -p dify up -d
    cd ../api
    ```
 
@@ -26,10 +26,6 @@
    cp .env.example .env
    ```
 
-> [!IMPORTANT]
->
-> When the frontend and backend run on different subdomains, set COOKIE_DOMAIN to the site’s top-level domain (e.g., `example.com`). The frontend and backend must be under the same top-level domain in order to share authentication cookies.
-
 1. Generate a `SECRET_KEY` in the `.env` file.
 
    bash for Linux

api/cnt_base.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-
-for pattern in "Base" "TypeBase"; do
-    printf "%s " "$pattern"
-    grep "($pattern):" -r --include='*.py' --exclude-dir=".venv" --exclude-dir="tests" . | wc -l
-done

api/configs/feature/__init__.py

@@ -77,6 +77,10 @@ class AppExecutionConfig(BaseSettings):
         description="Maximum number of concurrent active requests per app (0 for unlimited)",
         default=0,
     )
+    APP_DAILY_RATE_LIMIT: NonNegativeInt = Field(
+        description="Maximum number of requests per app per day",
+        default=5000,
+    )
 
 
 class CodeExecutionSandboxConfig(BaseSettings):
@@ -1082,7 +1086,7 @@ class CeleryScheduleTasksConfig(BaseSettings):
     )
     TRIGGER_PROVIDER_CREDENTIAL_THRESHOLD_SECONDS: int = Field(
         description="Proactive credential refresh threshold in seconds",
-        default=60 * 60,
+        default=180,
     )
     TRIGGER_PROVIDER_SUBSCRIPTION_THRESHOLD_SECONDS: int = Field(
         description="Proactive subscription refresh threshold in seconds",

api/configs/middleware/__init__.py

@@ -105,12 +105,6 @@ class KeywordStoreConfig(BaseSettings):
 
 
 class DatabaseConfig(BaseSettings):
-    # Database type selector
-    DB_TYPE: Literal["postgresql", "mysql", "oceanbase"] = Field(
-        description="Database type to use. OceanBase is MySQL-compatible.",
-        default="postgresql",
-    )
-
     DB_HOST: str = Field(
         description="Hostname or IP address of the database server.",
         default="localhost",
@@ -146,10 +140,10 @@ class DatabaseConfig(BaseSettings):
         default="",
     )
 
-    @computed_field  # type: ignore[prop-decorator]
-    @property
-    def SQLALCHEMY_DATABASE_URI_SCHEME(self) -> str:
-        return "postgresql" if self.DB_TYPE == "postgresql" else "mysql+pymysql"
+    SQLALCHEMY_DATABASE_URI_SCHEME: str = Field(
+        description="Database URI scheme for SQLAlchemy connection.",
+        default="postgresql",
+    )
 
     @computed_field  # type: ignore[prop-decorator]
     @property
@@ -210,15 +204,15 @@ class DatabaseConfig(BaseSettings):
         # Parse DB_EXTRAS for 'options'
         db_extras_dict = dict(parse_qsl(self.DB_EXTRAS))
         options = db_extras_dict.get("options", "")
-        connect_args = {}
-        # Use the dynamic SQLALCHEMY_DATABASE_URI_SCHEME property
-        if self.SQLALCHEMY_DATABASE_URI_SCHEME.startswith("postgresql"):
-            timezone_opt = "-c timezone=UTC"
-            if options:
-                merged_options = f"{options} {timezone_opt}"
-            else:
-                merged_options = timezone_opt
-            connect_args = {"options": merged_options}
+        # Always include timezone
+        timezone_opt = "-c timezone=UTC"
+        if options:
+            # Merge user options and timezone
+            merged_options = f"{options} {timezone_opt}"
+        else:
+            merged_options = timezone_opt
+
+        connect_args = {"options": merged_options}
 
         return {
             "pool_size": self.SQLALCHEMY_POOL_SIZE,

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

@@ -15,12 +15,11 @@ from controllers.console.wraps import (
     setup_required,
 )
 from core.ops.ops_trace_manager import OpsTraceManager
-from core.workflow.enums import NodeType
 from extensions.ext_database import db
 from fields.app_fields import app_detail_fields, app_detail_fields_with_site, app_pagination_fields
 from libs.login import current_account_with_tenant, login_required
 from libs.validators import validate_description_length
-from models import App, Workflow
+from models import App
 from services.app_dsl_service import AppDslService, ImportMode
 from services.app_service import AppService
 from services.enterprise.enterprise_service import EnterpriseService
@@ -107,35 +106,6 @@ class AppListApi(Resource):
                 if str(app.id) in res:
                     app.access_mode = res[str(app.id)].access_mode
 
-        workflow_capable_app_ids = [
-            str(app.id) for app in app_pagination.items if app.mode in {"workflow", "advanced-chat"}
-        ]
-        draft_trigger_app_ids: set[str] = set()
-        if workflow_capable_app_ids:
-            draft_workflows = (
-                db.session.execute(
-                    select(Workflow).where(
-                        Workflow.version == Workflow.VERSION_DRAFT,
-                        Workflow.app_id.in_(workflow_capable_app_ids),
-                    )
-                )
-                .scalars()
-                .all()
-            )
-            trigger_node_types = {
-                NodeType.TRIGGER_WEBHOOK,
-                NodeType.TRIGGER_SCHEDULE,
-                NodeType.TRIGGER_PLUGIN,
-            }
-            for workflow in draft_workflows:
-                for _, node_data in workflow.walk_nodes():
-                    if node_data.get("type") in trigger_node_types:
-                        draft_trigger_app_ids.add(str(workflow.app_id))
-                        break
-
-        for app in app_pagination.items:
-            app.has_draft_trigger = str(app.id) in draft_trigger_app_ids
-
         return marshal(app_pagination, app_pagination_fields), 200
 
     @api.doc("create_app")
@@ -250,8 +220,10 @@ class AppApi(Resource):
         args = parser.parse_args()
 
         app_service = AppService()
+        # Construct ArgsDict from parsed arguments
+        from services.app_service import AppService as AppServiceType
 
-        args_dict: AppService.ArgsDict = {
+        args_dict: AppServiceType.ArgsDict = {
             "name": args["name"],
             "description": args.get("description", ""),
             "icon_type": args.get("icon_type", ""),
@@ -381,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
@@ -398,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

@@ -10,9 +10,9 @@ from controllers.console.wraps import account_initialization_required, setup_req
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_database import db
 from libs.datetime_utils import parse_time_range
-from libs.helper import DatetimeString, convert_datetime_to_date
+from libs.helper import DatetimeString
 from libs.login import current_account_with_tenant, login_required
-from models import AppMode
+from models import AppMode, Message
 
 
 @console_ns.route("/apps/<uuid:app_id>/statistics/daily-messages")
@@ -44,9 +44,8 @@ class DailyMessageStatistic(Resource):
         )
         args = parser.parse_args()
 
-        converted_created_at = convert_datetime_to_date("created_at")
-        sql_query = f"""SELECT
-    {converted_created_at} AS date,
+        sql_query = """SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
     COUNT(*) AS message_count
 FROM
     messages
@@ -81,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",
@@ -106,18 +102,12 @@ 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()
-
-        converted_created_at = convert_datetime_to_date("created_at")
-        sql_query = f"""SELECT
-    {converted_created_at} AS date,
-    COUNT(DISTINCT conversation_id) AS conversation_count
-FROM
-    messages
-WHERE
-    app_id = :app_id
-    AND invoke_from != :invoke_from"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id, "invoke_from": InvokeFrom.DEBUGGER}
         assert account.timezone is not None
 
         try:
@@ -125,21 +115,30 @@ WHERE
         except ValueError as e:
             abort(400, description=str(e))
 
+        stmt = (
+            sa.select(
+                sa.func.date(
+                    sa.func.date_trunc("day", sa.text("created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz"))
+                ).label("date"),
+                sa.func.count(sa.distinct(Message.conversation_id)).label("conversation_count"),
+            )
+            .select_from(Message)
+            .where(Message.app_id == app_model.id, Message.invoke_from != InvokeFrom.DEBUGGER)
+        )
+
         if start_datetime_utc:
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            stmt = stmt.where(Message.created_at >= start_datetime_utc)
 
         if end_datetime_utc:
-            sql_query += " AND created_at < :end"
-            arg_dict["end"] = end_datetime_utc
+            stmt = stmt.where(Message.created_at < end_datetime_utc)
 
-        sql_query += " GROUP BY date ORDER BY date"
+        stmt = stmt.group_by("date").order_by("date")
 
         response_data = []
         with db.engine.begin() as conn:
-            rs = conn.execute(sa.text(sql_query), arg_dict)
-            for i in rs:
-                response_data.append({"date": str(i.date), "conversation_count": i.conversation_count})
+            rs = conn.execute(stmt, {"tz": account.timezone})
+            for row in rs:
+                response_data.append({"date": str(row.date), "conversation_count": row.conversation_count})
 
         return jsonify({"data": response_data})
 
@@ -149,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",
@@ -162,11 +165,15 @@ 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()
 
-        converted_created_at = convert_datetime_to_date("created_at")
-        sql_query = f"""SELECT
-    {converted_created_at} AS date,
+        sql_query = """SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
     COUNT(DISTINCT messages.from_end_user_id) AS terminal_count
 FROM
     messages
@@ -206,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",
@@ -219,11 +230,15 @@ 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()
 
-        converted_created_at = convert_datetime_to_date("created_at")
-        sql_query = f"""SELECT
-    {converted_created_at} AS date,
+        sql_query = """SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
     (SUM(messages.message_tokens) + SUM(messages.answer_tokens)) AS token_count,
     SUM(total_price) AS total_price
 FROM
@@ -266,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",
@@ -279,11 +298,15 @@ 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()
 
-        converted_created_at = convert_datetime_to_date("c.created_at")
-        sql_query = f"""SELECT
-    {converted_created_at} AS date,
+        sql_query = """SELECT
+    DATE(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
     AVG(subquery.message_count) AS interactions
 FROM
     (
@@ -342,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",
@@ -355,11 +382,15 @@ 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()
 
-        converted_created_at = convert_datetime_to_date("m.created_at")
-        sql_query = f"""SELECT
-    {converted_created_at} AS date,
+        sql_query = """SELECT
+    DATE(DATE_TRUNC('day', m.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
     COUNT(m.id) AS message_count,
     COUNT(mf.id) AS feedback_count
 FROM
@@ -408,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",
@@ -421,11 +456,15 @@ 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()
 
-        converted_created_at = convert_datetime_to_date("created_at")
-        sql_query = f"""SELECT
-    {converted_created_at} AS date,
+        sql_query = """SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
     AVG(provider_response_latency) AS latency
 FROM
     messages
@@ -465,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",
@@ -477,11 +520,16 @@ 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()
 
-        converted_created_at = convert_datetime_to_date("created_at")
-        sql_query = f"""SELECT
-    {converted_created_at} AS date,
+        sql_query = """SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
     CASE
         WHEN SUM(provider_response_latency) = 0 THEN 0
         ELSE (SUM(answer_tokens) / SUM(provider_response_latency))

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/datasets_document.py

@@ -162,7 +162,6 @@ class DatasetDocumentListApi(Resource):
             "keyword": "Search keyword",
             "sort": "Sort order (default: -created_at)",
             "fetch": "Fetch full details (default: false)",
-            "status": "Filter documents by display status",
         }
     )
     @api.response(200, "Documents retrieved successfully")
@@ -176,7 +175,6 @@ class DatasetDocumentListApi(Resource):
         limit = request.args.get("limit", default=20, type=int)
         search = request.args.get("keyword", default=None, type=str)
         sort = request.args.get("sort", default="-created_at", type=str)
-        status = request.args.get("status", default=None, type=str)
         # "yes", "true", "t", "y", "1" convert to True, while others convert to False.
         try:
             fetch_val = request.args.get("fetch", default="false")
@@ -205,9 +203,6 @@ class DatasetDocumentListApi(Resource):
 
         query = select(Document).filter_by(dataset_id=str(dataset_id), tenant_id=current_tenant_id)
 
-        if status:
-            query = DocumentService.apply_display_status_filter(query, status)
-
         if search:
             search = f"%{search}%"
             query = query.where(Document.name.like(search))

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()
 
@@ -1086,13 +1035,7 @@ class ToolMCPAuthApi(Resource):
                 return {"result": "success"}
         except MCPAuthError as e:
             try:
-                # Pass the extracted OAuth metadata hints to auth()
-                auth_result = auth(
-                    provider_entity,
-                    args.get("authorization_code"),
-                    resource_metadata_url=e.resource_metadata_url,
-                    scope_hint=e.scope_hint,
-                )
+                auth_result = auth(provider_entity, args.get("authorization_code"))
                 with Session(db.engine) as session, session.begin():
                     service = MCPToolManageService(session=session)
                     response = service.execute_auth_actions(auth_result)
@@ -1102,7 +1045,7 @@ class ToolMCPAuthApi(Resource):
                     service = MCPToolManageService(session=session)
                     service.clear_provider_credentials(provider_id=provider_id, tenant_id=tenant_id)
                 raise ValueError(f"Failed to refresh token, please try to authorize again: {e}") from e
-        except (MCPError, ValueError) as e:
+        except MCPError as e:
             with Session(db.engine) as session, session.begin():
                 service = MCPToolManageService(session=session)
                 service.clear_provider_credentials(provider_id=provider_id, tenant_id=tenant_id)
@@ -1154,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 (
@@ -128,7 +128,7 @@ class TenantApi(Resource):
     @login_required
     @account_initialization_required
     @marshal_with(tenant_fields)
-    def post(self):
+    def get(self):
         if request.path == "/info":
             logger.warning("Deprecated URL /info was used.")
 
@@ -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/service_api/dataset/document.py

@@ -456,16 +456,12 @@ class DocumentListApi(DatasetApiResource):
         page = request.args.get("page", default=1, type=int)
         limit = request.args.get("limit", default=20, type=int)
         search = request.args.get("keyword", default=None, type=str)
-        status = request.args.get("status", default=None, type=str)
         dataset = db.session.query(Dataset).where(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id).first()
         if not dataset:
             raise NotFound("Dataset not found.")
 
         query = select(Document).filter_by(dataset_id=str(dataset_id), tenant_id=tenant_id)
 
-        if status:
-            query = DocumentService.apply_display_status_filter(query, status)
-
         if search:
             search = f"%{search}%"
             query = query.where(Document.name.like(search))

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/app/apps/workflow/app_generator.py

@@ -145,8 +145,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
             **extract_external_trace_id_from_args(args),
         }
         workflow_run_id = str(uuid.uuid4())
-        # FIXME (Yeuoly): we need to remove the SKIP_PREPARE_USER_INPUTS_KEY from the args
-        # trigger shouldn't prepare user inputs
+        # for trigger debug run, not prepare user inputs
         if self._should_prepare_user_inputs(args):
             inputs = self._prepare_user_inputs(
                 user_inputs=inputs,

api/core/datasource/__base/datasource_runtime.py

@@ -1,10 +1,14 @@
-from typing import Any
+from typing import TYPE_CHECKING, Any, Optional
 
 from pydantic import BaseModel, Field
 
+# Import InvokeFrom locally to avoid circular import
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.datasource.entities.datasource_entities import DatasourceInvokeFrom
 
+if TYPE_CHECKING:
+    from core.app.entities.app_invoke_entities import InvokeFrom
+
 
 class DatasourceRuntime(BaseModel):
     """
@@ -13,7 +17,7 @@ class DatasourceRuntime(BaseModel):
 
     tenant_id: str
     datasource_id: str | None = None
-    invoke_from: InvokeFrom | None = None
+    invoke_from: Optional["InvokeFrom"] = None
     datasource_invoke_from: DatasourceInvokeFrom | None = None
     credentials: dict[str, Any] = Field(default_factory=dict)
     runtime_parameters: dict[str, Any] = Field(default_factory=dict)

api/core/mcp/auth/auth_flow.py

@@ -6,8 +6,7 @@ import secrets
 import urllib.parse
 from urllib.parse import urljoin, urlparse
 
-import httpx
-from httpx import RequestError
+from httpx import ConnectError, HTTPStatusError, RequestError
 from pydantic import ValidationError
 
 from core.entities.mcp_provider import MCPProviderEntity, MCPSupportGrantType
@@ -21,7 +20,6 @@ from core.mcp.types import (
     OAuthClientMetadata,
     OAuthMetadata,
     OAuthTokens,
-    ProtectedResourceMetadata,
 )
 from extensions.ext_redis import redis_client
 
@@ -41,131 +39,6 @@ def generate_pkce_challenge() -> tuple[str, str]:
     return code_verifier, code_challenge
 
 
-def build_protected_resource_metadata_discovery_urls(
-    www_auth_resource_metadata_url: str | None, server_url: str
-) -> list[str]:
-    """
-    Build a list of URLs to try for Protected Resource Metadata discovery.
-
-    Per SEP-985, supports fallback when discovery fails at one URL.
-    """
-    urls = []
-
-    # First priority: URL from WWW-Authenticate header
-    if www_auth_resource_metadata_url:
-        urls.append(www_auth_resource_metadata_url)
-
-    # Fallback: construct from server URL
-    parsed = urlparse(server_url)
-    base_url = f"{parsed.scheme}://{parsed.netloc}"
-    fallback_url = urljoin(base_url, "/.well-known/oauth-protected-resource")
-    if fallback_url not in urls:
-        urls.append(fallback_url)
-
-    return urls
-
-
-def build_oauth_authorization_server_metadata_discovery_urls(auth_server_url: str | None, server_url: str) -> list[str]:
-    """
-    Build a list of URLs to try for OAuth Authorization Server Metadata discovery.
-
-    Supports both OAuth 2.0 (RFC 8414) and OpenID Connect discovery.
-
-    Per RFC 8414 section 3:
-    - If issuer has no path: https://example.com/.well-known/oauth-authorization-server
-    - If issuer has path: https://example.com/.well-known/oauth-authorization-server{path}
-
-    Example:
-    - issuer: https://example.com/oauth
-    - metadata: https://example.com/.well-known/oauth-authorization-server/oauth
-    """
-    urls = []
-    base_url = auth_server_url or server_url
-
-    parsed = urlparse(base_url)
-    base = f"{parsed.scheme}://{parsed.netloc}"
-    path = parsed.path.rstrip("/")  # Remove trailing slash
-
-    # Try OpenID Connect discovery first (more common)
-    urls.append(urljoin(base + "/", ".well-known/openid-configuration"))
-
-    # OAuth 2.0 Authorization Server Metadata (RFC 8414)
-    # Include the path component if present in the issuer URL
-    if path:
-        urls.append(urljoin(base, f".well-known/oauth-authorization-server{path}"))
-    else:
-        urls.append(urljoin(base, ".well-known/oauth-authorization-server"))
-
-    return urls
-
-
-def discover_protected_resource_metadata(
-    prm_url: str | None, server_url: str, protocol_version: str | None = None
-) -> ProtectedResourceMetadata | None:
-    """Discover OAuth 2.0 Protected Resource Metadata (RFC 9470)."""
-    urls = build_protected_resource_metadata_discovery_urls(prm_url, server_url)
-    headers = {"MCP-Protocol-Version": protocol_version or LATEST_PROTOCOL_VERSION, "User-Agent": "Dify"}
-
-    for url in urls:
-        try:
-            response = ssrf_proxy.get(url, headers=headers)
-            if response.status_code == 200:
-                return ProtectedResourceMetadata.model_validate(response.json())
-            elif response.status_code == 404:
-                continue  # Try next URL
-        except (RequestError, ValidationError):
-            continue  # Try next URL
-
-    return None
-
-
-def discover_oauth_authorization_server_metadata(
-    auth_server_url: str | None, server_url: str, protocol_version: str | None = None
-) -> OAuthMetadata | None:
-    """Discover OAuth 2.0 Authorization Server Metadata (RFC 8414)."""
-    urls = build_oauth_authorization_server_metadata_discovery_urls(auth_server_url, server_url)
-    headers = {"MCP-Protocol-Version": protocol_version or LATEST_PROTOCOL_VERSION, "User-Agent": "Dify"}
-
-    for url in urls:
-        try:
-            response = ssrf_proxy.get(url, headers=headers)
-            if response.status_code == 200:
-                return OAuthMetadata.model_validate(response.json())
-            elif response.status_code == 404:
-                continue  # Try next URL
-        except (RequestError, ValidationError):
-            continue  # Try next URL
-
-    return None
-
-
-def get_effective_scope(
-    scope_from_www_auth: str | None,
-    prm: ProtectedResourceMetadata | None,
-    asm: OAuthMetadata | None,
-    client_scope: str | None,
-) -> str | None:
-    """
-    Determine effective scope using priority-based selection strategy.
-
-    Priority order:
-    1. WWW-Authenticate header scope (server explicit requirement)
-    2. Protected Resource Metadata scopes
-    3. OAuth Authorization Server Metadata scopes
-    4. Client configured scope
-    """
-    if scope_from_www_auth:
-        return scope_from_www_auth
-
-    if prm and prm.scopes_supported:
-        return " ".join(prm.scopes_supported)
-
-    if asm and asm.scopes_supported:
-        return " ".join(asm.scopes_supported)
-
-    return client_scope
-
-
 def _create_secure_redis_state(state_data: OAuthCallbackState) -> str:
     """Create a secure state parameter by storing state data in Redis and returning a random state key."""
     # Generate a secure random state key
@@ -248,36 +121,42 @@ def check_support_resource_discovery(server_url: str) -> tuple[bool, str]:
         return False, ""
 
 
-def discover_oauth_metadata(
-    server_url: str,
-    resource_metadata_url: str | None = None,
-    scope_hint: str | None = None,
-    protocol_version: str | None = None,
-) -> tuple[OAuthMetadata | None, ProtectedResourceMetadata | None, str | None]:
-    """
-    Discover OAuth metadata using RFC 8414/9470 standards.
+def discover_oauth_metadata(server_url: str, protocol_version: str | None = None) -> OAuthMetadata | None:
+    """Looks up RFC 8414 OAuth 2.0 Authorization Server Metadata."""
+    # First check if the server supports OAuth 2.0 Resource Discovery
+    support_resource_discovery, oauth_discovery_url = check_support_resource_discovery(server_url)
+    if support_resource_discovery:
+        # The oauth_discovery_url is the authorization server base URL
+        # Try OpenID Connect discovery first (more common), then OAuth 2.0
+        urls_to_try = [
+            urljoin(oauth_discovery_url + "/", ".well-known/oauth-authorization-server"),
+            urljoin(oauth_discovery_url + "/", ".well-known/openid-configuration"),
+        ]
+    else:
+        urls_to_try = [urljoin(server_url, "/.well-known/oauth-authorization-server")]
 
-    Args:
-        server_url: The MCP server URL
-        resource_metadata_url: Protected Resource Metadata URL from WWW-Authenticate header
-        scope_hint: Scope hint from WWW-Authenticate header
-        protocol_version: MCP protocol version
+    headers = {"MCP-Protocol-Version": protocol_version or LATEST_PROTOCOL_VERSION}
 
-    Returns:
-        (oauth_metadata, protected_resource_metadata, scope_hint)
-    """
-    # Discover Protected Resource Metadata
-    prm = discover_protected_resource_metadata(resource_metadata_url, server_url, protocol_version)
+    for url in urls_to_try:
+        try:
+            response = ssrf_proxy.get(url, headers=headers)
+            if response.status_code == 404:
+                continue
+            if not response.is_success:
+                response.raise_for_status()
+            return OAuthMetadata.model_validate(response.json())
+        except (RequestError, HTTPStatusError) as e:
+            if isinstance(e, ConnectError):
+                response = ssrf_proxy.get(url)
+                if response.status_code == 404:
+                    continue  # Try next URL
+                if not response.is_success:
+                    raise ValueError(f"HTTP {response.status_code} trying to load well-known OAuth metadata")
+                return OAuthMetadata.model_validate(response.json())
+            # For other errors, try next URL
+            continue
 
-    # Get authorization server URL from PRM or use server URL
-    auth_server_url = None
-    if prm and prm.authorization_servers:
-        auth_server_url = prm.authorization_servers[0]
-
-    # Discover OAuth Authorization Server Metadata
-    asm = discover_oauth_authorization_server_metadata(auth_server_url, server_url, protocol_version)
-
-    return asm, prm, scope_hint
+    return None  # No metadata found
 
 
 def start_authorization(
@@ -287,7 +166,6 @@ def start_authorization(
     redirect_url: str,
     provider_id: str,
     tenant_id: str,
-    scope: str | None = None,
 ) -> tuple[str, str]:
     """Begins the authorization flow with secure Redis state storage."""
     response_type = "code"
@@ -297,6 +175,13 @@ def start_authorization(
         authorization_url = metadata.authorization_endpoint
         if response_type not in metadata.response_types_supported:
             raise ValueError(f"Incompatible auth server: does not support response type {response_type}")
+        if (
+            not metadata.code_challenge_methods_supported
+            or code_challenge_method not in metadata.code_challenge_methods_supported
+        ):
+            raise ValueError(
+                f"Incompatible auth server: does not support code challenge method {code_challenge_method}"
+            )
     else:
         authorization_url = urljoin(server_url, "/authorize")
 
@@ -325,49 +210,10 @@ def start_authorization(
         "state": state_key,
     }
 
-    # Add scope if provided
-    if scope:
-        params["scope"] = scope
-
     authorization_url = f"{authorization_url}?{urllib.parse.urlencode(params)}"
     return authorization_url, code_verifier
 
 
-def _parse_token_response(response: httpx.Response) -> OAuthTokens:
-    """
-    Parse OAuth token response supporting both JSON and form-urlencoded formats.
-
-    Per RFC 6749 Section 5.1, the standard format is JSON.
-    However, some legacy OAuth providers (e.g., early GitHub OAuth Apps) return
-    application/x-www-form-urlencoded format for backwards compatibility.
-
-    Args:
-        response: The HTTP response from token endpoint
-
-    Returns:
-        Parsed OAuth tokens
-
-    Raises:
-        ValueError: If response cannot be parsed
-    """
-    content_type = response.headers.get("content-type", "").lower()
-
-    if "application/json" in content_type:
-        # Standard OAuth 2.0 JSON response (RFC 6749)
-        return OAuthTokens.model_validate(response.json())
-    elif "application/x-www-form-urlencoded" in content_type:
-        # Legacy form-urlencoded response (non-standard but used by some providers)
-        token_data = dict(urllib.parse.parse_qsl(response.text))
-        return OAuthTokens.model_validate(token_data)
-    else:
-        # No content-type or unknown - try JSON first, fallback to form-urlencoded
-        try:
-            return OAuthTokens.model_validate(response.json())
-        except (ValidationError, json.JSONDecodeError):
-            token_data = dict(urllib.parse.parse_qsl(response.text))
-            return OAuthTokens.model_validate(token_data)
-
-
 def exchange_authorization(
     server_url: str,
     metadata: OAuthMetadata | None,
@@ -400,7 +246,7 @@ def exchange_authorization(
     response = ssrf_proxy.post(token_url, data=params)
     if not response.is_success:
         raise ValueError(f"Token exchange failed: HTTP {response.status_code}")
-    return _parse_token_response(response)
+    return OAuthTokens.model_validate(response.json())
 
 
 def refresh_authorization(
@@ -433,7 +279,7 @@ def refresh_authorization(
         raise MCPRefreshTokenError(e) from e
     if not response.is_success:
         raise MCPRefreshTokenError(response.text)
-    return _parse_token_response(response)
+    return OAuthTokens.model_validate(response.json())
 
 
 def client_credentials_flow(
@@ -476,7 +322,7 @@ def client_credentials_flow(
             f"Client credentials token request failed: HTTP {response.status_code}, Response: {response.text}"
         )
 
-    return _parse_token_response(response)
+    return OAuthTokens.model_validate(response.json())
 
 
 def register_client(
@@ -506,8 +352,6 @@ def auth(
     provider: MCPProviderEntity,
     authorization_code: str | None = None,
     state_param: str | None = None,
-    resource_metadata_url: str | None = None,
-    scope_hint: str | None = None,
 ) -> AuthResult:
     """
     Orchestrates the full auth flow with a server using secure Redis state storage.
@@ -519,26 +363,18 @@ def auth(
         provider: The MCP provider entity
         authorization_code: Optional authorization code from OAuth callback
         state_param: Optional state parameter from OAuth callback
-        resource_metadata_url: Optional Protected Resource Metadata URL from WWW-Authenticate
-        scope_hint: Optional scope hint from WWW-Authenticate header
 
     Returns:
         AuthResult containing actions to be performed and response data
     """
     actions: list[AuthAction] = []
     server_url = provider.decrypt_server_url()
-
-    # Discover OAuth metadata using RFC 8414/9470 standards
-    server_metadata, prm, scope_from_www_auth = discover_oauth_metadata(
-        server_url, resource_metadata_url, scope_hint, LATEST_PROTOCOL_VERSION
-    )
-
+    server_metadata = discover_oauth_metadata(server_url)
     client_metadata = provider.client_metadata
     provider_id = provider.id
     tenant_id = provider.tenant_id
     client_information = provider.retrieve_client_information()
     redirect_url = provider.redirect_url
-    credentials = provider.decrypt_credentials()
 
     # Determine grant type based on server metadata
     if not server_metadata:
@@ -556,8 +392,8 @@ def auth(
     else:
         effective_grant_type = MCPSupportGrantType.CLIENT_CREDENTIALS.value
 
-    # Determine effective scope using priority-based strategy
-    effective_scope = get_effective_scope(scope_from_www_auth, prm, server_metadata, credentials.get("scope"))
+    # Get stored credentials
+    credentials = provider.decrypt_credentials()
 
     if not client_information:
         if authorization_code is not None:
@@ -589,11 +425,12 @@ def auth(
     if effective_grant_type == MCPSupportGrantType.CLIENT_CREDENTIALS.value:
         # Direct token request without user interaction
         try:
+            scope = credentials.get("scope")
             tokens = client_credentials_flow(
                 server_url,
                 server_metadata,
                 client_information,
-                effective_scope,
+                scope,
             )
 
             # Return action to save tokens and grant type
@@ -689,7 +526,6 @@ def auth(
         redirect_url,
         provider_id,
         tenant_id,
-        effective_scope,
     )
 
     # Return action to save code verifier

api/core/mcp/auth_client.py

@@ -90,13 +90,7 @@ class MCPClientWithAuthRetry(MCPClient):
                 mcp_service = MCPToolManageService(session=session)
 
                 # Perform authentication using the service's auth method
-                # Extract OAuth metadata hints from the error
-                mcp_service.auth_with_actions(
-                    self.provider_entity,
-                    self.authorization_code,
-                    resource_metadata_url=error.resource_metadata_url,
-                    scope_hint=error.scope_hint,
-                )
+                mcp_service.auth_with_actions(self.provider_entity, self.authorization_code)
 
                 # Retrieve new tokens
                 self.provider_entity = mcp_service.get_provider_entity(

api/core/mcp/client/sse_client.py

@@ -290,7 +290,7 @@ def sse_client(
 
     except httpx.HTTPStatusError as exc:
         if exc.response.status_code == 401:
-            raise MCPAuthError(response=exc.response)
+            raise MCPAuthError()
         raise MCPConnectionError()
     except Exception:
         logger.exception("Error connecting to SSE endpoint")

api/core/mcp/client/streamable_client.py

@@ -138,10 +138,6 @@ class StreamableHTTPTransport:
     ) -> bool:
         """Handle an SSE event, returning True if the response is complete."""
         if sse.event == "message":
-            # ping event send by server will be recognized  as a message event with empty data by httpx-sse's SSEDecoder
-            if not sse.data.strip():
-                return False
-
             try:
                 message = JSONRPCMessage.model_validate_json(sse.data)
                 logger.debug("SSE message: %s", message)

api/core/mcp/error.py

@@ -1,10 +1,3 @@
-import re
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    import httpx
-
-
 class MCPError(Exception):
     pass
 
@@ -14,49 +7,7 @@ class MCPConnectionError(MCPError):
 
 
 class MCPAuthError(MCPConnectionError):
-    def __init__(
-        self,
-        message: str | None = None,
-        response: "httpx.Response | None" = None,
-        www_authenticate_header: str | None = None,
-    ):
-        """
-        MCP Authentication Error.
-
-        Args:
-            message: Error message
-            response: HTTP response object (will extract WWW-Authenticate header if provided)
-            www_authenticate_header: Pre-extracted WWW-Authenticate header value
-        """
-        super().__init__(message or "Authentication failed")
-
-        # Extract OAuth metadata hints from WWW-Authenticate header
-        if response is not None:
-            www_authenticate_header = response.headers.get("WWW-Authenticate")
-
-        self.resource_metadata_url: str | None = None
-        self.scope_hint: str | None = None
-
-        if www_authenticate_header:
-            self.resource_metadata_url = self._extract_field(www_authenticate_header, "resource_metadata")
-            self.scope_hint = self._extract_field(www_authenticate_header, "scope")
-
-    @staticmethod
-    def _extract_field(www_auth: str, field_name: str) -> str | None:
-        """Extract a specific field from the WWW-Authenticate header."""
-        # Pattern to match field="value" or field=value
-        pattern = rf'{field_name}="([^"]*)"'
-        match = re.search(pattern, www_auth)
-        if match:
-            return match.group(1)
-
-        # Try without quotes
-        pattern = rf"{field_name}=([^\s,]+)"
-        match = re.search(pattern, www_auth)
-        if match:
-            return match.group(1)
-
-        return None
+    pass
 
 
 class MCPRefreshTokenError(MCPError):

api/core/mcp/session/base_session.py

@@ -149,7 +149,7 @@ class BaseSession(
     messages when entered.
     """
 
-    _response_streams: dict[RequestId, queue.Queue[JSONRPCResponse | JSONRPCError | HTTPStatusError]]
+    _response_streams: dict[RequestId, queue.Queue[JSONRPCResponse | JSONRPCError]]
     _request_id: int
     _in_flight: dict[RequestId, RequestResponder[ReceiveRequestT, SendResultT]]
     _receive_request_type: type[ReceiveRequestT]
@@ -230,7 +230,7 @@ class BaseSession(
         request_id = self._request_id
         self._request_id = request_id + 1
 
-        response_queue: queue.Queue[JSONRPCResponse | JSONRPCError | HTTPStatusError] = queue.Queue()
+        response_queue: queue.Queue[JSONRPCResponse | JSONRPCError] = queue.Queue()
         self._response_streams[request_id] = response_queue
 
         try:
@@ -261,17 +261,11 @@ class BaseSession(
                         message="No response received",
                     )
                 )
-            elif isinstance(response_or_error, HTTPStatusError):
-                # HTTPStatusError from streamable_client with preserved response object
-                if response_or_error.response.status_code == 401:
-                    raise MCPAuthError(response=response_or_error.response)
-                else:
-                    raise MCPConnectionError(
-                        ErrorData(code=response_or_error.response.status_code, message=str(response_or_error))
-                    )
             elif isinstance(response_or_error, JSONRPCError):
                 if response_or_error.error.code == 401:
-                    raise MCPAuthError(message=response_or_error.error.message)
+                    raise MCPAuthError(
+                        ErrorData(code=response_or_error.error.code, message=response_or_error.error.message)
+                    )
                 else:
                     raise MCPConnectionError(
                         ErrorData(code=response_or_error.error.code, message=response_or_error.error.message)
@@ -333,17 +327,13 @@ class BaseSession(
                 if isinstance(message, HTTPStatusError):
                     response_queue = self._response_streams.get(self._request_id - 1)
                     if response_queue is not None:
-                        # For 401 errors, pass the HTTPStatusError directly to preserve response object
-                        if message.response.status_code == 401:
-                            response_queue.put(message)
-                        else:
-                            response_queue.put(
-                                JSONRPCError(
-                                    jsonrpc="2.0",
-                                    id=self._request_id - 1,
-                                    error=ErrorData(code=message.response.status_code, message=message.args[0]),
-                                )
+                        response_queue.put(
+                            JSONRPCError(
+                                jsonrpc="2.0",
+                                id=self._request_id - 1,
+                                error=ErrorData(code=message.response.status_code, message=message.args[0]),
                             )
+                        )
                     else:
                         self._handle_incoming(RuntimeError(f"Received response with an unknown request ID: {message}"))
                 elif isinstance(message, Exception):

api/core/mcp/types.py

@@ -23,7 +23,7 @@ for reference.
   not separate types in the schema.
 """
 # Client support both version, not support 2025-06-18 yet.
-LATEST_PROTOCOL_VERSION = "2025-06-18"
+LATEST_PROTOCOL_VERSION = "2025-03-26"
 # Server support 2024-11-05 to allow claude to use.
 SERVER_LATEST_PROTOCOL_VERSION = "2024-11-05"
 DEFAULT_NEGOTIATED_VERSION = "2025-03-26"
@@ -1330,13 +1330,3 @@ class OAuthMetadata(BaseModel):
     response_types_supported: list[str]
     grant_types_supported: list[str] | None = None
     code_challenge_methods_supported: list[str] | None = None
-    scopes_supported: list[str] | None = None
-
-
-class ProtectedResourceMetadata(BaseModel):
-    """OAuth 2.0 Protected Resource Metadata (RFC 9470)."""
-
-    resource: str | None = None
-    authorization_servers: list[str]
-    scopes_supported: list[str] | None = None
-    bearer_methods_supported: list[str] | None = None

api/core/moderation/openai_moderation/openai_moderation.py

@@ -52,7 +52,7 @@ class OpenAIModeration(Moderation):
         text = "\n".join(str(inputs.values()))
         model_manager = ModelManager()
         model_instance = model_manager.get_model_instance(
-            tenant_id=self.tenant_id, provider="openai", model_type=ModelType.MODERATION, model="omni-moderation-latest"
+            tenant_id=self.tenant_id, provider="openai", model_type=ModelType.MODERATION, model="text-moderation-stable"
         )
 
         openai_moderation = model_instance.invoke_moderation(text=text)

api/core/rag/extractor/word_extractor.py

@@ -152,15 +152,13 @@ class WordExtractor(BaseExtractor):
         # Initialize a row, all of which are empty by default
         row_cells = [""] * total_cols
         col_index = 0
-        while col_index < len(row.cells):
+        for cell in row.cells:
             # make sure the col_index is not out of range
-            while col_index < len(row.cells) and row_cells[col_index] != "":
+            while col_index < total_cols and row_cells[col_index] != "":
                 col_index += 1
             # if col_index is out of range the loop is jumped
-            if col_index >= len(row.cells):
+            if col_index >= total_cols:
                 break
-            # get the correct cell
-            cell = row.cells[col_index]
             cell_content = self._parse_cell(cell, image_map).strip()
             cell_colspan = cell.grid_span or 1
             for i in range(cell_colspan):

api/core/rag/pipeline/queue.py

@@ -54,9 +54,6 @@ class TenantIsolatedTaskQueue:
                 serialized_data = wrapper.serialize()
                 serialized_tasks.append(serialized_data)
 
-        if not serialized_tasks:
-            return
-
         redis_client.lpush(self._queue, *serialized_tasks)
 
     def pull_tasks(self, count: int = 1) -> Sequence[Any]:

api/core/rag/retrieval/dataset_retrieval.py

@@ -7,7 +7,8 @@ from collections.abc import Generator, Mapping
 from typing import Any, Union, cast
 
 from flask import Flask, current_app
-from sqlalchemy import and_, or_, select
+from sqlalchemy import Float, and_, or_, select, text
+from sqlalchemy import cast as sqlalchemy_cast
 
 from core.app.app_config.entities import (
     DatasetEntity,
@@ -1022,55 +1023,60 @@ class DatasetRetrieval:
         self, sequence: int, condition: str, metadata_name: str, value: Any | None, filters: list
     ):
         if value is None and condition not in ("empty", "not empty"):
-            return filters
-
-        json_field = DatasetDocument.doc_metadata[metadata_name].as_string()
+            return
 
+        key = f"{metadata_name}_{sequence}"
+        key_value = f"{metadata_name}_{sequence}_value"
         match condition:
             case "contains":
-                filters.append(json_field.like(f"%{value}%"))
-
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
+                        **{key: metadata_name, key_value: f"%{value}%"}
+                    )
+                )
             case "not contains":
-                filters.append(json_field.notlike(f"%{value}%"))
-
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} NOT LIKE :{key_value}")).params(
+                        **{key: metadata_name, key_value: f"%{value}%"}
+                    )
+                )
             case "start with":
-                filters.append(json_field.like(f"{value}%"))
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
+                        **{key: metadata_name, key_value: f"{value}%"}
+                    )
+                )
 
             case "end with":
-                filters.append(json_field.like(f"%{value}"))
-
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
+                        **{key: metadata_name, key_value: f"%{value}"}
+                    )
+                )
             case "is" | "=":
                 if isinstance(value, str):
-                    filters.append(json_field == value)
-                elif isinstance(value, (int, float)):
-                    filters.append(DatasetDocument.doc_metadata[metadata_name].as_float() == value)
-
+                    filters.append(DatasetDocument.doc_metadata[metadata_name] == f'"{value}"')
+                else:
+                    filters.append(sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) == value)
             case "is not" | "≠":
                 if isinstance(value, str):
-                    filters.append(json_field != value)
-                elif isinstance(value, (int, float)):
-                    filters.append(DatasetDocument.doc_metadata[metadata_name].as_float() != value)
-
+                    filters.append(DatasetDocument.doc_metadata[metadata_name] != f'"{value}"')
+                else:
+                    filters.append(sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) != value)
             case "empty":
                 filters.append(DatasetDocument.doc_metadata[metadata_name].is_(None))
-
             case "not empty":
                 filters.append(DatasetDocument.doc_metadata[metadata_name].isnot(None))
-
             case "before" | "<":
-                filters.append(DatasetDocument.doc_metadata[metadata_name].as_float() < value)
-
+                filters.append(sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) < value)
             case "after" | ">":
-                filters.append(DatasetDocument.doc_metadata[metadata_name].as_float() > value)
-
+                filters.append(sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) > value)
             case "≤" | "<=":
-                filters.append(DatasetDocument.doc_metadata[metadata_name].as_float() <= value)
-
+                filters.append(sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) <= value)
             case "≥" | ">=":
-                filters.append(DatasetDocument.doc_metadata[metadata_name].as_float() >= value)
+                filters.append(sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) >= value)
             case _:
                 pass
-
         return filters
 
     def _fetch_model_config(

api/core/tools/tool_manager.py

@@ -13,7 +13,6 @@ from sqlalchemy.orm import Session
 from yarl import URL
 
 import contexts
-from configs import dify_config
 from core.helper.provider_cache import ToolProviderCredentialsCache
 from core.plugin.impl.tool import PluginToolManager
 from core.tools.__base.tool_provider import ToolProviderController
@@ -33,6 +32,7 @@ from services.tools.mcp_tools_manage_service import MCPToolManageService
 if TYPE_CHECKING:
     from core.workflow.nodes.tool.entities import ToolEntity
 
+from configs import dify_config
 from core.agent.entities import AgentToolEntity
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.helper.module_import_helper import load_single_subclass_from_source
@@ -63,6 +63,7 @@ from services.tools.tools_transform_service import ToolTransformService
 
 if TYPE_CHECKING:
     from core.workflow.nodes.tool.entities import ToolEntity
+    from core.workflow.runtime import VariablePool
 
 logger = logging.getLogger(__name__)
 
@@ -617,28 +618,12 @@ class ToolManager:
         """
         # according to multi credentials, select the one with is_default=True first, then created_at oldest
         # for compatibility with old version
-        if dify_config.SQLALCHEMY_DATABASE_URI_SCHEME == "postgresql":
-            # PostgreSQL: Use DISTINCT ON
-            sql = """
+        sql = """
                 SELECT DISTINCT ON (tenant_id, provider) id
                 FROM tool_builtin_providers
                 WHERE tenant_id = :tenant_id
                 ORDER BY tenant_id, provider, is_default DESC, created_at DESC
                 """
-        else:
-            # MySQL: Use window function to achieve same result
-            sql = """
-                SELECT id FROM (
-                    SELECT id, 
-                           ROW_NUMBER() OVER (
-                               PARTITION BY tenant_id, provider 
-                               ORDER BY is_default DESC, created_at DESC
-                           ) as rn
-                    FROM tool_builtin_providers
-                    WHERE tenant_id = :tenant_id
-                ) ranked WHERE rn = 1
-                """
-
         with Session(db.engine, autoflush=False) as session:
             ids = [row.id for row in session.execute(sa.text(sql), {"tenant_id": tenant_id}).all()]
             return session.query(BuiltinToolProvider).where(BuiltinToolProvider.id.in_(ids)).all()

api/core/variables/types.py

@@ -202,35 +202,6 @@ class SegmentType(StrEnum):
             raise ValueError(f"element_type is only supported by array type, got {self}")
         return _ARRAY_ELEMENT_TYPES_MAPPING.get(self)
 
-    @staticmethod
-    def get_zero_value(t: "SegmentType"):
-        # Lazy import to avoid circular dependency
-        from factories import variable_factory
-
-        match t:
-            case (
-                SegmentType.ARRAY_OBJECT
-                | SegmentType.ARRAY_ANY
-                | SegmentType.ARRAY_STRING
-                | SegmentType.ARRAY_NUMBER
-                | SegmentType.ARRAY_BOOLEAN
-            ):
-                return variable_factory.build_segment_with_type(t, [])
-            case SegmentType.OBJECT:
-                return variable_factory.build_segment({})
-            case SegmentType.STRING:
-                return variable_factory.build_segment("")
-            case SegmentType.INTEGER:
-                return variable_factory.build_segment(0)
-            case SegmentType.FLOAT:
-                return variable_factory.build_segment(0.0)
-            case SegmentType.NUMBER:
-                return variable_factory.build_segment(0)
-            case SegmentType.BOOLEAN:
-                return variable_factory.build_segment(False)
-            case _:
-                raise ValueError(f"unsupported variable type: {t}")
-
 
 _ARRAY_ELEMENT_TYPES_MAPPING: Mapping[SegmentType, SegmentType] = {
     # ARRAY_ANY does not have corresponding element type.

api/core/workflow/graph_engine/graph_engine.py

@@ -192,6 +192,7 @@ class GraphEngine:
         self._dispatcher = Dispatcher(
             event_queue=self._event_queue,
             event_handler=self._event_handler_registry,
+            event_collector=self._event_manager,
             execution_coordinator=self._execution_coordinator,
             event_emitter=self._event_manager,
         )

api/core/workflow/graph_engine/orchestration/dispatcher.py

@@ -43,6 +43,7 @@ class Dispatcher:
         self,
         event_queue: queue.Queue[GraphNodeEventBase],
         event_handler: "EventHandler",
+        event_collector: EventManager,
         execution_coordinator: ExecutionCoordinator,
         event_emitter: EventManager | None = None,
     ) -> None:
@@ -52,11 +53,13 @@ class Dispatcher:
         Args:
             event_queue: Queue of events from workers
             event_handler: Event handler registry for processing events
+            event_collector: Event manager for collecting unhandled events
             execution_coordinator: Coordinator for execution flow
             event_emitter: Optional event manager to signal completion
         """
         self._event_queue = event_queue
         self._event_handler = event_handler
+        self._event_collector = event_collector
         self._execution_coordinator = execution_coordinator
         self._event_emitter = event_emitter
 
@@ -83,31 +86,37 @@ class Dispatcher:
     def _dispatcher_loop(self) -> None:
         """Main dispatcher loop."""
         try:
-            self._process_commands()
             while not self._stop_event.is_set():
-                if (
-                    self._execution_coordinator.aborted
-                    or self._execution_coordinator.paused
-                    or self._execution_coordinator.execution_complete
-                ):
-                    break
+                commands_checked = False
+                should_check_commands = False
+                should_break = False
 
-                self._execution_coordinator.check_scaling()
-                try:
-                    event = self._event_queue.get(timeout=0.1)
-                    self._event_handler.dispatch(event)
-                    self._event_queue.task_done()
-                    self._process_commands(event)
-                except queue.Empty:
-                    time.sleep(0.1)
+                if self._execution_coordinator.is_execution_complete():
+                    should_check_commands = True
+                    should_break = True
+                else:
+                    # Check for scaling
+                    self._execution_coordinator.check_scaling()
 
-            self._process_commands()
-            while True:
-                try:
-                    event = self._event_queue.get(block=False)
-                    self._event_handler.dispatch(event)
-                    self._event_queue.task_done()
-                except queue.Empty:
+                    # Process events
+                    try:
+                        event = self._event_queue.get(timeout=0.1)
+                        # Route to the event handler
+                        self._event_handler.dispatch(event)
+                        should_check_commands = self._should_check_commands(event)
+                        self._event_queue.task_done()
+                    except queue.Empty:
+                        # Process commands even when no new events arrive so abort requests are not missed
+                        should_check_commands = True
+                        time.sleep(0.1)
+
+                if should_check_commands and not commands_checked:
+                    self._execution_coordinator.check_commands()
+                    commands_checked = True
+
+                if should_break:
+                    if not commands_checked:
+                        self._execution_coordinator.check_commands()
                     break
 
         except Exception as e:
@@ -120,6 +129,6 @@ class Dispatcher:
             if self._event_emitter:
                 self._event_emitter.mark_complete()
 
-    def _process_commands(self, event: GraphNodeEventBase | None = None):
-        if event is None or isinstance(event, self._COMMAND_TRIGGER_EVENTS):
-            self._execution_coordinator.process_commands()
+    def _should_check_commands(self, event: GraphNodeEventBase) -> bool:
+        """Return True if the event represents a node completion."""
+        return isinstance(event, self._COMMAND_TRIGGER_EVENTS)

api/core/workflow/graph_engine/orchestration/execution_coordinator.py

@@ -40,7 +40,7 @@ class ExecutionCoordinator:
         self._command_processor = command_processor
         self._worker_pool = worker_pool
 
-    def process_commands(self) -> None:
+    def check_commands(self) -> None:
         """Process any pending commands."""
         self._command_processor.process_commands()
 
@@ -48,16 +48,24 @@ class ExecutionCoordinator:
         """Check and perform worker scaling if needed."""
         self._worker_pool.check_and_scale()
 
-    @property
-    def execution_complete(self):
+    def is_execution_complete(self) -> bool:
+        """
+        Check if execution is complete.
+
+        Returns:
+            True if execution is complete
+        """
+        # Treat paused, aborted, or failed executions as terminal states
+        if self._graph_execution.is_paused:
+            return True
+
+        if self._graph_execution.aborted or self._graph_execution.has_error:
+            return True
+
         return self._state_manager.is_execution_complete()
 
     @property
-    def aborted(self):
-        return self._graph_execution.aborted or self._graph_execution.has_error
-
-    @property
-    def paused(self) -> bool:
+    def is_paused(self) -> bool:
         """Expose whether the underlying graph execution is paused."""
         return self._graph_execution.is_paused
 

api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py

@@ -6,7 +6,8 @@ from collections import defaultdict
 from collections.abc import Mapping, Sequence
 from typing import TYPE_CHECKING, Any, cast
 
-from sqlalchemy import and_, func, literal, or_, select
+from sqlalchemy import Float, and_, func, or_, select, text
+from sqlalchemy import cast as sqlalchemy_cast
 from sqlalchemy.orm import sessionmaker
 
 from core.app.app_config.entities import DatasetRetrieveConfigEntity
@@ -596,79 +597,79 @@ class KnowledgeRetrievalNode(LLMUsageTrackingMixin, Node):
         if value is None and condition not in ("empty", "not empty"):
             return filters
 
-        json_field = Document.doc_metadata[metadata_name].as_string()
-
+        key = f"{metadata_name}_{sequence}"
+        key_value = f"{metadata_name}_{sequence}_value"
         match condition:
             case "contains":
-                filters.append(json_field.like(f"%{value}%"))
-
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
+                        **{key: metadata_name, key_value: f"%{value}%"}
+                    )
+                )
             case "not contains":
-                filters.append(json_field.notlike(f"%{value}%"))
-
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} NOT LIKE :{key_value}")).params(
+                        **{key: metadata_name, key_value: f"%{value}%"}
+                    )
+                )
             case "start with":
-                filters.append(json_field.like(f"{value}%"))
-
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
+                        **{key: metadata_name, key_value: f"{value}%"}
+                    )
+                )
             case "end with":
-                filters.append(json_field.like(f"%{value}"))
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
+                        **{key: metadata_name, key_value: f"%{value}"}
+                    )
+                )
             case "in":
                 if isinstance(value, str):
-                    value_list = [v.strip() for v in value.split(",") if v.strip()]
-                elif isinstance(value, (list, tuple)):
-                    value_list = [str(v) for v in value if v is not None]
+                    escaped_values = [v.strip().replace("'", "''") for v in str(value).split(",")]
+                    escaped_value_str = ",".join(escaped_values)
                 else:
-                    value_list = [str(value)] if value is not None else []
-
-                if not value_list:
-                    filters.append(literal(False))
-                else:
-                    filters.append(json_field.in_(value_list))
-
+                    escaped_value_str = str(value)
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} = any(string_to_array(:{key_value},','))")).params(
+                        **{key: metadata_name, key_value: escaped_value_str}
+                    )
+                )
             case "not in":
                 if isinstance(value, str):
-                    value_list = [v.strip() for v in value.split(",") if v.strip()]
-                elif isinstance(value, (list, tuple)):
-                    value_list = [str(v) for v in value if v is not None]
+                    escaped_values = [v.strip().replace("'", "''") for v in str(value).split(",")]
+                    escaped_value_str = ",".join(escaped_values)
                 else:
-                    value_list = [str(value)] if value is not None else []
-
-                if not value_list:
-                    filters.append(literal(True))
-                else:
-                    filters.append(json_field.notin_(value_list))
-
-            case "is" | "=":
+                    escaped_value_str = str(value)
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} != all(string_to_array(:{key_value},','))")).params(
+                        **{key: metadata_name, key_value: escaped_value_str}
+                    )
+                )
+            case "=" | "is":
                 if isinstance(value, str):
-                    filters.append(json_field == value)
-                elif isinstance(value, (int, float)):
-                    filters.append(Document.doc_metadata[metadata_name].as_float() == value)
-
+                    filters.append(Document.doc_metadata[metadata_name] == f'"{value}"')
+                else:
+                    filters.append(sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) == value)
             case "is not" | "≠":
                 if isinstance(value, str):
-                    filters.append(json_field != value)
-                elif isinstance(value, (int, float)):
-                    filters.append(Document.doc_metadata[metadata_name].as_float() != value)
-
+                    filters.append(Document.doc_metadata[metadata_name] != f'"{value}"')
+                else:
+                    filters.append(sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) != value)
             case "empty":
                 filters.append(Document.doc_metadata[metadata_name].is_(None))
-
             case "not empty":
                 filters.append(Document.doc_metadata[metadata_name].isnot(None))
-
             case "before" | "<":
-                filters.append(Document.doc_metadata[metadata_name].as_float() < value)
-
+                filters.append(sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) < value)
             case "after" | ">":
-                filters.append(Document.doc_metadata[metadata_name].as_float() > value)
-
+                filters.append(sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) > value)
             case "≤" | "<=":
-                filters.append(Document.doc_metadata[metadata_name].as_float() <= value)
-
+                filters.append(sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) <= value)
             case "≥" | ">=":
-                filters.append(Document.doc_metadata[metadata_name].as_float() >= value)
-
+                filters.append(sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) >= value)
             case _:
                 pass
-
         return filters
 
     @classmethod

api/core/workflow/nodes/variable_assigner/v1/node.py

@@ -2,6 +2,7 @@ from collections.abc import Callable, Mapping, Sequence
 from typing import TYPE_CHECKING, Any, TypeAlias
 
 from core.variables import SegmentType, Variable
+from core.variables.segments import BooleanSegment
 from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID
 from core.workflow.conversation_variable_updater import ConversationVariableUpdater
 from core.workflow.entities import GraphInitParams
@@ -11,6 +12,7 @@ from core.workflow.nodes.base.entities import BaseNodeData, RetryConfig
 from core.workflow.nodes.base.node import Node
 from core.workflow.nodes.variable_assigner.common import helpers as common_helpers
 from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNodeError
+from factories import variable_factory
 
 from ..common.impl import conversation_variable_updater_factory
 from .node_data import VariableAssignerData, WriteMode
@@ -114,7 +116,7 @@ class VariableAssignerNode(Node):
                 updated_variable = original_variable.model_copy(update={"value": updated_value})
 
             case WriteMode.CLEAR:
-                income_value = SegmentType.get_zero_value(original_variable.value_type)
+                income_value = get_zero_value(original_variable.value_type)
                 updated_variable = original_variable.model_copy(update={"value": income_value.to_object()})
 
         # Over write the variable.
@@ -141,3 +143,24 @@ class VariableAssignerNode(Node):
             process_data=common_helpers.set_updated_variables({}, updated_variables),
             outputs={},
         )
+
+
+def get_zero_value(t: SegmentType):
+    # TODO(QuantumGhost): this should be a method of `SegmentType`.
+    match t:
+        case SegmentType.ARRAY_OBJECT | SegmentType.ARRAY_STRING | SegmentType.ARRAY_NUMBER | SegmentType.ARRAY_BOOLEAN:
+            return variable_factory.build_segment_with_type(t, [])
+        case SegmentType.OBJECT:
+            return variable_factory.build_segment({})
+        case SegmentType.STRING:
+            return variable_factory.build_segment("")
+        case SegmentType.INTEGER:
+            return variable_factory.build_segment(0)
+        case SegmentType.FLOAT:
+            return variable_factory.build_segment(0.0)
+        case SegmentType.NUMBER:
+            return variable_factory.build_segment(0)
+        case SegmentType.BOOLEAN:
+            return BooleanSegment(value=False)
+        case _:
+            raise VariableOperatorNodeError(f"unsupported variable type: {t}")

api/core/workflow/nodes/variable_assigner/v2/constants.py

@@ -0,0 +1,14 @@
+from core.variables import SegmentType
+
+# Note: This mapping is duplicated with `get_zero_value`. Consider refactoring to avoid redundancy.
+EMPTY_VALUE_MAPPING = {
+    SegmentType.STRING: "",
+    SegmentType.NUMBER: 0,
+    SegmentType.BOOLEAN: False,
+    SegmentType.OBJECT: {},
+    SegmentType.ARRAY_ANY: [],
+    SegmentType.ARRAY_STRING: [],
+    SegmentType.ARRAY_NUMBER: [],
+    SegmentType.ARRAY_OBJECT: [],
+    SegmentType.ARRAY_BOOLEAN: [],
+}

api/core/workflow/nodes/variable_assigner/v2/node.py

@@ -16,6 +16,7 @@ from core.workflow.nodes.variable_assigner.common.exc import VariableOperatorNod
 from core.workflow.nodes.variable_assigner.common.impl import conversation_variable_updater_factory
 
 from . import helpers
+from .constants import EMPTY_VALUE_MAPPING
 from .entities import VariableAssignerNodeData, VariableOperationItem
 from .enums import InputType, Operation
 from .exc import (
@@ -248,7 +249,7 @@ class VariableAssignerNode(Node):
             case Operation.OVER_WRITE:
                 return value
             case Operation.CLEAR:
-                return SegmentType.get_zero_value(variable.value_type).to_object()
+                return EMPTY_VALUE_MAPPING[variable.value_type]
             case Operation.APPEND:
                 return variable.value + [value]
             case Operation.EXTEND:

api/core/workflow/runtime/graph_runtime_state.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import importlib
 import json
 from collections.abc import Mapping, Sequence
+from collections.abc import Mapping as TypingMapping
 from copy import deepcopy
 from dataclasses import dataclass
 from typing import Any, Protocol
@@ -99,8 +100,8 @@ class ResponseStreamCoordinatorProtocol(Protocol):
 class GraphProtocol(Protocol):
     """Structural interface required from graph instances attached to the runtime state."""
 
-    nodes: Mapping[str, object]
-    edges: Mapping[str, object]
+    nodes: TypingMapping[str, object]
+    edges: TypingMapping[str, object]
     root_node: object
 
     def get_outgoing_edges(self, node_id: str) -> Sequence[object]: ...

api/enums/quota_type.py

@@ -1,209 +0,0 @@
-import logging
-from dataclasses import dataclass
-from enum import StrEnum, auto
-
-logger = logging.getLogger(__name__)
-
-
-@dataclass
-class QuotaCharge:
-    """
-    Result of a quota consumption operation.
-
-    Attributes:
-        success: Whether the quota charge succeeded
-        charge_id: UUID for refund, or None if failed/disabled
-    """
-
-    success: bool
-    charge_id: str | None
-    _quota_type: "QuotaType"
-
-    def refund(self) -> None:
-        """
-        Refund this quota charge.
-
-        Safe to call even if charge failed or was disabled.
-        This method guarantees no exceptions will be raised.
-        """
-        if self.charge_id:
-            self._quota_type.refund(self.charge_id)
-            logger.info("Refunded quota for %s with charge_id: %s", self._quota_type.value, self.charge_id)
-
-
-class QuotaType(StrEnum):
-    """
-    Supported quota types for tenant feature usage.
-
-    Add additional types here whenever new billable features become available.
-    """
-
-    # Trigger execution quota
-    TRIGGER = auto()
-
-    # Workflow execution quota
-    WORKFLOW = auto()
-
-    UNLIMITED = auto()
-
-    @property
-    def billing_key(self) -> str:
-        """
-        Get the billing key for the feature.
-        """
-        match self:
-            case QuotaType.TRIGGER:
-                return "trigger_event"
-            case QuotaType.WORKFLOW:
-                return "api_rate_limit"
-            case _:
-                raise ValueError(f"Invalid quota type: {self}")
-
-    def consume(self, tenant_id: str, amount: int = 1) -> QuotaCharge:
-        """
-        Consume quota for the feature.
-
-        Args:
-            tenant_id: The tenant identifier
-            amount: Amount to consume (default: 1)
-
-        Returns:
-            QuotaCharge with success status and charge_id for refund
-
-        Raises:
-            QuotaExceededError: When quota is insufficient
-        """
-        from configs import dify_config
-        from services.billing_service import BillingService
-        from services.errors.app import QuotaExceededError
-
-        if not dify_config.BILLING_ENABLED:
-            logger.debug("Billing disabled, allowing request for %s", tenant_id)
-            return QuotaCharge(success=True, charge_id=None, _quota_type=self)
-
-        logger.info("Consuming %d %s quota for tenant %s", amount, self.value, tenant_id)
-
-        if amount <= 0:
-            raise ValueError("Amount to consume must be greater than 0")
-
-        try:
-            response = BillingService.update_tenant_feature_plan_usage(tenant_id, self.billing_key, delta=amount)
-
-            if response.get("result") != "success":
-                logger.warning(
-                    "Failed to consume quota for %s, feature %s details: %s",
-                    tenant_id,
-                    self.value,
-                    response.get("detail"),
-                )
-                raise QuotaExceededError(feature=self.value, tenant_id=tenant_id, required=amount)
-
-            charge_id = response.get("history_id")
-            logger.debug(
-                "Successfully consumed %d %s quota for tenant %s, charge_id: %s",
-                amount,
-                self.value,
-                tenant_id,
-                charge_id,
-            )
-            return QuotaCharge(success=True, charge_id=charge_id, _quota_type=self)
-
-        except QuotaExceededError:
-            raise
-        except Exception:
-            # fail-safe: allow request on billing errors
-            logger.exception("Failed to consume quota for %s, feature %s", tenant_id, self.value)
-            return unlimited()
-
-    def check(self, tenant_id: str, amount: int = 1) -> bool:
-        """
-        Check if tenant has sufficient quota without consuming.
-
-        Args:
-            tenant_id: The tenant identifier
-            amount: Amount to check (default: 1)
-
-        Returns:
-            True if quota is sufficient, False otherwise
-        """
-        from configs import dify_config
-
-        if not dify_config.BILLING_ENABLED:
-            return True
-
-        if amount <= 0:
-            raise ValueError("Amount to check must be greater than 0")
-
-        try:
-            remaining = self.get_remaining(tenant_id)
-            return remaining >= amount if remaining != -1 else True
-        except Exception:
-            logger.exception("Failed to check quota for %s, feature %s", tenant_id, self.value)
-            # fail-safe: allow request on billing errors
-            return True
-
-    def refund(self, charge_id: str) -> None:
-        """
-        Refund quota using charge_id from consume().
-
-        This method guarantees no exceptions will be raised.
-        All errors are logged but silently handled.
-
-        Args:
-            charge_id: The UUID returned from consume()
-        """
-        try:
-            from configs import dify_config
-            from services.billing_service import BillingService
-
-            if not dify_config.BILLING_ENABLED:
-                return
-
-            if not charge_id:
-                logger.warning("Cannot refund: charge_id is empty")
-                return
-
-            logger.info("Refunding %s quota with charge_id: %s", self.value, charge_id)
-
-            response = BillingService.refund_tenant_feature_plan_usage(charge_id)
-            if response.get("result") == "success":
-                logger.debug("Successfully refunded %s quota, charge_id: %s", self.value, charge_id)
-            else:
-                logger.warning("Refund failed for charge_id: %s", charge_id)
-
-        except Exception:
-            # Catch ALL exceptions - refund must never fail
-            logger.exception("Failed to refund quota for charge_id: %s", charge_id)
-            # Don't raise - refund is best-effort and must be silent
-
-    def get_remaining(self, tenant_id: str) -> int:
-        """
-        Get remaining quota for the tenant.
-
-        Args:
-            tenant_id: The tenant identifier
-
-        Returns:
-            Remaining quota amount
-        """
-        from services.billing_service import BillingService
-
-        try:
-            usage_info = BillingService.get_tenant_feature_plan_usage(tenant_id, self.billing_key)
-            # Assuming the API returns a dict with 'remaining' or 'limit' and 'used'
-            if isinstance(usage_info, dict):
-                return usage_info.get("remaining", 0)
-            # If it returns a simple number, treat it as remaining
-            return int(usage_info) if usage_info else 0
-        except Exception:
-            logger.exception("Failed to get remaining quota for %s, feature %s", tenant_id, self.value)
-            return -1
-
-
-def unlimited() -> QuotaCharge:
-    """
-    Return a quota charge for unlimited quota.
-
-    This is useful for features that are not subject to quota limits, such as the UNLIMITED quota type.
-    """
-    return QuotaCharge(success=True, charge_id=None, _quota_type=QuotaType.UNLIMITED)

api/extensions/ext_redis.py

@@ -10,6 +10,7 @@ from redis import RedisError
 from redis.cache import CacheConfig
 from redis.cluster import ClusterNode, RedisCluster
 from redis.connection import Connection, SSLConnection
+from redis.lock import Lock
 from redis.sentinel import Sentinel
 
 from configs import dify_config

api/extensions/storage/clickzetta_volume/clickzetta_volume_storage.py

@@ -45,6 +45,7 @@ class ClickZettaVolumeConfig(BaseModel):
         This method will first try to use CLICKZETTA_VOLUME_* environment variables,
         then fall back to CLICKZETTA_* environment variables (for vector DB config).
         """
+        import os
 
         # Helper function to get environment variable with fallback
         def get_env_with_fallback(volume_key: str, fallback_key: str, default: str | None = None) -> str:

api/extensions/storage/google_cloud_storage.py

@@ -3,7 +3,7 @@ import io
 import json
 from collections.abc import Generator
 
-from google.cloud import storage as google_cloud_storage  # type: ignore
+from google.cloud import storage as google_cloud_storage
 
 from configs import dify_config
 from extensions.storage.base_storage import BaseStorage

api/fields/app_fields.py

@@ -116,7 +116,6 @@ app_partial_fields = {
     "access_mode": fields.String,
     "create_user_name": fields.String,
     "author_name": fields.String,
-    "has_draft_trigger": fields.Boolean,
 }
 
 

api/libs/email_i18n.py

@@ -38,12 +38,6 @@ class EmailType(StrEnum):
     EMAIL_REGISTER = auto()
     EMAIL_REGISTER_WHEN_ACCOUNT_EXIST = auto()
     RESET_PASSWORD_WHEN_ACCOUNT_NOT_EXIST_NO_REGISTER = auto()
-    TRIGGER_EVENTS_LIMIT_SANDBOX = auto()
-    TRIGGER_EVENTS_LIMIT_PROFESSIONAL = auto()
-    TRIGGER_EVENTS_USAGE_WARNING_SANDBOX = auto()
-    TRIGGER_EVENTS_USAGE_WARNING_PROFESSIONAL = auto()
-    API_RATE_LIMIT_LIMIT_SANDBOX = auto()
-    API_RATE_LIMIT_WARNING_SANDBOX = auto()
 
 
 class EmailLanguage(StrEnum):
@@ -451,78 +445,6 @@ def create_default_email_config() -> EmailI18nConfig:
                 branded_template_path="clean_document_job_mail_template_zh-CN.html",
             ),
         },
-        EmailType.TRIGGER_EVENTS_LIMIT_SANDBOX: {
-            EmailLanguage.EN_US: EmailTemplate(
-                subject="You’ve reached your Sandbox Trigger Events limit",
-                template_path="trigger_events_limit_template_en-US.html",
-                branded_template_path="without-brand/trigger_events_limit_template_en-US.html",
-            ),
-            EmailLanguage.ZH_HANS: EmailTemplate(
-                subject="您的 Sandbox 触发事件额度已用尽",
-                template_path="trigger_events_limit_template_zh-CN.html",
-                branded_template_path="without-brand/trigger_events_limit_template_zh-CN.html",
-            ),
-        },
-        EmailType.TRIGGER_EVENTS_LIMIT_PROFESSIONAL: {
-            EmailLanguage.EN_US: EmailTemplate(
-                subject="You’ve reached your monthly Trigger Events limit",
-                template_path="trigger_events_limit_template_en-US.html",
-                branded_template_path="without-brand/trigger_events_limit_template_en-US.html",
-            ),
-            EmailLanguage.ZH_HANS: EmailTemplate(
-                subject="您的月度触发事件额度已用尽",
-                template_path="trigger_events_limit_template_zh-CN.html",
-                branded_template_path="without-brand/trigger_events_limit_template_zh-CN.html",
-            ),
-        },
-        EmailType.TRIGGER_EVENTS_USAGE_WARNING_SANDBOX: {
-            EmailLanguage.EN_US: EmailTemplate(
-                subject="You’re nearing your Sandbox Trigger Events limit",
-                template_path="trigger_events_usage_warning_template_en-US.html",
-                branded_template_path="without-brand/trigger_events_usage_warning_template_en-US.html",
-            ),
-            EmailLanguage.ZH_HANS: EmailTemplate(
-                subject="您的 Sandbox 触发事件额度接近上限",
-                template_path="trigger_events_usage_warning_template_zh-CN.html",
-                branded_template_path="without-brand/trigger_events_usage_warning_template_zh-CN.html",
-            ),
-        },
-        EmailType.TRIGGER_EVENTS_USAGE_WARNING_PROFESSIONAL: {
-            EmailLanguage.EN_US: EmailTemplate(
-                subject="You’re nearing your Monthly Trigger Events limit",
-                template_path="trigger_events_usage_warning_template_en-US.html",
-                branded_template_path="without-brand/trigger_events_usage_warning_template_en-US.html",
-            ),
-            EmailLanguage.ZH_HANS: EmailTemplate(
-                subject="您的月度触发事件额度接近上限",
-                template_path="trigger_events_usage_warning_template_zh-CN.html",
-                branded_template_path="without-brand/trigger_events_usage_warning_template_zh-CN.html",
-            ),
-        },
-        EmailType.API_RATE_LIMIT_LIMIT_SANDBOX: {
-            EmailLanguage.EN_US: EmailTemplate(
-                subject="You’ve reached your API Rate Limit",
-                template_path="api_rate_limit_limit_template_en-US.html",
-                branded_template_path="without-brand/api_rate_limit_limit_template_en-US.html",
-            ),
-            EmailLanguage.ZH_HANS: EmailTemplate(
-                subject="您的 API 速率额度已用尽",
-                template_path="api_rate_limit_limit_template_zh-CN.html",
-                branded_template_path="without-brand/api_rate_limit_limit_template_zh-CN.html",
-            ),
-        },
-        EmailType.API_RATE_LIMIT_WARNING_SANDBOX: {
-            EmailLanguage.EN_US: EmailTemplate(
-                subject="You’re nearing your API Rate Limit",
-                template_path="api_rate_limit_warning_template_en-US.html",
-                branded_template_path="without-brand/api_rate_limit_warning_template_en-US.html",
-            ),
-            EmailLanguage.ZH_HANS: EmailTemplate(
-                subject="您的 API 速率额度接近上限",
-                template_path="api_rate_limit_warning_template_zh-CN.html",
-                branded_template_path="without-brand/api_rate_limit_warning_template_zh-CN.html",
-            ),
-        },
         EmailType.EMAIL_REGISTER: {
             EmailLanguage.EN_US: EmailTemplate(
                 subject="Register Your {application_title} Account",

api/libs/helper.py

@@ -177,15 +177,6 @@ def timezone(timezone_string):
     raise ValueError(error)
 
 
-def convert_datetime_to_date(field, target_timezone: str = ":tz"):
-    if dify_config.DB_TYPE == "postgresql":
-        return f"DATE(DATE_TRUNC('day', {field} AT TIME ZONE 'UTC' AT TIME ZONE {target_timezone}))"
-    elif dify_config.DB_TYPE == "mysql":
-        return f"DATE(CONVERT_TZ({field}, 'UTC', {target_timezone}))"
-    else:
-        raise NotImplementedError(f"Unsupported database type: {dify_config.DB_TYPE}")
-
-
 def generate_string(n):
     letters_digits = string.ascii_letters + string.digits
     result = ""

api/migrations/versions/00bacef91f18_rename_api_provider_description.py

@@ -8,12 +8,6 @@ Create Date: 2024-01-07 04:07:34.482983
 import sqlalchemy as sa
 from alembic import op
 
-import models.types
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '00bacef91f18'
 down_revision = '8ec536f3c800'
@@ -23,31 +17,17 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('description', sa.Text(), nullable=False))
-            batch_op.drop_column('description_str')
-    else:
-        with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('description', models.types.LongText(), nullable=False))
-            batch_op.drop_column('description_str')
+    with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('description', sa.Text(), nullable=False))
+        batch_op.drop_column('description_str')
 
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('description_str', sa.TEXT(), autoincrement=False, nullable=False))
-            batch_op.drop_column('description')
-    else:
-        with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('description_str', models.types.LongText(), autoincrement=False, nullable=False))
-            batch_op.drop_column('description')
+    with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('description_str', sa.TEXT(), autoincrement=False, nullable=False))
+        batch_op.drop_column('description')
 
     # ### end Alembic commands ###

api/migrations/versions/04c602f5dc9b_update_appmodelconfig_and_add_table_.py

@@ -10,10 +10,6 @@ from alembic import op
 
 import models.types
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '04c602f5dc9b'
 down_revision = '4ff534e1eb11'
@@ -23,28 +19,15 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('tracing_app_configs',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('app_id', models.types.StringUUID(), nullable=False),
-        sa.Column('tracing_provider', sa.String(length=255), nullable=True),
-        sa.Column('tracing_config', sa.JSON(), nullable=True), 
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('now()'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tracing_app_config_pkey')
-        )
-    else:
-        op.create_table('tracing_app_configs',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('app_id', models.types.StringUUID(), nullable=False),
-        sa.Column('tracing_provider', sa.String(length=255), nullable=True),
-        sa.Column('tracing_config', sa.JSON(), nullable=True),  
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.now(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.now(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tracing_app_config_pkey')
-        )
+    op.create_table('tracing_app_configs',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('app_id', models.types.StringUUID(), nullable=False),
+    sa.Column('tracing_provider', sa.String(length=255), nullable=True),
+    sa.Column('tracing_config', sa.JSON(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('now()'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tracing_app_config_pkey')
+    )
 
     # ### end Alembic commands ###
 

api/migrations/versions/053da0c1d756_add_api_tool_privacy.py

@@ -9,12 +9,6 @@ import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import postgresql
 
-import models.types
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '053da0c1d756'
 down_revision = '4829e54d2fee'
@@ -24,31 +18,16 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('tool_conversation_variables',
-        sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('user_id', postgresql.UUID(), nullable=False),
-        sa.Column('tenant_id', postgresql.UUID(), nullable=False),
-        sa.Column('conversation_id', postgresql.UUID(), nullable=False),
-        sa.Column('variables_str', sa.Text(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_conversation_variables_pkey')
-        )
-    else:
-        op.create_table('tool_conversation_variables',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('user_id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('conversation_id', models.types.StringUUID(), nullable=False),
-        sa.Column('variables_str', models.types.LongText(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_conversation_variables_pkey')
-        )
-    
+    op.create_table('tool_conversation_variables',
+    sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('user_id', postgresql.UUID(), nullable=False),
+    sa.Column('tenant_id', postgresql.UUID(), nullable=False),
+    sa.Column('conversation_id', postgresql.UUID(), nullable=False),
+    sa.Column('variables_str', sa.Text(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tool_conversation_variables_pkey')
+    )
     with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
         batch_op.add_column(sa.Column('privacy_policy', sa.String(length=255), nullable=True))
         batch_op.alter_column('icon',

api/migrations/versions/114eed84c228_remove_tool_id_from_model_invoke.py

@@ -9,12 +9,6 @@ import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import postgresql
 
-import models.types
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '114eed84c228'
 down_revision = 'c71211c8f604'
@@ -32,13 +26,7 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('tool_model_invokes', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('tool_id', postgresql.UUID(), autoincrement=False, nullable=False))
-    else:
-        with op.batch_alter_table('tool_model_invokes', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('tool_id', models.types.StringUUID(), autoincrement=False, nullable=False))
+    with op.batch_alter_table('tool_model_invokes', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('tool_id', postgresql.UUID(), autoincrement=False, nullable=False))
 
     # ### end Alembic commands ###

api/migrations/versions/161cadc1af8d_add_dataset_permission_tenant_id.py

@@ -8,11 +8,7 @@ Create Date: 2024-07-05 14:30:59.472593
 import sqlalchemy as sa
 from alembic import op
 
-import models.types
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
+import models as models
 
 # revision identifiers, used by Alembic.
 revision = '161cadc1af8d'
@@ -23,16 +19,9 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('dataset_permissions', schema=None) as batch_op:
-            # Step 1: Add column without NOT NULL constraint
-            op.add_column('dataset_permissions', sa.Column('tenant_id', sa.UUID(), nullable=False))
-    else:
-        with op.batch_alter_table('dataset_permissions', schema=None) as batch_op:
-            # Step 1: Add column without NOT NULL constraint
-            op.add_column('dataset_permissions', sa.Column('tenant_id', models.types.StringUUID(), nullable=False))
+    with op.batch_alter_table('dataset_permissions', schema=None) as batch_op:
+        # Step 1: Add column without NOT NULL constraint
+        op.add_column('dataset_permissions', sa.Column('tenant_id', sa.UUID(), nullable=False))
 
     # ### end Alembic commands ###
 

api/migrations/versions/16fa53d9faec_add_provider_model_support.py

@@ -9,12 +9,6 @@ import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import postgresql
 
-import models.types
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '16fa53d9faec'
 down_revision = '8d2d099ceb74'
@@ -24,87 +18,44 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('provider_models',
-        sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', postgresql.UUID(), nullable=False),
-        sa.Column('provider_name', sa.String(length=40), nullable=False),
-        sa.Column('model_name', sa.String(length=40), nullable=False),
-        sa.Column('model_type', sa.String(length=40), nullable=False),
-        sa.Column('encrypted_config', sa.Text(), nullable=True),
-        sa.Column('is_valid', sa.Boolean(), server_default=sa.text('false'), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='provider_model_pkey'),
-        sa.UniqueConstraint('tenant_id', 'provider_name', 'model_name', 'model_type', name='unique_provider_model_name')
-        )
-    else:
-        op.create_table('provider_models',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('provider_name', sa.String(length=40), nullable=False),
-        sa.Column('model_name', sa.String(length=40), nullable=False),
-        sa.Column('model_type', sa.String(length=40), nullable=False),
-        sa.Column('encrypted_config', models.types.LongText(), nullable=True),
-        sa.Column('is_valid', sa.Boolean(), server_default=sa.text('false'), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='provider_model_pkey'),
-        sa.UniqueConstraint('tenant_id', 'provider_name', 'model_name', 'model_type', name='unique_provider_model_name')
-        )
-    
+    op.create_table('provider_models',
+    sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', postgresql.UUID(), nullable=False),
+    sa.Column('provider_name', sa.String(length=40), nullable=False),
+    sa.Column('model_name', sa.String(length=40), nullable=False),
+    sa.Column('model_type', sa.String(length=40), nullable=False),
+    sa.Column('encrypted_config', sa.Text(), nullable=True),
+    sa.Column('is_valid', sa.Boolean(), server_default=sa.text('false'), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='provider_model_pkey'),
+    sa.UniqueConstraint('tenant_id', 'provider_name', 'model_name', 'model_type', name='unique_provider_model_name')
+    )
     with op.batch_alter_table('provider_models', schema=None) as batch_op:
         batch_op.create_index('provider_model_tenant_id_provider_idx', ['tenant_id', 'provider_name'], unique=False)
 
-    if _is_pg(conn):
-        op.create_table('tenant_default_models',
-        sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', postgresql.UUID(), nullable=False),
-        sa.Column('provider_name', sa.String(length=40), nullable=False),
-        sa.Column('model_name', sa.String(length=40), nullable=False),
-        sa.Column('model_type', sa.String(length=40), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tenant_default_model_pkey')
-        )
-    else:
-        op.create_table('tenant_default_models',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('provider_name', sa.String(length=40), nullable=False),
-        sa.Column('model_name', sa.String(length=40), nullable=False),
-        sa.Column('model_type', sa.String(length=40), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tenant_default_model_pkey')
-        )
-    
+    op.create_table('tenant_default_models',
+    sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', postgresql.UUID(), nullable=False),
+    sa.Column('provider_name', sa.String(length=40), nullable=False),
+    sa.Column('model_name', sa.String(length=40), nullable=False),
+    sa.Column('model_type', sa.String(length=40), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tenant_default_model_pkey')
+    )
     with op.batch_alter_table('tenant_default_models', schema=None) as batch_op:
         batch_op.create_index('tenant_default_model_tenant_id_provider_type_idx', ['tenant_id', 'provider_name', 'model_type'], unique=False)
 
-    if _is_pg(conn):
-        op.create_table('tenant_preferred_model_providers',
-        sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', postgresql.UUID(), nullable=False),
-        sa.Column('provider_name', sa.String(length=40), nullable=False),
-        sa.Column('preferred_provider_type', sa.String(length=40), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tenant_preferred_model_provider_pkey')
-        )
-    else:
-        op.create_table('tenant_preferred_model_providers',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('provider_name', sa.String(length=40), nullable=False),
-        sa.Column('preferred_provider_type', sa.String(length=40), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tenant_preferred_model_provider_pkey')
-        )
-    
+    op.create_table('tenant_preferred_model_providers',
+    sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', postgresql.UUID(), nullable=False),
+    sa.Column('provider_name', sa.String(length=40), nullable=False),
+    sa.Column('preferred_provider_type', sa.String(length=40), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tenant_preferred_model_provider_pkey')
+    )
     with op.batch_alter_table('tenant_preferred_model_providers', schema=None) as batch_op:
         batch_op.create_index('tenant_preferred_model_provider_tenant_provider_idx', ['tenant_id', 'provider_name'], unique=False)
 

api/migrations/versions/17b5ab037c40_add_keyworg_table_storage_type.py

@@ -8,10 +8,6 @@ Create Date: 2024-04-01 09:48:54.232201
 import sqlalchemy as sa
 from alembic import op
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '17b5ab037c40'
 down_revision = 'a8f9b3c45e4a'
@@ -21,14 +17,9 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('dataset_keyword_tables', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('data_source_type', sa.String(length=255), server_default=sa.text("'database'::character varying"), nullable=False))
-    else:
-        with op.batch_alter_table('dataset_keyword_tables', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('data_source_type', sa.String(length=255), server_default=sa.text("'database'"), nullable=False))
+
+    with op.batch_alter_table('dataset_keyword_tables', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('data_source_type', sa.String(length=255), server_default=sa.text("'database'::character varying"), nullable=False))
 
     # ### end Alembic commands ###
 

api/migrations/versions/2024_08_13_0633-63a83fcf12ba_support_conversation_variables.py

@@ -10,10 +10,6 @@ from alembic import op
 
 import models as models
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '63a83fcf12ba'
 down_revision = '1787fbae959a'
@@ -23,39 +19,21 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('workflow__conversation_variables',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('conversation_id', models.types.StringUUID(), nullable=False),
-        sa.Column('app_id', models.types.StringUUID(), nullable=False),
-        sa.Column('data', sa.Text(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-        sa.PrimaryKeyConstraint('id', 'conversation_id', name=op.f('workflow__conversation_variables_pkey'))
-        )
-    else:
-        op.create_table('workflow__conversation_variables',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('conversation_id', models.types.StringUUID(), nullable=False),
-        sa.Column('app_id', models.types.StringUUID(), nullable=False),
-        sa.Column('data', models.types.LongText(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', 'conversation_id', name=op.f('workflow__conversation_variables_pkey'))
-        )
-    
+    op.create_table('workflow__conversation_variables',
+    sa.Column('id', models.types.StringUUID(), nullable=False),
+    sa.Column('conversation_id', models.types.StringUUID(), nullable=False),
+    sa.Column('app_id', models.types.StringUUID(), nullable=False),
+    sa.Column('data', sa.Text(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.PrimaryKeyConstraint('id', 'conversation_id', name=op.f('workflow__conversation_variables_pkey'))
+    )
     with op.batch_alter_table('workflow__conversation_variables', schema=None) as batch_op:
         batch_op.create_index(batch_op.f('workflow__conversation_variables_app_id_idx'), ['app_id'], unique=False)
         batch_op.create_index(batch_op.f('workflow__conversation_variables_created_at_idx'), ['created_at'], unique=False)
 
-    if _is_pg(conn):
-        with op.batch_alter_table('workflows', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('conversation_variables', sa.Text(), server_default='{}', nullable=False))
-    else:
-        with op.batch_alter_table('workflows', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('conversation_variables', models.types.LongText(), default='{}', nullable=False))
+    with op.batch_alter_table('workflows', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('conversation_variables', sa.Text(), server_default='{}', nullable=False))
 
     # ### end Alembic commands ###
 

api/migrations/versions/2024_08_15_0956-0251a1c768cc_add_tidb_auth_binding.py

@@ -10,10 +10,6 @@ from alembic import op
 
 import models as models
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '0251a1c768cc'
 down_revision = 'bbadea11becb'
@@ -23,35 +19,18 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('tidb_auth_bindings',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=True),
-        sa.Column('cluster_id', sa.String(length=255), nullable=False),
-        sa.Column('cluster_name', sa.String(length=255), nullable=False),
-        sa.Column('active', sa.Boolean(), server_default=sa.text('false'), nullable=False),
-        sa.Column('status', sa.String(length=255), server_default=sa.text("'CREATING'::character varying"), nullable=False),
-        sa.Column('account', sa.String(length=255), nullable=False),
-        sa.Column('password', sa.String(length=255), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tidb_auth_bindings_pkey')
-        )
-    else:
-        op.create_table('tidb_auth_bindings',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=True),
-        sa.Column('cluster_id', sa.String(length=255), nullable=False),
-        sa.Column('cluster_name', sa.String(length=255), nullable=False),
-        sa.Column('active', sa.Boolean(), server_default=sa.text('false'), nullable=False),
-        sa.Column('status', sa.String(length=255), server_default=sa.text("'CREATING'"), nullable=False),
-        sa.Column('account', sa.String(length=255), nullable=False),
-        sa.Column('password', sa.String(length=255), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tidb_auth_bindings_pkey')
-        )
-    
+    op.create_table('tidb_auth_bindings',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=True),
+    sa.Column('cluster_id', sa.String(length=255), nullable=False),
+    sa.Column('cluster_name', sa.String(length=255), nullable=False),
+    sa.Column('active', sa.Boolean(), server_default=sa.text('false'), nullable=False),
+    sa.Column('status', sa.String(length=255), server_default=sa.text("'CREATING'::character varying"), nullable=False),
+    sa.Column('account', sa.String(length=255), nullable=False),
+    sa.Column('password', sa.String(length=255), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tidb_auth_bindings_pkey')
+    )
     with op.batch_alter_table('tidb_auth_bindings', schema=None) as batch_op:
         batch_op.create_index('tidb_auth_bindings_active_idx', ['active'], unique=False)
         batch_op.create_index('tidb_auth_bindings_status_idx', ['status'], unique=False)

api/migrations/versions/2024_09_11_1012-d57ba9ebb251_add_parent_message_id_to_messages.py

@@ -10,10 +10,6 @@ from alembic import op
 
 import models as models
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = 'd57ba9ebb251'
 down_revision = '675b5321501b'
@@ -26,14 +22,8 @@ def upgrade():
     with op.batch_alter_table('messages', schema=None) as batch_op:
         batch_op.add_column(sa.Column('parent_message_id', models.types.StringUUID(), nullable=True))
 
-    # Set parent_message_id for existing messages to distinguish them from new messages with actual parent IDs or NULLs
-    conn = op.get_bind()
-    if _is_pg(conn):
-        # PostgreSQL: Use uuid_nil() function
-        op.execute('UPDATE messages SET parent_message_id = uuid_nil() WHERE parent_message_id IS NULL')
-    else:
-        # MySQL: Use a specific UUID value to represent nil
-        op.execute("UPDATE messages SET parent_message_id = '00000000-0000-0000-0000-000000000000' WHERE parent_message_id IS NULL")
+    # Set parent_message_id for existing messages to uuid_nil() to distinguish them from new messages with actual parent IDs or NULLs
+    op.execute('UPDATE messages SET parent_message_id = uuid_nil() WHERE parent_message_id IS NULL')
 
     # ### end Alembic commands ###
 

api/migrations/versions/2024_09_24_0922-6af6a521a53e_update_retrieval_resource.py

@@ -6,11 +6,7 @@ Create Date: 2024-09-24 09:22:43.570120
 
 """
 from alembic import op
-import models.types
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
+import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
@@ -23,58 +19,30 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('dataset_retriever_resources', schema=None) as batch_op:
-            batch_op.alter_column('document_id',
-                   existing_type=sa.UUID(),
-                   nullable=True)
-            batch_op.alter_column('data_source_type',
-                   existing_type=sa.TEXT(),
-                   nullable=True)
-            batch_op.alter_column('segment_id',
-                   existing_type=sa.UUID(),
-                   nullable=True)
-    else:
-        with op.batch_alter_table('dataset_retriever_resources', schema=None) as batch_op:
-            batch_op.alter_column('document_id',
-                   existing_type=models.types.StringUUID(),
-                   nullable=True)
-            batch_op.alter_column('data_source_type',
-                   existing_type=models.types.LongText(),
-                   nullable=True)
-            batch_op.alter_column('segment_id',
-                   existing_type=models.types.StringUUID(),
-                   nullable=True)
+    with op.batch_alter_table('dataset_retriever_resources', schema=None) as batch_op:
+        batch_op.alter_column('document_id',
+               existing_type=sa.UUID(),
+               nullable=True)
+        batch_op.alter_column('data_source_type',
+               existing_type=sa.TEXT(),
+               nullable=True)
+        batch_op.alter_column('segment_id',
+               existing_type=sa.UUID(),
+               nullable=True)
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('dataset_retriever_resources', schema=None) as batch_op:
-            batch_op.alter_column('segment_id',
-                   existing_type=sa.UUID(),
-                   nullable=False)
-            batch_op.alter_column('data_source_type',
-                   existing_type=sa.TEXT(),
-                   nullable=False)
-            batch_op.alter_column('document_id',
-                   existing_type=sa.UUID(),
-                   nullable=False)
-    else:
-        with op.batch_alter_table('dataset_retriever_resources', schema=None) as batch_op:
-            batch_op.alter_column('segment_id',
-                   existing_type=models.types.StringUUID(),
-                   nullable=False)
-            batch_op.alter_column('data_source_type',
-                   existing_type=models.types.LongText(),
-                   nullable=False)
-            batch_op.alter_column('document_id',
-                   existing_type=models.types.StringUUID(),
-                   nullable=False)
+    with op.batch_alter_table('dataset_retriever_resources', schema=None) as batch_op:
+        batch_op.alter_column('segment_id',
+               existing_type=sa.UUID(),
+               nullable=False)
+        batch_op.alter_column('data_source_type',
+               existing_type=sa.TEXT(),
+               nullable=False)
+        batch_op.alter_column('document_id',
+               existing_type=sa.UUID(),
+               nullable=False)
 
     # ### end Alembic commands ###

api/migrations/versions/2024_09_25_0434-33f5fac87f29_external_knowledge_api.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '33f5fac87f29'
 down_revision = '6af6a521a53e'
@@ -23,66 +19,34 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('external_knowledge_apis',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('name', sa.String(length=255), nullable=False),
-        sa.Column('description', sa.String(length=255), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('settings', sa.Text(), nullable=True),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_by', models.types.StringUUID(), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='external_knowledge_apis_pkey')
-        )
-    else:
-        op.create_table('external_knowledge_apis',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('name', sa.String(length=255), nullable=False),
-        sa.Column('description', sa.String(length=255), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('settings', models.types.LongText(), nullable=True),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_by', models.types.StringUUID(), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='external_knowledge_apis_pkey')
-        )
-    
+    op.create_table('external_knowledge_apis',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=False),
+    sa.Column('description', sa.String(length=255), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('settings', sa.Text(), nullable=True),
+    sa.Column('created_by', models.types.StringUUID(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_by', models.types.StringUUID(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='external_knowledge_apis_pkey')
+    )
     with op.batch_alter_table('external_knowledge_apis', schema=None) as batch_op:
         batch_op.create_index('external_knowledge_apis_name_idx', ['name'], unique=False)
         batch_op.create_index('external_knowledge_apis_tenant_idx', ['tenant_id'], unique=False)
 
-    if _is_pg(conn):
-        op.create_table('external_knowledge_bindings',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('external_knowledge_api_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('external_knowledge_id', sa.Text(), nullable=False),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_by', models.types.StringUUID(), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='external_knowledge_bindings_pkey')
-        )
-    else:
-        op.create_table('external_knowledge_bindings',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('external_knowledge_api_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('external_knowledge_id', sa.String(length=512), nullable=False),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_by', models.types.StringUUID(), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='external_knowledge_bindings_pkey')
-        )
-    
+    op.create_table('external_knowledge_bindings',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('external_knowledge_api_id', models.types.StringUUID(), nullable=False),
+    sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
+    sa.Column('external_knowledge_id', sa.Text(), nullable=False),
+    sa.Column('created_by', models.types.StringUUID(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_by', models.types.StringUUID(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='external_knowledge_bindings_pkey')
+    )
     with op.batch_alter_table('external_knowledge_bindings', schema=None) as batch_op:
         batch_op.create_index('external_knowledge_bindings_dataset_idx', ['dataset_id'], unique=False)
         batch_op.create_index('external_knowledge_bindings_external_knowledge_api_idx', ['external_knowledge_api_id'], unique=False)

api/migrations/versions/2024_10_10_0516-bbadea11becb_add_name_and_size_to_tool_files.py

@@ -16,10 +16,6 @@ branch_labels = None
 depends_on = None
 
 
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
-
 def upgrade():
     def _has_name_or_size_column() -> bool:
         # We cannot access the database in offline mode, so assume
@@ -50,26 +46,14 @@ def upgrade():
     if _has_name_or_size_column():
         return
 
-    if _is_pg(conn):
-        # PostgreSQL: Keep original syntax
-        with op.batch_alter_table("tool_files", schema=None) as batch_op:
-            batch_op.add_column(sa.Column("name", sa.String(), nullable=True))
-            batch_op.add_column(sa.Column("size", sa.Integer(), nullable=True))
-        op.execute("UPDATE tool_files SET name = '' WHERE name IS NULL")
-        op.execute("UPDATE tool_files SET size = -1 WHERE size IS NULL")
-        with op.batch_alter_table("tool_files", schema=None) as batch_op:
-            batch_op.alter_column("name", existing_type=sa.String(), nullable=False)
-            batch_op.alter_column("size", existing_type=sa.Integer(), nullable=False)
-    else:
-        # MySQL: Use compatible syntax
-        with op.batch_alter_table("tool_files", schema=None) as batch_op:
-            batch_op.add_column(sa.Column("name", sa.String(length=255), nullable=True))
-            batch_op.add_column(sa.Column("size", sa.Integer(), nullable=True))
-        op.execute("UPDATE tool_files SET name = '' WHERE name IS NULL")
-        op.execute("UPDATE tool_files SET size = -1 WHERE size IS NULL")
-        with op.batch_alter_table("tool_files", schema=None) as batch_op:
-            batch_op.alter_column("name", existing_type=sa.String(length=255), nullable=False)
-            batch_op.alter_column("size", existing_type=sa.Integer(), nullable=False)
+    with op.batch_alter_table("tool_files", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("name", sa.String(), nullable=True))
+        batch_op.add_column(sa.Column("size", sa.Integer(), nullable=True))
+    op.execute("UPDATE tool_files SET name = '' WHERE name IS NULL")
+    op.execute("UPDATE tool_files SET size = -1 WHERE size IS NULL")
+    with op.batch_alter_table("tool_files", schema=None) as batch_op:
+        batch_op.alter_column("name", existing_type=sa.String(), nullable=False)
+        batch_op.alter_column("size", existing_type=sa.Integer(), nullable=False)
     # ### end Alembic commands ###
 
 

api/migrations/versions/2024_10_22_0959-43fa78bc3b7d_add_white_list.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '43fa78bc3b7d'
 down_revision = '0251a1c768cc'
@@ -23,25 +19,13 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('whitelists',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=True),
-        sa.Column('category', sa.String(length=255), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='whitelists_pkey')
-        )
-    else:
-        op.create_table('whitelists',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=True),
-        sa.Column('category', sa.String(length=255), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='whitelists_pkey')
-        )
-    
+    op.create_table('whitelists',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=True),
+    sa.Column('category', sa.String(length=255), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='whitelists_pkey')
+    )
     with op.batch_alter_table('whitelists', schema=None) as batch_op:
         batch_op.create_index('whitelists_tenant_idx', ['tenant_id'], unique=False)
 

api/migrations/versions/2024_10_28_0720-08ec4f75af5e_add_tenant_plugin_permisisons.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '08ec4f75af5e'
 down_revision = 'ddcc8bbef391'
@@ -23,26 +19,14 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('account_plugin_permissions',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('install_permission', sa.String(length=16), server_default='everyone', nullable=False),
-        sa.Column('debug_permission', sa.String(length=16), server_default='noone', nullable=False),
-        sa.PrimaryKeyConstraint('id', name='account_plugin_permission_pkey'),
-        sa.UniqueConstraint('tenant_id', name='unique_tenant_plugin')
-        )
-    else:
-        op.create_table('account_plugin_permissions',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('install_permission', sa.String(length=16), server_default='everyone', nullable=False),
-        sa.Column('debug_permission', sa.String(length=16), server_default='noone', nullable=False),
-        sa.PrimaryKeyConstraint('id', name='account_plugin_permission_pkey'),
-        sa.UniqueConstraint('tenant_id', name='unique_tenant_plugin')
-        )
+    op.create_table('account_plugin_permissions',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('install_permission', sa.String(length=16), server_default='everyone', nullable=False),
+    sa.Column('debug_permission', sa.String(length=16), server_default='noone', nullable=False),
+    sa.PrimaryKeyConstraint('id', name='account_plugin_permission_pkey'),
+    sa.UniqueConstraint('tenant_id', name='unique_tenant_plugin')
+    )
 
     # ### end Alembic commands ###
 

api/migrations/versions/2024_11_01_0540-f4d7ce70a7ca_update_upload_files_source_url.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = 'f4d7ce70a7ca'
 down_revision = '93ad8c19c40b'
@@ -23,43 +19,23 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('upload_files', schema=None) as batch_op:
-            batch_op.alter_column('source_url',
-                   existing_type=sa.VARCHAR(length=255),
-                   type_=sa.TEXT(),
-                   existing_nullable=False,
-                   existing_server_default=sa.text("''::character varying"))
-    else:
-        with op.batch_alter_table('upload_files', schema=None) as batch_op:
-            batch_op.alter_column('source_url',
-                   existing_type=sa.VARCHAR(length=255),
-                   type_=models.types.LongText(),
-                   existing_nullable=False,
-                   existing_default=sa.text("''"))
+    with op.batch_alter_table('upload_files', schema=None) as batch_op:
+        batch_op.alter_column('source_url',
+               existing_type=sa.VARCHAR(length=255),
+               type_=sa.TEXT(),
+               existing_nullable=False,
+               existing_server_default=sa.text("''::character varying"))
 
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('upload_files', schema=None) as batch_op:
-            batch_op.alter_column('source_url',
-                   existing_type=sa.TEXT(),
-                   type_=sa.VARCHAR(length=255),
-                   existing_nullable=False,
-                   existing_server_default=sa.text("''::character varying"))
-    else:
-        with op.batch_alter_table('upload_files', schema=None) as batch_op:
-            batch_op.alter_column('source_url',
-                   existing_type=models.types.LongText(),
-                   type_=sa.VARCHAR(length=255),
-                   existing_nullable=False,
-                   existing_default=sa.text("''"))
+    with op.batch_alter_table('upload_files', schema=None) as batch_op:
+        batch_op.alter_column('source_url',
+               existing_type=sa.TEXT(),
+               type_=sa.VARCHAR(length=255),
+               existing_nullable=False,
+               existing_server_default=sa.text("''::character varying"))
 
     # ### end Alembic commands ###

api/migrations/versions/2024_11_01_0622-d07474999927_update_type_of_custom_disclaimer_to_text.py

@@ -7,9 +7,6 @@ Create Date: 2024-11-01 06:22:27.981398
 """
 from alembic import op
 import models as models
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
@@ -22,91 +19,49 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
     op.execute("UPDATE recommended_apps SET custom_disclaimer = '' WHERE custom_disclaimer IS NULL")
     op.execute("UPDATE sites SET custom_disclaimer = '' WHERE custom_disclaimer IS NULL")
     op.execute("UPDATE tool_api_providers SET custom_disclaimer = '' WHERE custom_disclaimer IS NULL")
 
-    if _is_pg(conn):
-        with op.batch_alter_table('recommended_apps', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.VARCHAR(length=255),
-                   type_=sa.TEXT(),
-                   nullable=False)
+    with op.batch_alter_table('recommended_apps', schema=None) as batch_op:
+        batch_op.alter_column('custom_disclaimer',
+               existing_type=sa.VARCHAR(length=255),
+               type_=sa.TEXT(),
+               nullable=False)
 
-        with op.batch_alter_table('sites', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.VARCHAR(length=255),
-                   type_=sa.TEXT(),
-                   nullable=False)
+    with op.batch_alter_table('sites', schema=None) as batch_op:
+        batch_op.alter_column('custom_disclaimer',
+               existing_type=sa.VARCHAR(length=255),
+               type_=sa.TEXT(),
+               nullable=False)
 
-        with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.VARCHAR(length=255),
-                   type_=sa.TEXT(),
-                   nullable=False)
-    else:
-        with op.batch_alter_table('recommended_apps', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.VARCHAR(length=255),
-                   type_=models.types.LongText(),
-                   nullable=False)
-
-        with op.batch_alter_table('sites', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.VARCHAR(length=255),
-                   type_=models.types.LongText(),
-                   nullable=False)
-
-        with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.VARCHAR(length=255),
-                   type_=models.types.LongText(),
-                   nullable=False)
+    with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
+        batch_op.alter_column('custom_disclaimer',
+               existing_type=sa.VARCHAR(length=255),
+               type_=sa.TEXT(),
+               nullable=False)
 
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.TEXT(),
-                   type_=sa.VARCHAR(length=255),
-                   nullable=True)
+    with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
+        batch_op.alter_column('custom_disclaimer',
+               existing_type=sa.TEXT(),
+               type_=sa.VARCHAR(length=255),
+               nullable=True)
 
-        with op.batch_alter_table('sites', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.TEXT(),
-                   type_=sa.VARCHAR(length=255),
-                   nullable=True)
+    with op.batch_alter_table('sites', schema=None) as batch_op:
+        batch_op.alter_column('custom_disclaimer',
+               existing_type=sa.TEXT(),
+               type_=sa.VARCHAR(length=255),
+               nullable=True)
 
-        with op.batch_alter_table('recommended_apps', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=sa.TEXT(),
-                   type_=sa.VARCHAR(length=255),
-                   nullable=True)
-    else:
-        with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=models.types.LongText(),
-                   type_=sa.VARCHAR(length=255),
-                   nullable=True)
-
-        with op.batch_alter_table('sites', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=models.types.LongText(),
-                   type_=sa.VARCHAR(length=255),
-                   nullable=True)
-
-        with op.batch_alter_table('recommended_apps', schema=None) as batch_op:
-            batch_op.alter_column('custom_disclaimer',
-                   existing_type=models.types.LongText(),
-                   type_=sa.VARCHAR(length=255),
-                   nullable=True)
+    with op.batch_alter_table('recommended_apps', schema=None) as batch_op:
+        batch_op.alter_column('custom_disclaimer',
+               existing_type=sa.TEXT(),
+               type_=sa.VARCHAR(length=255),
+               nullable=True)
 
     # ### end Alembic commands ###

api/migrations/versions/2024_11_01_0623-09a8d1878d9b_update_workflows_graph_features_and_.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '09a8d1878d9b'
 down_revision = 'd07474999927'
@@ -23,103 +19,55 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('conversations', schema=None) as batch_op:
-            batch_op.alter_column('inputs',
-                   existing_type=postgresql.JSON(astext_type=sa.Text()),
-                   nullable=False)
+    with op.batch_alter_table('conversations', schema=None) as batch_op:
+        batch_op.alter_column('inputs',
+               existing_type=postgresql.JSON(astext_type=sa.Text()),
+               nullable=False)
 
-        with op.batch_alter_table('messages', schema=None) as batch_op:
-            batch_op.alter_column('inputs',
-                   existing_type=postgresql.JSON(astext_type=sa.Text()),
-                   nullable=False)
-    else:
-        with op.batch_alter_table('conversations', schema=None) as batch_op:
-            batch_op.alter_column('inputs',
-                   existing_type=sa.JSON(),
-                   nullable=False)
-
-        with op.batch_alter_table('messages', schema=None) as batch_op:
-            batch_op.alter_column('inputs',
-                   existing_type=sa.JSON(),
-                   nullable=False)
+    with op.batch_alter_table('messages', schema=None) as batch_op:
+        batch_op.alter_column('inputs',
+               existing_type=postgresql.JSON(astext_type=sa.Text()),
+               nullable=False)
 
     op.execute("UPDATE workflows SET updated_at = created_at WHERE updated_at IS NULL")
     op.execute("UPDATE workflows SET graph = '' WHERE graph IS NULL")
     op.execute("UPDATE workflows SET features = '' WHERE features IS NULL")
-    if _is_pg(conn):
-        with op.batch_alter_table('workflows', schema=None) as batch_op:
-            batch_op.alter_column('graph',
-                existing_type=sa.TEXT(),
-                nullable=False)
-            batch_op.alter_column('features',
-                existing_type=sa.TEXT(),
-                nullable=False)
-            batch_op.alter_column('updated_at',
-                existing_type=postgresql.TIMESTAMP(),
-                nullable=False)
-    else:
-        with op.batch_alter_table('workflows', schema=None) as batch_op:
-            batch_op.alter_column('graph',
-                existing_type=models.types.LongText(),
-                nullable=False)
-            batch_op.alter_column('features',
-                existing_type=models.types.LongText(),
-                nullable=False)
-            batch_op.alter_column('updated_at',
-                existing_type=sa.TIMESTAMP(),
-                nullable=False)
+
+    with op.batch_alter_table('workflows', schema=None) as batch_op:
+        batch_op.alter_column('graph',
+               existing_type=sa.TEXT(),
+               nullable=False)
+        batch_op.alter_column('features',
+               existing_type=sa.TEXT(),
+               nullable=False)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=False)
+
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('workflows', schema=None) as batch_op:
-            batch_op.alter_column('updated_at',
-                existing_type=postgresql.TIMESTAMP(),
-                nullable=True)
-            batch_op.alter_column('features',
-                existing_type=sa.TEXT(),
-                nullable=True)
-            batch_op.alter_column('graph',
-                existing_type=sa.TEXT(),
-                nullable=True)
-    else:
-        with op.batch_alter_table('workflows', schema=None) as batch_op:
-            batch_op.alter_column('updated_at',
-                existing_type=sa.TIMESTAMP(),
-                nullable=True)
-            batch_op.alter_column('features',
-                existing_type=models.types.LongText(),
-                nullable=True)
-            batch_op.alter_column('graph',
-                existing_type=models.types.LongText(),
-                nullable=True)
+    with op.batch_alter_table('workflows', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               nullable=True)
+        batch_op.alter_column('features',
+               existing_type=sa.TEXT(),
+               nullable=True)
+        batch_op.alter_column('graph',
+               existing_type=sa.TEXT(),
+               nullable=True)
 
-    if _is_pg(conn):
-        with op.batch_alter_table('messages', schema=None) as batch_op:
-            batch_op.alter_column('inputs',
-                   existing_type=postgresql.JSON(astext_type=sa.Text()),
-                   nullable=True)
+    with op.batch_alter_table('messages', schema=None) as batch_op:
+        batch_op.alter_column('inputs',
+               existing_type=postgresql.JSON(astext_type=sa.Text()),
+               nullable=True)
 
-        with op.batch_alter_table('conversations', schema=None) as batch_op:
-            batch_op.alter_column('inputs',
-                   existing_type=postgresql.JSON(astext_type=sa.Text()),
-                   nullable=True)
-    else:
-        with op.batch_alter_table('messages', schema=None) as batch_op:
-            batch_op.alter_column('inputs',
-                   existing_type=sa.JSON(),
-                   nullable=True)
-
-        with op.batch_alter_table('conversations', schema=None) as batch_op:
-            batch_op.alter_column('inputs',
-                   existing_type=sa.JSON(),
-                   nullable=True)
+    with op.batch_alter_table('conversations', schema=None) as batch_op:
+        batch_op.alter_column('inputs',
+               existing_type=postgresql.JSON(astext_type=sa.Text()),
+               nullable=True)
 
     # ### end Alembic commands ###

api/migrations/versions/2024_11_22_0701-e19037032219_parent_child_index.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 
 
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
-
 # revision identifiers, used by Alembic.
 revision = 'e19037032219'
 down_revision = 'd7999dfa4aae'
@@ -23,53 +19,27 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('child_chunks',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('document_id', models.types.StringUUID(), nullable=False),
-        sa.Column('segment_id', models.types.StringUUID(), nullable=False),
-        sa.Column('position', sa.Integer(), nullable=False),
-        sa.Column('content', sa.Text(), nullable=False),
-        sa.Column('word_count', sa.Integer(), nullable=False),
-        sa.Column('index_node_id', sa.String(length=255), nullable=True),
-        sa.Column('index_node_hash', sa.String(length=255), nullable=True),
-        sa.Column('type', sa.String(length=255), server_default=sa.text("'automatic'::character varying"), nullable=False),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_by', models.types.StringUUID(), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('indexing_at', sa.DateTime(), nullable=True),
-        sa.Column('completed_at', sa.DateTime(), nullable=True),
-        sa.Column('error', sa.Text(), nullable=True),
-        sa.PrimaryKeyConstraint('id', name='child_chunk_pkey')
-        )
-    else:
-        op.create_table('child_chunks',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('document_id', models.types.StringUUID(), nullable=False),
-        sa.Column('segment_id', models.types.StringUUID(), nullable=False),
-        sa.Column('position', sa.Integer(), nullable=False),
-        sa.Column('content', models.types.LongText(), nullable=False),
-        sa.Column('word_count', sa.Integer(), nullable=False),
-        sa.Column('index_node_id', sa.String(length=255), nullable=True),
-        sa.Column('index_node_hash', sa.String(length=255), nullable=True),
-        sa.Column('type', sa.String(length=255), server_default=sa.text("'automatic'"), nullable=False),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_by', models.types.StringUUID(), nullable=True),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('indexing_at', sa.DateTime(), nullable=True),
-        sa.Column('completed_at', sa.DateTime(), nullable=True),
-        sa.Column('error', models.types.LongText(), nullable=True),
-        sa.PrimaryKeyConstraint('id', name='child_chunk_pkey')
-        )
-    
+    op.create_table('child_chunks',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
+    sa.Column('document_id', models.types.StringUUID(), nullable=False),
+    sa.Column('segment_id', models.types.StringUUID(), nullable=False),
+    sa.Column('position', sa.Integer(), nullable=False),
+    sa.Column('content', sa.Text(), nullable=False),
+    sa.Column('word_count', sa.Integer(), nullable=False),
+    sa.Column('index_node_id', sa.String(length=255), nullable=True),
+    sa.Column('index_node_hash', sa.String(length=255), nullable=True),
+    sa.Column('type', sa.String(length=255), server_default=sa.text("'automatic'::character varying"), nullable=False),
+    sa.Column('created_by', models.types.StringUUID(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_by', models.types.StringUUID(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('indexing_at', sa.DateTime(), nullable=True),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.Column('error', sa.Text(), nullable=True),
+    sa.PrimaryKeyConstraint('id', name='child_chunk_pkey')
+    )
     with op.batch_alter_table('child_chunks', schema=None) as batch_op:
         batch_op.create_index('child_chunk_dataset_id_idx', ['tenant_id', 'dataset_id', 'document_id', 'segment_id', 'index_node_id'], unique=False)
 

api/migrations/versions/2024_12_19_1746-11b07f66c737_remove_unused_tool_providers.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '11b07f66c737'
 down_revision = 'cf8f4fc45278'
@@ -29,30 +25,15 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('tool_providers',
-        sa.Column('id', sa.UUID(), server_default=sa.text('uuid_generate_v4()'), autoincrement=False, nullable=False),
-        sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
-        sa.Column('tool_name', sa.VARCHAR(length=40), autoincrement=False, nullable=False),
-        sa.Column('encrypted_credentials', sa.TEXT(), autoincrement=False, nullable=True),
-        sa.Column('is_enabled', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False),
-        sa.Column('created_at', postgresql.TIMESTAMP(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), autoincrement=False, nullable=False),
-        sa.Column('updated_at', postgresql.TIMESTAMP(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), autoincrement=False, nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_provider_pkey'),
-        sa.UniqueConstraint('tenant_id', 'tool_name', name='unique_tool_provider_tool_name')
-        )
-    else:
-        op.create_table('tool_providers',
-        sa.Column('id', models.types.StringUUID(), autoincrement=False, nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), autoincrement=False, nullable=False),
-        sa.Column('tool_name', sa.VARCHAR(length=40), autoincrement=False, nullable=False),
-        sa.Column('encrypted_credentials', models.types.LongText(), autoincrement=False, nullable=True),
-        sa.Column('is_enabled', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False),
-        sa.Column('created_at', sa.TIMESTAMP(), server_default=sa.func.current_timestamp(), autoincrement=False, nullable=False),
-        sa.Column('updated_at', sa.TIMESTAMP(), server_default=sa.func.current_timestamp(), autoincrement=False, nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_provider_pkey'),
-        sa.UniqueConstraint('tenant_id', 'tool_name', name='unique_tool_provider_tool_name')
-        )
+    op.create_table('tool_providers',
+    sa.Column('id', sa.UUID(), server_default=sa.text('uuid_generate_v4()'), autoincrement=False, nullable=False),
+    sa.Column('tenant_id', sa.UUID(), autoincrement=False, nullable=False),
+    sa.Column('tool_name', sa.VARCHAR(length=40), autoincrement=False, nullable=False),
+    sa.Column('encrypted_credentials', sa.TEXT(), autoincrement=False, nullable=True),
+    sa.Column('is_enabled', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False),
+    sa.Column('created_at', postgresql.TIMESTAMP(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), autoincrement=False, nullable=False),
+    sa.Column('updated_at', postgresql.TIMESTAMP(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), autoincrement=False, nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tool_provider_pkey'),
+    sa.UniqueConstraint('tenant_id', 'tool_name', name='unique_tool_provider_tool_name')
+    )
     # ### end Alembic commands ###

api/migrations/versions/2024_12_25_1137-923752d42eb6_add_auto_disabled_dataset_logs.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '923752d42eb6'
 down_revision = 'e19037032219'
@@ -23,29 +19,15 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('dataset_auto_disable_logs',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('document_id', models.types.StringUUID(), nullable=False),
-        sa.Column('notified', sa.Boolean(), server_default=sa.text('false'), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='dataset_auto_disable_log_pkey')
-        )
-    else:
-        op.create_table('dataset_auto_disable_logs',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('document_id', models.types.StringUUID(), nullable=False),
-        sa.Column('notified', sa.Boolean(), server_default=sa.text('false'), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='dataset_auto_disable_log_pkey')
-        )
-    
+    op.create_table('dataset_auto_disable_logs',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
+    sa.Column('document_id', models.types.StringUUID(), nullable=False),
+    sa.Column('notified', sa.Boolean(), server_default=sa.text('false'), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='dataset_auto_disable_log_pkey')
+    )
     with op.batch_alter_table('dataset_auto_disable_logs', schema=None) as batch_op:
         batch_op.create_index('dataset_auto_disable_log_created_atx', ['created_at'], unique=False)
         batch_op.create_index('dataset_auto_disable_log_dataset_idx', ['dataset_id'], unique=False)

api/migrations/versions/2025_01_14_0617-f051706725cc_add_rate_limit_logs.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = 'f051706725cc'
 down_revision = 'ee79d9b1c156'
@@ -23,27 +19,14 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('rate_limit_logs',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('subscription_plan', sa.String(length=255), nullable=False),
-        sa.Column('operation', sa.String(length=255), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='rate_limit_log_pkey')
-        )
-    else:
-        op.create_table('rate_limit_logs',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('subscription_plan', sa.String(length=255), nullable=False),
-        sa.Column('operation', sa.String(length=255), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='rate_limit_log_pkey')
-        )
-    
+    op.create_table('rate_limit_logs',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('subscription_plan', sa.String(length=255), nullable=False),
+    sa.Column('operation', sa.String(length=255), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='rate_limit_log_pkey')
+    )
     with op.batch_alter_table('rate_limit_logs', schema=None) as batch_op:
         batch_op.create_index('rate_limit_log_operation_idx', ['operation'], unique=False)
         batch_op.create_index('rate_limit_log_tenant_idx', ['tenant_id'], unique=False)

api/migrations/versions/2025_02_27_0917-d20049ed0af6_add_metadata_function.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = 'd20049ed0af6'
 down_revision = 'f051706725cc'
@@ -23,66 +19,34 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('dataset_metadata_bindings',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('metadata_id', models.types.StringUUID(), nullable=False),
-        sa.Column('document_id', models.types.StringUUID(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='dataset_metadata_binding_pkey')
-        )
-    else:
-        op.create_table('dataset_metadata_bindings',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('metadata_id', models.types.StringUUID(), nullable=False),
-        sa.Column('document_id', models.types.StringUUID(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='dataset_metadata_binding_pkey')
-        )
-    
+    op.create_table('dataset_metadata_bindings',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
+    sa.Column('metadata_id', models.types.StringUUID(), nullable=False),
+    sa.Column('document_id', models.types.StringUUID(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.Column('created_by', models.types.StringUUID(), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='dataset_metadata_binding_pkey')
+    )
     with op.batch_alter_table('dataset_metadata_bindings', schema=None) as batch_op:
         batch_op.create_index('dataset_metadata_binding_dataset_idx', ['dataset_id'], unique=False)
         batch_op.create_index('dataset_metadata_binding_document_idx', ['document_id'], unique=False)
         batch_op.create_index('dataset_metadata_binding_metadata_idx', ['metadata_id'], unique=False)
         batch_op.create_index('dataset_metadata_binding_tenant_idx', ['tenant_id'], unique=False)
 
-    if _is_pg(conn):
-        # PostgreSQL: Keep original syntax
-        op.create_table('dataset_metadatas',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('type', sa.String(length=255), nullable=False),
-        sa.Column('name', sa.String(length=255), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.Column('updated_by', models.types.StringUUID(), nullable=True),
-        sa.PrimaryKeyConstraint('id', name='dataset_metadata_pkey')
-        )
-    else:
-        # MySQL: Use compatible syntax
-        op.create_table('dataset_metadatas',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
-        sa.Column('type', sa.String(length=255), nullable=False),
-        sa.Column('name', sa.String(length=255), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('created_by', models.types.StringUUID(), nullable=False),
-        sa.Column('updated_by', models.types.StringUUID(), nullable=True),
-        sa.PrimaryKeyConstraint('id', name='dataset_metadata_pkey')
-        )
-    
+    op.create_table('dataset_metadatas',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('dataset_id', models.types.StringUUID(), nullable=False),
+    sa.Column('type', sa.String(length=255), nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('created_by', models.types.StringUUID(), nullable=False),
+    sa.Column('updated_by', models.types.StringUUID(), nullable=True),
+    sa.PrimaryKeyConstraint('id', name='dataset_metadata_pkey')
+    )
     with op.batch_alter_table('dataset_metadatas', schema=None) as batch_op:
         batch_op.create_index('dataset_metadata_dataset_idx', ['dataset_id'], unique=False)
         batch_op.create_index('dataset_metadata_tenant_idx', ['tenant_id'], unique=False)
@@ -90,31 +54,23 @@ def upgrade():
     with op.batch_alter_table('datasets', schema=None) as batch_op:
         batch_op.add_column(sa.Column('built_in_field_enabled', sa.Boolean(), server_default=sa.text('false'), nullable=False))
 
-    if _is_pg(conn):
-        with op.batch_alter_table('documents', schema=None) as batch_op:
-            batch_op.alter_column('doc_metadata',
-                   existing_type=postgresql.JSON(astext_type=sa.Text()),
-                   type_=postgresql.JSONB(astext_type=sa.Text()),
-                   existing_nullable=True)
-            batch_op.create_index('document_metadata_idx', ['doc_metadata'], unique=False, postgresql_using='gin')
-    else:
-        pass
+    with op.batch_alter_table('documents', schema=None) as batch_op:
+        batch_op.alter_column('doc_metadata',
+               existing_type=postgresql.JSON(astext_type=sa.Text()),
+               type_=postgresql.JSONB(astext_type=sa.Text()),
+               existing_nullable=True)
+        batch_op.create_index('document_metadata_idx', ['doc_metadata'], unique=False, postgresql_using='gin')
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('documents', schema=None) as batch_op:
-            batch_op.drop_index('document_metadata_idx', postgresql_using='gin')
-            batch_op.alter_column('doc_metadata',
-                   existing_type=postgresql.JSONB(astext_type=sa.Text()),
-                   type_=postgresql.JSON(astext_type=sa.Text()),
-                   existing_nullable=True)
-    else:
-        pass
+    with op.batch_alter_table('documents', schema=None) as batch_op:
+        batch_op.drop_index('document_metadata_idx', postgresql_using='gin')
+        batch_op.alter_column('doc_metadata',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               type_=postgresql.JSON(astext_type=sa.Text()),
+               existing_nullable=True)
 
     with op.batch_alter_table('datasets', schema=None) as batch_op:
         batch_op.drop_column('built_in_field_enabled')

api/migrations/versions/2025_03_03_1436-ee79d9b1c156_add_marked_name_and_marked_comment_in_.py

@@ -17,23 +17,10 @@ branch_labels = None
 depends_on = None
 
 
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
-
 def upgrade():
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        # PostgreSQL: Keep original syntax
-        with op.batch_alter_table('workflows', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('marked_name', sa.String(), nullable=False, server_default=''))
-            batch_op.add_column(sa.Column('marked_comment', sa.String(), nullable=False, server_default=''))
-    else:
-        # MySQL: Use compatible syntax
-        with op.batch_alter_table('workflows', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('marked_name', sa.String(length=255), nullable=False, server_default=''))
-            batch_op.add_column(sa.Column('marked_comment', sa.String(length=255), nullable=False, server_default=''))
+    with op.batch_alter_table('workflows', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('marked_name', sa.String(), nullable=False, server_default=''))
+        batch_op.add_column(sa.Column('marked_comment', sa.String(), nullable=False, server_default=''))
 
 
 def downgrade():

api/migrations/versions/2025_05_15_1531-2adcbe1f5dfb_add_workflowdraftvariable_model.py

@@ -11,10 +11,6 @@ from alembic import op
 
 import models as models
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = "2adcbe1f5dfb"
 down_revision = "d28f2004b072"
@@ -24,46 +20,24 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table(
-            "workflow_draft_variables",
-            sa.Column("id", models.types.StringUUID(), server_default=sa.text("uuid_generate_v4()"), nullable=False),
-            sa.Column("created_at", sa.DateTime(), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
-            sa.Column("updated_at", sa.DateTime(), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
-            sa.Column("app_id", models.types.StringUUID(), nullable=False),
-            sa.Column("last_edited_at", sa.DateTime(), nullable=True),
-            sa.Column("node_id", sa.String(length=255), nullable=False),
-            sa.Column("name", sa.String(length=255), nullable=False),
-            sa.Column("description", sa.String(length=255), nullable=False),
-            sa.Column("selector", sa.String(length=255), nullable=False),
-            sa.Column("value_type", sa.String(length=20), nullable=False),
-            sa.Column("value", sa.Text(), nullable=False),
-            sa.Column("visible", sa.Boolean(), nullable=False),
-            sa.Column("editable", sa.Boolean(), nullable=False),
-            sa.PrimaryKeyConstraint("id", name=op.f("workflow_draft_variables_pkey")),
-            sa.UniqueConstraint("app_id", "node_id", "name", name=op.f("workflow_draft_variables_app_id_key")),
-        )
-    else:
-        op.create_table(
-            "workflow_draft_variables",
-            sa.Column("id", models.types.StringUUID(), nullable=False),
-            sa.Column("created_at", sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-            sa.Column("updated_at", sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-            sa.Column("app_id", models.types.StringUUID(), nullable=False),
-            sa.Column("last_edited_at", sa.DateTime(), nullable=True),
-            sa.Column("node_id", sa.String(length=255), nullable=False),
-            sa.Column("name", sa.String(length=255), nullable=False),
-            sa.Column("description", sa.String(length=255), nullable=False),
-            sa.Column("selector", sa.String(length=255), nullable=False),
-            sa.Column("value_type", sa.String(length=20), nullable=False),
-            sa.Column("value", models.types.LongText(), nullable=False),
-            sa.Column("visible", sa.Boolean(), nullable=False),
-            sa.Column("editable", sa.Boolean(), nullable=False),
-            sa.PrimaryKeyConstraint("id", name=op.f("workflow_draft_variables_pkey")),
-            sa.UniqueConstraint("app_id", "node_id", "name", name=op.f("workflow_draft_variables_app_id_key")),
-        )
+    op.create_table(
+        "workflow_draft_variables",
+        sa.Column("id", models.types.StringUUID(), server_default=sa.text("uuid_generate_v4()"), nullable=False),
+        sa.Column("created_at", sa.DateTime(), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(), server_default=sa.text("CURRENT_TIMESTAMP"), nullable=False),
+        sa.Column("app_id", models.types.StringUUID(), nullable=False),
+        sa.Column("last_edited_at", sa.DateTime(), nullable=True),
+        sa.Column("node_id", sa.String(length=255), nullable=False),
+        sa.Column("name", sa.String(length=255), nullable=False),
+        sa.Column("description", sa.String(length=255), nullable=False),
+        sa.Column("selector", sa.String(length=255), nullable=False),
+        sa.Column("value_type", sa.String(length=20), nullable=False),
+        sa.Column("value", sa.Text(), nullable=False),
+        sa.Column("visible", sa.Boolean(), nullable=False),
+        sa.Column("editable", sa.Boolean(), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("workflow_draft_variables_pkey")),
+        sa.UniqueConstraint("app_id", "node_id", "name", name=op.f("workflow_draft_variables_app_id_key")),
+    )
 
     # ### end Alembic commands ###
 

api/migrations/versions/2025_06_06_1424-4474872b0ee6_workflow_draft_varaibles_add_node_execution_id.py

@@ -7,10 +7,6 @@ Create Date: 2025-06-06 14:24:44.213018
 """
 from alembic import op
 import models as models
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
 import sqlalchemy as sa
 
 
@@ -22,30 +18,19 @@ depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        # `CREATE INDEX CONCURRENTLY` cannot run within a transaction, so use the `autocommit_block`
-        # context manager to wrap the index creation statement.
-        # Reference:
-        #
-        # - https://www.postgresql.org/docs/current/sql-createindex.html#:~:text=Another%20difference%20is,CREATE%20INDEX%20CONCURRENTLY%20cannot.
-        # - https://alembic.sqlalchemy.org/en/latest/api/runtime.html#alembic.runtime.migration.MigrationContext.autocommit_block
-        with op.get_context().autocommit_block():
-            op.create_index(
-                op.f('workflow_node_executions_tenant_id_idx'),
-                "workflow_node_executions",
-                ['tenant_id', 'workflow_id', 'node_id', sa.literal_column('created_at DESC')],
-                unique=False,
-                postgresql_concurrently=True,
-            )
-    else:
+    # `CREATE INDEX CONCURRENTLY` cannot run within a transaction, so use the `autocommit_block`
+    # context manager to wrap the index creation statement.
+    # Reference:
+    #
+    # - https://www.postgresql.org/docs/current/sql-createindex.html#:~:text=Another%20difference%20is,CREATE%20INDEX%20CONCURRENTLY%20cannot.
+    # - https://alembic.sqlalchemy.org/en/latest/api/runtime.html#alembic.runtime.migration.MigrationContext.autocommit_block
+    with op.get_context().autocommit_block():
         op.create_index(
             op.f('workflow_node_executions_tenant_id_idx'),
             "workflow_node_executions",
             ['tenant_id', 'workflow_id', 'node_id', sa.literal_column('created_at DESC')],
             unique=False,
+            postgresql_concurrently=True,
         )
 
     with op.batch_alter_table('workflow_draft_variables', schema=None) as batch_op:
@@ -66,13 +51,8 @@ def downgrade():
     # Reference:
     #
     # https://www.postgresql.org/docs/current/sql-createindex.html#:~:text=Another%20difference%20is,CREATE%20INDEX%20CONCURRENTLY%20cannot.
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.get_context().autocommit_block():
-            op.drop_index(op.f('workflow_node_executions_tenant_id_idx'), postgresql_concurrently=True)
-    else:
-        op.drop_index(op.f('workflow_node_executions_tenant_id_idx'))
+    with op.get_context().autocommit_block():
+        op.drop_index(op.f('workflow_node_executions_tenant_id_idx'), postgresql_concurrently=True)
 
     with op.batch_alter_table('workflow_draft_variables', schema=None) as batch_op:
         batch_op.drop_column('node_execution_id')

api/migrations/versions/2025_06_25_0936-58eb7bdb93fe_add_mcp_server_tool_and_app_server.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 
 
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
-
 # revision identifiers, used by Alembic.
 revision = '58eb7bdb93fe'
 down_revision = '0ab65e1cc7fa'
@@ -23,80 +19,40 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('app_mcp_servers',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('app_id', models.types.StringUUID(), nullable=False),
-        sa.Column('name', sa.String(length=255), nullable=False),
-        sa.Column('description', sa.String(length=255), nullable=False),
-        sa.Column('server_code', sa.String(length=255), nullable=False),
-        sa.Column('status', sa.String(length=255), server_default=sa.text("'normal'::character varying"), nullable=False),
-        sa.Column('parameters', sa.Text(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='app_mcp_server_pkey'),
-        sa.UniqueConstraint('tenant_id', 'app_id', name='unique_app_mcp_server_tenant_app_id'),
-        sa.UniqueConstraint('server_code', name='unique_app_mcp_server_server_code')
-        )
-    else:
-        op.create_table('app_mcp_servers',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('app_id', models.types.StringUUID(), nullable=False),
-        sa.Column('name', sa.String(length=255), nullable=False),
-        sa.Column('description', sa.String(length=255), nullable=False),
-        sa.Column('server_code', sa.String(length=255), nullable=False),
-        sa.Column('status', sa.String(length=255), server_default=sa.text("'normal'"), nullable=False),
-        sa.Column('parameters', models.types.LongText(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='app_mcp_server_pkey'),
-        sa.UniqueConstraint('tenant_id', 'app_id', name='unique_app_mcp_server_tenant_app_id'),
-        sa.UniqueConstraint('server_code', name='unique_app_mcp_server_server_code')
-        )
-    if _is_pg(conn):
-        op.create_table('tool_mcp_providers',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('name', sa.String(length=40), nullable=False),
-        sa.Column('server_identifier', sa.String(length=24), nullable=False),
-        sa.Column('server_url', sa.Text(), nullable=False),
-        sa.Column('server_url_hash', sa.String(length=64), nullable=False),
-        sa.Column('icon', sa.String(length=255), nullable=True),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('user_id', models.types.StringUUID(), nullable=False),
-        sa.Column('encrypted_credentials', sa.Text(), nullable=True),
-        sa.Column('authed', sa.Boolean(), nullable=False),
-        sa.Column('tools', sa.Text(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_mcp_provider_pkey'),
-        sa.UniqueConstraint('tenant_id', 'name', name='unique_mcp_provider_name'),
-        sa.UniqueConstraint('tenant_id', 'server_identifier', name='unique_mcp_provider_server_identifier'),
-        sa.UniqueConstraint('tenant_id', 'server_url_hash', name='unique_mcp_provider_server_url')
-        )
-    else:
-        op.create_table('tool_mcp_providers',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('name', sa.String(length=40), nullable=False),
-        sa.Column('server_identifier', sa.String(length=24), nullable=False),
-        sa.Column('server_url', models.types.LongText(), nullable=False),
-        sa.Column('server_url_hash', sa.String(length=64), nullable=False),
-        sa.Column('icon', sa.String(length=255), nullable=True),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('user_id', models.types.StringUUID(), nullable=False),
-        sa.Column('encrypted_credentials', models.types.LongText(), nullable=True),
-        sa.Column('authed', sa.Boolean(), nullable=False),
-        sa.Column('tools', models.types.LongText(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_mcp_provider_pkey'),
-        sa.UniqueConstraint('tenant_id', 'name', name='unique_mcp_provider_name'),
-        sa.UniqueConstraint('tenant_id', 'server_identifier', name='unique_mcp_provider_server_identifier'),
-        sa.UniqueConstraint('tenant_id', 'server_url_hash', name='unique_mcp_provider_server_url')
-        )
+    op.create_table('app_mcp_servers',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('app_id', models.types.StringUUID(), nullable=False),
+    sa.Column('name', sa.String(length=255), nullable=False),
+    sa.Column('description', sa.String(length=255), nullable=False),
+    sa.Column('server_code', sa.String(length=255), nullable=False),
+    sa.Column('status', sa.String(length=255), server_default=sa.text("'normal'::character varying"), nullable=False),
+    sa.Column('parameters', sa.Text(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='app_mcp_server_pkey'),
+    sa.UniqueConstraint('tenant_id', 'app_id', name='unique_app_mcp_server_tenant_app_id'),
+    sa.UniqueConstraint('server_code', name='unique_app_mcp_server_server_code')
+    )
+    op.create_table('tool_mcp_providers',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('name', sa.String(length=40), nullable=False),
+    sa.Column('server_identifier', sa.String(length=24), nullable=False),
+    sa.Column('server_url', sa.Text(), nullable=False),
+    sa.Column('server_url_hash', sa.String(length=64), nullable=False),
+    sa.Column('icon', sa.String(length=255), nullable=True),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('user_id', models.types.StringUUID(), nullable=False),
+    sa.Column('encrypted_credentials', sa.Text(), nullable=True),
+    sa.Column('authed', sa.Boolean(), nullable=False),
+    sa.Column('tools', sa.Text(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tool_mcp_provider_pkey'),
+    sa.UniqueConstraint('tenant_id', 'name', name='unique_mcp_provider_name'),
+    sa.UniqueConstraint('tenant_id', 'server_identifier', name='unique_mcp_provider_server_identifier'),
+    sa.UniqueConstraint('tenant_id', 'server_url_hash', name='unique_mcp_provider_server_url')
+    )
 
     # ### end Alembic commands ###
 

api/migrations/versions/2025_07_02_2332-1c9ba48be8e4_add_uuidv7_function_in_sql.py

@@ -27,10 +27,6 @@ import models as models
 import sqlalchemy as sa
 
 
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
-
 # revision identifiers, used by Alembic.
 revision = '1c9ba48be8e4'
 down_revision = '58eb7bdb93fe'
@@ -44,11 +40,7 @@ def upgrade():
     # The ability to specify source timestamp has been removed because its type signature is incompatible with
     # PostgreSQL 18's `uuidv7` function. This capability is rarely needed in practice, as IDs can be
     # generated and controlled within the application layer.
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        # PostgreSQL: Create uuidv7 functions
-        op.execute(sa.text(r"""
+    op.execute(sa.text(r"""
 /* Main function to generate a uuidv7 value with millisecond precision */
 CREATE FUNCTION uuidv7() RETURNS uuid
 AS
@@ -71,7 +63,7 @@ COMMENT ON FUNCTION uuidv7 IS
     'Generate a uuid-v7 value with a 48-bit timestamp (millisecond precision) and 74 bits of randomness';
 """))
 
-        op.execute(sa.text(r"""
+    op.execute(sa.text(r"""
 CREATE FUNCTION uuidv7_boundary(timestamptz) RETURNS uuid
 AS
 $$
@@ -87,15 +79,8 @@ COMMENT ON FUNCTION uuidv7_boundary(timestamptz) IS
     'Generate a non-random uuidv7 with the given timestamp (first 48 bits) and all random bits to 0. As the smallest possible uuidv7 for that timestamp, it may be used as a boundary for partitions.';
 """
 ))
-    else:
-        pass
 
 
 def downgrade():
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.execute(sa.text("DROP FUNCTION uuidv7"))
-        op.execute(sa.text("DROP FUNCTION uuidv7_boundary"))
-    else:
-        pass
+    op.execute(sa.text("DROP FUNCTION uuidv7"))
+    op.execute(sa.text("DROP FUNCTION uuidv7_boundary"))

api/migrations/versions/2025_07_04_1705-71f5020c6470_tool_oauth.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 
 
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
-
 # revision identifiers, used by Alembic.
 revision = '71f5020c6470'
 down_revision = '1c9ba48be8e4'
@@ -23,63 +19,31 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('tool_oauth_system_clients',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('plugin_id', sa.String(length=512), nullable=False),
-        sa.Column('provider', sa.String(length=255), nullable=False),
-        sa.Column('encrypted_oauth_params', sa.Text(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_oauth_system_client_pkey'),
-        sa.UniqueConstraint('plugin_id', 'provider', name='tool_oauth_system_client_plugin_id_provider_idx')
-        )
-    else:
-        op.create_table('tool_oauth_system_clients',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('plugin_id', sa.String(length=512), nullable=False),
-        sa.Column('provider', sa.String(length=255), nullable=False),
-        sa.Column('encrypted_oauth_params', models.types.LongText(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_oauth_system_client_pkey'),
-        sa.UniqueConstraint('plugin_id', 'provider', name='tool_oauth_system_client_plugin_id_provider_idx')
-        )
-    if _is_pg(conn):
-        op.create_table('tool_oauth_tenant_clients',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('plugin_id', sa.String(length=512), nullable=False),
-        sa.Column('provider', sa.String(length=255), nullable=False),
-        sa.Column('enabled', sa.Boolean(), server_default=sa.text('true'), nullable=False),
-        sa.Column('encrypted_oauth_params', sa.Text(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_oauth_tenant_client_pkey'),
-        sa.UniqueConstraint('tenant_id', 'plugin_id', 'provider', name='unique_tool_oauth_tenant_client')
-        )
-    else:
-        op.create_table('tool_oauth_tenant_clients',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('plugin_id', sa.String(length=255), nullable=False),
-        sa.Column('provider', sa.String(length=255), nullable=False),
-        sa.Column('enabled', sa.Boolean(), server_default=sa.text('true'), nullable=False),
-        sa.Column('encrypted_oauth_params', models.types.LongText(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tool_oauth_tenant_client_pkey'),
-        sa.UniqueConstraint('tenant_id', 'plugin_id', 'provider', name='unique_tool_oauth_tenant_client')
-        )
+    op.create_table('tool_oauth_system_clients',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('plugin_id', sa.String(length=512), nullable=False),
+    sa.Column('provider', sa.String(length=255), nullable=False),
+    sa.Column('encrypted_oauth_params', sa.Text(), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tool_oauth_system_client_pkey'),
+    sa.UniqueConstraint('plugin_id', 'provider', name='tool_oauth_system_client_plugin_id_provider_idx')
+    )
+    op.create_table('tool_oauth_tenant_clients',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('plugin_id', sa.String(length=512), nullable=False),
+    sa.Column('provider', sa.String(length=255), nullable=False),
+    sa.Column('enabled', sa.Boolean(), server_default=sa.text('true'), nullable=False),
+    sa.Column('encrypted_oauth_params', sa.Text(), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tool_oauth_tenant_client_pkey'),
+    sa.UniqueConstraint('tenant_id', 'plugin_id', 'provider', name='unique_tool_oauth_tenant_client')
+    )
 
-    if _is_pg(conn):
-        with op.batch_alter_table('tool_builtin_providers', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('name', sa.String(length=256), server_default=sa.text("'API KEY 1'::character varying"), nullable=False))
-            batch_op.add_column(sa.Column('is_default', sa.Boolean(), server_default=sa.text('false'), nullable=False))
-            batch_op.add_column(sa.Column('credential_type', sa.String(length=32), server_default=sa.text("'api-key'::character varying"), nullable=False))
-            batch_op.drop_constraint(batch_op.f('unique_builtin_tool_provider'), type_='unique')
-            batch_op.create_unique_constraint(batch_op.f('unique_builtin_tool_provider'), ['tenant_id', 'provider', 'name'])
-    else:
-        with op.batch_alter_table('tool_builtin_providers', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('name', sa.String(length=256), server_default=sa.text("'API KEY 1'"), nullable=False))
-            batch_op.add_column(sa.Column('is_default', sa.Boolean(), server_default=sa.text('false'), nullable=False))
-            batch_op.add_column(sa.Column('credential_type', sa.String(length=32), server_default=sa.text("'api-key'"), nullable=False))
-            batch_op.drop_constraint(batch_op.f('unique_builtin_tool_provider'), type_='unique')
-            batch_op.create_unique_constraint(batch_op.f('unique_builtin_tool_provider'), ['tenant_id', 'provider', 'name'])
+    with op.batch_alter_table('tool_builtin_providers', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('name', sa.String(length=256), server_default=sa.text("'API KEY 1'::character varying"), nullable=False))
+        batch_op.add_column(sa.Column('is_default', sa.Boolean(), server_default=sa.text('false'), nullable=False))
+        batch_op.add_column(sa.Column('credential_type', sa.String(length=32), server_default=sa.text("'api-key'::character varying"), nullable=False))
+        batch_op.drop_constraint(batch_op.f('unique_builtin_tool_provider'), type_='unique')
+        batch_op.create_unique_constraint(batch_op.f('unique_builtin_tool_provider'), ['tenant_id', 'provider', 'name'])
 
     # ### end Alembic commands ###
 

api/migrations/versions/2025_07_23_1508-8bcc02c9bd07_add_tenant_plugin_autoupgrade_table.py

@@ -10,10 +10,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = '8bcc02c9bd07'
 down_revision = '375fe79ead14'
@@ -23,36 +19,19 @@ depends_on = None
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('tenant_plugin_auto_upgrade_strategies',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('strategy_setting', sa.String(length=16), server_default='fix_only', nullable=False),
-        sa.Column('upgrade_time_of_day', sa.Integer(), nullable=False),
-        sa.Column('upgrade_mode', sa.String(length=16), server_default='exclude', nullable=False),
-        sa.Column('exclude_plugins', sa.ARRAY(sa.String(length=255)), nullable=False),
-        sa.Column('include_plugins', sa.ARRAY(sa.String(length=255)), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tenant_plugin_auto_upgrade_strategy_pkey'),
-        sa.UniqueConstraint('tenant_id', name='unique_tenant_plugin_auto_upgrade_strategy')
-        )
-    else:
-        op.create_table('tenant_plugin_auto_upgrade_strategies',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('strategy_setting', sa.String(length=16), server_default='fix_only', nullable=False),
-        sa.Column('upgrade_time_of_day', sa.Integer(), nullable=False),
-        sa.Column('upgrade_mode', sa.String(length=16), server_default='exclude', nullable=False),
-        sa.Column('exclude_plugins', sa.JSON(), nullable=False),
-        sa.Column('include_plugins', sa.JSON(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='tenant_plugin_auto_upgrade_strategy_pkey'),
-        sa.UniqueConstraint('tenant_id', name='unique_tenant_plugin_auto_upgrade_strategy')
-        )
+    op.create_table('tenant_plugin_auto_upgrade_strategies',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('strategy_setting', sa.String(length=16), server_default='fix_only', nullable=False),
+    sa.Column('upgrade_time_of_day', sa.Integer(), nullable=False),
+    sa.Column('upgrade_mode', sa.String(length=16), server_default='exclude', nullable=False),
+    sa.Column('exclude_plugins', sa.ARRAY(sa.String(length=255)), nullable=False),
+    sa.Column('include_plugins', sa.ARRAY(sa.String(length=255)), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tenant_plugin_auto_upgrade_strategy_pkey'),
+    sa.UniqueConstraint('tenant_id', name='unique_tenant_plugin_auto_upgrade_strategy')
+    )
     # ### end Alembic commands ###
 
 

api/migrations/versions/2025_07_24_1450-532b3f888abf_manual_dataset_field_update.py

@@ -7,10 +7,6 @@ Create Date: 2025-07-24 14:50:48.779833
 """
 from alembic import op
 import models as models
-
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
 import sqlalchemy as sa
 
 
@@ -22,18 +18,8 @@ depends_on = None
 
 
 def upgrade():
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.execute("ALTER TABLE tidb_auth_bindings ALTER COLUMN status SET DEFAULT 'CREATING'::character varying")
-    else:
-        op.execute("ALTER TABLE tidb_auth_bindings ALTER COLUMN status SET DEFAULT 'CREATING'")
+    op.execute("ALTER TABLE tidb_auth_bindings ALTER COLUMN status SET DEFAULT 'CREATING'::character varying")
 
 
 def downgrade():
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.execute("ALTER TABLE tidb_auth_bindings ALTER COLUMN status SET DEFAULT 'CREATING'::character varying")
-    else:
-        op.execute("ALTER TABLE tidb_auth_bindings ALTER COLUMN status SET DEFAULT 'CREATING'")
+    op.execute("ALTER TABLE tidb_auth_bindings ALTER COLUMN status SET DEFAULT 'CREATING'")

api/migrations/versions/2025_08_09_1553-e8446f481c1e_add_provider_credential_pool_support.py

@@ -11,10 +11,6 @@ import models as models
 import sqlalchemy as sa
 from sqlalchemy.sql import table, column
 
-
-def _is_pg(conn):
-    return conn.dialect.name == "postgresql"
-
 # revision identifiers, used by Alembic.
 revision = 'e8446f481c1e'
 down_revision = 'fa8b0fa6f407'
@@ -24,30 +20,16 @@ depends_on = None
 
 def upgrade():
     # Create provider_credentials table
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        op.create_table('provider_credentials',
-        sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuidv7()'), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('provider_name', sa.String(length=255), nullable=False),
-        sa.Column('credential_name', sa.String(length=255), nullable=False),
-        sa.Column('encrypted_config', sa.Text(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='provider_credential_pkey')
-        )
-    else:
-        op.create_table('provider_credentials',
-        sa.Column('id', models.types.StringUUID(), nullable=False),
-        sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
-        sa.Column('provider_name', sa.String(length=255), nullable=False),
-        sa.Column('credential_name', sa.String(length=255), nullable=False),
-        sa.Column('encrypted_config', models.types.LongText(), nullable=False),
-        sa.Column('created_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.Column('updated_at', sa.DateTime(), server_default=sa.func.current_timestamp(), nullable=False),
-        sa.PrimaryKeyConstraint('id', name='provider_credential_pkey')
-        )
+    op.create_table('provider_credentials',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuidv7()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('provider_name', sa.String(length=255), nullable=False),
+    sa.Column('credential_name', sa.String(length=255), nullable=False),
+    sa.Column('encrypted_config', sa.Text(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='provider_credential_pkey')
+    )
 
     # Create index for provider_credentials
     with op.batch_alter_table('provider_credentials', schema=None) as batch_op:
@@ -78,49 +60,27 @@ def upgrade():
 
 def migrate_existing_providers_data():
     """migrate providers table data to provider_credentials"""
-    conn = op.get_bind()
-    # Define table structure for data manipulation
-    if _is_pg(conn):
-        providers_table = table('providers',
-            column('id', models.types.StringUUID()),
-            column('tenant_id', models.types.StringUUID()),
-            column('provider_name', sa.String()),
-            column('encrypted_config', sa.Text()),
-            column('created_at', sa.DateTime()),
-            column('updated_at', sa.DateTime()),
-            column('credential_id', models.types.StringUUID()),
-        )
-    else:
-        providers_table = table('providers',
-            column('id', models.types.StringUUID()),
-            column('tenant_id', models.types.StringUUID()),
-            column('provider_name', sa.String()),
-            column('encrypted_config', models.types.LongText()),
-            column('created_at', sa.DateTime()),
-            column('updated_at', sa.DateTime()),
-            column('credential_id', models.types.StringUUID()),
-        )
 
-    if _is_pg(conn):
-        provider_credential_table = table('provider_credentials',
-            column('id', models.types.StringUUID()),
-            column('tenant_id', models.types.StringUUID()),
-            column('provider_name', sa.String()),
-            column('credential_name', sa.String()),
-            column('encrypted_config', sa.Text()),
-            column('created_at', sa.DateTime()),
-            column('updated_at', sa.DateTime())
-        )
-    else:
-        provider_credential_table = table('provider_credentials',
-            column('id', models.types.StringUUID()),
-            column('tenant_id', models.types.StringUUID()),
-            column('provider_name', sa.String()),
-            column('credential_name', sa.String()),
-            column('encrypted_config', models.types.LongText()),
-            column('created_at', sa.DateTime()),
-            column('updated_at', sa.DateTime())
-        )
+    # Define table structure for data manipulation
+    providers_table = table('providers',
+        column('id', models.types.StringUUID()),
+        column('tenant_id', models.types.StringUUID()),
+        column('provider_name', sa.String()),
+        column('encrypted_config', sa.Text()),
+        column('created_at', sa.DateTime()),
+        column('updated_at', sa.DateTime()),
+        column('credential_id', models.types.StringUUID()),
+    )
+
+    provider_credential_table = table('provider_credentials',
+        column('id', models.types.StringUUID()),
+        column('tenant_id', models.types.StringUUID()),
+        column('provider_name', sa.String()),
+        column('credential_name', sa.String()),
+        column('encrypted_config', sa.Text()),
+        column('created_at', sa.DateTime()),
+        column('updated_at', sa.DateTime())
+    )
 
     # Get database connection
     conn = op.get_bind()
@@ -163,14 +123,8 @@ def migrate_existing_providers_data():
 
 def downgrade():
     # Re-add encrypted_config column to providers table
-    conn = op.get_bind()
-    
-    if _is_pg(conn):
-        with op.batch_alter_table('providers', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('encrypted_config', sa.Text(), nullable=True))
-    else:
-        with op.batch_alter_table('providers', schema=None) as batch_op:
-            batch_op.add_column(sa.Column('encrypted_config', models.types.LongText(), nullable=True))
+    with op.batch_alter_table('providers', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('encrypted_config', sa.Text(), nullable=True))
 
     # Migrate data back from provider_credentials to providers