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

feat(style): adjust minimum and maximum width for block-selector and data source components
feat(trigger): enhance trigger handling with new data validation and logging improvements
2025-10-14 15:28:35 +08:00 · 2025-10-14 15:23:28 +08:00 · 2025-10-14 14:36:52 +08:00 · 2025-10-14 11:55:12 +08:00 · 2025-10-13 22:24:12 +08:00 · 2025-10-13 21:10:31 +08:00
2546 changed files with 45041 additions and 203741 deletions
@@ -1,6 +0,0 @@
 # Cursor Rules for Dify Project
 ## Automated Test Generation
 - Use `web/testing/testing.md` as the canonical instruction set for generating frontend automated tests.
 - When proposing or saving tests, re-read that document and follow every requirement.
@@ -11,7 +11,7 @@
 			"nodeGypDependencies": true,
 			"version": "lts"
 		},
-		"ghcr.io/devcontainers-extra/features/npm-package:1": {
+		"ghcr.io/devcontainers-contrib/features/npm-package:1": {
 			"package": "typescript",
 			"version": "latest"
 		},
@@ -1,15 +1,17 @@
 #!/bin/bash
 WORKSPACE_ROOT=$(pwd)
 npm add -g pnpm@10.15.0
 corepack enable
 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 gevent -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
@@ -29,7 +29,7 @@ trim_trailing_whitespace = false
 # Matches multiple files with brace expansion notation
 # Set default charset
-[*.{js,jsx,ts,tsx,mjs}]
+[*.{js,tsx}]
 indent_style = space
 indent_size = 2
@@ -1,226 +0,0 @@
 # CODEOWNERS
 # This file defines code ownership for the Dify project.
 # Each line is a file pattern followed by one or more owners.
 # Owners can be @username, @org/team-name, or email addresses.
 # For more information, see: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 * @crazywoola @laipz8200 @Yeuoly
 # Backend (default owner, more specific rules below will override)
 api/ @QuantumGhost
 # Backend - Workflow - Engine (Core graph execution engine)
 api/core/workflow/graph_engine/ @laipz8200 @QuantumGhost
 api/core/workflow/runtime/ @laipz8200 @QuantumGhost
 api/core/workflow/graph/ @laipz8200 @QuantumGhost
 api/core/workflow/graph_events/ @laipz8200 @QuantumGhost
 api/core/workflow/node_events/ @laipz8200 @QuantumGhost
 api/core/model_runtime/ @laipz8200 @QuantumGhost
 # Backend - Workflow - Nodes (Agent, Iteration, Loop, LLM)
 api/core/workflow/nodes/agent/ @Nov1c444
 api/core/workflow/nodes/iteration/ @Nov1c444
 api/core/workflow/nodes/loop/ @Nov1c444
 api/core/workflow/nodes/llm/ @Nov1c444
 # Backend - RAG (Retrieval Augmented Generation)
 api/core/rag/ @JohnJyong
 api/services/rag_pipeline/ @JohnJyong
 api/services/dataset_service.py @JohnJyong
 api/services/knowledge_service.py @JohnJyong
 api/services/external_knowledge_service.py @JohnJyong
 api/services/hit_testing_service.py @JohnJyong
 api/services/metadata_service.py @JohnJyong
 api/services/vector_service.py @JohnJyong
 api/services/entities/knowledge_entities/ @JohnJyong
 api/services/entities/external_knowledge_entities/ @JohnJyong
 api/controllers/console/datasets/ @JohnJyong
 api/controllers/service_api/dataset/ @JohnJyong
 api/models/dataset.py @JohnJyong
 api/tasks/rag_pipeline/ @JohnJyong
 api/tasks/add_document_to_index_task.py @JohnJyong
 api/tasks/batch_clean_document_task.py @JohnJyong
 api/tasks/clean_document_task.py @JohnJyong
 api/tasks/clean_notion_document_task.py @JohnJyong
 api/tasks/document_indexing_task.py @JohnJyong
 api/tasks/document_indexing_sync_task.py @JohnJyong
 api/tasks/document_indexing_update_task.py @JohnJyong
 api/tasks/duplicate_document_indexing_task.py @JohnJyong
 api/tasks/recover_document_indexing_task.py @JohnJyong
 api/tasks/remove_document_from_index_task.py @JohnJyong
 api/tasks/retry_document_indexing_task.py @JohnJyong
 api/tasks/sync_website_document_indexing_task.py @JohnJyong
 api/tasks/batch_create_segment_to_index_task.py @JohnJyong
 api/tasks/create_segment_to_index_task.py @JohnJyong
 api/tasks/delete_segment_from_index_task.py @JohnJyong
 api/tasks/disable_segment_from_index_task.py @JohnJyong
 api/tasks/disable_segments_from_index_task.py @JohnJyong
 api/tasks/enable_segment_to_index_task.py @JohnJyong
 api/tasks/enable_segments_to_index_task.py @JohnJyong
 api/tasks/clean_dataset_task.py @JohnJyong
 api/tasks/deal_dataset_index_update_task.py @JohnJyong
 api/tasks/deal_dataset_vector_index_task.py @JohnJyong
 # Backend - Plugins
 api/core/plugin/ @Mairuis @Yeuoly @Stream29
 api/services/plugin/ @Mairuis @Yeuoly @Stream29
 api/controllers/console/workspace/plugin.py @Mairuis @Yeuoly @Stream29
 api/controllers/inner_api/plugin/ @Mairuis @Yeuoly @Stream29
 api/tasks/process_tenant_plugin_autoupgrade_check_task.py @Mairuis @Yeuoly @Stream29
 # Backend - Trigger/Schedule/Webhook
 api/controllers/trigger/ @Mairuis @Yeuoly
 api/controllers/console/app/workflow_trigger.py @Mairuis @Yeuoly
 api/controllers/console/workspace/trigger_providers.py @Mairuis @Yeuoly
 api/core/trigger/ @Mairuis @Yeuoly
 api/core/app/layers/trigger_post_layer.py @Mairuis @Yeuoly
 api/services/trigger/ @Mairuis @Yeuoly
 api/models/trigger.py @Mairuis @Yeuoly
 api/fields/workflow_trigger_fields.py @Mairuis @Yeuoly
 api/repositories/workflow_trigger_log_repository.py @Mairuis @Yeuoly
 api/repositories/sqlalchemy_workflow_trigger_log_repository.py @Mairuis @Yeuoly
 api/libs/schedule_utils.py @Mairuis @Yeuoly
 api/services/workflow/scheduler.py @Mairuis @Yeuoly
 api/schedule/trigger_provider_refresh_task.py @Mairuis @Yeuoly
 api/schedule/workflow_schedule_task.py @Mairuis @Yeuoly
 api/tasks/trigger_processing_tasks.py @Mairuis @Yeuoly
 api/tasks/trigger_subscription_refresh_tasks.py @Mairuis @Yeuoly
 api/tasks/workflow_schedule_tasks.py @Mairuis @Yeuoly
 api/tasks/workflow_cfs_scheduler/ @Mairuis @Yeuoly
 api/events/event_handlers/sync_plugin_trigger_when_app_created.py @Mairuis @Yeuoly
 api/events/event_handlers/update_app_triggers_when_app_published_workflow_updated.py @Mairuis @Yeuoly
 api/events/event_handlers/sync_workflow_schedule_when_app_published.py @Mairuis @Yeuoly
 api/events/event_handlers/sync_webhook_when_app_created.py @Mairuis @Yeuoly
 # Backend - Async Workflow
 api/services/async_workflow_service.py @Mairuis @Yeuoly
 api/tasks/async_workflow_tasks.py @Mairuis @Yeuoly
 # Backend - Billing
 api/services/billing_service.py @hj24 @zyssyz123
 api/controllers/console/billing/ @hj24 @zyssyz123
 # Backend - Enterprise
 api/configs/enterprise/ @GarfieldDai @GareArc
 api/services/enterprise/ @GarfieldDai @GareArc
 api/services/feature_service.py @GarfieldDai @GareArc
 api/controllers/console/feature.py @GarfieldDai @GareArc
 api/controllers/web/feature.py @GarfieldDai @GareArc
 # Backend - Database Migrations
 api/migrations/ @snakevash @laipz8200
 # Frontend
 web/ @iamjoel
 # Frontend - App - Orchestration
 web/app/components/workflow/ @iamjoel @zxhlyh
 web/app/components/workflow-app/ @iamjoel @zxhlyh
 web/app/components/app/configuration/ @iamjoel @zxhlyh
 web/app/components/app/app-publisher/ @iamjoel @zxhlyh
 # Frontend - WebApp - Chat
 web/app/components/base/chat/ @iamjoel @zxhlyh
 # Frontend - WebApp - Completion
 web/app/components/share/text-generation/ @iamjoel @zxhlyh
 # Frontend - App - List and Creation
 web/app/components/apps/ @JzoNgKVO @iamjoel
 web/app/components/app/create-app-dialog/ @JzoNgKVO @iamjoel
 web/app/components/app/create-app-modal/ @JzoNgKVO @iamjoel
 web/app/components/app/create-from-dsl-modal/ @JzoNgKVO @iamjoel
 # Frontend - App - API Documentation
 web/app/components/develop/ @JzoNgKVO @iamjoel
 # Frontend - App - Logs and Annotations
 web/app/components/app/workflow-log/ @JzoNgKVO @iamjoel
 web/app/components/app/log/ @JzoNgKVO @iamjoel
 web/app/components/app/log-annotation/ @JzoNgKVO @iamjoel
 web/app/components/app/annotation/ @JzoNgKVO @iamjoel
 # Frontend - App - Monitoring
 web/app/(commonLayout)/app/(appDetailLayout)/\[appId\]/overview/ @JzoNgKVO @iamjoel
 web/app/components/app/overview/ @JzoNgKVO @iamjoel
 # Frontend - App - Settings
 web/app/components/app-sidebar/ @JzoNgKVO @iamjoel
 # Frontend - RAG - Hit Testing
 web/app/components/datasets/hit-testing/ @JzoNgKVO @iamjoel
 # Frontend - RAG - List and Creation
 web/app/components/datasets/list/ @iamjoel @WTW0313
 web/app/components/datasets/create/ @iamjoel @WTW0313
 web/app/components/datasets/create-from-pipeline/ @iamjoel @WTW0313
 web/app/components/datasets/external-knowledge-base/ @iamjoel @WTW0313
 # Frontend - RAG - Orchestration (general rule first, specific rules below override)
 web/app/components/rag-pipeline/ @iamjoel @WTW0313
 web/app/components/rag-pipeline/components/rag-pipeline-main.tsx @iamjoel @zxhlyh
 web/app/components/rag-pipeline/store/ @iamjoel @zxhlyh
 # Frontend - RAG - Documents List
 web/app/components/datasets/documents/list.tsx @iamjoel @WTW0313
 web/app/components/datasets/documents/create-from-pipeline/ @iamjoel @WTW0313
 # Frontend - RAG - Segments List
 web/app/components/datasets/documents/detail/ @iamjoel @WTW0313
 # Frontend - RAG - Settings
 web/app/components/datasets/settings/ @iamjoel @WTW0313
 # Frontend - Ecosystem - Plugins
 web/app/components/plugins/ @iamjoel @zhsama
 # Frontend - Ecosystem - Tools
 web/app/components/tools/ @iamjoel @Yessenia-d
 # Frontend - Ecosystem - MarketPlace
 web/app/components/plugins/marketplace/ @iamjoel @Yessenia-d
 # Frontend - Login and Registration
 web/app/signin/ @douxc @iamjoel
 web/app/signup/ @douxc @iamjoel
 web/app/reset-password/ @douxc @iamjoel
 web/app/install/ @douxc @iamjoel
 web/app/init/ @douxc @iamjoel
 web/app/forgot-password/ @douxc @iamjoel
 web/app/account/ @douxc @iamjoel
 # Frontend - Service Authentication
 web/service/base.ts @douxc @iamjoel
 # Frontend - WebApp Authentication and Access Control
 web/app/(shareLayout)/components/ @douxc @iamjoel
 web/app/(shareLayout)/webapp-signin/ @douxc @iamjoel
 web/app/(shareLayout)/webapp-reset-password/ @douxc @iamjoel
 web/app/components/app/app-access-control/ @douxc @iamjoel
 # Frontend - Explore Page
 web/app/components/explore/ @CodingOnStar @iamjoel
 # Frontend - Personal Settings
 web/app/components/header/account-setting/ @CodingOnStar @iamjoel
 web/app/components/header/account-dropdown/ @CodingOnStar @iamjoel
 # Frontend - Analytics
 web/app/components/base/ga/ @CodingOnStar @iamjoel
 # Frontend - Base Components
 web/app/components/base/ @iamjoel @zxhlyh
 # Frontend - Utils and Hooks
 web/utils/classnames.ts @iamjoel @zxhlyh
 web/utils/time.ts @iamjoel @zxhlyh
 web/utils/format.ts @iamjoel @zxhlyh
 web/utils/clipboard.ts @iamjoel @zxhlyh
 web/hooks/use-document-title.ts @iamjoel @zxhlyh
 # Frontend - Billing and Education
 web/app/components/billing/ @iamjoel @zxhlyh
 web/app/education-apply/ @iamjoel @zxhlyh
 # Frontend - Workspace
 web/app/components/header/account-dropdown/workplace-selector/ @iamjoel @zxhlyh
@@ -1,12 +0,0 @@
 # Copilot Instructions
 GitHub Copilot must follow the unified frontend testing requirements documented in `web/testing/testing.md`.
 Key reminders:
 - Generate tests using the mandated tech stack, naming, and code style (AAA pattern, `fireEvent`, descriptive test names, cleans up mocks).
 - Cover rendering, prop combinations, and edge cases by default; extend coverage for hooks, routing, async flows, and domain-specific components when applicable.
 - Target >95% line and branch coverage and 100% function/statement coverage.
 - Apply the project's mocking conventions for i18n, toast notifications, and Next.js utilities.
 Any suggestions from Copilot that conflict with `web/testing/testing.md` should be revised before acceptance.
@@ -39,11 +39,25 @@ jobs:
      - name: Install dependencies
        run: uv sync --project api --dev
      - name: Run Unit tests
        run: |
          uv run --project api bash dev/pytest/pytest_unit_tests.sh
      - name: Run pyrefly check
        run: |
          cd api
          uv add --dev pyrefly
          uv run pyrefly check || true
      - name: Coverage Summary
        run: |
          set -x
          # Extract coverage percentage and create a summary
          TOTAL_COVERAGE=$(python -c 'import json; print(json.load(open("coverage.json"))["totals"]["percent_covered_display"])')
          # Create a detailed coverage summary
          echo "### Test Coverage Summary :test_tube:" >> $GITHUB_STEP_SUMMARY
          echo "Total Coverage: ${TOTAL_COVERAGE}%" >> $GITHUB_STEP_SUMMARY
          uv run --project api coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
      - name: Run dify config tests
        run: uv run --project api dev/pytest/pytest_config_tests.py
@@ -62,7 +76,7 @@ jobs:
          compose-file: |
            docker/docker-compose.middleware.yaml
          services: |
-            db_postgres
+            db
            redis
            sandbox
            ssrf_proxy
@@ -79,19 +93,3 @@ jobs:
      - name: Run TestContainers
        run: uv run --project api bash dev/pytest/pytest_testcontainers.sh
      - name: Run Unit tests
        run: |
          uv run --project api bash dev/pytest/pytest_unit_tests.sh
      - name: Coverage Summary
        run: |
          set -x
          # Extract coverage percentage and create a summary
          TOTAL_COVERAGE=$(python -c 'import json; print(json.load(open("coverage.json"))["totals"]["percent_covered_display"])')
          # Create a detailed coverage summary
          echo "### Test Coverage Summary :test_tube:" >> $GITHUB_STEP_SUMMARY
          echo "Total Coverage: ${TOTAL_COVERAGE}%" >> $GITHUB_STEP_SUMMARY
          uv run --project api coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
@@ -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
@@ -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
@@ -1,7 +1,6 @@
 #!/bin/bash
 yq eval '.services.weaviate.ports += ["8080:8080"]' -i docker/docker-compose.yaml
 yq eval '.services.weaviate.ports += ["50051:50051"]' -i docker/docker-compose.yaml
 yq eval '.services.qdrant.ports += ["6333:6333"]' -i docker/docker-compose.yaml
 yq eval '.services.chroma.ports += ["8000:8000"]' -i docker/docker-compose.yaml
 yq eval '.services["milvus-standalone"].ports += ["19530:19530"]' -i docker/docker-compose.yaml
@@ -14,4 +13,4 @@ yq eval '.services.tidb.ports += ["4000:4000"]' -i docker/tidb/docker-compose.ya
 yq eval '.services.oceanbase.ports += ["2881:2881"]' -i docker/docker-compose.yaml
 yq eval '.services.opengauss.ports += ["6600:6600"]' -i docker/docker-compose.yaml
-echo "Ports exposed for sandbox, weaviate (HTTP 8080, gRPC 50051), tidb, qdrant, chroma, milvus, pgvector, pgvecto-rs, elasticsearch, couchbase, opengauss"
+echo "Ports exposed for sandbox, weaviate, tidb, qdrant, chroma, milvus, pgvector, pgvecto-rs, elasticsearch, couchbase, opengauss"
@@ -103,11 +103,6 @@ jobs:
        run: |
          pnpm run lint
      - name: Web type check
        if: steps.changed-files.outputs.any_changed == 'true'
        working-directory: ./web
        run: pnpm run type-check
  docker-compose-template:
    name: Docker Compose Template
    runs-on: ubuntu-latest
@@ -20,22 +20,22 @@ jobs:
    steps:
      - uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+          fetch-depth: 2
          token: ${{ secrets.GITHUB_TOKEN }}
      - name: Check for file changes in i18n/en-US
        id: check_files
        run: |
-          git fetch origin "${{ github.event.before }}" || true
+          recent_commit_sha=$(git rev-parse HEAD)
-          git fetch origin "${{ github.sha }}" || true
+          second_recent_commit_sha=$(git rev-parse HEAD~1)
-          changed_files=$(git diff --name-only "${{ github.event.before }}" "${{ github.sha }}" -- 'i18n/en-US/*.ts')
+          changed_files=$(git diff --name-only $recent_commit_sha $second_recent_commit_sha -- 'i18n/en-US/*.ts')
          echo "Changed files: $changed_files"
          if [ -n "$changed_files" ]; then
            echo "FILES_CHANGED=true" >> $GITHUB_ENV
            file_args=""
            for file in $changed_files; do
              filename=$(basename "$file" .ts)
-              file_args="$file_args --file $filename"
+              file_args="$file_args --file=$filename"
            done
            echo "FILE_ARGS=$file_args" >> $GITHUB_ENV
            echo "File arguments: $file_args"
@@ -77,15 +77,12 @@ jobs:
        uses: peter-evans/create-pull-request@v6
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: 'chore(i18n): update translations based on en-US changes'
+          commit-message: Update i18n files and type definitions based on en-US changes
-          title: 'chore(i18n): translate i18n files and update type definitions'
+          title: 'chore: translate i18n files and update type definitions'
          body: |
            This PR was automatically created to update i18n files and TypeScript type definitions based on changes in en-US locale.
-
+            
            **Triggered by:** ${{ github.sha }}
            **Changes included:**
            - Updated translation files for all locales
            - Regenerated TypeScript type definitions for type safety
-          branch: chore/automated-i18n-updates-${{ github.sha }}
+          branch: chore/automated-i18n-updates
          delete-branch: true
@@ -51,13 +51,13 @@ jobs:
      - name: Expose Service Ports
        run: sh .github/workflows/expose_service_ports.sh
-#      - name: Set up Vector Store (TiDB)
+      - name: Set up Vector Store (TiDB)
-#        uses: hoverkraft-tech/compose-action@v2.0.2
+        uses: hoverkraft-tech/compose-action@v2.0.2
-#        with:
+        with:
-#          compose-file: docker/tidb/docker-compose.yaml
+          compose-file: docker/tidb/docker-compose.yaml
-#          services: |
+          services: |
-#            tidb
+            tidb
-#            tiflash
+            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)
+      - name: Check VDB Ready (TiDB)
-#        run: uv run --project api python api/tests/integration_tests/vdb/tidb_vector/check_tiflash_ready.py
+        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
@@ -6,9 +6,6 @@ __pycache__/
 # C extensions
 *.so
 # *db files
 *.db
 # Distribution / packaging
 .Python
 build/
@@ -100,7 +97,6 @@ __pypackages__/
 # Celery stuff
 celerybeat-schedule
 celerybeat-schedule.db
 celerybeat.pid
 # SageMath parsed files
@@ -186,8 +182,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
@@ -8,7 +8,8 @@
            "module": "flask",
            "env": {
                "FLASK_APP": "app.py",
-                "FLASK_ENV": "development"
+                "FLASK_ENV": "development",
                "GEVENT_SUPPORT": "True"
            },
            "args": [
                "run",
@@ -27,7 +28,9 @@
            "type": "debugpy",
            "request": "launch",
            "module": "celery",
-            "env": {},
+            "env": {
                "GEVENT_SUPPORT": "True"
            },
            "args": [
                "-A",
                "app.celery",
@@ -37,7 +40,7 @@
                "-c",
                "1",
                "-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",
+                "dataset,generation,mail,ops_trace",
                "--loglevel",
                "INFO"
            ],
@@ -1,5 +0,0 @@
 # Windsurf Testing Rules
 - Use `web/testing/testing.md` as the single source of truth for frontend automated testing.
 - Honor every requirement in that document when generating or accepting tests.
 - When proposing or saving tests, re-read that document and follow every requirement.
@@ -14,7 +14,7 @@ The codebase is split into:
 - Run backend CLI commands through `uv run --project api <command>`.
- Before submission, all backend modifications must pass local checks: `make lint`, `make type-check`, and `uv run --project api --dev dev/pytest/pytest_unit_tests.sh`.
+- Backend QA gate requires passing `make lint`, `make type-check`, and `uv run --project api --dev dev/pytest/pytest_unit_tests.sh` before review.
 - Use Makefile targets for linting and formatting; `make lint` and `make type-check` cover the required checks.
@@ -77,8 +77,6 @@ How we prioritize:
 For setting up the frontend service, please refer to our comprehensive [guide](https://github.com/langgenius/dify/blob/main/web/README.md) in the `web/README.md` file. This document provides detailed instructions to help you set up the frontend environment properly.
 **Testing**: All React components must have comprehensive test coverage. See [web/testing/testing.md](https://github.com/langgenius/dify/blob/main/web/testing/testing.md) for the canonical frontend testing guidelines and follow every requirement described there.
 #### Backend
 For setting up the backend service, kindly refer to our detailed [instructions](https://github.com/langgenius/dify/blob/main/api/README.md) in the `api/README.md` file. This document contains step-by-step guidance to help you get the backend up and running smoothly.
@@ -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
@@ -36,12 +36,6 @@
        <img alt="Issues closed" src="https://img.shields.io/github/issues-search?query=repo%3Alanggenius%2Fdify%20is%3Aclosed&label=issues%20closed&labelColor=%20%237d89b0&color=%20%235d6b98"></a>
    <a href="https://github.com/langgenius/dify/discussions/" target="_blank">
        <img alt="Discussion posts" src="https://img.shields.io/github/discussions/langgenius/dify?labelColor=%20%239b8afb&color=%20%237a5af8"></a>
    <a href="https://insights.linuxfoundation.org/project/langgenius-dify" target="_blank">
        <img alt="LFX Health Score" src="https://insights.linuxfoundation.org/api/badge/health-score?project=langgenius-dify"></a>
    <a href="https://insights.linuxfoundation.org/project/langgenius-dify" target="_blank">
        <img alt="LFX Contributors" src="https://insights.linuxfoundation.org/api/badge/contributors?project=langgenius-dify"></a>
    <a href="https://insights.linuxfoundation.org/project/langgenius-dify" target="_blank">
        <img alt="LFX Active Contributors" src="https://insights.linuxfoundation.org/api/badge/active-contributors?project=langgenius-dify"></a>
 </p>
 <p align="center">
@@ -69,7 +63,7 @@ Dify is an open-source platform for developing LLM applications. Its intuitive i
 > - CPU >= 2 Core
 > - RAM >= 4 GiB
-<br/>
+</br>
 The easiest way to start the Dify server is through [Docker Compose](docker/docker-compose.yaml). Before running Dify with the following commands, make sure that [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/) are installed on your machine:
@@ -115,15 +109,15 @@ All of Dify's offerings come with corresponding APIs, so you could effortlessly
 ## Using Dify
- **Cloud <br/>**
+- **Cloud </br>**
  We host a [Dify Cloud](https://dify.ai) service for anyone to try with zero setup. It provides all the capabilities of the self-deployed version, and includes 200 free GPT-4 calls in the sandbox plan.
- **Self-hosting Dify Community Edition<br/>**
+- **Self-hosting Dify Community Edition</br>**
  Quickly get Dify running in your environment with this [starter guide](#quick-start).
  Use our [documentation](https://docs.dify.ai) for further references and more in-depth instructions.
- **Dify for enterprise / organizations<br/>**
+- **Dify for enterprise / organizations</br>**
-  We provide additional enterprise-centric features. [Send us an email](mailto:business@dify.ai?subject=%5BGitHub%5DBusiness%20License%20Inquiry) to discuss your enterprise needs. <br/>
+  We provide additional enterprise-centric features. [Log your questions for us through this chatbot](https://udify.app/chat/22L1zSxg6yW1cWQg) or [send us an email](mailto:business@dify.ai?subject=%5BGitHub%5DBusiness%20License%20Inquiry) to discuss enterprise needs. </br>
  > For startups and small businesses using AWS, check out [Dify Premium on AWS Marketplace](https://aws.amazon.com/marketplace/pp/prodview-t22mebxzwjhu6) and deploy it to your own AWS VPC with one click. It's an affordable AMI offering with the option to create apps with custom logo and branding.
@@ -135,18 +129,8 @@ Star Dify on GitHub and be instantly notified of new releases.
 ## Advanced Setup
 ### Custom configurations
 If you need to customize the configuration, please refer to the comments in our [.env.example](docker/.env.example) file and update the corresponding values in your `.env` file. Additionally, you might need to make adjustments to the `docker-compose.yaml` file itself, such as changing image versions, port mappings, or volume mounts, based on your specific deployment environment and requirements. After making any changes, please re-run `docker-compose up -d`. You can find the full list of available environment variables [here](https://docs.dify.ai/getting-started/install-self-hosted/environments).
 ### Metrics Monitoring with Grafana
 Import the dashboard to Grafana, using Dify's PostgreSQL database as data source, to monitor metrics in granularity of apps, tenants, messages, and more.
 - [Grafana Dashboard by @bowenliang123](https://github.com/bowenliang123/dify-grafana-dashboard)
 ### Deployment with Kubernetes
 If you'd like to configure a highly-available setup, there are community-contributed [Helm Charts](https://helm.sh/) and YAML files which allow Dify to be deployed on Kubernetes.
 - [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
@@ -27,9 +27,6 @@ FILES_URL=http://localhost:5001
 # Example: INTERNAL_FILES_URL=http://api:5001
 INTERNAL_FILES_URL=http://127.0.0.1:5001
 # TRIGGER URL
 TRIGGER_URL=http://localhost:5001
 # The time in seconds after the signature is rejected
 FILES_ACCESS_TIMEOUT=300
@@ -72,15 +69,12 @@ REDIS_CLUSTERS_PASSWORD=
 # celery configuration
 CELERY_BROKER_URL=redis://:difyai123456@localhost:${REDIS_PORT}/1
 CELERY_BACKEND=redis
-
+# PostgreSQL database configuration
 # Database configuration
 DB_TYPE=postgresql
 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 +156,9 @@ 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.
 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
@@ -176,18 +168,6 @@ WEAVIATE_ENDPOINT=http://localhost:8080
 WEAVIATE_API_KEY=WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih
 WEAVIATE_GRPC_ENABLED=false
 WEAVIATE_BATCH_SIZE=100
 WEAVIATE_TOKENIZATION=word
 # 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
@@ -354,6 +334,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
@@ -379,12 +368,6 @@ UPLOAD_IMAGE_FILE_SIZE_LIMIT=10
 UPLOAD_VIDEO_FILE_SIZE_LIMIT=100
 UPLOAD_AUDIO_FILE_SIZE_LIMIT=50
 # Comma-separated list of file extensions blocked from upload for security reasons.
 # Extensions should be lowercase without dots (e.g., exe,bat,sh,dll).
 # Empty by default to allow all file types.
 # Recommended: exe,bat,cmd,com,scr,vbs,ps1,msi,dll
 UPLOAD_FILE_EXTENSION_BLACKLIST=
 # Model configuration
 MULTIMODAL_SEND_FORMAT=base64
 PROMPT_GENERATION_MAX_TOKENS=512
@@ -451,9 +434,6 @@ CODE_EXECUTION_SSL_VERIFY=True
 CODE_EXECUTION_POOL_MAX_CONNECTIONS=100
 CODE_EXECUTION_POOL_MAX_KEEPALIVE_CONNECTIONS=20
 CODE_EXECUTION_POOL_KEEPALIVE_EXPIRY=5.0
 CODE_EXECUTION_CONNECT_TIMEOUT=10
 CODE_EXECUTION_READ_TIMEOUT=60
 CODE_EXECUTION_WRITE_TIMEOUT=10
 CODE_MAX_NUMBER=9223372036854775807
 CODE_MIN_NUMBER=-9223372036854775808
 CODE_MAX_STRING_LENGTH=400000
@@ -532,7 +512,7 @@ API_WORKFLOW_NODE_EXECUTION_REPOSITORY=repositories.sqlalchemy_api_workflow_node
 API_WORKFLOW_RUN_REPOSITORY=repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository
 # Workflow log cleanup configuration
 # Enable automatic cleanup of workflow run logs to manage database size
-WORKFLOW_LOG_CLEANUP_ENABLED=false
+WORKFLOW_LOG_CLEANUP_ENABLED=true
 # Number of days to retain workflow run logs (default: 30 days)
 WORKFLOW_LOG_RETENTION_DAYS=30
 # Batch size for workflow log cleanup operations (default: 100)
@@ -540,7 +520,6 @@ WORKFLOW_LOG_CLEANUP_BATCH_SIZE=100
 # App configuration
 APP_MAX_EXECUTION_TIME=1200
 APP_DEFAULT_ACTIVE_REQUESTS=0
 APP_MAX_ACTIVE_REQUESTS=0
 # Celery beat configuration
@@ -632,9 +611,3 @@ SWAGGER_UI_PATH=/swagger-ui.html
 # Whether to encrypt dataset IDs when exporting DSL files (default: true)
 # Set to false to export dataset IDs as plain text for easier cross-environment import
 DSL_EXPORT_ENCRYPT_DATASET_ID=true
 # Tenant isolated task queue configuration
 TENANT_ISOLATED_TASK_CONCURRENCY=1
 # Maximum number of segments for dataset segments API (0 for unlimited)
 DATASET_MAX_SEGMENTS_PER_REQUEST=0
@@ -16,7 +16,6 @@ layers =
    graph
    nodes
    node_events
    runtime
    entities
 containers =
    core.workflow
@@ -54,7 +54,7 @@
                "--loglevel",
                "DEBUG",
                "-Q",
-                "dataset,priority_pipeline,pipeline,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation,workflow,schedule_poller,schedule_executor,triggered_workflow_dispatcher,trigger_refresh_executor"
+                "dataset,generation,mail,ops_trace,app_deletion,workflow"
            ]
        }
    ]
@@ -1,62 +0,0 @@
 # Agent Skill Index
 Start with the section that best matches your need. Each entry lists the problems it solves plus key files/concepts so you know what to expect before opening it.
 ______________________________________________________________________
 ## Platform Foundations
 - **[Infrastructure Overview](agent_skills/infra.md)**\
  When to read this:
  - You need to understand where a feature belongs in the architecture.
  - You’re wiring storage, Redis, vector stores, or OTEL.
  - You’re about to add CLI commands or async jobs.\
    What it covers: configuration stack (`configs/app_config.py`, remote settings), storage entry points (`extensions/ext_storage.py`, `core/file/file_manager.py`), Redis conventions (`extensions/ext_redis.py`), plugin runtime topology, vector-store factory (`core/rag/datasource/vdb/*`), observability hooks, SSRF proxy usage, and core CLI commands.
 - **[Coding Style](agent_skills/coding_style.md)**\
  When to read this:
  - You’re writing or reviewing backend code and need the authoritative checklist.
  - You’re unsure about Pydantic validators, SQLAlchemy session usage, or logging patterns.
  - You want the exact lint/type/test commands used in PRs.\
    Includes: Ruff & BasedPyright commands, no-annotation policy, session examples (`with Session(db.engine, ...)`), `@field_validator` usage, logging expectations, and the rule set for file size, helpers, and package management.
 ______________________________________________________________________
 ## Plugin & Extension Development
 - **[Plugin Systems](agent_skills/plugin.md)**\
  When to read this:
  - You’re building or debugging a marketplace plugin.
  - You need to know how manifests, providers, daemons, and migrations fit together.\
    What it covers: plugin manifests (`core/plugin/entities/plugin.py`), installation/upgrade flows (`services/plugin/plugin_service.py`, CLI commands), runtime adapters (`core/plugin/impl/*` for tool/model/datasource/trigger/endpoint/agent), daemon coordination (`core/plugin/entities/plugin_daemon.py`), and how provider registries surface capabilities to the rest of the platform.
 - **[Plugin OAuth](agent_skills/plugin_oauth.md)**\
  When to read this:
  - You must integrate OAuth for a plugin or datasource.
  - You’re handling credential encryption or refresh flows.\
    Topics: credential storage, encryption helpers (`core/helper/provider_encryption.py`), OAuth client bootstrap (`services/plugin/oauth_service.py`, `services/plugin/plugin_parameter_service.py`), and how console/API layers expose the flows.
 ______________________________________________________________________
 ## Workflow Entry & Execution
 - **[Trigger Concepts](agent_skills/trigger.md)**\
  When to read this:
  - You’re debugging why a workflow didn’t start.
  - You’re adding a new trigger type or hook.
  - You need to trace async execution, draft debugging, or webhook/schedule pipelines.\
    Details: Start-node taxonomy, webhook & schedule internals (`core/workflow/nodes/trigger_*`, `services/trigger/*`), async orchestration (`services/async_workflow_service.py`, Celery queues), debug event bus, and storage/logging interactions.
 ______________________________________________________________________
 ## Additional Notes for Agents
 - All skill docs assume you follow the coding style guide—run Ruff/BasedPyright/tests listed there before submitting changes.
 - When you cannot find an answer in these briefs, search the codebase using the paths referenced (e.g., `core/plugin/impl/tool.py`, `services/dataset_service.py`).
 - If you run into cross-cutting concerns (tenancy, configuration, storage), check the infrastructure guide first; it links to most supporting modules.
 - Keep multi-tenancy and configuration central: everything flows through `configs.dify_config` and `tenant_id`.
 - When touching plugins or triggers, consult both the system overview and the specialised doc to ensure you adjust lifecycle, storage, and observability consistently.
@@ -15,11 +15,7 @@ FROM base AS packages
 # RUN sed -i 's@deb.debian.org@mirrors.aliyun.com@g' /etc/apt/sources.list.d/debian.sources
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
+    && apt-get install -y --no-install-recommends gcc g++ libc-dev libffi-dev libgmp-dev libmpfr-dev libmpc-dev
          # basic environment
          g++ \
          # for building gmpy2
          libmpfr-dev libmpc-dev
 # Install Python dependencies
 COPY pyproject.toml uv.lock ./
@@ -48,22 +44,14 @@ ENV PYTHONIOENCODING=utf-8
 WORKDIR /app/api
 # Create non-root user
 ARG dify_uid=1001
 RUN groupadd -r -g ${dify_uid} dify && \
    useradd -r -u ${dify_uid} -g ${dify_uid} -s /bin/bash dify && \
    chown -R dify:dify /app
 RUN \
    apt-get update \
    # Install dependencies
    && apt-get install -y --no-install-recommends \
        # basic environment
-        curl nodejs \
+        curl nodejs libgmp-dev libmpfr-dev libmpc-dev \
        # for gmpy2 \
        libgmp-dev libmpfr-dev libmpc-dev \
        # For Security
-        expat libldap-2.5-0=2.5.13+dfsg-5 perl libsqlite3-0=3.40.1-2+deb12u2 zlib1g=1:1.2.13.dfsg-1 \
+        expat libldap-2.5-0 perl libsqlite3-0 zlib1g \
        # install fonts to support the use of tools like pypdfium2
        fonts-noto-cjk \
        # install a package to improve the accuracy of guessing mime type and file extension
@@ -75,29 +63,24 @@ RUN \
 # Copy Python environment and packages
 ENV VIRTUAL_ENV=/app/api/.venv
-COPY --from=packages --chown=dify:dify ${VIRTUAL_ENV} ${VIRTUAL_ENV}
+COPY --from=packages ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 # Download nltk data
-RUN mkdir -p /usr/local/share/nltk_data && NLTK_DATA=/usr/local/share/nltk_data python -c "import nltk; nltk.download('punkt'); nltk.download('averaged_perceptron_tagger'); nltk.download('stopwords')" \
+RUN python -c "import nltk; nltk.download('punkt'); nltk.download('averaged_perceptron_tagger')"
    && chmod -R 755 /usr/local/share/nltk_data
 ENV TIKTOKEN_CACHE_DIR=/app/api/.tiktoken_cache
-RUN python -c "import tiktoken; tiktoken.encoding_for_model('gpt2')" \
+RUN python -c "import tiktoken; tiktoken.encoding_for_model('gpt2')"
    && chown -R dify:dify ${TIKTOKEN_CACHE_DIR}
 # Copy source code
-COPY --chown=dify:dify . /app/api/
+COPY . /app/api/
 # Prepare entrypoint script
 COPY --chown=dify:dify --chmod=755 docker/entrypoint.sh /entrypoint.sh
 # Copy entrypoint
 COPY docker/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 ARG COMMIT_SHA
 ENV COMMIT_SHA=${COMMIT_SHA}
 ENV NLTK_DATA=/usr/local/share/nltk_data
 USER dify
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
@@ -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
+   # 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
+   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
@@ -84,7 +80,7 @@
 1. If you need to handle and debug the async tasks (e.g. dataset importing and documents indexing), please start the worker service.
 ```bash
-uv run celery -A app.celery worker -P threads -c 2 --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
+uv run celery -A app.celery worker -P gevent -c 2 --loglevel INFO -Q dataset,generation,mail,ops_trace,app_deletion,plugin,workflow_storage,conversation
 ```
 Additionally, if you want to debug the celery scheduled tasks, you can run the following command in another terminal to start the beat service:
@@ -1,115 +0,0 @@
 ## Linter
 - Always follow `.ruff.toml`.
 - Run `uv run ruff check --fix --unsafe-fixes`.
 - Keep each line under 100 characters (including spaces).
 ## Code Style
 - `snake_case` for variables and functions.
 - `PascalCase` for classes.
 - `UPPER_CASE` for constants.
 ## Rules
 - Use Pydantic v2 standard.
 - Use `uv` for package management.
 - Do not override dunder methods like `__init__`, `__iadd__`, etc.
 - Never launch services (`uv run app.py`, `flask run`, etc.); running tests under `tests/` is allowed.
 - Prefer simple functions over classes for lightweight helpers.
 - Keep files below 800 lines; split when necessary.
 - Keep code readable—no clever hacks.
 - Never use `print`; log with `logger = logging.getLogger(__name__)`.
 ## Guiding Principles
 - Mirror the project’s layered architecture: controller → service → core/domain.
 - Reuse existing helpers in `core/`, `services/`, and `libs/` before creating new abstractions.
 - Optimise for observability: deterministic control flow, clear logging, actionable errors.
 ## SQLAlchemy Patterns
 - Models inherit from `models.base.Base`; never create ad-hoc metadata or engines.
 - Open sessions with context managers:
  ```python
  from sqlalchemy.orm import Session
  with Session(db.engine, expire_on_commit=False) as session:
      stmt = select(Workflow).where(
          Workflow.id == workflow_id,
          Workflow.tenant_id == tenant_id,
      )
      workflow = session.execute(stmt).scalar_one_or_none()
  ```
 - Use SQLAlchemy expressions; avoid raw SQL unless necessary.
 - Introduce repository abstractions only for very large tables (e.g., workflow executions) to support alternative storage strategies.
 - Always scope queries by `tenant_id` and protect write paths with safeguards (`FOR UPDATE`, row counts, etc.).
 ## Storage & External IO
 - Access storage via `extensions.ext_storage.storage`.
 - Use `core.helper.ssrf_proxy` for outbound HTTP fetches.
 - Background tasks that touch storage must be idempotent and log the relevant object identifiers.
 ## Pydantic Usage
 - Define DTOs with Pydantic v2 models and forbid extras by default.
 - Use `@field_validator` / `@model_validator` for domain rules.
 - Example:
  ```python
  from pydantic import BaseModel, ConfigDict, HttpUrl, field_validator
  class TriggerConfig(BaseModel):
      endpoint: HttpUrl
      secret: str
      model_config = ConfigDict(extra="forbid")
      @field_validator("secret")
      def ensure_secret_prefix(cls, value: str) -> str:
          if not value.startswith("dify_"):
              raise ValueError("secret must start with dify_")
          return value
  ```
 ## Generics & Protocols
 - Use `typing.Protocol` to define behavioural contracts (e.g., cache interfaces).
 - Apply generics (`TypeVar`, `Generic`) for reusable utilities like caches or providers.
 - Validate dynamic inputs at runtime when generics cannot enforce safety alone.
 ## Error Handling & Logging
 - Raise domain-specific exceptions (`services/errors`, `core/errors`) and translate to HTTP responses in controllers.
 - Declare `logger = logging.getLogger(__name__)` at module top.
 - Include tenant/app/workflow identifiers in log context.
 - Log retryable events at `warning`, terminal failures at `error`.
 ## Tooling & Checks
 - Format/lint: `uv run --project api --dev ruff format ./api` and `uv run --project api --dev ruff check --fix --unsafe-fixes ./api`.
 - Type checks: `uv run --directory api --dev basedpyright`.
 - Tests: `uv run --project api --dev dev/pytest/pytest_unit_tests.sh`.
 - Run all of the above before submitting your work.
 ## Controllers & Services
 - Controllers: parse input via Pydantic, invoke services, return serialised responses; no business logic.
 - Services: coordinate repositories, providers, background tasks; keep side effects explicit.
 - Avoid repositories unless necessary; direct SQLAlchemy usage is preferred for typical tables.
 - Document non-obvious behaviour with concise comments.
 ## Miscellaneous
 - Use `configs.dify_config` for configuration—never read environment variables directly.
 - Maintain tenant awareness end-to-end; `tenant_id` must flow through every layer touching shared resources.
 - Queue async work through `services/async_workflow_service`; implement tasks under `tasks/` with explicit queue selection.
 - Keep experimental scripts under `dev/`; do not ship them in production builds.
@@ -1,96 +0,0 @@
 ## Configuration
 - Import `configs.dify_config` for every runtime toggle. Do not read environment variables directly.
 - Add new settings to the proper mixin inside `configs/` (deployment, feature, middleware, etc.) so they load through `DifyConfig`.
 - Remote overrides come from the optional providers in `configs/remote_settings_sources`; keep defaults in code safe when the value is missing.
 - Example: logging pulls targets from `extensions/ext_logging.py`, and model provider URLs are assembled in `services/entities/model_provider_entities.py`.
 ## Dependencies
 - Runtime dependencies live in `[project].dependencies` inside `pyproject.toml`. Optional clients go into the `storage`, `tools`, or `vdb` groups under `[dependency-groups]`.
 - Always pin versions and keep the list alphabetised. Shared tooling (lint, typing, pytest) belongs in the `dev` group.
 - When code needs a new package, explain why in the PR and run `uv lock` so the lockfile stays current.
 ## Storage & Files
 - Use `extensions.ext_storage.storage` for all blob IO; it already respects the configured backend.
 - Convert files for workflows with helpers in `core/file/file_manager.py`; they handle signed URLs and multimodal payloads.
 - When writing controller logic, delegate upload quotas and metadata to `services/file_service.py` instead of touching storage directly.
 - All outbound HTTP fetches (webhooks, remote files) must go through the SSRF-safe client in `core/helper/ssrf_proxy.py`; it wraps `httpx` with the allow/deny rules configured for the platform.
 ## Redis & Shared State
 - Access Redis through `extensions.ext_redis.redis_client`. For locking, reuse `redis_client.lock`.
 - Prefer higher-level helpers when available: rate limits use `libs.helper.RateLimiter`, provider metadata uses caches in `core/helper/provider_cache.py`.
 ## Models
 - SQLAlchemy models sit in `models/` and inherit from the shared declarative `Base` defined in `models/base.py` (metadata configured via `models/engine.py`).
 - `models/__init__.py` exposes grouped aggregates: account/tenant models, app and conversation tables, datasets, providers, workflow runs, triggers, etc. Import from there to avoid deep path churn.
 - Follow the DDD boundary: persistence objects live in `models/`, repositories under `repositories/` translate them into domain entities, and services consume those repositories.
 - When adding a table, create the model class, register it in `models/__init__.py`, wire a repository if needed, and generate an Alembic migration as described below.
 ## Vector Stores
 - Vector client implementations live in `core/rag/datasource/vdb/<provider>`, with a common factory in `core/rag/datasource/vdb/vector_factory.py` and enums in `core/rag/datasource/vdb/vector_type.py`.
 - Retrieval pipelines call these providers through `core/rag/datasource/retrieval_service.py` and dataset ingestion flows in `services/dataset_service.py`.
 - The CLI helper `flask vdb-migrate` orchestrates bulk migrations using routines in `commands.py`; reuse that pattern when adding new backend transitions.
 - To add another store, mirror the provider layout, register it with the factory, and include any schema changes in Alembic migrations.
 ## Observability & OTEL
 - OpenTelemetry settings live under the observability mixin in `configs/observability`. Toggle exporters and sampling via `dify_config`, not ad-hoc env reads.
 - HTTP, Celery, Redis, SQLAlchemy, and httpx instrumentation is initialised in `extensions/ext_app_metrics.py` and `extensions/ext_request_logging.py`; reuse these hooks when adding new workers or entrypoints.
 - When creating background tasks or external calls, propagate tracing context with helpers in the existing instrumented clients (e.g. use the shared `httpx` session from `core/helper/http_client_pooling.py`).
 - If you add a new external integration, ensure spans and metrics are emitted by wiring the appropriate OTEL instrumentation package in `pyproject.toml` and configuring it in `extensions/`.
 ## Ops Integrations
 - Langfuse support and other tracing bridges live under `core/ops/opik_trace`. Config toggles sit in `configs/observability`, while exporters are initialised in the OTEL extensions mentioned above.
 - External monitoring services should follow this pattern: keep client code in `core/ops`, expose switches via `dify_config`, and hook initialisation in `extensions/ext_app_metrics.py` or sibling modules.
 - Before instrumenting new code paths, check whether existing context helpers (e.g. `extensions/ext_request_logging.py`) already capture the necessary metadata.
 ## Controllers, Services, Core
 - Controllers only parse HTTP input and call a service method. Keep business rules in `services/`.
 - Services enforce tenant rules, quotas, and orchestration, then call into `core/` engines (workflow execution, tools, LLMs).
 - When adding a new endpoint, search for an existing service to extend before introducing a new layer. Example: workflow APIs pipe through `services/workflow_service.py` into `core/workflow`.
 ## Plugins, Tools, Providers
 - In Dify a plugin is a tenant-installable bundle that declares one or more providers (tool, model, datasource, trigger, endpoint, agent strategy) plus its resource needs and version metadata. The manifest (`core/plugin/entities/plugin.py`) mirrors what you see in the marketplace documentation.
 - Installation, upgrades, and migrations are orchestrated by `services/plugin/plugin_service.py` together with helpers such as `services/plugin/plugin_migration.py`.
 - Runtime loading happens through the implementations under `core/plugin/impl/*` (tool/model/datasource/trigger/endpoint/agent). These modules normalise plugin providers so that downstream systems (`core/tools/tool_manager.py`, `services/model_provider_service.py`, `services/trigger/*`) can treat builtin and plugin capabilities the same way.
 - For remote execution, plugin daemons (`core/plugin/entities/plugin_daemon.py`, `core/plugin/impl/plugin.py`) manage lifecycle hooks, credential forwarding, and background workers that keep plugin processes in sync with the main application.
 - Acquire tool implementations through `core/tools/tool_manager.py`; it resolves builtin, plugin, and workflow-as-tool providers uniformly, injecting the right context (tenant, credentials, runtime config).
 - To add a new plugin capability, extend the relevant `core/plugin/entities` schema and register the implementation in the matching `core/plugin/impl` module rather than importing the provider directly.
 ## Async Workloads
 see `agent_skills/trigger.md` for more detailed documentation.
 - Enqueue background work through `services/async_workflow_service.py`. It routes jobs to the tiered Celery queues defined in `tasks/`.
 - Workers boot from `celery_entrypoint.py` and execute functions in `tasks/workflow_execution_tasks.py`, `tasks/trigger_processing_tasks.py`, etc.
 - Scheduled workflows poll from `schedule/workflow_schedule_tasks.py`. Follow the same pattern if you need new periodic jobs.
 ## Database & Migrations
 - SQLAlchemy models live under `models/` and map directly to migration files in `migrations/versions`.
 - Generate migrations with `uv run --project api flask db revision --autogenerate -m "<summary>"`, then review the diff; never hand-edit the database outside Alembic.
 - Apply migrations locally using `uv run --project api flask db upgrade`; production deploys expect the same history.
 - If you add tenant-scoped data, confirm the upgrade includes tenant filters or defaults consistent with the service logic touching those tables.
 ## CLI Commands
 - Maintenance commands from `commands.py` are registered on the Flask CLI. Run them via `uv run --project api flask <command>`.
 - Use the built-in `db` commands from Flask-Migrate for schema operations (`flask db upgrade`, `flask db stamp`, etc.). Only fall back to custom helpers if you need their extra behaviour.
 - Custom entries such as `flask reset-password`, `flask reset-email`, and `flask vdb-migrate` handle self-hosted account recovery and vector database migrations.
 - Before adding a new command, check whether an existing service can be reused and ensure the command guards edition-specific behaviour (many enforce `SELF_HOSTED`). Document any additions in the PR.
 - Ruff helpers are run directly with `uv`: `uv run --project api --dev ruff format ./api` for formatting and `uv run --project api --dev ruff check ./api` (add `--fix` if you want automatic fixes).
 ## When You Add Features
 - Check for an existing helper or service before writing a new util.
 - Uphold tenancy: every service method should receive the tenant ID from controller wrappers such as `controllers/console/wraps.py`.
 - Update or create tests alongside behaviour changes (`tests/unit_tests` for fast coverage, `tests/integration_tests` when touching orchestrations).
 - Run `uv run --project api --dev ruff check ./api`, `uv run --directory api --dev basedpyright`, and `uv run --project api --dev dev/pytest/pytest_unit_tests.sh` before submitting changes.
@@ -1 +0,0 @@
 // TBD
@@ -1 +0,0 @@
 // TBD
@@ -1,53 +0,0 @@
 ## Overview
 Trigger is a collection of nodes that we called `Start` nodes, also, the concept of `Start` is the same as `RootNode` in the workflow engine `core/workflow/graph_engine`, On the other hand, `Start` node is the entry point of workflows, every workflow run always starts from a `Start` node.
 ## Trigger nodes
 - `UserInput`
 - `Trigger Webhook`
 - `Trigger Schedule`
 - `Trigger Plugin`
 ### UserInput
 Before `Trigger` concept is introduced, it's what we called `Start` node, but now, to avoid confusion, it was renamed to `UserInput` node, has a strong relation with `ServiceAPI` in `controllers/service_api/app`
 1. `UserInput` node introduces a list of arguments that need to be provided by the user, finally it will be converted into variables in the workflow variable pool.
 1. `ServiceAPI` accept those arguments, and pass through them into `UserInput` node.
 1. For its detailed implementation, please refer to `core/workflow/nodes/start`
 ### Trigger Webhook
 Inside Webhook Node, Dify provided a UI panel that allows user define a HTTP manifest `core/workflow/nodes/trigger_webhook/entities.py`.`WebhookData`, also, Dify generates a random webhook id for each `Trigger Webhook` node, the implementation was implemented in `core/trigger/utils/endpoint.py`, as you can see, `webhook-debug` is a debug mode for webhook, you may find it in `controllers/trigger/webhook.py`.
 Finally, requests to `webhook` endpoint will be converted into variables in workflow variable pool during workflow execution.
 ### Trigger Schedule
 `Trigger Schedule` node is a node that allows user define a schedule to trigger the workflow, detailed manifest is here `core/workflow/nodes/trigger_schedule/entities.py`, we have a poller and executor to handle millions of schedules, see `docker/entrypoint.sh` / `schedule/workflow_schedule_task.py` for help.
 To Achieve this, a `WorkflowSchedulePlan` model was introduced in `models/trigger.py`, and a `events/event_handlers/sync_workflow_schedule_when_app_published.py` was used to sync workflow schedule plans when app is published.
 ### Trigger Plugin
 `Trigger Plugin` node allows user define there own distributed trigger plugin, whenever a request was received, Dify forwards it to the plugin and wait for parsed variables from it.
 1. Requests were saved in storage by `services/trigger/trigger_request_service.py`, referenced by `services/trigger/trigger_service.py`.`TriggerService`.`process_endpoint`
 1. Plugins accept those requests and parse variables from it, see `core/plugin/impl/trigger.py` for details.
 A `subscription` concept was out here by Dify, it means an endpoint address from Dify was bound to thirdparty webhook service like `Github` `Slack` `Linear` `GoogleDrive` `Gmail` etc. Once a subscription was created, Dify continually receives requests from the platforms and handle them one by one.
 ## Worker Pool / Async Task
 All the events that triggered a new workflow run is always in async mode, a unified entrypoint can be found here `services/async_workflow_service.py`.`AsyncWorkflowService`.`trigger_workflow_async`.
 The infrastructure we used is `celery`, we've already configured it in `docker/entrypoint.sh`, and the consumers are in `tasks/async_workflow_tasks.py`, 3 queues were used to handle different tiers of users, `PROFESSIONAL_QUEUE` `TEAM_QUEUE` `SANDBOX_QUEUE`.
 ## Debug Strategy
 Dify divided users into 2 groups: builders / end users.
 Builders are the users who create workflows, in this stage, debugging a workflow becomes a critical part of the workflow development process, as the start node in workflows, trigger nodes can `listen` to the events from `WebhookDebug` `Schedule` `Plugin`, debugging process was created in `controllers/console/app/workflow.py`.`DraftWorkflowTriggerNodeApi`.
 A polling process can be considered as combine of few single `poll` operations, each `poll` operation fetches events cached in `Redis`, returns `None` if no event was found, more detailed implemented: `core/trigger/debug/event_bus.py` was used to handle the polling process, and `core/trigger/debug/event_selectors.py` was used to select the event poller based on the trigger type.
@@ -1,7 +1,7 @@
 import sys
-def is_db_command() -> bool:
+def is_db_command():
    if len(sys.argv) > 1 and sys.argv[0].endswith("flask") and sys.argv[1] == "db":
        return True
    return False
@@ -13,12 +13,23 @@ if is_db_command():
    app = create_migrations_app()
 else:
-    # Gunicorn and Celery handle monkey patching automatically in production by
+    # It seems that JetBrains Python debugger does not work well with gevent,
-    # specifying the `gevent` worker class. Manual monkey patching is not required here.
+    # so we need to disable gevent in debug mode.
    # If you are using debugpy and set GEVENT_SUPPORT=True, you can debug with gevent.
    # if (flask_debug := os.environ.get("FLASK_DEBUG", "0")) and flask_debug.lower() in {"false", "0", "no"}:
    # from gevent import monkey
    #
-    # See `api/docker/entrypoint.sh` (lines 33 and 47) for details.
+    # # gevent
    # monkey.patch_all()
    #
-    # For third-party library patching, refer to `gunicorn.conf.py` and `celery_entrypoint.py`.
+    # from grpc.experimental import gevent as grpc_gevent  # type: ignore
    #
    # # grpc gevent
    # grpc_gevent.init_gevent()
    # import psycogreen.gevent  # type: ignore
    #
    # psycogreen.gevent.patch_psycopg()
    from app_factory import create_app
@@ -18,7 +18,6 @@ def create_flask_app_with_configs() -> DifyApp:
    """
    dify_app = DifyApp(__name__)
    dify_app.config.from_mapping(dify_config.model_dump())
    dify_app.config["RESTX_INCLUDE_ALL_MODELS"] = True
    # add before request hook
    @dify_app.before_request
@@ -51,7 +50,6 @@ def initialize_extensions(app: DifyApp):
        ext_commands,
        ext_compress,
        ext_database,
        ext_forward_refs,
        ext_hosting_provider,
        ext_import_modules,
        ext_logging,
@@ -76,7 +74,6 @@ def initialize_extensions(app: DifyApp):
        ext_warnings,
        ext_import_modules,
        ext_orjson,
        ext_forward_refs,
        ext_set_secretkey,
        ext_compress,
        ext_code_based_extension,
@@ -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
@@ -321,8 +321,6 @@ def migrate_knowledge_vector_database():
            )
            datasets = db.paginate(select=stmt, page=page, per_page=50, max_per_page=50, error_out=False)
            if not datasets.items:
                break
        except SQLAlchemyError:
            raise
@@ -1471,10 +1469,7 @@ def setup_datasource_oauth_client(provider, client_params):
@click.command("transform-datasource-credentials", help="Transform datasource credentials.")
-@click.option(
+def transform_datasource_credentials():
    "--environment", prompt=True, help="the environment to transform datasource credentials", default="online"
 )
 def transform_datasource_credentials(environment: str):
    """
    Transform datasource credentials
    """
@@ -1485,14 +1480,9 @@ def transform_datasource_credentials(environment: str):
        notion_plugin_id = "langgenius/notion_datasource"
        firecrawl_plugin_id = "langgenius/firecrawl_datasource"
        jina_plugin_id = "langgenius/jina_datasource"
-        if environment == "online":
+        notion_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(notion_plugin_id)  # pyright: ignore[reportPrivateUsage]
-            notion_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(notion_plugin_id)  # pyright: ignore[reportPrivateUsage]
+        firecrawl_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(firecrawl_plugin_id)  # pyright: ignore[reportPrivateUsage]
-            firecrawl_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(firecrawl_plugin_id)  # pyright: ignore[reportPrivateUsage]
+        jina_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(jina_plugin_id)  # pyright: ignore[reportPrivateUsage]
            jina_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(jina_plugin_id)  # pyright: ignore[reportPrivateUsage]
        else:
            notion_plugin_unique_identifier = None
            firecrawl_plugin_unique_identifier = None
            jina_plugin_unique_identifier = None
        oauth_credential_type = CredentialType.OAUTH2
        api_key_credential_type = CredentialType.API_KEY
@@ -1658,7 +1648,7 @@ def transform_datasource_credentials(environment: str):
                            "integration_secret": api_key,
                        }
                        datasource_provider = DatasourceProvider(
-                            provider="jinareader",
+                            provider="jina",
                            tenant_id=tenant_id,
                            plugin_id=jina_plugin_id,
                            auth_type=api_key_credential_type.value,
@@ -73,14 +73,14 @@ class AppExecutionConfig(BaseSettings):
        description="Maximum allowed execution time for the application in seconds",
        default=1200,
    )
    APP_DEFAULT_ACTIVE_REQUESTS: NonNegativeInt = Field(
        description="Default number of concurrent active requests per app (0 for unlimited)",
        default=0,
    )
    APP_MAX_ACTIVE_REQUESTS: NonNegativeInt = Field(
        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):
@@ -185,22 +185,6 @@ class TriggerConfig(BaseSettings):
    )
 class AsyncWorkflowConfig(BaseSettings):
    """
    Configuration for async workflow
    """
    ASYNC_WORKFLOW_SCHEDULER_GRANULARITY: int = Field(
        description="Granularity for async workflow scheduler, "
        "sometime, few users could block the queue due to some time-consuming tasks, "
        "to avoid this, workflow can be suspended if needed, to achieve"
        "this, a time-based checker is required, every granularity seconds, "
        "the checker will check the workflow queue and suspend the workflow",
        default=120,
        ge=1,
    )
 class PluginConfig(BaseSettings):
    """
    Plugin configs
@@ -216,11 +200,6 @@ class PluginConfig(BaseSettings):
        default="plugin-api-key",
    )
    PLUGIN_DAEMON_TIMEOUT: PositiveFloat | None = Field(
        description="Timeout in seconds for requests to the plugin daemon (set to None to disable)",
        default=300.0,
    )
    INNER_API_KEY_FOR_PLUGIN: str = Field(description="Inner api key for plugin", default="inner-api-key")
    PLUGIN_REMOTE_INSTALL_HOST: str = Field(
@@ -290,8 +269,6 @@ class EndpointConfig(BaseSettings):
        description="Template url for endpoint plugin", default="http://localhost:5002/e/{hook_id}"
    )
    TRIGGER_URL: str = Field(description="Template url for triggers", default="http://localhost:5001")
 class FileAccessConfig(BaseSettings):
    """
@@ -360,42 +337,12 @@ class FileUploadConfig(BaseSettings):
        default=10,
    )
    inner_UPLOAD_FILE_EXTENSION_BLACKLIST: str = Field(
        description=(
            "Comma-separated list of file extensions that are blocked from upload. "
            "Extensions should be lowercase without dots (e.g., 'exe,bat,sh,dll'). "
            "Empty by default to allow all file types."
        ),
        validation_alias=AliasChoices("UPLOAD_FILE_EXTENSION_BLACKLIST"),
        default="",
    )
    @computed_field  # type: ignore[misc]
    @property
    def UPLOAD_FILE_EXTENSION_BLACKLIST(self) -> set[str]:
        """
        Parse and return the blacklist as a set of lowercase extensions.
        Returns an empty set if no blacklist is configured.
        """
        if not self.inner_UPLOAD_FILE_EXTENSION_BLACKLIST:
            return set()
        return {
            ext.strip().lower().strip(".")
            for ext in self.inner_UPLOAD_FILE_EXTENSION_BLACKLIST.split(",")
            if ext.strip()
        }
 class HttpConfig(BaseSettings):
    """
    HTTP-related configurations for the application
    """
    COOKIE_DOMAIN: str = Field(
        description="Explicit cookie domain for console/service cookies when sharing across subdomains",
        default="",
    )
    API_COMPRESSION_ENABLED: bool = Field(
        description="Enable or disable gzip compression for HTTP responses",
        default=False,
@@ -607,7 +554,7 @@ class UpdateConfig(BaseSettings):
 class WorkflowVariableTruncationConfig(BaseSettings):
    WORKFLOW_VARIABLE_TRUNCATION_MAX_SIZE: PositiveInt = Field(
-        # 1000 KiB
+        # 100KB
        1024_000,
        description="Maximum size for variable to trigger final truncation.",
    )
@@ -974,11 +921,6 @@ class DataSetConfig(BaseSettings):
        default=True,
    )
    DATASET_MAX_SEGMENTS_PER_REQUEST: NonNegativeInt = Field(
        description="Maximum number of segments for dataset segments API (0 for unlimited)",
        default=0,
    )
 class WorkspaceConfig(BaseSettings):
    """
@@ -1071,28 +1013,6 @@ class CeleryScheduleTasksConfig(BaseSettings):
        default=0,
    )
    # Trigger provider refresh (simple version)
    ENABLE_TRIGGER_PROVIDER_REFRESH_TASK: bool = Field(
        description="Enable trigger provider refresh poller",
        default=True,
    )
    TRIGGER_PROVIDER_REFRESH_INTERVAL: int = Field(
        description="Trigger provider refresh poller interval in minutes",
        default=1,
    )
    TRIGGER_PROVIDER_REFRESH_BATCH_SIZE: int = Field(
        description="Max trigger subscriptions to process per tick",
        default=200,
    )
    TRIGGER_PROVIDER_CREDENTIAL_THRESHOLD_SECONDS: int = Field(
        description="Proactive credential refresh threshold in seconds",
        default=60 * 60,
    )
    TRIGGER_PROVIDER_SUBSCRIPTION_THRESHOLD_SECONDS: int = Field(
        description="Proactive subscription refresh threshold in seconds",
        default=60 * 60,
    )
 class PositionConfig(BaseSettings):
    POSITION_PROVIDER_PINS: str = Field(
@@ -1190,7 +1110,7 @@ class AccountConfig(BaseSettings):
 class WorkflowLogConfig(BaseSettings):
-    WORKFLOW_LOG_CLEANUP_ENABLED: bool = Field(default=False, description="Enable workflow run log cleanup")
+    WORKFLOW_LOG_CLEANUP_ENABLED: bool = Field(default=True, description="Enable workflow run log cleanup")
    WORKFLOW_LOG_RETENTION_DAYS: int = Field(default=30, description="Retention days for workflow run logs")
    WORKFLOW_LOG_CLEANUP_BATCH_SIZE: int = Field(
        default=100, description="Batch size for workflow run log cleanup operations"
@@ -1209,13 +1129,6 @@ class SwaggerUIConfig(BaseSettings):
    )
 class TenantIsolatedTaskQueueConfig(BaseSettings):
    TENANT_ISOLATED_TASK_CONCURRENCY: int = Field(
        description="Number of tasks allowed to be delivered concurrently from isolated queue per tenant",
        default=1,
    )
 class FeatureConfig(
    # place the configs in alphabet order
    AppExecutionConfig,
@@ -1223,7 +1136,6 @@ class FeatureConfig(
    BillingConfig,
    CodeExecutionSandboxConfig,
    TriggerConfig,
    AsyncWorkflowConfig,
    PluginConfig,
    MarketplaceConfig,
    DataSetConfig,
@@ -1242,7 +1154,6 @@ class FeatureConfig(
    RagEtlConfig,
    RepositoryConfig,
    SecurityConfig,
    TenantIsolatedTaskQueueConfig,
    ToolConfig,
    UpdateConfig,
    WorkflowConfig,
@@ -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,12 +140,12 @@ class DatabaseConfig(BaseSettings):
        default="",
    )
-    @computed_field  # type: ignore[prop-decorator]
+    SQLALCHEMY_DATABASE_URI_SCHEME: str = Field(
-    @property
+        description="Database URI scheme for SQLAlchemy connection.",
-    def SQLALCHEMY_DATABASE_URI_SCHEME(self) -> str:
+        default="postgresql",
-        return "postgresql" if self.DB_TYPE == "postgresql" else "mysql+pymysql"
+    )
-    @computed_field  # type: ignore[prop-decorator]
+    @computed_field  # type: ignore[misc]
    @property
    def SQLALCHEMY_DATABASE_URI(self) -> str:
        db_extras = (
@@ -204,21 +198,21 @@ class DatabaseConfig(BaseSettings):
        default=os.cpu_count() or 1,
    )
-    @computed_field  # type: ignore[prop-decorator]
+    @computed_field  # type: ignore[misc]
    @property
    def SQLALCHEMY_ENGINE_OPTIONS(self) -> dict[str, Any]:
        # Parse DB_EXTRAS for 'options'
        db_extras_dict = dict(parse_qsl(self.DB_EXTRAS))
        options = db_extras_dict.get("options", "")
-        connect_args = {}
+        # Always include timezone
-        # Use the dynamic SQLALCHEMY_DATABASE_URI_SCHEME property
+        timezone_opt = "-c timezone=UTC"
-        if self.SQLALCHEMY_DATABASE_URI_SCHEME.startswith("postgresql"):
+        if options:
-            timezone_opt = "-c timezone=UTC"
+            # Merge user options and timezone
-            if options:
+            merged_options = f"{options} {timezone_opt}"
-                merged_options = f"{options} {timezone_opt}"
+        else:
-            else:
+            merged_options = timezone_opt
-                merged_options = timezone_opt
+
-            connect_args = {"options": merged_options}
+        connect_args = {"options": merged_options}
        return {
            "pool_size": self.SQLALCHEMY_POOL_SIZE,
@@ -22,17 +22,7 @@ class WeaviateConfig(BaseSettings):
        default=True,
    )
    WEAVIATE_GRPC_ENDPOINT: str | None = Field(
        description="URL of the Weaviate gRPC server (e.g., 'grpc://localhost:50051' or 'grpcs://weaviate.example.com:443')",
        default=None,
    )
    WEAVIATE_BATCH_SIZE: PositiveInt = Field(
        description="Number of objects to be processed in a single batch operation (default is 100)",
        default=100,
    )
    WEAVIATE_TOKENIZATION: str | None = Field(
        description="Tokenization for Weaviate (default is word)",
        default="word",
    )
@@ -55,16 +55,3 @@ else:
        "properties",
    }
 DOCUMENT_EXTENSIONS: set[str] = convert_to_lower_and_upper_set(_doc_extensions)
 # console
 COOKIE_NAME_ACCESS_TOKEN = "access_token"
 COOKIE_NAME_REFRESH_TOKEN = "refresh_token"
 COOKIE_NAME_CSRF_TOKEN = "csrf_token"
 # webapp
 COOKIE_NAME_WEBAPP_ACCESS_TOKEN = "webapp_access_token"
 COOKIE_NAME_PASSPORT = "passport"
 HEADER_NAME_CSRF_TOKEN = "X-CSRF-Token"
 HEADER_NAME_APP_CODE = "X-App-Code"
 HEADER_NAME_PASSPORT = "X-App-Passport"
@@ -31,9 +31,3 @@ def supported_language(lang):
    error = f"{lang} is not a valid language."
    raise ValueError(error)
 def get_valid_language(lang: str | None) -> str:
    if lang and lang in languages:
        return lang
    return languages[0]
@@ -25,12 +25,6 @@ class UnsupportedFileTypeError(BaseHTTPException):
    code = 415
 class BlockedFileExtensionError(BaseHTTPException):
    error_code = "file_extension_blocked"
    description = "The file extension is blocked for security reasons."
    code = 400
 class TooManyFilesError(BaseHTTPException):
    error_code = "too_many_files"
    description = "Only one file is allowed."
@@ -24,7 +24,7 @@ except ImportError:
        )
    else:
        warnings.warn("To use python-magic guess MIMETYPE, you need to install `libmagic`", stacklevel=2)
-    magic = None  # type: ignore[assignment]
+    magic = None  # type: ignore
 from pydantic import BaseModel
@@ -12,10 +12,9 @@ P = ParamSpec("P")
 R = TypeVar("R")
 from configs import dify_config
 from constants.languages import supported_language
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.wraps import only_edition_cloud
 from extensions.ext_database import db
 from libs.token import extract_access_token
 from models.model import App, InstalledApp, RecommendedApp
@@ -25,9 +24,19 @@ def admin_required(view: Callable[P, R]):
        if not dify_config.ADMIN_API_KEY:
            raise Unauthorized("API key is invalid.")
-        auth_token = extract_access_token(request)
+        auth_header = request.headers.get("Authorization")
-        if not auth_token:
+        if auth_header is None:
            raise Unauthorized("Authorization header is missing.")
        if " " not in auth_header:
            raise Unauthorized("Invalid Authorization header format. Expected 'Bearer <api-key>' format.")
        auth_scheme, auth_token = auth_header.split(None, 1)
        auth_scheme = auth_scheme.lower()
        if auth_scheme != "bearer":
            raise Unauthorized("Invalid Authorization header format. Expected 'Bearer <api-key>' format.")
        if auth_token != dify_config.ADMIN_API_KEY:
            raise Unauthorized("API key is invalid.")
@@ -38,10 +47,10 @@ def admin_required(view: Callable[P, R]):
@console_ns.route("/admin/insert-explore-apps")
 class InsertExploreAppListApi(Resource):
-    @console_ns.doc("insert_explore_app")
+    @api.doc("insert_explore_app")
-    @console_ns.doc(description="Insert or update an app in the explore list")
+    @api.doc(description="Insert or update an app in the explore list")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "InsertExploreAppRequest",
            {
                "app_id": fields.String(required=True, description="Application ID"),
@@ -55,23 +64,21 @@ class InsertExploreAppListApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "App updated successfully")
+    @api.response(200, "App updated successfully")
-    @console_ns.response(201, "App inserted successfully")
+    @api.response(201, "App inserted successfully")
-    @console_ns.response(404, "App not found")
+    @api.response(404, "App not found")
    @only_edition_cloud
    @admin_required
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("app_id", type=str, required=True, nullable=False, location="json")
-            .add_argument("app_id", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("desc", type=str, location="json")
-            .add_argument("desc", type=str, location="json")
+        parser.add_argument("copyright", type=str, location="json")
-            .add_argument("copyright", type=str, location="json")
+        parser.add_argument("privacy_policy", type=str, location="json")
-            .add_argument("privacy_policy", type=str, location="json")
+        parser.add_argument("custom_disclaimer", type=str, location="json")
-            .add_argument("custom_disclaimer", type=str, location="json")
+        parser.add_argument("language", type=supported_language, required=True, nullable=False, location="json")
-            .add_argument("language", type=supported_language, required=True, nullable=False, location="json")
+        parser.add_argument("category", type=str, required=True, nullable=False, location="json")
-            .add_argument("category", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("position", type=int, required=True, nullable=False, location="json")
            .add_argument("position", type=int, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        app = db.session.execute(select(App).where(App.id == args["app_id"])).scalar_one_or_none()
@@ -131,10 +138,10 @@ class InsertExploreAppListApi(Resource):
@console_ns.route("/admin/insert-explore-apps/<uuid:app_id>")
 class InsertExploreAppApi(Resource):
-    @console_ns.doc("delete_explore_app")
+    @api.doc("delete_explore_app")
-    @console_ns.doc(description="Remove an app from the explore list")
+    @api.doc(description="Remove an app from the explore list")
-    @console_ns.doc(params={"app_id": "Application ID to remove"})
+    @api.doc(params={"app_id": "Application ID to remove"})
-    @console_ns.response(204, "App removed successfully")
+    @api.response(204, "App removed successfully")
    @only_edition_cloud
    @admin_required
    def delete(self, app_id):
@@ -7,12 +7,13 @@ from werkzeug.exceptions import Forbidden
 from extensions.ext_database import db
 from libs.helper import TimestampField
-from libs.login import current_account_with_tenant, login_required
+from libs.login import current_user, login_required
 from models.account import Account
 from models.dataset import Dataset
 from models.model import ApiToken, App
-from . import console_ns
+from . import api, console_ns
-from .wraps import account_initialization_required, edit_permission_required, setup_required
+from .wraps import account_initialization_required, setup_required
 api_key_fields = {
    "id": fields.String,
@@ -24,12 +25,6 @@ api_key_fields = {
 api_key_list = {"data": fields.List(fields.Nested(api_key_fields), attribute="items")}
 api_key_item_model = console_ns.model("ApiKeyItem", api_key_fields)
 api_key_list_model = console_ns.model(
    "ApiKeyList", {"data": fields.List(fields.Nested(api_key_item_model), attribute="items")}
 )
 def _get_resource(resource_id, tenant_id, resource_model):
    if resource_model == App:
@@ -58,13 +53,13 @@ class BaseApiKeyListResource(Resource):
    token_prefix: str | None = None
    max_keys = 10
-    @marshal_with(api_key_list_model)
+    @marshal_with(api_key_list)
    def get(self, resource_id):
        assert self.resource_id_field is not None, "resource_id_field must be set"
        resource_id = str(resource_id)
-        _, current_tenant_id = current_account_with_tenant()
+        assert isinstance(current_user, Account)
-
+        assert current_user.current_tenant_id is not None
-        _get_resource(resource_id, current_tenant_id, self.resource_model)
+        _get_resource(resource_id, current_user.current_tenant_id, self.resource_model)
        keys = db.session.scalars(
            select(ApiToken).where(
                ApiToken.type == self.resource_type, getattr(ApiToken, self.resource_id_field) == resource_id
@@ -72,13 +67,16 @@ class BaseApiKeyListResource(Resource):
        ).all()
        return {"items": keys}
-    @marshal_with(api_key_item_model)
+    @marshal_with(api_key_fields)
    @edit_permission_required
    def post(self, resource_id):
        assert self.resource_id_field is not None, "resource_id_field must be set"
        resource_id = str(resource_id)
-        _, current_tenant_id = current_account_with_tenant()
+        assert isinstance(current_user, Account)
-        _get_resource(resource_id, current_tenant_id, self.resource_model)
+        assert current_user.current_tenant_id is not None
        _get_resource(resource_id, current_user.current_tenant_id, self.resource_model)
        if not current_user.has_edit_permission:
            raise Forbidden()
        current_key_count = (
            db.session.query(ApiToken)
            .where(ApiToken.type == self.resource_type, getattr(ApiToken, self.resource_id_field) == resource_id)
@@ -95,7 +93,7 @@ class BaseApiKeyListResource(Resource):
        key = ApiToken.generate_api_key(self.token_prefix or "", 24)
        api_token = ApiToken()
        setattr(api_token, self.resource_id_field, resource_id)
-        api_token.tenant_id = current_tenant_id
+        api_token.tenant_id = current_user.current_tenant_id
        api_token.token = key
        api_token.type = self.resource_type
        db.session.add(api_token)
@@ -110,11 +108,15 @@ class BaseApiKeyResource(Resource):
    resource_model: type | None = None
    resource_id_field: str | None = None
-    def delete(self, resource_id: str, api_key_id: str):
+    def delete(self, resource_id, api_key_id):
        assert self.resource_id_field is not None, "resource_id_field must be set"
-        current_user, current_tenant_id = current_account_with_tenant()
+        resource_id = str(resource_id)
-        _get_resource(resource_id, current_tenant_id, self.resource_model)
+        api_key_id = str(api_key_id)
        assert isinstance(current_user, Account)
        assert current_user.current_tenant_id is not None
        _get_resource(resource_id, current_user.current_tenant_id, self.resource_model)
        # The role of the current user in the ta table must be admin or owner
        if not current_user.is_admin_or_owner:
            raise Forbidden()
@@ -139,23 +141,28 @@ class BaseApiKeyResource(Resource):
@console_ns.route("/apps/<uuid:resource_id>/api-keys")
 class AppApiKeyListResource(BaseApiKeyListResource):
-    @console_ns.doc("get_app_api_keys")
+    @api.doc("get_app_api_keys")
-    @console_ns.doc(description="Get all API keys for an app")
+    @api.doc(description="Get all API keys for an app")
-    @console_ns.doc(params={"resource_id": "App ID"})
+    @api.doc(params={"resource_id": "App ID"})
-    @console_ns.response(200, "Success", api_key_list_model)
+    @api.response(200, "Success", api_key_list)
-    def get(self, resource_id):  # type: ignore
+    def get(self, resource_id):
        """Get all API keys for an app"""
        return super().get(resource_id)
-    @console_ns.doc("create_app_api_key")
+    @api.doc("create_app_api_key")
-    @console_ns.doc(description="Create a new API key for an app")
+    @api.doc(description="Create a new API key for an app")
-    @console_ns.doc(params={"resource_id": "App ID"})
+    @api.doc(params={"resource_id": "App ID"})
-    @console_ns.response(201, "API key created successfully", api_key_item_model)
+    @api.response(201, "API key created successfully", api_key_fields)
-    @console_ns.response(400, "Maximum keys exceeded")
+    @api.response(400, "Maximum keys exceeded")
-    def post(self, resource_id):  # type: ignore
+    def post(self, resource_id):
        """Create a new API key for an app"""
        return super().post(resource_id)
    def after_request(self, resp):
        resp.headers["Access-Control-Allow-Origin"] = "*"
        resp.headers["Access-Control-Allow-Credentials"] = "true"
        return resp
    resource_type = "app"
    resource_model = App
    resource_id_field = "app_id"
@@ -164,14 +171,19 @@ class AppApiKeyListResource(BaseApiKeyListResource):
@console_ns.route("/apps/<uuid:resource_id>/api-keys/<uuid:api_key_id>")
 class AppApiKeyResource(BaseApiKeyResource):
-    @console_ns.doc("delete_app_api_key")
+    @api.doc("delete_app_api_key")
-    @console_ns.doc(description="Delete an API key for an app")
+    @api.doc(description="Delete an API key for an app")
-    @console_ns.doc(params={"resource_id": "App ID", "api_key_id": "API key ID"})
+    @api.doc(params={"resource_id": "App ID", "api_key_id": "API key ID"})
-    @console_ns.response(204, "API key deleted successfully")
+    @api.response(204, "API key deleted successfully")
    def delete(self, resource_id, api_key_id):
        """Delete an API key for an app"""
        return super().delete(resource_id, api_key_id)
    def after_request(self, resp):
        resp.headers["Access-Control-Allow-Origin"] = "*"
        resp.headers["Access-Control-Allow-Credentials"] = "true"
        return resp
    resource_type = "app"
    resource_model = App
    resource_id_field = "app_id"
@@ -179,23 +191,28 @@ class AppApiKeyResource(BaseApiKeyResource):
@console_ns.route("/datasets/<uuid:resource_id>/api-keys")
 class DatasetApiKeyListResource(BaseApiKeyListResource):
-    @console_ns.doc("get_dataset_api_keys")
+    @api.doc("get_dataset_api_keys")
-    @console_ns.doc(description="Get all API keys for a dataset")
+    @api.doc(description="Get all API keys for a dataset")
-    @console_ns.doc(params={"resource_id": "Dataset ID"})
+    @api.doc(params={"resource_id": "Dataset ID"})
-    @console_ns.response(200, "Success", api_key_list_model)
+    @api.response(200, "Success", api_key_list)
-    def get(self, resource_id):  # type: ignore
+    def get(self, resource_id):
        """Get all API keys for a dataset"""
        return super().get(resource_id)
-    @console_ns.doc("create_dataset_api_key")
+    @api.doc("create_dataset_api_key")
-    @console_ns.doc(description="Create a new API key for a dataset")
+    @api.doc(description="Create a new API key for a dataset")
-    @console_ns.doc(params={"resource_id": "Dataset ID"})
+    @api.doc(params={"resource_id": "Dataset ID"})
-    @console_ns.response(201, "API key created successfully", api_key_item_model)
+    @api.response(201, "API key created successfully", api_key_fields)
-    @console_ns.response(400, "Maximum keys exceeded")
+    @api.response(400, "Maximum keys exceeded")
-    def post(self, resource_id):  # type: ignore
+    def post(self, resource_id):
        """Create a new API key for a dataset"""
        return super().post(resource_id)
    def after_request(self, resp):
        resp.headers["Access-Control-Allow-Origin"] = "*"
        resp.headers["Access-Control-Allow-Credentials"] = "true"
        return resp
    resource_type = "dataset"
    resource_model = Dataset
    resource_id_field = "dataset_id"
@@ -204,14 +221,19 @@ class DatasetApiKeyListResource(BaseApiKeyListResource):
@console_ns.route("/datasets/<uuid:resource_id>/api-keys/<uuid:api_key_id>")
 class DatasetApiKeyResource(BaseApiKeyResource):
-    @console_ns.doc("delete_dataset_api_key")
+    @api.doc("delete_dataset_api_key")
-    @console_ns.doc(description="Delete an API key for a dataset")
+    @api.doc(description="Delete an API key for a dataset")
-    @console_ns.doc(params={"resource_id": "Dataset ID", "api_key_id": "API key ID"})
+    @api.doc(params={"resource_id": "Dataset ID", "api_key_id": "API key ID"})
-    @console_ns.response(204, "API key deleted successfully")
+    @api.response(204, "API key deleted successfully")
    def delete(self, resource_id, api_key_id):
        """Delete an API key for a dataset"""
        return super().delete(resource_id, api_key_id)
    def after_request(self, resp):
        resp.headers["Access-Control-Allow-Origin"] = "*"
        resp.headers["Access-Control-Allow-Credentials"] = "true"
        return resp
    resource_type = "dataset"
    resource_model = Dataset
    resource_id_field = "dataset_id"
@@ -1,39 +1,35 @@
-from flask import request
+from flask_restx import Resource, fields, reqparse
 from flask_restx import Resource, fields
 from pydantic import BaseModel, Field
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.wraps import account_initialization_required, setup_required
 from libs.login import login_required
 from services.advanced_prompt_template_service import AdvancedPromptTemplateService
 class AdvancedPromptTemplateQuery(BaseModel):
    app_mode: str = Field(..., description="Application mode")
    model_mode: str = Field(..., description="Model mode")
    has_context: str = Field(default="true", description="Whether has context")
    model_name: str = Field(..., description="Model name")
 console_ns.schema_model(
    AdvancedPromptTemplateQuery.__name__,
    AdvancedPromptTemplateQuery.model_json_schema(ref_template="#/definitions/{model}"),
 )
@console_ns.route("/app/prompt-templates")
 class AdvancedPromptTemplateList(Resource):
-    @console_ns.doc("get_advanced_prompt_templates")
+    @api.doc("get_advanced_prompt_templates")
-    @console_ns.doc(description="Get advanced prompt templates based on app mode and model configuration")
+    @api.doc(description="Get advanced prompt templates based on app mode and model configuration")
-    @console_ns.expect(console_ns.models[AdvancedPromptTemplateQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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"))
    )
-    @console_ns.response(400, "Invalid request parameters")
+    @api.response(400, "Invalid request parameters")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self):
-        args = AdvancedPromptTemplateQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("app_mode", type=str, required=True, location="args")
        parser.add_argument("model_mode", type=str, required=True, location="args")
        parser.add_argument("has_context", type=str, required=False, default="true", location="args")
        parser.add_argument("model_name", type=str, required=True, location="args")
        args = parser.parse_args()
-        return AdvancedPromptTemplateService.get_prompt(args.model_dump())
+        return AdvancedPromptTemplateService.get_prompt(args)
@@ -1,6 +1,6 @@
 from flask_restx import Resource, fields, reqparse
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from libs.helper import uuid_value
@@ -8,29 +8,29 @@ 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):
-    @console_ns.doc("get_agent_logs")
+    @api.doc("get_agent_logs")
-    @console_ns.doc(description="Get agent execution logs for an application")
+    @api.doc(description="Get agent execution logs for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(parser)
+    @api.expect(
-    @console_ns.response(
+        api.parser()
-        200, "Agent logs retrieved successfully", fields.List(fields.Raw(description="Agent log entries"))
+        .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")
    )
-    @console_ns.response(400, "Invalid request parameters")
+    @api.response(200, "Agent logs retrieved successfully", fields.List(fields.Raw(description="Agent log entries")))
    @api.response(400, "Invalid request parameters")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.AGENT_CHAT])
    def get(self, app_model):
        """Get agent logs"""
        parser = reqparse.RequestParser()
        parser.add_argument("message_id", type=uuid_value, required=True, location="args")
        parser.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"])
@@ -1,34 +1,33 @@
 from typing import Literal
 from flask import request
 from flask_login import current_user
 from flask_restx import Resource, fields, marshal, marshal_with, reqparse
 from werkzeug.exceptions import Forbidden
 from controllers.common.errors import NoFileUploadedError, TooManyFilesError
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.wraps import (
    account_initialization_required,
    cloud_edition_billing_resource_check,
    edit_permission_required,
    setup_required,
 )
 from extensions.ext_redis import redis_client
 from fields.annotation_fields import (
    annotation_fields,
    annotation_hit_history_fields,
    build_annotation_model,
 )
 from libs.helper import uuid_value
 from libs.login import login_required
 from services.annotation_service import AppAnnotationService
@console_ns.route("/apps/<uuid:app_id>/annotation-reply/<string:action>")
 class AnnotationReplyActionApi(Resource):
-    @console_ns.doc("annotation_reply_action")
+    @api.doc("annotation_reply_action")
-    @console_ns.doc(description="Enable or disable annotation reply for an app")
+    @api.doc(description="Enable or disable annotation reply for an app")
-    @console_ns.doc(params={"app_id": "Application ID", "action": "Action to perform (enable/disable)"})
+    @api.doc(params={"app_id": "Application ID", "action": "Action to perform (enable/disable)"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "AnnotationReplyActionRequest",
            {
                "score_threshold": fields.Float(required=True, description="Score threshold for annotation matching"),
@@ -37,21 +36,21 @@ class AnnotationReplyActionApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "Action completed successfully")
+    @api.response(200, "Action completed successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_resource_check("annotation")
    @edit_permission_required
    def post(self, app_id, action: Literal["enable", "disable"]):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("score_threshold", required=True, type=float, location="json")
-            .add_argument("score_threshold", required=True, type=float, location="json")
+        parser.add_argument("embedding_provider_name", required=True, type=str, location="json")
-            .add_argument("embedding_provider_name", required=True, type=str, location="json")
+        parser.add_argument("embedding_model_name", required=True, type=str, location="json")
            .add_argument("embedding_model_name", required=True, type=str, location="json")
        )
        args = parser.parse_args()
        if action == "enable":
            result = AppAnnotationService.enable_app_annotation(args, app_id)
@@ -62,16 +61,18 @@ class AnnotationReplyActionApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/annotation-setting")
 class AppAnnotationSettingDetailApi(Resource):
-    @console_ns.doc("get_annotation_setting")
+    @api.doc("get_annotation_setting")
-    @console_ns.doc(description="Get annotation settings for an app")
+    @api.doc(description="Get annotation settings for an app")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Annotation settings retrieved successfully")
+    @api.response(200, "Annotation settings retrieved successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def get(self, app_id):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
        result = AppAnnotationService.get_app_annotation_setting_by_app_id(app_id)
        return result, 200
@@ -79,11 +80,11 @@ class AppAnnotationSettingDetailApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/annotation-settings/<uuid:annotation_setting_id>")
 class AppAnnotationSettingUpdateApi(Resource):
-    @console_ns.doc("update_annotation_setting")
+    @api.doc("update_annotation_setting")
-    @console_ns.doc(description="Update annotation settings for an app")
+    @api.doc(description="Update annotation settings for an app")
-    @console_ns.doc(params={"app_id": "Application ID", "annotation_setting_id": "Annotation setting ID"})
+    @api.doc(params={"app_id": "Application ID", "annotation_setting_id": "Annotation setting ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "AnnotationSettingUpdateRequest",
            {
                "score_threshold": fields.Float(required=True, description="Score threshold"),
@@ -92,17 +93,20 @@ class AppAnnotationSettingUpdateApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "Settings updated successfully")
+    @api.response(200, "Settings updated successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self, app_id, annotation_setting_id):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
        annotation_setting_id = str(annotation_setting_id)
-        parser = reqparse.RequestParser().add_argument("score_threshold", required=True, type=float, location="json")
+        parser = reqparse.RequestParser()
        parser.add_argument("score_threshold", required=True, type=float, location="json")
        args = parser.parse_args()
        result = AppAnnotationService.update_app_annotation_setting(app_id, annotation_setting_id, args)
@@ -111,17 +115,19 @@ class AppAnnotationSettingUpdateApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/annotation-reply/<string:action>/status/<uuid:job_id>")
 class AnnotationReplyActionStatusApi(Resource):
-    @console_ns.doc("get_annotation_reply_action_status")
+    @api.doc("get_annotation_reply_action_status")
-    @console_ns.doc(description="Get status of annotation reply action job")
+    @api.doc(description="Get status of annotation reply action job")
-    @console_ns.doc(params={"app_id": "Application ID", "job_id": "Job ID", "action": "Action type"})
+    @api.doc(params={"app_id": "Application ID", "job_id": "Job ID", "action": "Action type"})
-    @console_ns.response(200, "Job status retrieved successfully")
+    @api.response(200, "Job status retrieved successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_resource_check("annotation")
    @edit_permission_required
    def get(self, app_id, job_id, action):
        if not current_user.is_editor:
            raise Forbidden()
        job_id = str(job_id)
        app_annotation_job_key = f"{action}_app_annotation_job_{str(job_id)}"
        cache_result = redis_client.get(app_annotation_job_key)
@@ -139,22 +145,24 @@ class AnnotationReplyActionStatusApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/annotations")
 class AnnotationApi(Resource):
-    @console_ns.doc("list_annotations")
+    @api.doc("list_annotations")
-    @console_ns.doc(description="Get annotations for an app with pagination")
+    @api.doc(description="Get annotations for an app with pagination")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.parser()
+        api.parser()
        .add_argument("page", type=int, location="args", default=1, help="Page number")
        .add_argument("limit", type=int, location="args", default=20, help="Page size")
        .add_argument("keyword", type=str, location="args", default="", help="Search keyword")
    )
-    @console_ns.response(200, "Annotations retrieved successfully")
+    @api.response(200, "Annotations retrieved successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def get(self, app_id):
        if not current_user.is_editor:
            raise Forbidden()
        page = request.args.get("page", default=1, type=int)
        limit = request.args.get("limit", default=20, type=int)
        keyword = request.args.get("keyword", default="", type=str)
@@ -170,48 +178,45 @@ class AnnotationApi(Resource):
        }
        return response, 200
-    @console_ns.doc("create_annotation")
+    @api.doc("create_annotation")
-    @console_ns.doc(description="Create a new annotation for an app")
+    @api.doc(description="Create a new annotation for an app")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "CreateAnnotationRequest",
            {
-                "message_id": fields.String(description="Message ID (optional)"),
+                "question": fields.String(required=True, description="Question text"),
-                "question": fields.String(description="Question text (required when message_id not provided)"),
+                "answer": fields.String(required=True, description="Answer text"),
                "answer": fields.String(description="Answer text (use 'answer' or 'content')"),
                "content": fields.String(description="Content text (use 'answer' or 'content')"),
                "annotation_reply": fields.Raw(description="Annotation reply data"),
            },
        )
    )
-    @console_ns.response(201, "Annotation created successfully", build_annotation_model(console_ns))
+    @api.response(201, "Annotation created successfully", annotation_fields)
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_resource_check("annotation")
    @marshal_with(annotation_fields)
    @edit_permission_required
    def post(self, app_id):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("question", required=True, type=str, location="json")
-            .add_argument("message_id", required=False, type=uuid_value, location="json")
+        parser.add_argument("answer", required=True, type=str, location="json")
            .add_argument("question", required=False, type=str, location="json")
            .add_argument("answer", required=False, type=str, location="json")
            .add_argument("content", required=False, type=str, location="json")
            .add_argument("annotation_reply", required=False, type=dict, location="json")
        )
        args = parser.parse_args()
-        annotation = AppAnnotationService.up_insert_app_annotation_from_message(args, app_id)
+        annotation = AppAnnotationService.insert_app_annotation_directly(args, app_id)
        return annotation
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def delete(self, app_id):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
        # Use request.args.getlist to get annotation_ids array directly
@@ -236,51 +241,46 @@ class AnnotationApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/annotations/export")
 class AnnotationExportApi(Resource):
-    @console_ns.doc("export_annotations")
+    @api.doc("export_annotations")
-    @console_ns.doc(description="Export all annotations for an app")
+    @api.doc(description="Export all annotations for an app")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(
+    @api.response(200, "Annotations exported successfully", fields.List(fields.Nested(annotation_fields)))
-        200,
+    @api.response(403, "Insufficient permissions")
        "Annotations exported successfully",
        console_ns.model("AnnotationList", {"data": fields.List(fields.Nested(build_annotation_model(console_ns)))}),
    )
    @console_ns.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def get(self, app_id):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
        annotation_list = AppAnnotationService.export_annotation_list_by_app_id(app_id)
        response = {"data": marshal(annotation_list, annotation_fields)}
        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):
-    @console_ns.doc("update_delete_annotation")
+    @api.doc("update_delete_annotation")
-    @console_ns.doc(description="Update or delete an annotation")
+    @api.doc(description="Update or delete an annotation")
-    @console_ns.doc(params={"app_id": "Application ID", "annotation_id": "Annotation ID"})
+    @api.doc(params={"app_id": "Application ID", "annotation_id": "Annotation ID"})
-    @console_ns.response(200, "Annotation updated successfully", build_annotation_model(console_ns))
+    @api.response(200, "Annotation updated successfully", annotation_fields)
-    @console_ns.response(204, "Annotation deleted successfully")
+    @api.response(204, "Annotation deleted successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @console_ns.expect(parser)
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_resource_check("annotation")
    @edit_permission_required
    @marshal_with(annotation_fields)
    def post(self, app_id, annotation_id):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
        annotation_id = str(annotation_id)
        parser = reqparse.RequestParser()
        parser.add_argument("question", required=True, type=str, location="json")
        parser.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
@@ -288,8 +288,10 @@ class AnnotationUpdateDeleteApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def delete(self, app_id, annotation_id):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
        annotation_id = str(annotation_id)
        AppAnnotationService.delete_app_annotation(app_id, annotation_id)
@@ -298,18 +300,20 @@ class AnnotationUpdateDeleteApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/annotations/batch-import")
 class AnnotationBatchImportApi(Resource):
-    @console_ns.doc("batch_import_annotations")
+    @api.doc("batch_import_annotations")
-    @console_ns.doc(description="Batch import annotations from CSV file")
+    @api.doc(description="Batch import annotations from CSV file")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Batch import started successfully")
+    @api.response(200, "Batch import started successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
-    @console_ns.response(400, "No file uploaded or too many files")
+    @api.response(400, "No file uploaded or too many files")
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_resource_check("annotation")
    @edit_permission_required
    def post(self, app_id):
        if not current_user.is_editor:
            raise Forbidden()
        app_id = str(app_id)
        # check file
        if "file" not in request.files:
@@ -328,17 +332,19 @@ class AnnotationBatchImportApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/annotations/batch-import-status/<uuid:job_id>")
 class AnnotationBatchImportStatusApi(Resource):
-    @console_ns.doc("get_batch_import_status")
+    @api.doc("get_batch_import_status")
-    @console_ns.doc(description="Get status of batch import job")
+    @api.doc(description="Get status of batch import job")
-    @console_ns.doc(params={"app_id": "Application ID", "job_id": "Job ID"})
+    @api.doc(params={"app_id": "Application ID", "job_id": "Job ID"})
-    @console_ns.response(200, "Job status retrieved successfully")
+    @api.response(200, "Job status retrieved successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_resource_check("annotation")
    @edit_permission_required
    def get(self, app_id, job_id):
        if not current_user.is_editor:
            raise Forbidden()
        job_id = str(job_id)
        indexing_cache_key = f"app_annotation_batch_import_{str(job_id)}"
        cache_result = redis_client.get(indexing_cache_key)
@@ -355,32 +361,25 @@ class AnnotationBatchImportStatusApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/annotations/<uuid:annotation_id>/hit-histories")
 class AnnotationHitHistoryListApi(Resource):
-    @console_ns.doc("list_annotation_hit_histories")
+    @api.doc("list_annotation_hit_histories")
-    @console_ns.doc(description="Get hit histories for an annotation")
+    @api.doc(description="Get hit histories for an annotation")
-    @console_ns.doc(params={"app_id": "Application ID", "annotation_id": "Annotation ID"})
+    @api.doc(params={"app_id": "Application ID", "annotation_id": "Annotation ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.parser()
+        api.parser()
        .add_argument("page", type=int, location="args", default=1, help="Page number")
        .add_argument("limit", type=int, location="args", default=20, help="Page size")
    )
-    @console_ns.response(
+    @api.response(
-        200,
+        200, "Hit histories retrieved successfully", fields.List(fields.Nested(annotation_hit_history_fields))
        "Hit histories retrieved successfully",
        console_ns.model(
            "AnnotationHitHistoryList",
            {
                "data": fields.List(
                    fields.Nested(console_ns.model("AnnotationHitHistoryItem", annotation_hit_history_fields))
                )
            },
        ),
    )
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def get(self, app_id, annotation_id):
        if not current_user.is_editor:
            raise Forbidden()
        page = request.args.get("page", default=1, type=int)
        limit = request.args.get("limit", default=20, type=int)
        app_id = str(app_id)
@@ -1,295 +1,96 @@
 import uuid
-from typing import Literal
+from typing import cast
-from flask import request
+from flask_login import current_user
-from flask_restx import Resource, fields, marshal, marshal_with
+from flask_restx import Resource, fields, inputs, marshal, marshal_with, reqparse
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy import select
 from sqlalchemy.orm import Session
-from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import BadRequest, Forbidden, abort
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import (
    account_initialization_required,
    cloud_edition_billing_resource_check,
    edit_permission_required,
    enterprise_license_required,
    is_admin_or_owner_required,
    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 (
+from fields.app_fields import app_detail_fields, app_detail_fields_with_site, app_pagination_fields
-    deleted_tool_fields,
+from libs.login import login_required
    model_config_fields,
    model_config_partial_fields,
    site_fields,
    tag_fields,
 )
 from fields.workflow_fields import workflow_partial_fields as _workflow_partial_fields_dict
 from libs.helper import AppIconUrlField, TimestampField
 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 Account, App
 from services.app_dsl_service import AppDslService, ImportMode
 from services.app_service import AppService
 from services.enterprise.enterprise_service import EnterpriseService
 from services.feature_service import FeatureService
 ALLOW_CREATE_APP_MODES = ["chat", "agent-chat", "advanced-chat", "workflow", "completion"]
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class AppListQuery(BaseModel):
    page: int = Field(default=1, ge=1, le=99999, description="Page number (1-99999)")
    limit: int = Field(default=20, ge=1, le=100, description="Page size (1-100)")
    mode: Literal["completion", "chat", "advanced-chat", "workflow", "agent-chat", "channel", "all"] = Field(
        default="all", description="App mode filter"
    )
    name: str | None = Field(default=None, description="Filter by app name")
    tag_ids: list[str] | None = Field(default=None, description="Comma-separated tag IDs")
    is_created_by_me: bool | None = Field(default=None, description="Filter by creator")
    @field_validator("tag_ids", mode="before")
    @classmethod
    def validate_tag_ids(cls, value: str | list[str] | None) -> list[str] | None:
        if not value:
            return None
        if isinstance(value, str):
            items = [item.strip() for item in value.split(",") if item.strip()]
        elif isinstance(value, list):
            items = [str(item).strip() for item in value if item and str(item).strip()]
        else:
            raise TypeError("Unsupported tag_ids type.")
        if not items:
            return None
        try:
            return [str(uuid.UUID(item)) for item in items]
        except ValueError as exc:
            raise ValueError("Invalid UUID format in tag_ids.") from exc
 class CreateAppPayload(BaseModel):
    name: str = Field(..., min_length=1, description="App name")
    description: str | None = Field(default=None, description="App description (max 400 chars)")
    mode: Literal["chat", "agent-chat", "advanced-chat", "workflow", "completion"] = Field(..., description="App mode")
    icon_type: str | None = Field(default=None, description="Icon type")
    icon: str | None = Field(default=None, description="Icon")
    icon_background: str | None = Field(default=None, description="Icon background color")
    @field_validator("description")
    @classmethod
    def validate_description(cls, value: str | None) -> str | None:
        if value is None:
            return value
        return validate_description_length(value)
 class UpdateAppPayload(BaseModel):
    name: str = Field(..., min_length=1, description="App name")
    description: str | None = Field(default=None, description="App description (max 400 chars)")
    icon_type: str | None = Field(default=None, description="Icon type")
    icon: str | None = Field(default=None, description="Icon")
    icon_background: str | None = Field(default=None, description="Icon background color")
    use_icon_as_answer_icon: bool | None = Field(default=None, description="Use icon as answer icon")
    max_active_requests: int | None = Field(default=None, description="Maximum active requests")
    @field_validator("description")
    @classmethod
    def validate_description(cls, value: str | None) -> str | None:
        if value is None:
            return value
        return validate_description_length(value)
 class CopyAppPayload(BaseModel):
    name: str | None = Field(default=None, description="Name for the copied app")
    description: str | None = Field(default=None, description="Description for the copied app")
    icon_type: str | None = Field(default=None, description="Icon type")
    icon: str | None = Field(default=None, description="Icon")
    icon_background: str | None = Field(default=None, description="Icon background color")
    @field_validator("description")
    @classmethod
    def validate_description(cls, value: str | None) -> str | None:
        if value is None:
            return value
        return validate_description_length(value)
 class AppExportQuery(BaseModel):
    include_secret: bool = Field(default=False, description="Include secrets in export")
    workflow_id: str | None = Field(default=None, description="Specific workflow ID to export")
 class AppNamePayload(BaseModel):
    name: str = Field(..., min_length=1, description="Name to check")
 class AppIconPayload(BaseModel):
    icon: str | None = Field(default=None, description="Icon data")
    icon_background: str | None = Field(default=None, description="Icon background color")
 class AppSiteStatusPayload(BaseModel):
    enable_site: bool = Field(..., description="Enable or disable site")
 class AppApiStatusPayload(BaseModel):
    enable_api: bool = Field(..., description="Enable or disable API")
 class AppTracePayload(BaseModel):
    enabled: bool = Field(..., description="Enable or disable tracing")
    tracing_provider: str = Field(..., description="Tracing provider")
 def reg(cls: type[BaseModel]):
    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
 reg(AppListQuery)
 reg(CreateAppPayload)
 reg(UpdateAppPayload)
 reg(CopyAppPayload)
 reg(AppExportQuery)
 reg(AppNamePayload)
 reg(AppIconPayload)
 reg(AppSiteStatusPayload)
 reg(AppApiStatusPayload)
 reg(AppTracePayload)
 # Register models for flask_restx to avoid dict type issues in Swagger
 # Register base models first
 tag_model = console_ns.model("Tag", tag_fields)
 workflow_partial_model = console_ns.model("WorkflowPartial", _workflow_partial_fields_dict)
 model_config_model = console_ns.model("ModelConfig", model_config_fields)
 model_config_partial_model = console_ns.model("ModelConfigPartial", model_config_partial_fields)
 deleted_tool_model = console_ns.model("DeletedTool", deleted_tool_fields)
 site_model = console_ns.model("Site", site_fields)
 app_partial_model = console_ns.model(
    "AppPartial",
    {
        "id": fields.String,
        "name": fields.String,
        "max_active_requests": fields.Raw(),
        "description": fields.String(attribute="desc_or_prompt"),
        "mode": fields.String(attribute="mode_compatible_with_agent"),
        "icon_type": fields.String,
        "icon": fields.String,
        "icon_background": fields.String,
        "icon_url": AppIconUrlField,
        "model_config": fields.Nested(model_config_partial_model, attribute="app_model_config", allow_null=True),
        "workflow": fields.Nested(workflow_partial_model, allow_null=True),
        "use_icon_as_answer_icon": fields.Boolean,
        "created_by": fields.String,
        "created_at": TimestampField,
        "updated_by": fields.String,
        "updated_at": TimestampField,
        "tags": fields.List(fields.Nested(tag_model)),
        "access_mode": fields.String,
        "create_user_name": fields.String,
        "author_name": fields.String,
        "has_draft_trigger": fields.Boolean,
    },
 )
 app_detail_model = console_ns.model(
    "AppDetail",
    {
        "id": fields.String,
        "name": fields.String,
        "description": fields.String,
        "mode": fields.String(attribute="mode_compatible_with_agent"),
        "icon": fields.String,
        "icon_background": fields.String,
        "enable_site": fields.Boolean,
        "enable_api": fields.Boolean,
        "model_config": fields.Nested(model_config_model, attribute="app_model_config", allow_null=True),
        "workflow": fields.Nested(workflow_partial_model, allow_null=True),
        "tracing": fields.Raw,
        "use_icon_as_answer_icon": fields.Boolean,
        "created_by": fields.String,
        "created_at": TimestampField,
        "updated_by": fields.String,
        "updated_at": TimestampField,
        "access_mode": fields.String,
        "tags": fields.List(fields.Nested(tag_model)),
    },
 )
 app_detail_with_site_model = console_ns.model(
    "AppDetailWithSite",
    {
        "id": fields.String,
        "name": fields.String,
        "description": fields.String,
        "mode": fields.String(attribute="mode_compatible_with_agent"),
        "icon_type": fields.String,
        "icon": fields.String,
        "icon_background": fields.String,
        "icon_url": AppIconUrlField,
        "enable_site": fields.Boolean,
        "enable_api": fields.Boolean,
        "model_config": fields.Nested(model_config_model, attribute="app_model_config", allow_null=True),
        "workflow": fields.Nested(workflow_partial_model, allow_null=True),
        "api_base_url": fields.String,
        "use_icon_as_answer_icon": fields.Boolean,
        "max_active_requests": fields.Integer,
        "created_by": fields.String,
        "created_at": TimestampField,
        "updated_by": fields.String,
        "updated_at": TimestampField,
        "deleted_tools": fields.List(fields.Nested(deleted_tool_model)),
        "access_mode": fields.String,
        "tags": fields.List(fields.Nested(tag_model)),
        "site": fields.Nested(site_model),
    },
 )
 app_pagination_model = console_ns.model(
    "AppPagination",
    {
        "page": fields.Integer,
        "limit": fields.Integer(attribute="per_page"),
        "total": fields.Integer,
        "has_more": fields.Boolean(attribute="has_next"),
        "data": fields.List(fields.Nested(app_partial_model), attribute="items"),
    },
 )
@console_ns.route("/apps")
 class AppListApi(Resource):
-    @console_ns.doc("list_apps")
+    @api.doc("list_apps")
-    @console_ns.doc(description="Get list of applications with pagination and filtering")
+    @api.doc(description="Get list of applications with pagination and filtering")
-    @console_ns.expect(console_ns.models[AppListQuery.__name__])
+    @api.expect(
-    @console_ns.response(200, "Success", app_pagination_model)
+        api.parser()
        .add_argument("page", type=int, location="args", help="Page number (1-99999)", default=1)
        .add_argument("limit", type=int, location="args", help="Page size (1-100)", default=20)
        .add_argument(
            "mode",
            type=str,
            location="args",
            choices=["completion", "chat", "advanced-chat", "workflow", "agent-chat", "channel", "all"],
            default="all",
            help="App mode filter",
        )
        .add_argument("name", type=str, location="args", help="Filter by app name")
        .add_argument("tag_ids", type=str, location="args", help="Comma-separated tag IDs")
        .add_argument("is_created_by_me", type=bool, location="args", help="Filter by creator")
    )
    @api.response(200, "Success", app_pagination_fields)
    @setup_required
    @login_required
    @account_initialization_required
    @enterprise_license_required
    def get(self):
        """Get app list"""
        current_user, current_tenant_id = current_account_with_tenant()
-        args = AppListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        def uuid_list(value):
-        args_dict = args.model_dump()
+            try:
                return [str(uuid.UUID(v)) for v in value.split(",")]
            except ValueError:
                abort(400, message="Invalid UUID format in tag_ids.")
        parser = reqparse.RequestParser()
        parser.add_argument("page", type=inputs.int_range(1, 99999), required=False, default=1, location="args")
        parser.add_argument("limit", type=inputs.int_range(1, 100), required=False, default=20, location="args")
        parser.add_argument(
            "mode",
            type=str,
            choices=[
                "completion",
                "chat",
                "advanced-chat",
                "workflow",
                "agent-chat",
                "channel",
                "all",
            ],
            default="all",
            location="args",
            required=False,
        )
        parser.add_argument("name", type=str, location="args", required=False)
        parser.add_argument("tag_ids", type=uuid_list, location="args", required=False)
        parser.add_argument("is_created_by_me", type=inputs.boolean, location="args", required=False)
        args = parser.parse_args()
        # get app list
        app_service = AppService()
-        app_pagination = app_service.get_paginate_apps(current_user.id, current_tenant_id, args_dict)
+        app_pagination = app_service.get_paginate_apps(current_user.id, current_user.current_tenant_id, args)
        if not app_pagination:
            return {"data": [], "total": 0, "page": 1, "limit": 20, "has_more": False}
@@ -303,72 +104,71 @@ class AppListApi(Resource):
                if str(app.id) in res:
                    app.access_mode = res[str(app.id)].access_mode
-        workflow_capable_app_ids = [
+        return marshal(app_pagination, app_pagination_fields), 200
            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:
+    @api.doc("create_app")
-            app.has_draft_trigger = str(app.id) in draft_trigger_app_ids
+    @api.doc(description="Create a new application")
-
+    @api.expect(
-        return marshal(app_pagination, app_pagination_model), 200
+        api.model(
-
+            "CreateAppRequest",
-    @console_ns.doc("create_app")
+            {
-    @console_ns.doc(description="Create a new application")
+                "name": fields.String(required=True, description="App name"),
-    @console_ns.expect(console_ns.models[CreateAppPayload.__name__])
+                "description": fields.String(description="App description (max 400 chars)"),
-    @console_ns.response(201, "App created successfully", app_detail_model)
+                "mode": fields.String(required=True, enum=ALLOW_CREATE_APP_MODES, description="App mode"),
-    @console_ns.response(403, "Insufficient permissions")
+                "icon_type": fields.String(description="Icon type"),
-    @console_ns.response(400, "Invalid request parameters")
+                "icon": fields.String(description="Icon"),
                "icon_background": fields.String(description="Icon background color"),
            },
        )
    )
    @api.response(201, "App created successfully", app_detail_fields)
    @api.response(403, "Insufficient permissions")
    @api.response(400, "Invalid request parameters")
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(app_detail_model)
+    @marshal_with(app_detail_fields)
    @cloud_edition_billing_resource_check("apps")
    @edit_permission_required
    def post(self):
        """Create app"""
-        current_user, current_tenant_id = current_account_with_tenant()
+        parser = reqparse.RequestParser()
-        args = CreateAppPayload.model_validate(console_ns.payload)
+        parser.add_argument("name", type=str, required=True, location="json")
        parser.add_argument("description", type=validate_description_length, location="json")
        parser.add_argument("mode", type=str, choices=ALLOW_CREATE_APP_MODES, location="json")
        parser.add_argument("icon_type", type=str, location="json")
        parser.add_argument("icon", type=str, location="json")
        parser.add_argument("icon_background", type=str, location="json")
        args = parser.parse_args()
        # The role of the current user in the ta table must be admin, owner, or editor
        if not current_user.is_editor:
            raise Forbidden()
        if "mode" not in args or args["mode"] is None:
            raise BadRequest("mode is required")
        app_service = AppService()
-        app = app_service.create_app(current_tenant_id, args.model_dump(), current_user)
+        if not isinstance(current_user, Account):
            raise ValueError("current_user must be an Account instance")
        if current_user.current_tenant_id is None:
            raise ValueError("current_user.current_tenant_id cannot be None")
        app = app_service.create_app(current_user.current_tenant_id, args, current_user)
        return app, 201
@console_ns.route("/apps/<uuid:app_id>")
 class AppApi(Resource):
-    @console_ns.doc("get_app_detail")
+    @api.doc("get_app_detail")
-    @console_ns.doc(description="Get application details")
+    @api.doc(description="Get application details")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Success", app_detail_with_site_model)
+    @api.response(200, "Success", app_detail_fields_with_site)
    @setup_required
    @login_required
    @account_initialization_required
    @enterprise_license_required
    @get_app_model
-    @marshal_with(app_detail_with_site_model)
+    @marshal_with(app_detail_fields_with_site)
    def get(self, app_model):
        """Get app detail"""
        app_service = AppService()
@@ -381,50 +181,79 @@ class AppApi(Resource):
        return app_model
-    @console_ns.doc("update_app")
+    @api.doc("update_app")
-    @console_ns.doc(description="Update application details")
+    @api.doc(description="Update application details")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[UpdateAppPayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "App updated successfully", app_detail_with_site_model)
+        api.model(
-    @console_ns.response(403, "Insufficient permissions")
+            "UpdateAppRequest",
-    @console_ns.response(400, "Invalid request parameters")
+            {
                "name": fields.String(required=True, description="App name"),
                "description": fields.String(description="App description (max 400 chars)"),
                "icon_type": fields.String(description="Icon type"),
                "icon": fields.String(description="Icon"),
                "icon_background": fields.String(description="Icon background color"),
                "use_icon_as_answer_icon": fields.Boolean(description="Use icon as answer icon"),
                "max_active_requests": fields.Integer(description="Maximum active requests"),
            },
        )
    )
    @api.response(200, "App updated successfully", app_detail_fields_with_site)
    @api.response(403, "Insufficient permissions")
    @api.response(400, "Invalid request parameters")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model
-    @edit_permission_required
+    @marshal_with(app_detail_fields_with_site)
    @marshal_with(app_detail_with_site_model)
    def put(self, app_model):
        """Update app"""
-        args = UpdateAppPayload.model_validate(console_ns.payload)
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not current_user.is_editor:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("name", type=str, required=True, nullable=False, location="json")
        parser.add_argument("description", type=validate_description_length, location="json")
        parser.add_argument("icon_type", type=str, location="json")
        parser.add_argument("icon", type=str, location="json")
        parser.add_argument("icon_background", type=str, location="json")
        parser.add_argument("use_icon_as_answer_icon", type=bool, location="json")
        parser.add_argument("max_active_requests", type=int, location="json")
        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,
+            "name": args["name"],
-            "description": args.description or "",
+            "description": args.get("description", ""),
-            "icon_type": args.icon_type or "",
+            "icon_type": args.get("icon_type", ""),
-            "icon": args.icon or "",
+            "icon": args.get("icon", ""),
-            "icon_background": args.icon_background or "",
+            "icon_background": args.get("icon_background", ""),
-            "use_icon_as_answer_icon": args.use_icon_as_answer_icon or False,
+            "use_icon_as_answer_icon": args.get("use_icon_as_answer_icon", False),
-            "max_active_requests": args.max_active_requests or 0,
+            "max_active_requests": args.get("max_active_requests", 0),
        }
        app_model = app_service.update_app(app_model, args_dict)
        return app_model
-    @console_ns.doc("delete_app")
+    @api.doc("delete_app")
-    @console_ns.doc(description="Delete application")
+    @api.doc(description="Delete application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(204, "App deleted successfully")
+    @api.response(204, "App deleted successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def delete(self, app_model):
        """Delete app"""
        # The role of the current user in the ta table must be admin, owner, or editor
        if not current_user.is_editor:
            raise Forbidden()
        app_service = AppService()
        app_service.delete_app(app_model)
@@ -433,37 +262,55 @@ class AppApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/copy")
 class AppCopyApi(Resource):
-    @console_ns.doc("copy_app")
+    @api.doc("copy_app")
-    @console_ns.doc(description="Create a copy of an existing application")
+    @api.doc(description="Create a copy of an existing application")
-    @console_ns.doc(params={"app_id": "Application ID to copy"})
+    @api.doc(params={"app_id": "Application ID to copy"})
-    @console_ns.expect(console_ns.models[CopyAppPayload.__name__])
+    @api.expect(
-    @console_ns.response(201, "App copied successfully", app_detail_with_site_model)
+        api.model(
-    @console_ns.response(403, "Insufficient permissions")
+            "CopyAppRequest",
            {
                "name": fields.String(description="Name for the copied app"),
                "description": fields.String(description="Description for the copied app"),
                "icon_type": fields.String(description="Icon type"),
                "icon": fields.String(description="Icon"),
                "icon_background": fields.String(description="Icon background color"),
            },
        )
    )
    @api.response(201, "App copied successfully", app_detail_fields_with_site)
    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model
-    @edit_permission_required
+    @marshal_with(app_detail_fields_with_site)
    @marshal_with(app_detail_with_site_model)
    def post(self, app_model):
        """Copy app"""
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not current_user.is_editor:
            raise Forbidden()
-        args = CopyAppPayload.model_validate(console_ns.payload or {})
+        parser = reqparse.RequestParser()
        parser.add_argument("name", type=str, location="json")
        parser.add_argument("description", type=validate_description_length, location="json")
        parser.add_argument("icon_type", type=str, location="json")
        parser.add_argument("icon", type=str, location="json")
        parser.add_argument("icon_background", type=str, location="json")
        args = parser.parse_args()
        with Session(db.engine) as session:
            import_service = AppDslService(session)
            yaml_content = import_service.export_dsl(app_model=app_model, include_secret=True)
            account = cast(Account, current_user)
            result = import_service.import_app(
-                account=current_user,
+                account=account,
                import_mode=ImportMode.YAML_CONTENT,
                yaml_content=yaml_content,
-                name=args.name,
+                name=args.get("name"),
-                description=args.description,
+                description=args.get("description"),
-                icon_type=args.icon_type,
+                icon_type=args.get("icon_type"),
-                icon=args.icon,
+                icon=args.get("icon"),
-                icon_background=args.icon_background,
+                icon_background=args.get("icon_background"),
            )
            session.commit()
@@ -475,131 +322,178 @@ class AppCopyApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/export")
 class AppExportApi(Resource):
-    @console_ns.doc("export_app")
+    @api.doc("export_app")
-    @console_ns.doc(description="Export application configuration as DSL")
+    @api.doc(description="Export application configuration as DSL")
-    @console_ns.doc(params={"app_id": "Application ID to export"})
+    @api.doc(params={"app_id": "Application ID to export"})
-    @console_ns.expect(console_ns.models[AppExportQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        api.parser()
        .add_argument("include_secret", type=bool, location="args", default=False, help="Include secrets in export")
        .add_argument("workflow_id", type=str, location="args", help="Specific workflow ID to export")
    )
    @api.response(
        200,
        "App exported successfully",
-        console_ns.model("AppExportResponse", {"data": fields.String(description="DSL export data")}),
+        api.model("AppExportResponse", {"data": fields.String(description="DSL export data")}),
    )
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def get(self, app_model):
        """Export app"""
-        args = AppExportQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not current_user.is_editor:
            raise Forbidden()
        # Add include_secret params
        parser = reqparse.RequestParser()
        parser.add_argument("include_secret", type=inputs.boolean, default=False, location="args")
        parser.add_argument("workflow_id", type=str, location="args")
        args = parser.parse_args()
        return {
            "data": AppDslService.export_dsl(
-                app_model=app_model,
+                app_model=app_model, include_secret=args["include_secret"], workflow_id=args.get("workflow_id")
                include_secret=args.include_secret,
                workflow_id=args.workflow_id,
            )
        }
@console_ns.route("/apps/<uuid:app_id>/name")
 class AppNameApi(Resource):
-    @console_ns.doc("check_app_name")
+    @api.doc("check_app_name")
-    @console_ns.doc(description="Check if app name is available")
+    @api.doc(description="Check if app name is available")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[AppNamePayload.__name__])
+    @api.expect(api.parser().add_argument("name", type=str, required=True, location="args", help="Name to check"))
-    @console_ns.response(200, "Name availability checked")
+    @api.response(200, "Name availability checked")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model
-    @marshal_with(app_detail_model)
+    @marshal_with(app_detail_fields)
    @edit_permission_required
    def post(self, app_model):
-        args = AppNamePayload.model_validate(console_ns.payload)
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not current_user.is_editor:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("name", type=str, required=True, location="json")
        args = parser.parse_args()
        app_service = AppService()
-        app_model = app_service.update_app_name(app_model, args.name)
+        app_model = app_service.update_app_name(app_model, args["name"])
        return app_model
@console_ns.route("/apps/<uuid:app_id>/icon")
 class AppIconApi(Resource):
-    @console_ns.doc("update_app_icon")
+    @api.doc("update_app_icon")
-    @console_ns.doc(description="Update application icon")
+    @api.doc(description="Update application icon")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[AppIconPayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Icon updated successfully")
+        api.model(
-    @console_ns.response(403, "Insufficient permissions")
+            "AppIconRequest",
            {
                "icon": fields.String(required=True, description="Icon data"),
                "icon_type": fields.String(description="Icon type"),
                "icon_background": fields.String(description="Icon background color"),
            },
        )
    )
    @api.response(200, "Icon updated successfully")
    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model
-    @marshal_with(app_detail_model)
+    @marshal_with(app_detail_fields)
    @edit_permission_required
    def post(self, app_model):
-        args = AppIconPayload.model_validate(console_ns.payload or {})
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not current_user.is_editor:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("icon", type=str, location="json")
        parser.add_argument("icon_background", type=str, location="json")
        args = parser.parse_args()
        app_service = AppService()
-        app_model = app_service.update_app_icon(app_model, args.icon or "", args.icon_background or "")
+        app_model = app_service.update_app_icon(app_model, args.get("icon") or "", args.get("icon_background") or "")
        return app_model
@console_ns.route("/apps/<uuid:app_id>/site-enable")
 class AppSiteStatus(Resource):
-    @console_ns.doc("update_app_site_status")
+    @api.doc("update_app_site_status")
-    @console_ns.doc(description="Enable or disable app site")
+    @api.doc(description="Enable or disable app site")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[AppSiteStatusPayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Site status updated successfully", app_detail_model)
+        api.model(
-    @console_ns.response(403, "Insufficient permissions")
+            "AppSiteStatusRequest", {"enable_site": fields.Boolean(required=True, description="Enable or disable site")}
        )
    )
    @api.response(200, "Site status updated successfully", app_detail_fields)
    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model
-    @marshal_with(app_detail_model)
+    @marshal_with(app_detail_fields)
    @edit_permission_required
    def post(self, app_model):
-        args = AppSiteStatusPayload.model_validate(console_ns.payload)
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not current_user.is_editor:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("enable_site", type=bool, required=True, location="json")
        args = parser.parse_args()
        app_service = AppService()
-        app_model = app_service.update_app_site_status(app_model, args.enable_site)
+        app_model = app_service.update_app_site_status(app_model, args["enable_site"])
        return app_model
@console_ns.route("/apps/<uuid:app_id>/api-enable")
 class AppApiStatus(Resource):
-    @console_ns.doc("update_app_api_status")
+    @api.doc("update_app_api_status")
-    @console_ns.doc(description="Enable or disable app API")
+    @api.doc(description="Enable or disable app API")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[AppApiStatusPayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "API status updated successfully", app_detail_model)
+        api.model(
-    @console_ns.response(403, "Insufficient permissions")
+            "AppApiStatusRequest", {"enable_api": fields.Boolean(required=True, description="Enable or disable API")}
        )
    )
    @api.response(200, "API status updated successfully", app_detail_fields)
    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @is_admin_or_owner_required
    @account_initialization_required
    @get_app_model
-    @marshal_with(app_detail_model)
+    @marshal_with(app_detail_fields)
    def post(self, app_model):
-        args = AppApiStatusPayload.model_validate(console_ns.payload)
+        # The role of the current user in the ta table must be admin or owner
        if not current_user.is_admin_or_owner:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("enable_api", type=bool, required=True, location="json")
        args = parser.parse_args()
        app_service = AppService()
-        app_model = app_service.update_app_api_status(app_model, args.enable_api)
+        app_model = app_service.update_app_api_status(app_model, args["enable_api"])
        return app_model
@console_ns.route("/apps/<uuid:app_id>/trace")
 class AppTraceApi(Resource):
-    @console_ns.doc("get_app_trace")
+    @api.doc("get_app_trace")
-    @console_ns.doc(description="Get app tracing configuration")
+    @api.doc(description="Get app tracing configuration")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Trace configuration retrieved successfully")
+    @api.response(200, "Trace configuration retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
@@ -609,24 +503,36 @@ class AppTraceApi(Resource):
        return app_trace_config
-    @console_ns.doc("update_app_trace")
+    @api.doc("update_app_trace")
-    @console_ns.doc(description="Update app tracing configuration")
+    @api.doc(description="Update app tracing configuration")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[AppTracePayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Trace configuration updated successfully")
+        api.model(
-    @console_ns.response(403, "Insufficient permissions")
+            "AppTraceRequest",
            {
                "enabled": fields.Boolean(required=True, description="Enable or disable tracing"),
                "tracing_provider": fields.String(required=True, description="Tracing provider"),
            },
        )
    )
    @api.response(200, "Trace configuration updated successfully")
    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self, app_id):
        # add app trace
-        args = AppTracePayload.model_validate(console_ns.payload)
+        if not current_user.is_editor:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("enabled", type=bool, required=True, location="json")
        parser.add_argument("tracing_provider", type=str, required=True, location="json")
        args = parser.parse_args()
        OpsTraceManager.update_app_tracing_config(
            app_id=app_id,
-            enabled=args.enabled,
+            enabled=args["enabled"],
-            tracing_provider=args.tracing_provider,
+            tracing_provider=args["tracing_provider"],
        )
        return {"result": "success"}
@@ -1,20 +1,20 @@
-from flask_restx import Resource, fields, marshal_with, reqparse
+from typing import cast
 from flask_login import current_user
 from flask_restx import Resource, marshal_with, reqparse
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import (
    account_initialization_required,
    cloud_edition_billing_resource_check,
    edit_permission_required,
    setup_required,
 )
 from extensions.ext_database import db
-from fields.app_fields import (
+from fields.app_fields import app_import_check_dependencies_fields, app_import_fields
-    app_import_check_dependencies_fields,
+from libs.login import login_required
-    app_import_fields,
+from models import Account
    leaked_dependency_fields,
 )
 from libs.login import current_account_with_tenant, login_required
 from models.model import App
 from services.app_dsl_service import AppDslService, ImportStatus
 from services.enterprise.enterprise_service import EnterpriseService
@@ -22,52 +22,36 @@ from services.feature_service import FeatureService
 from .. import console_ns
 # Register models for flask_restx to avoid dict type issues in Swagger
 # Register base model first
 leaked_dependency_model = console_ns.model("LeakedDependency", leaked_dependency_fields)
 app_import_model = console_ns.model("AppImport", app_import_fields)
 # For nested models, need to replace nested dict with registered model
 app_import_check_dependencies_fields_copy = app_import_check_dependencies_fields.copy()
 app_import_check_dependencies_fields_copy["leaked_dependencies"] = fields.List(fields.Nested(leaked_dependency_model))
 app_import_check_dependencies_model = console_ns.model(
    "AppImportCheckDependencies", app_import_check_dependencies_fields_copy
 )
 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):
    @console_ns.expect(parser)
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(app_import_model)
+    @marshal_with(app_import_fields)
    @cloud_edition_billing_resource_check("apps")
    @edit_permission_required
    def post(self):
        # Check user role first
-        current_user, _ = current_account_with_tenant()
+        if not current_user.is_editor:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("mode", type=str, required=True, location="json")
        parser.add_argument("yaml_content", type=str, location="json")
        parser.add_argument("yaml_url", type=str, location="json")
        parser.add_argument("name", type=str, location="json")
        parser.add_argument("description", type=str, location="json")
        parser.add_argument("icon_type", type=str, location="json")
        parser.add_argument("icon", type=str, location="json")
        parser.add_argument("icon_background", type=str, location="json")
        parser.add_argument("app_id", type=str, location="json")
        args = parser.parse_args()
        # Create service with session
        with Session(db.engine) as session:
            import_service = AppDslService(session)
            # Import app
-            account = current_user
+            account = cast(Account, current_user)
            result = import_service.import_app(
                account=account,
                import_mode=args["mode"],
@@ -98,17 +82,17 @@ class AppImportConfirmApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(app_import_model)
+    @marshal_with(app_import_fields)
    @edit_permission_required
    def post(self, import_id):
        # Check user role first
-        current_user, _ = current_account_with_tenant()
+        if not current_user.is_editor:
            raise Forbidden()
        # Create service with session
        with Session(db.engine) as session:
            import_service = AppDslService(session)
            # Confirm import
-            account = current_user
+            account = cast(Account, current_user)
            result = import_service.confirm_import(import_id=import_id, account=account)
            session.commit()
@@ -124,9 +108,11 @@ class AppImportCheckDependenciesApi(Resource):
    @login_required
    @get_app_model
    @account_initialization_required
-    @marshal_with(app_import_check_dependencies_model)
+    @marshal_with(app_import_check_dependencies_fields)
    @edit_permission_required
    def get(self, app_model: App):
        if not current_user.is_editor:
            raise Forbidden()
        with Session(db.engine) as session:
            import_service = AppDslService(session)
            result = import_service.check_dependencies(app_model=app_model)
@@ -5,7 +5,7 @@ from flask_restx import Resource, fields, reqparse
 from werkzeug.exceptions import InternalServerError
 import services
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.error import (
    AppUnavailableError,
    AudioTooLargeError,
@@ -36,16 +36,16 @@ logger = logging.getLogger(__name__)
@console_ns.route("/apps/<uuid:app_id>/audio-to-text")
 class ChatMessageAudioApi(Resource):
-    @console_ns.doc("chat_message_audio_transcript")
+    @api.doc("chat_message_audio_transcript")
-    @console_ns.doc(description="Transcript audio to text for chat messages")
+    @api.doc(description="Transcript audio to text for chat messages")
-    @console_ns.doc(params={"app_id": "App ID"})
+    @api.doc(params={"app_id": "App ID"})
-    @console_ns.response(
+    @api.response(
        200,
        "Audio transcription successful",
-        console_ns.model("AudioTranscriptResponse", {"text": fields.String(description="Transcribed text from audio")}),
+        api.model("AudioTranscriptResponse", {"text": fields.String(description="Transcribed text from audio")}),
    )
-    @console_ns.response(400, "Bad request - No audio uploaded or unsupported type")
+    @api.response(400, "Bad request - No audio uploaded or unsupported type")
-    @console_ns.response(413, "Audio file too large")
+    @api.response(413, "Audio file too large")
    @setup_required
    @login_required
    @account_initialization_required
@@ -89,11 +89,11 @@ class ChatMessageAudioApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/text-to-audio")
 class ChatMessageTextApi(Resource):
-    @console_ns.doc("chat_message_text_to_speech")
+    @api.doc("chat_message_text_to_speech")
-    @console_ns.doc(description="Convert text to speech for chat messages")
+    @api.doc(description="Convert text to speech for chat messages")
-    @console_ns.doc(params={"app_id": "App ID"})
+    @api.doc(params={"app_id": "App ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "TextToSpeechRequest",
            {
                "message_id": fields.String(description="Message ID"),
@@ -103,21 +103,19 @@ class ChatMessageTextApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "Text to speech conversion successful")
+    @api.response(200, "Text to speech conversion successful")
-    @console_ns.response(400, "Bad request - Invalid parameters")
+    @api.response(400, "Bad request - Invalid parameters")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    def post(self, app_model: App):
        try:
-            parser = (
+            parser = reqparse.RequestParser()
-                reqparse.RequestParser()
+            parser.add_argument("message_id", type=str, location="json")
-                .add_argument("message_id", type=str, location="json")
+            parser.add_argument("text", type=str, location="json")
-                .add_argument("text", type=str, location="json")
+            parser.add_argument("voice", type=str, location="json")
-                .add_argument("voice", type=str, location="json")
+            parser.add_argument("streaming", type=bool, location="json")
                .add_argument("streaming", type=bool, location="json")
            )
            args = parser.parse_args()
            message_id = args.get("message_id", None)
@@ -156,23 +154,20 @@ class ChatMessageTextApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/text-to-audio/voices")
 class TextModesApi(Resource):
-    @console_ns.doc("get_text_to_speech_voices")
+    @api.doc("get_text_to_speech_voices")
-    @console_ns.doc(description="Get available TTS voices for a specific language")
+    @api.doc(description="Get available TTS voices for a specific language")
-    @console_ns.doc(params={"app_id": "App ID"})
+    @api.doc(params={"app_id": "App ID"})
-    @console_ns.expect(
+    @api.expect(api.parser().add_argument("language", type=str, required=True, location="args", help="Language code"))
-        console_ns.parser().add_argument("language", type=str, required=True, location="args", help="Language code")
+    @api.response(200, "TTS voices retrieved successfully", fields.List(fields.Raw(description="Available voices")))
-    )
+    @api.response(400, "Invalid language parameter")
    @console_ns.response(
        200, "TTS voices retrieved successfully", fields.List(fields.Raw(description="Available voices"))
    )
    @console_ns.response(400, "Invalid language parameter")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, app_model):
        try:
-            parser = reqparse.RequestParser().add_argument("language", type=str, required=True, location="args")
+            parser = reqparse.RequestParser()
            parser.add_argument("language", type=str, required=True, location="args")
            args = parser.parse_args()
            response = AudioService.transcript_tts_voices(
@@ -1,13 +1,11 @@
 import logging
 from typing import Any, Literal
 from flask import request
-from flask_restx import Resource
+from flask_restx import Resource, fields, reqparse
-from pydantic import BaseModel, Field, field_validator
+from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 from werkzeug.exceptions import InternalServerError, NotFound
 import services
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.error import (
    AppUnavailableError,
    CompletionRequestError,
@@ -17,8 +15,9 @@ from controllers.console.app.error import (
    ProviderQuotaExceededError,
 )
 from controllers.console.app.wraps import get_app_model
-from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
+from controllers.console.wraps import account_initialization_required, setup_required
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import (
    ModelCurrentlyNotSupportError,
@@ -33,66 +32,48 @@ from libs.login import current_user, login_required
 from models import Account
 from models.model import AppMode
 from services.app_generate_service import AppGenerateService
 from services.app_task_service import AppTaskService
 from services.errors.llm import InvokeRateLimitError
 logger = logging.getLogger(__name__)
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class BaseMessagePayload(BaseModel):
    inputs: dict[str, Any]
    model_config_data: dict[str, Any] = Field(..., alias="model_config")
    files: list[Any] | None = Field(default=None, description="Uploaded files")
    response_mode: Literal["blocking", "streaming"] = Field(default="blocking", description="Response mode")
    retriever_from: str = Field(default="dev", description="Retriever source")
 class CompletionMessagePayload(BaseMessagePayload):
    query: str = Field(default="", description="Query text")
 class ChatMessagePayload(BaseMessagePayload):
    query: str = Field(..., description="User query")
    conversation_id: str | None = Field(default=None, description="Conversation ID")
    parent_message_id: str | None = Field(default=None, description="Parent message ID")
    @field_validator("conversation_id", "parent_message_id")
    @classmethod
    def validate_uuid(cls, value: str | None) -> str | None:
        if value is None:
            return value
        return uuid_value(value)
 console_ns.schema_model(
    CompletionMessagePayload.__name__,
    CompletionMessagePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
 console_ns.schema_model(
    ChatMessagePayload.__name__, ChatMessagePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
 )
 # define completion message api for user
@console_ns.route("/apps/<uuid:app_id>/completion-messages")
 class CompletionMessageApi(Resource):
-    @console_ns.doc("create_completion_message")
+    @api.doc("create_completion_message")
-    @console_ns.doc(description="Generate completion message for debugging")
+    @api.doc(description="Generate completion message for debugging")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[CompletionMessagePayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Completion generated successfully")
+        api.model(
-    @console_ns.response(400, "Invalid request parameters")
+            "CompletionMessageRequest",
-    @console_ns.response(404, "App not found")
+            {
                "inputs": fields.Raw(required=True, description="Input variables"),
                "query": fields.String(description="Query text", default=""),
                "files": fields.List(fields.Raw(), description="Uploaded files"),
                "model_config": fields.Raw(required=True, description="Model configuration"),
                "response_mode": fields.String(enum=["blocking", "streaming"], description="Response mode"),
                "retriever_from": fields.String(default="dev", description="Retriever source"),
            },
        )
    )
    @api.response(200, "Completion generated successfully")
    @api.response(400, "Invalid request parameters")
    @api.response(404, "App not found")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=AppMode.COMPLETION)
    def post(self, app_model):
-        args_model = CompletionMessagePayload.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
-        args = args_model.model_dump(exclude_none=True, by_alias=True)
+        parser.add_argument("inputs", type=dict, required=True, location="json")
        parser.add_argument("query", type=str, location="json", default="")
        parser.add_argument("files", type=list, required=False, location="json")
        parser.add_argument("model_config", type=dict, required=True, location="json")
        parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
        parser.add_argument("retriever_from", type=str, required=False, default="dev", location="json")
        args = parser.parse_args()
-        streaming = args_model.response_mode != "blocking"
+        streaming = args["response_mode"] != "blocking"
        args["auto_generate_name"] = False
        try:
@@ -127,10 +108,10 @@ class CompletionMessageApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/completion-messages/<string:task_id>/stop")
 class CompletionMessageStopApi(Resource):
-    @console_ns.doc("stop_completion_message")
+    @api.doc("stop_completion_message")
-    @console_ns.doc(description="Stop a running completion message generation")
+    @api.doc(description="Stop a running completion message generation")
-    @console_ns.doc(params={"app_id": "Application ID", "task_id": "Task ID to stop"})
+    @api.doc(params={"app_id": "Application ID", "task_id": "Task ID to stop"})
-    @console_ns.response(200, "Task stopped successfully")
+    @api.response(200, "Task stopped successfully")
    @setup_required
    @login_required
    @account_initialization_required
@@ -138,36 +119,57 @@ class CompletionMessageStopApi(Resource):
    def post(self, app_model, task_id):
        if not isinstance(current_user, Account):
            raise ValueError("current_user must be an Account instance")
-
+        AppQueueManager.set_stop_flag(task_id, InvokeFrom.DEBUGGER, current_user.id)
        AppTaskService.stop_task(
            task_id=task_id,
            invoke_from=InvokeFrom.DEBUGGER,
            user_id=current_user.id,
            app_mode=AppMode.value_of(app_model.mode),
        )
        return {"result": "success"}, 200
@console_ns.route("/apps/<uuid:app_id>/chat-messages")
 class ChatMessageApi(Resource):
-    @console_ns.doc("create_chat_message")
+    @api.doc("create_chat_message")
-    @console_ns.doc(description="Generate chat message for debugging")
+    @api.doc(description="Generate chat message for debugging")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[ChatMessagePayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Chat message generated successfully")
+        api.model(
-    @console_ns.response(400, "Invalid request parameters")
+            "ChatMessageRequest",
-    @console_ns.response(404, "App or conversation not found")
+            {
                "inputs": fields.Raw(required=True, description="Input variables"),
                "query": fields.String(required=True, description="User query"),
                "files": fields.List(fields.Raw(), description="Uploaded files"),
                "model_config": fields.Raw(required=True, description="Model configuration"),
                "conversation_id": fields.String(description="Conversation ID"),
                "parent_message_id": fields.String(description="Parent message ID"),
                "response_mode": fields.String(enum=["blocking", "streaming"], description="Response mode"),
                "retriever_from": fields.String(default="dev", description="Retriever source"),
            },
        )
    )
    @api.response(200, "Chat message generated successfully")
    @api.response(400, "Invalid request parameters")
    @api.response(404, "App or conversation not found")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT])
    @edit_permission_required
    def post(self, app_model):
-        args_model = ChatMessagePayload.model_validate(console_ns.payload)
+        if not isinstance(current_user, Account):
-        args = args_model.model_dump(exclude_none=True, by_alias=True)
+            raise Forbidden()
-        streaming = args_model.response_mode != "blocking"
+        if not current_user.has_edit_permission:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, required=True, location="json")
        parser.add_argument("query", type=str, required=True, location="json")
        parser.add_argument("files", type=list, required=False, location="json")
        parser.add_argument("model_config", type=dict, required=True, location="json")
        parser.add_argument("conversation_id", type=uuid_value, location="json")
        parser.add_argument("parent_message_id", type=uuid_value, required=False, location="json")
        parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
        parser.add_argument("retriever_from", type=str, required=False, default="dev", location="json")
        args = parser.parse_args()
        streaming = args["response_mode"] != "blocking"
        args["auto_generate_name"] = False
        external_trace_id = get_external_trace_id(request)
@@ -208,10 +210,10 @@ class ChatMessageApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/chat-messages/<string:task_id>/stop")
 class ChatMessageStopApi(Resource):
-    @console_ns.doc("stop_chat_message")
+    @api.doc("stop_chat_message")
-    @console_ns.doc(description="Stop a running chat message generation")
+    @api.doc(description="Stop a running chat message generation")
-    @console_ns.doc(params={"app_id": "Application ID", "task_id": "Task ID to stop"})
+    @api.doc(params={"app_id": "Application ID", "task_id": "Task ID to stop"})
-    @console_ns.response(200, "Task stopped successfully")
+    @api.response(200, "Task stopped successfully")
    @setup_required
    @login_required
    @account_initialization_required
@@ -219,12 +221,6 @@ class ChatMessageStopApi(Resource):
    def post(self, app_model, task_id):
        if not isinstance(current_user, Account):
            raise ValueError("current_user must be an Account instance")
-
+        AppQueueManager.set_stop_flag(task_id, InvokeFrom.DEBUGGER, current_user.id)
        AppTaskService.stop_task(
            task_id=task_id,
            invoke_from=InvokeFrom.DEBUGGER,
            user_id=current_user.id,
            app_mode=AppMode.value_of(app_model.mode),
        )
        return {"result": "success"}, 200
@@ -1,377 +1,116 @@
-from typing import Literal
+from datetime import datetime
 import pytz  # pip install pytz
 import sqlalchemy as sa
-from flask import abort, request
+from flask_login import current_user
-from flask_restx import Resource, fields, marshal_with
+from flask_restx import Resource, marshal_with, reqparse
-from pydantic import BaseModel, Field, field_validator
+from flask_restx.inputs import int_range
 from sqlalchemy import func, or_
 from sqlalchemy.orm import joinedload
-from werkzeug.exceptions import NotFound
+from werkzeug.exceptions import Forbidden, NotFound
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
-from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
+from controllers.console.wraps import account_initialization_required, setup_required
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_database import db
-from fields.conversation_fields import MessageTextField
+from fields.conversation_fields import (
-from fields.raws import FilesContainedField
+    conversation_detail_fields,
-from libs.datetime_utils import naive_utc_now, parse_time_range
+    conversation_message_detail_fields,
-from libs.helper import TimestampField
+    conversation_pagination_fields,
-from libs.login import current_account_with_tenant, login_required
+    conversation_with_summary_pagination_fields,
-from models import Conversation, EndUser, Message, MessageAnnotation
+)
 from libs.datetime_utils import naive_utc_now
 from libs.helper import DatetimeString
 from libs.login import login_required
 from models import Account, Conversation, EndUser, Message, MessageAnnotation
 from models.model import AppMode
 from services.conversation_service import ConversationService
 from services.errors.conversation import ConversationNotExistsError
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class BaseConversationQuery(BaseModel):
    keyword: str | None = Field(default=None, description="Search keyword")
    start: str | None = Field(default=None, description="Start date (YYYY-MM-DD HH:MM)")
    end: str | None = Field(default=None, description="End date (YYYY-MM-DD HH:MM)")
    annotation_status: Literal["annotated", "not_annotated", "all"] = Field(
        default="all", description="Annotation status filter"
    )
    page: int = Field(default=1, ge=1, le=99999, description="Page number")
    limit: int = Field(default=20, ge=1, le=100, description="Page size (1-100)")
    @field_validator("start", "end", mode="before")
    @classmethod
    def blank_to_none(cls, value: str | None) -> str | None:
        if value == "":
            return None
        return value
 class CompletionConversationQuery(BaseConversationQuery):
    pass
 class ChatConversationQuery(BaseConversationQuery):
    message_count_gte: int | None = Field(default=None, ge=1, description="Minimum message count")
    sort_by: Literal["created_at", "-created_at", "updated_at", "-updated_at"] = Field(
        default="-updated_at", description="Sort field and direction"
    )
 console_ns.schema_model(
    CompletionConversationQuery.__name__,
    CompletionConversationQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
 console_ns.schema_model(
    ChatConversationQuery.__name__,
    ChatConversationQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
 # Register models for flask_restx to avoid dict type issues in Swagger
 # Register in dependency order: base models first, then dependent models
 # Base models
 simple_account_model = console_ns.model(
    "SimpleAccount",
    {
        "id": fields.String,
        "name": fields.String,
        "email": fields.String,
    },
 )
 feedback_stat_model = console_ns.model(
    "FeedbackStat",
    {
        "like": fields.Integer,
        "dislike": fields.Integer,
    },
 )
 status_count_model = console_ns.model(
    "StatusCount",
    {
        "success": fields.Integer,
        "failed": fields.Integer,
        "partial_success": fields.Integer,
    },
 )
 message_file_model = console_ns.model(
    "MessageFile",
    {
        "id": fields.String,
        "filename": fields.String,
        "type": fields.String,
        "url": fields.String,
        "mime_type": fields.String,
        "size": fields.Integer,
        "transfer_method": fields.String,
        "belongs_to": fields.String(default="user"),
        "upload_file_id": fields.String(default=None),
    },
 )
 agent_thought_model = console_ns.model(
    "AgentThought",
    {
        "id": fields.String,
        "chain_id": fields.String,
        "message_id": fields.String,
        "position": fields.Integer,
        "thought": fields.String,
        "tool": fields.String,
        "tool_labels": fields.Raw,
        "tool_input": fields.String,
        "created_at": TimestampField,
        "observation": fields.String,
        "files": fields.List(fields.String),
    },
 )
 simple_model_config_model = console_ns.model(
    "SimpleModelConfig",
    {
        "model": fields.Raw(attribute="model_dict"),
        "pre_prompt": fields.String,
    },
 )
 model_config_model = console_ns.model(
    "ModelConfig",
    {
        "opening_statement": fields.String,
        "suggested_questions": fields.Raw,
        "model": fields.Raw,
        "user_input_form": fields.Raw,
        "pre_prompt": fields.String,
        "agent_mode": fields.Raw,
    },
 )
 # Models that depend on simple_account_model
 feedback_model = console_ns.model(
    "Feedback",
    {
        "rating": fields.String,
        "content": fields.String,
        "from_source": fields.String,
        "from_end_user_id": fields.String,
        "from_account": fields.Nested(simple_account_model, allow_null=True),
    },
 )
 annotation_model = console_ns.model(
    "Annotation",
    {
        "id": fields.String,
        "question": fields.String,
        "content": fields.String,
        "account": fields.Nested(simple_account_model, allow_null=True),
        "created_at": TimestampField,
    },
 )
 annotation_hit_history_model = console_ns.model(
    "AnnotationHitHistory",
    {
        "annotation_id": fields.String(attribute="id"),
        "annotation_create_account": fields.Nested(simple_account_model, allow_null=True),
        "created_at": TimestampField,
    },
 )
 # Simple message detail model
 simple_message_detail_model = console_ns.model(
    "SimpleMessageDetail",
    {
        "inputs": FilesContainedField,
        "query": fields.String,
        "message": MessageTextField,
        "answer": fields.String,
    },
 )
 # Message detail model that depends on multiple models
 message_detail_model = console_ns.model(
    "MessageDetail",
    {
        "id": fields.String,
        "conversation_id": fields.String,
        "inputs": FilesContainedField,
        "query": fields.String,
        "message": fields.Raw,
        "message_tokens": fields.Integer,
        "answer": fields.String(attribute="re_sign_file_url_answer"),
        "answer_tokens": fields.Integer,
        "provider_response_latency": fields.Float,
        "from_source": fields.String,
        "from_end_user_id": fields.String,
        "from_account_id": fields.String,
        "feedbacks": fields.List(fields.Nested(feedback_model)),
        "workflow_run_id": fields.String,
        "annotation": fields.Nested(annotation_model, allow_null=True),
        "annotation_hit_history": fields.Nested(annotation_hit_history_model, allow_null=True),
        "created_at": TimestampField,
        "agent_thoughts": fields.List(fields.Nested(agent_thought_model)),
        "message_files": fields.List(fields.Nested(message_file_model)),
        "metadata": fields.Raw(attribute="message_metadata_dict"),
        "status": fields.String,
        "error": fields.String,
        "parent_message_id": fields.String,
    },
 )
 # Conversation models
 conversation_fields_model = console_ns.model(
    "Conversation",
    {
        "id": fields.String,
        "status": fields.String,
        "from_source": fields.String,
        "from_end_user_id": fields.String,
        "from_end_user_session_id": fields.String(),
        "from_account_id": fields.String,
        "from_account_name": fields.String,
        "read_at": TimestampField,
        "created_at": TimestampField,
        "updated_at": TimestampField,
        "annotation": fields.Nested(annotation_model, allow_null=True),
        "model_config": fields.Nested(simple_model_config_model),
        "user_feedback_stats": fields.Nested(feedback_stat_model),
        "admin_feedback_stats": fields.Nested(feedback_stat_model),
        "message": fields.Nested(simple_message_detail_model, attribute="first_message"),
    },
 )
 conversation_pagination_model = console_ns.model(
    "ConversationPagination",
    {
        "page": fields.Integer,
        "limit": fields.Integer(attribute="per_page"),
        "total": fields.Integer,
        "has_more": fields.Boolean(attribute="has_next"),
        "data": fields.List(fields.Nested(conversation_fields_model), attribute="items"),
    },
 )
 conversation_message_detail_model = console_ns.model(
    "ConversationMessageDetail",
    {
        "id": fields.String,
        "status": fields.String,
        "from_source": fields.String,
        "from_end_user_id": fields.String,
        "from_account_id": fields.String,
        "created_at": TimestampField,
        "model_config": fields.Nested(model_config_model),
        "message": fields.Nested(message_detail_model, attribute="first_message"),
    },
 )
 conversation_with_summary_model = console_ns.model(
    "ConversationWithSummary",
    {
        "id": fields.String,
        "status": fields.String,
        "from_source": fields.String,
        "from_end_user_id": fields.String,
        "from_end_user_session_id": fields.String,
        "from_account_id": fields.String,
        "from_account_name": fields.String,
        "name": fields.String,
        "summary": fields.String(attribute="summary_or_query"),
        "read_at": TimestampField,
        "created_at": TimestampField,
        "updated_at": TimestampField,
        "annotated": fields.Boolean,
        "model_config": fields.Nested(simple_model_config_model),
        "message_count": fields.Integer,
        "user_feedback_stats": fields.Nested(feedback_stat_model),
        "admin_feedback_stats": fields.Nested(feedback_stat_model),
        "status_count": fields.Nested(status_count_model),
    },
 )
 conversation_with_summary_pagination_model = console_ns.model(
    "ConversationWithSummaryPagination",
    {
        "page": fields.Integer,
        "limit": fields.Integer(attribute="per_page"),
        "total": fields.Integer,
        "has_more": fields.Boolean(attribute="has_next"),
        "data": fields.List(fields.Nested(conversation_with_summary_model), attribute="items"),
    },
 )
 conversation_detail_model = console_ns.model(
    "ConversationDetail",
    {
        "id": fields.String,
        "status": fields.String,
        "from_source": fields.String,
        "from_end_user_id": fields.String,
        "from_account_id": fields.String,
        "created_at": TimestampField,
        "updated_at": TimestampField,
        "annotated": fields.Boolean,
        "introduction": fields.String,
        "model_config": fields.Nested(model_config_model),
        "message_count": fields.Integer,
        "user_feedback_stats": fields.Nested(feedback_stat_model),
        "admin_feedback_stats": fields.Nested(feedback_stat_model),
    },
 )
@console_ns.route("/apps/<uuid:app_id>/completion-conversations")
 class CompletionConversationApi(Resource):
-    @console_ns.doc("list_completion_conversations")
+    @api.doc("list_completion_conversations")
-    @console_ns.doc(description="Get completion conversations with pagination and filtering")
+    @api.doc(description="Get completion conversations with pagination and filtering")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[CompletionConversationQuery.__name__])
+    @api.expect(
-    @console_ns.response(200, "Success", conversation_pagination_model)
+        api.parser()
-    @console_ns.response(403, "Insufficient permissions")
+        .add_argument("keyword", type=str, location="args", help="Search keyword")
        .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)")
        .add_argument(
            "annotation_status",
            type=str,
            location="args",
            choices=["annotated", "not_annotated", "all"],
            default="all",
            help="Annotation status filter",
        )
        .add_argument("page", type=int, location="args", default=1, help="Page number")
        .add_argument("limit", type=int, location="args", default=20, help="Page size (1-100)")
    )
    @api.response(200, "Success", conversation_pagination_fields)
    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=AppMode.COMPLETION)
-    @marshal_with(conversation_pagination_model)
+    @marshal_with(conversation_pagination_fields)
    @edit_permission_required
    def get(self, app_model):
-        current_user, _ = current_account_with_tenant()
+        if not current_user.is_editor:
-        args = CompletionConversationQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("keyword", type=str, location="args")
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.add_argument(
            "annotation_status", type=str, choices=["annotated", "not_annotated", "all"], default="all", location="args"
        )
        parser.add_argument("page", type=int_range(1, 99999), default=1, location="args")
        parser.add_argument("limit", type=int_range(1, 100), default=20, location="args")
        args = parser.parse_args()
        query = sa.select(Conversation).where(
            Conversation.app_id == app_model.id, Conversation.mode == "completion", Conversation.is_deleted.is_(False)
        )
-        if args.keyword:
+        if args["keyword"]:
            query = query.join(Message, Message.conversation_id == Conversation.id).where(
                or_(
-                    Message.query.ilike(f"%{args.keyword}%"),
+                    Message.query.ilike(f"%{args['keyword']}%"),
-                    Message.answer.ilike(f"%{args.keyword}%"),
+                    Message.answer.ilike(f"%{args['keyword']}%"),
                )
            )
        account = current_user
-        assert account.timezone is not None
+        timezone = pytz.timezone(account.timezone)
        utc_timezone = pytz.utc
-        try:
+        if args["start"]:
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
-        except ValueError as e:
+            start_datetime = start_datetime.replace(second=0)
-            abort(400, description=str(e))
+
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
        if start_datetime_utc:
            query = query.where(Conversation.created_at >= start_datetime_utc)
-        if end_datetime_utc:
+        if args["end"]:
-            end_datetime_utc = end_datetime_utc.replace(second=59)
+            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=59)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            query = query.where(Conversation.created_at < end_datetime_utc)
        # FIXME, the type ignore in this file
-        if args.annotation_status == "annotated":
+        if args["annotation_status"] == "annotated":
            query = query.options(joinedload(Conversation.message_annotations)).join(  # type: ignore
                MessageAnnotation, MessageAnnotation.conversation_id == Conversation.id
            )
-        elif args.annotation_status == "not_annotated":
+        elif args["annotation_status"] == "not_annotated":
            query = (
                query.outerjoin(MessageAnnotation, MessageAnnotation.conversation_id == Conversation.id)
                .group_by(Conversation.id)
@@ -380,46 +119,49 @@ class CompletionConversationApi(Resource):
        query = query.order_by(Conversation.created_at.desc())
-        conversations = db.paginate(query, page=args.page, per_page=args.limit, error_out=False)
+        conversations = db.paginate(query, page=args["page"], per_page=args["limit"], error_out=False)
        return conversations
@console_ns.route("/apps/<uuid:app_id>/completion-conversations/<uuid:conversation_id>")
 class CompletionConversationDetailApi(Resource):
-    @console_ns.doc("get_completion_conversation")
+    @api.doc("get_completion_conversation")
-    @console_ns.doc(description="Get completion conversation details with messages")
+    @api.doc(description="Get completion conversation details with messages")
-    @console_ns.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
+    @api.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
-    @console_ns.response(200, "Success", conversation_message_detail_model)
+    @api.response(200, "Success", conversation_message_detail_fields)
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
-    @console_ns.response(404, "Conversation not found")
+    @api.response(404, "Conversation not found")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=AppMode.COMPLETION)
-    @marshal_with(conversation_message_detail_model)
+    @marshal_with(conversation_message_detail_fields)
    @edit_permission_required
    def get(self, app_model, conversation_id):
        if not current_user.is_editor:
            raise Forbidden()
        conversation_id = str(conversation_id)
        return _get_conversation(app_model, conversation_id)
-    @console_ns.doc("delete_completion_conversation")
+    @api.doc("delete_completion_conversation")
-    @console_ns.doc(description="Delete a completion conversation")
+    @api.doc(description="Delete a completion conversation")
-    @console_ns.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
+    @api.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
-    @console_ns.response(204, "Conversation deleted successfully")
+    @api.response(204, "Conversation deleted successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
-    @console_ns.response(404, "Conversation not found")
+    @api.response(404, "Conversation not found")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=AppMode.COMPLETION)
    @edit_permission_required
    def delete(self, app_model, conversation_id):
-        current_user, _ = current_account_with_tenant()
+        if not current_user.is_editor:
            raise Forbidden()
        conversation_id = str(conversation_id)
        try:
            if not isinstance(current_user, Account):
                raise ValueError("current_user must be an Account instance")
            ConversationService.delete(app_model, conversation_id, current_user)
        except ConversationNotExistsError:
            raise NotFound("Conversation Not Exists.")
@@ -429,21 +171,63 @@ class CompletionConversationDetailApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/chat-conversations")
 class ChatConversationApi(Resource):
-    @console_ns.doc("list_chat_conversations")
+    @api.doc("list_chat_conversations")
-    @console_ns.doc(description="Get chat conversations with pagination, filtering and summary")
+    @api.doc(description="Get chat conversations with pagination, filtering and summary")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[ChatConversationQuery.__name__])
+    @api.expect(
-    @console_ns.response(200, "Success", conversation_with_summary_pagination_model)
+        api.parser()
-    @console_ns.response(403, "Insufficient permissions")
+        .add_argument("keyword", type=str, location="args", help="Search keyword")
        .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)")
        .add_argument(
            "annotation_status",
            type=str,
            location="args",
            choices=["annotated", "not_annotated", "all"],
            default="all",
            help="Annotation status filter",
        )
        .add_argument("message_count_gte", type=int, location="args", help="Minimum message count")
        .add_argument("page", type=int, location="args", default=1, help="Page number")
        .add_argument("limit", type=int, location="args", default=20, help="Page size (1-100)")
        .add_argument(
            "sort_by",
            type=str,
            location="args",
            choices=["created_at", "-created_at", "updated_at", "-updated_at"],
            default="-updated_at",
            help="Sort field and direction",
        )
    )
    @api.response(200, "Success", conversation_with_summary_pagination_fields)
    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
-    @marshal_with(conversation_with_summary_pagination_model)
+    @marshal_with(conversation_with_summary_pagination_fields)
    @edit_permission_required
    def get(self, app_model):
-        current_user, _ = current_account_with_tenant()
+        if not current_user.is_editor:
-        args = ChatConversationQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("keyword", type=str, location="args")
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.add_argument(
            "annotation_status", type=str, choices=["annotated", "not_annotated", "all"], default="all", location="args"
        )
        parser.add_argument("message_count_gte", type=int_range(1, 99999), required=False, location="args")
        parser.add_argument("page", type=int_range(1, 99999), required=False, default=1, location="args")
        parser.add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
        parser.add_argument(
            "sort_by",
            type=str,
            choices=["created_at", "-created_at", "updated_at", "-updated_at"],
            required=False,
            default="-updated_at",
            location="args",
        )
        args = parser.parse_args()
        subquery = (
            db.session.query(
@@ -455,8 +239,8 @@ class ChatConversationApi(Resource):
        query = sa.select(Conversation).where(Conversation.app_id == app_model.id, Conversation.is_deleted.is_(False))
-        if args.keyword:
+        if args["keyword"]:
-            keyword_filter = f"%{args.keyword}%"
+            keyword_filter = f"%{args['keyword']}%"
            query = (
                query.join(
                    Message,
@@ -476,51 +260,58 @@ class ChatConversationApi(Resource):
            )
        account = current_user
-        assert account.timezone is not None
+        timezone = pytz.timezone(account.timezone)
        utc_timezone = pytz.utc
-        try:
+        if args["start"]:
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
-        except ValueError as e:
+            start_datetime = start_datetime.replace(second=0)
            abort(400, description=str(e))
-        if start_datetime_utc:
+            start_datetime_timezone = timezone.localize(start_datetime)
-            match args.sort_by:
+            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
            match args["sort_by"]:
                case "updated_at" | "-updated_at":
                    query = query.where(Conversation.updated_at >= start_datetime_utc)
                case "created_at" | "-created_at" | _:
                    query = query.where(Conversation.created_at >= start_datetime_utc)
-        if end_datetime_utc:
+        if args["end"]:
-            end_datetime_utc = end_datetime_utc.replace(second=59)
+            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
-            match args.sort_by:
+            end_datetime = end_datetime.replace(second=59)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            match args["sort_by"]:
                case "updated_at" | "-updated_at":
                    query = query.where(Conversation.updated_at <= end_datetime_utc)
                case "created_at" | "-created_at" | _:
                    query = query.where(Conversation.created_at <= end_datetime_utc)
-        if args.annotation_status == "annotated":
+        if args["annotation_status"] == "annotated":
            query = query.options(joinedload(Conversation.message_annotations)).join(  # type: ignore
                MessageAnnotation, MessageAnnotation.conversation_id == Conversation.id
            )
-        elif args.annotation_status == "not_annotated":
+        elif args["annotation_status"] == "not_annotated":
            query = (
                query.outerjoin(MessageAnnotation, MessageAnnotation.conversation_id == Conversation.id)
                .group_by(Conversation.id)
                .having(func.count(MessageAnnotation.id) == 0)
            )
-        if args.message_count_gte and args.message_count_gte >= 1:
+        if args["message_count_gte"] and args["message_count_gte"] >= 1:
            query = (
                query.options(joinedload(Conversation.messages))  # type: ignore
                .join(Message, Message.conversation_id == Conversation.id)
                .group_by(Conversation.id)
-                .having(func.count(Message.id) >= args.message_count_gte)
+                .having(func.count(Message.id) >= args["message_count_gte"])
            )
        if app_model.mode == AppMode.ADVANCED_CHAT:
            query = query.where(Conversation.invoke_from != InvokeFrom.DEBUGGER)
-        match args.sort_by:
+        match args["sort_by"]:
            case "created_at":
                query = query.order_by(Conversation.created_at.asc())
            case "-created_at":
@@ -532,46 +323,49 @@ class ChatConversationApi(Resource):
            case _:
                query = query.order_by(Conversation.created_at.desc())
-        conversations = db.paginate(query, page=args.page, per_page=args.limit, error_out=False)
+        conversations = db.paginate(query, page=args["page"], per_page=args["limit"], error_out=False)
        return conversations
@console_ns.route("/apps/<uuid:app_id>/chat-conversations/<uuid:conversation_id>")
 class ChatConversationDetailApi(Resource):
-    @console_ns.doc("get_chat_conversation")
+    @api.doc("get_chat_conversation")
-    @console_ns.doc(description="Get chat conversation details")
+    @api.doc(description="Get chat conversation details")
-    @console_ns.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
+    @api.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
-    @console_ns.response(200, "Success", conversation_detail_model)
+    @api.response(200, "Success", conversation_detail_fields)
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
-    @console_ns.response(404, "Conversation not found")
+    @api.response(404, "Conversation not found")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
-    @marshal_with(conversation_detail_model)
+    @marshal_with(conversation_detail_fields)
    @edit_permission_required
    def get(self, app_model, conversation_id):
        if not current_user.is_editor:
            raise Forbidden()
        conversation_id = str(conversation_id)
        return _get_conversation(app_model, conversation_id)
-    @console_ns.doc("delete_chat_conversation")
+    @api.doc("delete_chat_conversation")
-    @console_ns.doc(description="Delete a chat conversation")
+    @api.doc(description="Delete a chat conversation")
-    @console_ns.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
+    @api.doc(params={"app_id": "Application ID", "conversation_id": "Conversation ID"})
-    @console_ns.response(204, "Conversation deleted successfully")
+    @api.response(204, "Conversation deleted successfully")
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
-    @console_ns.response(404, "Conversation not found")
+    @api.response(404, "Conversation not found")
    @setup_required
    @login_required
    @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
    @account_initialization_required
    @edit_permission_required
    def delete(self, app_model, conversation_id):
-        current_user, _ = current_account_with_tenant()
+        if not current_user.is_editor:
            raise Forbidden()
        conversation_id = str(conversation_id)
        try:
            if not isinstance(current_user, Account):
                raise ValueError("current_user must be an Account instance")
            ConversationService.delete(app_model, conversation_id, current_user)
        except ConversationNotExistsError:
            raise NotFound("Conversation Not Exists.")
@@ -580,7 +374,6 @@ class ChatConversationDetailApi(Resource):
 def _get_conversation(app_model, conversation_id):
    current_user, _ = current_account_with_tenant()
    conversation = (
        db.session.query(Conversation)
        .where(Conversation.id == conversation_id, Conversation.app_id == app_model.id)
@@ -1,68 +1,47 @@
-from flask import request
+from flask_restx import Resource, marshal_with, reqparse
 from flask_restx import Resource, fields, marshal_with
 from pydantic import BaseModel, Field
 from sqlalchemy import select
 from sqlalchemy.orm import Session
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from extensions.ext_database import db
-from fields.conversation_variable_fields import (
+from fields.conversation_variable_fields import paginated_conversation_variable_fields
    conversation_variable_fields,
    paginated_conversation_variable_fields,
 )
 from libs.login import login_required
 from models import ConversationVariable
 from models.model import AppMode
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class ConversationVariablesQuery(BaseModel):
    conversation_id: str = Field(..., description="Conversation ID to filter variables")
 console_ns.schema_model(
    ConversationVariablesQuery.__name__,
    ConversationVariablesQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
 # Register models for flask_restx to avoid dict type issues in Swagger
 # Register base model first
 conversation_variable_model = console_ns.model("ConversationVariable", conversation_variable_fields)
 # For nested models, need to replace nested dict with registered model
 paginated_conversation_variable_fields_copy = paginated_conversation_variable_fields.copy()
 paginated_conversation_variable_fields_copy["data"] = fields.List(
    fields.Nested(conversation_variable_model), attribute="data"
 )
 paginated_conversation_variable_model = console_ns.model(
    "PaginatedConversationVariable", paginated_conversation_variable_fields_copy
 )
@console_ns.route("/apps/<uuid:app_id>/conversation-variables")
 class ConversationVariablesApi(Resource):
-    @console_ns.doc("get_conversation_variables")
+    @api.doc("get_conversation_variables")
-    @console_ns.doc(description="Get conversation variables for an application")
+    @api.doc(description="Get conversation variables for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[ConversationVariablesQuery.__name__])
+    @api.expect(
-    @console_ns.response(200, "Conversation variables retrieved successfully", paginated_conversation_variable_model)
+        api.parser().add_argument(
            "conversation_id", type=str, location="args", help="Conversation ID to filter variables"
        )
    )
    @api.response(200, "Conversation variables retrieved successfully", paginated_conversation_variable_fields)
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=AppMode.ADVANCED_CHAT)
-    @marshal_with(paginated_conversation_variable_model)
+    @marshal_with(paginated_conversation_variable_fields)
    def get(self, app_model):
-        args = ConversationVariablesQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("conversation_id", type=str, location="args")
        args = parser.parse_args()
        stmt = (
            select(ConversationVariable)
            .where(ConversationVariable.app_id == app_model.id)
            .order_by(ConversationVariable.created_at)
        )
-        stmt = stmt.where(ConversationVariable.conversation_id == args.conversation_id)
+        if args["conversation_id"]:
            stmt = stmt.where(ConversationVariable.conversation_id == args["conversation_id"])
        else:
            raise ValueError("conversation_id is required")
        # NOTE: This is a temporary solution to avoid performance issues.
        page = 1
@@ -1,10 +1,9 @@
 from collections.abc import Sequence
 from typing import Any
-from flask_restx import Resource
+from flask_login import current_user
-from pydantic import BaseModel, Field
+from flask_restx import Resource, fields, reqparse
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.error import (
    CompletionRequestError,
    ProviderModelCurrentlyNotSupportError,
@@ -19,74 +18,45 @@ from core.helper.code_executor.python3.python3_code_provider import Python3CodeP
 from core.llm_generator.llm_generator import LLMGenerator
 from core.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models import App
 from services.workflow_service import WorkflowService
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class RuleGeneratePayload(BaseModel):
    instruction: str = Field(..., description="Rule generation instruction")
    model_config_data: dict[str, Any] = Field(..., alias="model_config", description="Model configuration")
    no_variable: bool = Field(default=False, description="Whether to exclude variables")
 class RuleCodeGeneratePayload(RuleGeneratePayload):
    code_language: str = Field(default="javascript", description="Programming language for code generation")
 class RuleStructuredOutputPayload(BaseModel):
    instruction: str = Field(..., description="Structured output generation instruction")
    model_config_data: dict[str, Any] = Field(..., alias="model_config", description="Model configuration")
 class InstructionGeneratePayload(BaseModel):
    flow_id: str = Field(..., description="Workflow/Flow ID")
    node_id: str = Field(default="", description="Node ID for workflow context")
    current: str = Field(default="", description="Current instruction text")
    language: str = Field(default="javascript", description="Programming language (javascript/python)")
    instruction: str = Field(..., description="Instruction for generation")
    model_config_data: dict[str, Any] = Field(..., alias="model_config", description="Model configuration")
    ideal_output: str = Field(default="", description="Expected ideal output")
 class InstructionTemplatePayload(BaseModel):
    type: str = Field(..., description="Instruction template type")
 def reg(cls: type[BaseModel]):
    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
 reg(RuleGeneratePayload)
 reg(RuleCodeGeneratePayload)
 reg(RuleStructuredOutputPayload)
 reg(InstructionGeneratePayload)
 reg(InstructionTemplatePayload)
@console_ns.route("/rule-generate")
 class RuleGenerateApi(Resource):
-    @console_ns.doc("generate_rule_config")
+    @api.doc("generate_rule_config")
-    @console_ns.doc(description="Generate rule configuration using LLM")
+    @api.doc(description="Generate rule configuration using LLM")
-    @console_ns.expect(console_ns.models[RuleGeneratePayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Rule configuration generated successfully")
+        api.model(
-    @console_ns.response(400, "Invalid request parameters")
+            "RuleGenerateRequest",
-    @console_ns.response(402, "Provider quota exceeded")
+            {
                "instruction": fields.String(required=True, description="Rule generation instruction"),
                "model_config": fields.Raw(required=True, description="Model configuration"),
                "no_variable": fields.Boolean(required=True, default=False, description="Whether to exclude variables"),
            },
        )
    )
    @api.response(200, "Rule configuration generated successfully")
    @api.response(400, "Invalid request parameters")
    @api.response(402, "Provider quota exceeded")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self):
-        args = RuleGeneratePayload.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
-        _, current_tenant_id = current_account_with_tenant()
+        parser.add_argument("instruction", type=str, required=True, nullable=False, location="json")
        parser.add_argument("model_config", type=dict, required=True, nullable=False, location="json")
        parser.add_argument("no_variable", type=bool, required=True, default=False, location="json")
        args = parser.parse_args()
        account = current_user
        try:
            rules = LLMGenerator.generate_rule_config(
-                tenant_id=current_tenant_id,
+                tenant_id=account.current_tenant_id,
-                instruction=args.instruction,
+                instruction=args["instruction"],
-                model_config=args.model_config_data,
+                model_config=args["model_config"],
-                no_variable=args.no_variable,
+                no_variable=args["no_variable"],
            )
        except ProviderTokenNotInitError as ex:
            raise ProviderNotInitializeError(ex.description)
@@ -102,25 +72,42 @@ class RuleGenerateApi(Resource):
@console_ns.route("/rule-code-generate")
 class RuleCodeGenerateApi(Resource):
-    @console_ns.doc("generate_rule_code")
+    @api.doc("generate_rule_code")
-    @console_ns.doc(description="Generate code rules using LLM")
+    @api.doc(description="Generate code rules using LLM")
-    @console_ns.expect(console_ns.models[RuleCodeGeneratePayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Code rules generated successfully")
+        api.model(
-    @console_ns.response(400, "Invalid request parameters")
+            "RuleCodeGenerateRequest",
-    @console_ns.response(402, "Provider quota exceeded")
+            {
                "instruction": fields.String(required=True, description="Code generation instruction"),
                "model_config": fields.Raw(required=True, description="Model configuration"),
                "no_variable": fields.Boolean(required=True, default=False, description="Whether to exclude variables"),
                "code_language": fields.String(
                    default="javascript", description="Programming language for code generation"
                ),
            },
        )
    )
    @api.response(200, "Code rules generated successfully")
    @api.response(400, "Invalid request parameters")
    @api.response(402, "Provider quota exceeded")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self):
-        args = RuleCodeGeneratePayload.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
-        _, current_tenant_id = current_account_with_tenant()
+        parser.add_argument("instruction", type=str, required=True, nullable=False, location="json")
        parser.add_argument("model_config", type=dict, required=True, nullable=False, location="json")
        parser.add_argument("no_variable", type=bool, required=True, default=False, location="json")
        parser.add_argument("code_language", type=str, required=False, default="javascript", location="json")
        args = parser.parse_args()
        account = current_user
        try:
            code_result = LLMGenerator.generate_code(
-                tenant_id=current_tenant_id,
+                tenant_id=account.current_tenant_id,
-                instruction=args.instruction,
+                instruction=args["instruction"],
-                model_config=args.model_config_data,
+                model_config=args["model_config"],
-                code_language=args.code_language,
+                code_language=args["code_language"],
            )
        except ProviderTokenNotInitError as ex:
            raise ProviderNotInitializeError(ex.description)
@@ -136,24 +123,35 @@ class RuleCodeGenerateApi(Resource):
@console_ns.route("/rule-structured-output-generate")
 class RuleStructuredOutputGenerateApi(Resource):
-    @console_ns.doc("generate_structured_output")
+    @api.doc("generate_structured_output")
-    @console_ns.doc(description="Generate structured output rules using LLM")
+    @api.doc(description="Generate structured output rules using LLM")
-    @console_ns.expect(console_ns.models[RuleStructuredOutputPayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Structured output generated successfully")
+        api.model(
-    @console_ns.response(400, "Invalid request parameters")
+            "StructuredOutputGenerateRequest",
-    @console_ns.response(402, "Provider quota exceeded")
+            {
                "instruction": fields.String(required=True, description="Structured output generation instruction"),
                "model_config": fields.Raw(required=True, description="Model configuration"),
            },
        )
    )
    @api.response(200, "Structured output generated successfully")
    @api.response(400, "Invalid request parameters")
    @api.response(402, "Provider quota exceeded")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self):
-        args = RuleStructuredOutputPayload.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
-        _, current_tenant_id = current_account_with_tenant()
+        parser.add_argument("instruction", type=str, required=True, nullable=False, location="json")
        parser.add_argument("model_config", type=dict, required=True, nullable=False, location="json")
        args = parser.parse_args()
        account = current_user
        try:
            structured_output = LLMGenerator.generate_structured_output(
-                tenant_id=current_tenant_id,
+                tenant_id=account.current_tenant_id,
-                instruction=args.instruction,
+                instruction=args["instruction"],
-                model_config=args.model_config_data,
+                model_config=args["model_config"],
            )
        except ProviderTokenNotInitError as ex:
            raise ProviderNotInitializeError(ex.description)
@@ -169,79 +167,99 @@ class RuleStructuredOutputGenerateApi(Resource):
@console_ns.route("/instruction-generate")
 class InstructionGenerateApi(Resource):
-    @console_ns.doc("generate_instruction")
+    @api.doc("generate_instruction")
-    @console_ns.doc(description="Generate instruction for workflow nodes or general use")
+    @api.doc(description="Generate instruction for workflow nodes or general use")
-    @console_ns.expect(console_ns.models[InstructionGeneratePayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Instruction generated successfully")
+        api.model(
-    @console_ns.response(400, "Invalid request parameters or flow/workflow not found")
+            "InstructionGenerateRequest",
-    @console_ns.response(402, "Provider quota exceeded")
+            {
                "flow_id": fields.String(required=True, description="Workflow/Flow ID"),
                "node_id": fields.String(description="Node ID for workflow context"),
                "current": fields.String(description="Current instruction text"),
                "language": fields.String(default="javascript", description="Programming language (javascript/python)"),
                "instruction": fields.String(required=True, description="Instruction for generation"),
                "model_config": fields.Raw(required=True, description="Model configuration"),
                "ideal_output": fields.String(description="Expected ideal output"),
            },
        )
    )
    @api.response(200, "Instruction generated successfully")
    @api.response(400, "Invalid request parameters or flow/workflow not found")
    @api.response(402, "Provider quota exceeded")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self):
-        args = InstructionGeneratePayload.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
-        _, current_tenant_id = current_account_with_tenant()
+        parser.add_argument("flow_id", type=str, required=True, default="", location="json")
        parser.add_argument("node_id", type=str, required=False, default="", location="json")
        parser.add_argument("current", type=str, required=False, default="", location="json")
        parser.add_argument("language", type=str, required=False, default="javascript", location="json")
        parser.add_argument("instruction", type=str, required=True, nullable=False, location="json")
        parser.add_argument("model_config", type=dict, required=True, nullable=False, location="json")
        parser.add_argument("ideal_output", type=str, required=False, default="", location="json")
        args = parser.parse_args()
        providers: list[type[CodeNodeProvider]] = [Python3CodeProvider, JavascriptCodeProvider]
        code_provider: type[CodeNodeProvider] | None = next(
-            (p for p in providers if p.is_accept_language(args.language)), None
+            (p for p in providers if p.is_accept_language(args["language"])), None
        )
        code_template = code_provider.get_default_code() if code_provider else ""
        try:
            # Generate from nothing for a workflow node
-            if (args.current in (code_template, "")) and args.node_id != "":
+            if (args["current"] == code_template or args["current"] == "") and args["node_id"] != "":
-                app = db.session.query(App).where(App.id == args.flow_id).first()
+                app = db.session.query(App).where(App.id == args["flow_id"]).first()
                if not app:
-                    return {"error": f"app {args.flow_id} not found"}, 400
+                    return {"error": f"app {args['flow_id']} not found"}, 400
                workflow = WorkflowService().get_draft_workflow(app_model=app)
                if not workflow:
-                    return {"error": f"workflow {args.flow_id} not found"}, 400
+                    return {"error": f"workflow {args['flow_id']} not found"}, 400
                nodes: Sequence = workflow.graph_dict["nodes"]
-                node = [node for node in nodes if node["id"] == args.node_id]
+                node = [node for node in nodes if node["id"] == args["node_id"]]
                if len(node) == 0:
-                    return {"error": f"node {args.node_id} not found"}, 400
+                    return {"error": f"node {args['node_id']} not found"}, 400
                node_type = node[0]["data"]["type"]
                match node_type:
                    case "llm":
                        return LLMGenerator.generate_rule_config(
-                            current_tenant_id,
+                            current_user.current_tenant_id,
-                            instruction=args.instruction,
+                            instruction=args["instruction"],
-                            model_config=args.model_config_data,
+                            model_config=args["model_config"],
                            no_variable=True,
                        )
                    case "agent":
                        return LLMGenerator.generate_rule_config(
-                            current_tenant_id,
+                            current_user.current_tenant_id,
-                            instruction=args.instruction,
+                            instruction=args["instruction"],
-                            model_config=args.model_config_data,
+                            model_config=args["model_config"],
                            no_variable=True,
                        )
                    case "code":
                        return LLMGenerator.generate_code(
-                            tenant_id=current_tenant_id,
+                            tenant_id=current_user.current_tenant_id,
-                            instruction=args.instruction,
+                            instruction=args["instruction"],
-                            model_config=args.model_config_data,
+                            model_config=args["model_config"],
-                            code_language=args.language,
+                            code_language=args["language"],
                        )
                    case _:
                        return {"error": f"invalid node type: {node_type}"}
-            if args.node_id == "" and args.current != "":  # For legacy app without a workflow
+            if args["node_id"] == "" and args["current"] != "":  # For legacy app without a workflow
                return LLMGenerator.instruction_modify_legacy(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
-                    flow_id=args.flow_id,
+                    flow_id=args["flow_id"],
-                    current=args.current,
+                    current=args["current"],
-                    instruction=args.instruction,
+                    instruction=args["instruction"],
-                    model_config=args.model_config_data,
+                    model_config=args["model_config"],
-                    ideal_output=args.ideal_output,
+                    ideal_output=args["ideal_output"],
                )
-            if args.node_id != "" and args.current != "":  # For workflow node
+            if args["node_id"] != "" and args["current"] != "":  # For workflow node
                return LLMGenerator.instruction_modify_workflow(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
-                    flow_id=args.flow_id,
+                    flow_id=args["flow_id"],
-                    node_id=args.node_id,
+                    node_id=args["node_id"],
-                    current=args.current,
+                    current=args["current"],
-                    instruction=args.instruction,
+                    instruction=args["instruction"],
-                    model_config=args.model_config_data,
+                    model_config=args["model_config"],
-                    ideal_output=args.ideal_output,
+                    ideal_output=args["ideal_output"],
                    workflow_service=WorkflowService(),
                )
            return {"error": "incompatible parameters"}, 400
@@ -257,17 +275,27 @@ class InstructionGenerateApi(Resource):
@console_ns.route("/instruction-generate/template")
 class InstructionGenerationTemplateApi(Resource):
-    @console_ns.doc("get_instruction_template")
+    @api.doc("get_instruction_template")
-    @console_ns.doc(description="Get instruction generation template")
+    @api.doc(description="Get instruction generation template")
-    @console_ns.expect(console_ns.models[InstructionTemplatePayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Template retrieved successfully")
+        api.model(
-    @console_ns.response(400, "Invalid request parameters")
+            "InstructionTemplateRequest",
            {
                "instruction": fields.String(required=True, description="Template instruction"),
                "ideal_output": fields.String(description="Expected ideal output"),
            },
        )
    )
    @api.response(200, "Template retrieved successfully")
    @api.response(400, "Invalid request parameters")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self):
-        args = InstructionTemplatePayload.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
-        match args.type:
+        parser.add_argument("type", type=str, required=True, default=False, location="json")
        args = parser.parse_args()
        match args["type"]:
            case "prompt":
                from core.llm_generator.prompts import INSTRUCTION_GENERATE_TEMPLATE_PROMPT
@@ -277,4 +305,4 @@ class InstructionGenerationTemplateApi(Resource):
                return {"data": INSTRUCTION_GENERATE_TEMPLATE_CODE}
            case _:
-                raise ValueError(f"Invalid type: {args.type}")
+                raise ValueError(f"Invalid type: {args['type']}")
@@ -1,20 +1,18 @@
 import json
 from enum import StrEnum
 from flask_login import current_user
 from flask_restx import Resource, fields, marshal_with, reqparse
 from werkzeug.exceptions import NotFound
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
-from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
+from controllers.console.wraps import account_initialization_required, setup_required
 from extensions.ext_database import db
 from fields.app_fields import app_server_fields
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models.model import AppMCPServer
 # Register model for flask_restx to avoid dict type issues in Swagger
 app_server_model = console_ns.model("AppServer", app_server_fields)
 class AppMCPServerStatus(StrEnum):
    ACTIVE = "active"
@@ -23,24 +21,24 @@ class AppMCPServerStatus(StrEnum):
@console_ns.route("/apps/<uuid:app_id>/server")
 class AppMCPServerController(Resource):
-    @console_ns.doc("get_app_mcp_server")
+    @api.doc("get_app_mcp_server")
-    @console_ns.doc(description="Get MCP server configuration for an application")
+    @api.doc(description="Get MCP server configuration for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "MCP server configuration retrieved successfully", app_server_model)
+    @api.response(200, "MCP server configuration retrieved successfully", app_server_fields)
    @setup_required
    @login_required
    @account_initialization_required
    @setup_required
    @get_app_model
-    @marshal_with(app_server_model)
+    @marshal_with(app_server_fields)
    def get(self, app_model):
        server = db.session.query(AppMCPServer).where(AppMCPServer.app_id == app_model.id).first()
        return server
-    @console_ns.doc("create_app_mcp_server")
+    @api.doc("create_app_mcp_server")
-    @console_ns.doc(description="Create MCP server configuration for an application")
+    @api.doc(description="Create MCP server configuration for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "MCPServerCreateRequest",
            {
                "description": fields.String(description="Server description"),
@@ -48,21 +46,19 @@ class AppMCPServerController(Resource):
            },
        )
    )
-    @console_ns.response(201, "MCP server configuration created successfully", app_server_model)
+    @api.response(201, "MCP server configuration created successfully", app_server_fields)
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model
-    @login_required
+    @marshal_with(app_server_fields)
    @setup_required
    @marshal_with(app_server_model)
    @edit_permission_required
    def post(self, app_model):
-        _, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_editor:
-        parser = (
+            raise NotFound()
-            reqparse.RequestParser()
+        parser = reqparse.RequestParser()
-            .add_argument("description", type=str, required=False, location="json")
+        parser.add_argument("description", type=str, required=False, location="json")
-            .add_argument("parameters", type=dict, required=True, location="json")
+        parser.add_argument("parameters", type=dict, required=True, location="json")
        )
        args = parser.parse_args()
        description = args.get("description")
@@ -75,18 +71,18 @@ class AppMCPServerController(Resource):
            parameters=json.dumps(args["parameters"], ensure_ascii=False),
            status=AppMCPServerStatus.ACTIVE,
            app_id=app_model.id,
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            server_code=AppMCPServer.generate_server_code(16),
        )
        db.session.add(server)
        db.session.commit()
        return server
-    @console_ns.doc("update_app_mcp_server")
+    @api.doc("update_app_mcp_server")
-    @console_ns.doc(description="Update MCP server configuration for an application")
+    @api.doc(description="Update MCP server configuration for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "MCPServerUpdateRequest",
            {
                "id": fields.String(required=True, description="Server ID"),
@@ -96,23 +92,22 @@ class AppMCPServerController(Resource):
            },
        )
    )
-    @console_ns.response(200, "MCP server configuration updated successfully", app_server_model)
+    @api.response(200, "MCP server configuration updated successfully", app_server_fields)
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
-    @console_ns.response(404, "Server not found")
+    @api.response(404, "Server not found")
    @get_app_model
    @login_required
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(app_server_model)
+    @get_app_model
-    @edit_permission_required
+    @marshal_with(app_server_fields)
    def put(self, app_model):
-        parser = (
+        if not current_user.is_editor:
-            reqparse.RequestParser()
+            raise NotFound()
-            .add_argument("id", type=str, required=True, location="json")
+        parser = reqparse.RequestParser()
-            .add_argument("description", type=str, required=False, location="json")
+        parser.add_argument("id", type=str, required=True, location="json")
-            .add_argument("parameters", type=dict, required=True, location="json")
+        parser.add_argument("description", type=str, required=False, location="json")
-            .add_argument("status", type=str, required=False, location="json")
+        parser.add_argument("parameters", type=dict, required=True, location="json")
-        )
+        parser.add_argument("status", type=str, required=False, location="json")
        args = parser.parse_args()
        server = db.session.query(AppMCPServer).where(AppMCPServer.id == args["id"]).first()
        if not server:
@@ -137,23 +132,23 @@ class AppMCPServerController(Resource):
@console_ns.route("/apps/<uuid:server_id>/server/refresh")
 class AppMCPServerRefreshController(Resource):
-    @console_ns.doc("refresh_app_mcp_server")
+    @api.doc("refresh_app_mcp_server")
-    @console_ns.doc(description="Refresh MCP server configuration and regenerate server code")
+    @api.doc(description="Refresh MCP server configuration and regenerate server code")
-    @console_ns.doc(params={"server_id": "Server ID"})
+    @api.doc(params={"server_id": "Server ID"})
-    @console_ns.response(200, "MCP server refreshed successfully", app_server_model)
+    @api.response(200, "MCP server refreshed successfully", app_server_fields)
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
-    @console_ns.response(404, "Server not found")
+    @api.response(404, "Server not found")
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(app_server_model)
+    @marshal_with(app_server_fields)
    @edit_permission_required
    def get(self, server_id):
-        _, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_editor:
            raise NotFound()
        server = (
            db.session.query(AppMCPServer)
            .where(AppMCPServer.id == server_id)
-            .where(AppMCPServer.tenant_id == current_tenant_id)
+            .where(AppMCPServer.tenant_id == current_user.current_tenant_id)
            .first()
        )
        if not server:
@@ -1,13 +1,11 @@
 import logging
 from typing import Literal
-from flask import request
+from flask_restx import Resource, fields, marshal_with, reqparse
-from flask_restx import Resource, fields, marshal_with
+from flask_restx.inputs import int_range
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy import exists, select
-from werkzeug.exceptions import InternalServerError, NotFound
+from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.error import (
    CompletionRequestError,
    ProviderModelCurrentlyNotSupportError,
@@ -18,233 +16,74 @@ from controllers.console.app.wraps import get_app_model
 from controllers.console.explore.error import AppSuggestedQuestionsAfterAnswerDisabledError
 from controllers.console.wraps import (
    account_initialization_required,
-    edit_permission_required,
+    cloud_edition_billing_resource_check,
    setup_required,
 )
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
-from fields.raws import FilesContainedField
+from fields.conversation_fields import annotation_fields, message_detail_fields
-from libs.helper import TimestampField, uuid_value
+from libs.helper import uuid_value
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
-from libs.login import current_account_with_tenant, login_required
+from libs.login import current_user, login_required
 from models.account import Account
 from models.model import AppMode, Conversation, Message, MessageAnnotation, MessageFeedback
 from services.annotation_service import AppAnnotationService
 from services.errors.conversation import ConversationNotExistsError
 from services.errors.message import MessageNotExistsError, SuggestedQuestionsAfterAnswerDisabledError
 from services.message_service import MessageService
 logger = logging.getLogger(__name__)
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class ChatMessagesQuery(BaseModel):
    conversation_id: str = Field(..., description="Conversation ID")
    first_id: str | None = Field(default=None, description="First message ID for pagination")
    limit: int = Field(default=20, ge=1, le=100, description="Number of messages to return (1-100)")
    @field_validator("first_id", mode="before")
    @classmethod
    def empty_to_none(cls, value: str | None) -> str | None:
        if value == "":
            return None
        return value
    @field_validator("conversation_id", "first_id")
    @classmethod
    def validate_uuid(cls, value: str | None) -> str | None:
        if value is None:
            return value
        return uuid_value(value)
 class MessageFeedbackPayload(BaseModel):
    message_id: str = Field(..., description="Message ID")
    rating: Literal["like", "dislike"] | None = Field(default=None, description="Feedback rating")
    @field_validator("message_id")
    @classmethod
    def validate_message_id(cls, value: str) -> str:
        return uuid_value(value)
 class FeedbackExportQuery(BaseModel):
    from_source: Literal["user", "admin"] | None = Field(default=None, description="Filter by feedback source")
    rating: Literal["like", "dislike"] | None = Field(default=None, description="Filter by rating")
    has_comment: bool | None = Field(default=None, description="Only include feedback with comments")
    start_date: str | None = Field(default=None, description="Start date (YYYY-MM-DD)")
    end_date: str | None = Field(default=None, description="End date (YYYY-MM-DD)")
    format: Literal["csv", "json"] = Field(default="csv", description="Export format")
    @field_validator("has_comment", mode="before")
    @classmethod
    def parse_bool(cls, value: bool | str | None) -> bool | None:
        if isinstance(value, bool) or value is None:
            return value
        lowered = value.lower()
        if lowered in {"true", "1", "yes", "on"}:
            return True
        if lowered in {"false", "0", "no", "off"}:
            return False
        raise ValueError("has_comment must be a boolean value")
 def reg(cls: type[BaseModel]):
    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
 reg(ChatMessagesQuery)
 reg(MessageFeedbackPayload)
 reg(FeedbackExportQuery)
 # Register models for flask_restx to avoid dict type issues in Swagger
 # Register in dependency order: base models first, then dependent models
 # Base models
 simple_account_model = console_ns.model(
    "SimpleAccount",
    {
        "id": fields.String,
        "name": fields.String,
        "email": fields.String,
    },
 )
 message_file_model = console_ns.model(
    "MessageFile",
    {
        "id": fields.String,
        "filename": fields.String,
        "type": fields.String,
        "url": fields.String,
        "mime_type": fields.String,
        "size": fields.Integer,
        "transfer_method": fields.String,
        "belongs_to": fields.String(default="user"),
        "upload_file_id": fields.String(default=None),
    },
 )
 agent_thought_model = console_ns.model(
    "AgentThought",
    {
        "id": fields.String,
        "chain_id": fields.String,
        "message_id": fields.String,
        "position": fields.Integer,
        "thought": fields.String,
        "tool": fields.String,
        "tool_labels": fields.Raw,
        "tool_input": fields.String,
        "created_at": TimestampField,
        "observation": fields.String,
        "files": fields.List(fields.String),
    },
 )
 # Models that depend on simple_account_model
 feedback_model = console_ns.model(
    "Feedback",
    {
        "rating": fields.String,
        "content": fields.String,
        "from_source": fields.String,
        "from_end_user_id": fields.String,
        "from_account": fields.Nested(simple_account_model, allow_null=True),
    },
 )
 annotation_model = console_ns.model(
    "Annotation",
    {
        "id": fields.String,
        "question": fields.String,
        "content": fields.String,
        "account": fields.Nested(simple_account_model, allow_null=True),
        "created_at": TimestampField,
    },
 )
 annotation_hit_history_model = console_ns.model(
    "AnnotationHitHistory",
    {
        "annotation_id": fields.String(attribute="id"),
        "annotation_create_account": fields.Nested(simple_account_model, allow_null=True),
        "created_at": TimestampField,
    },
 )
 # Message detail model that depends on multiple models
 message_detail_model = console_ns.model(
    "MessageDetail",
    {
        "id": fields.String,
        "conversation_id": fields.String,
        "inputs": FilesContainedField,
        "query": fields.String,
        "message": fields.Raw,
        "message_tokens": fields.Integer,
        "answer": fields.String(attribute="re_sign_file_url_answer"),
        "answer_tokens": fields.Integer,
        "provider_response_latency": fields.Float,
        "from_source": fields.String,
        "from_end_user_id": fields.String,
        "from_account_id": fields.String,
        "feedbacks": fields.List(fields.Nested(feedback_model)),
        "workflow_run_id": fields.String,
        "annotation": fields.Nested(annotation_model, allow_null=True),
        "annotation_hit_history": fields.Nested(annotation_hit_history_model, allow_null=True),
        "created_at": TimestampField,
        "agent_thoughts": fields.List(fields.Nested(agent_thought_model)),
        "message_files": fields.List(fields.Nested(message_file_model)),
        "metadata": fields.Raw(attribute="message_metadata_dict"),
        "status": fields.String,
        "error": fields.String,
        "parent_message_id": fields.String,
    },
 )
 # Message infinite scroll pagination model
 message_infinite_scroll_pagination_model = console_ns.model(
    "MessageInfiniteScrollPagination",
    {
        "limit": fields.Integer,
        "has_more": fields.Boolean,
        "data": fields.List(fields.Nested(message_detail_model)),
    },
 )
@console_ns.route("/apps/<uuid:app_id>/chat-messages")
 class ChatMessageListApi(Resource):
-    @console_ns.doc("list_chat_messages")
+    message_infinite_scroll_pagination_fields = {
-    @console_ns.doc(description="Get chat messages for a conversation with pagination")
+        "limit": fields.Integer,
-    @console_ns.doc(params={"app_id": "Application ID"})
+        "has_more": fields.Boolean,
-    @console_ns.expect(console_ns.models[ChatMessagesQuery.__name__])
+        "data": fields.List(fields.Nested(message_detail_fields)),
-    @console_ns.response(200, "Success", message_infinite_scroll_pagination_model)
+    }
-    @console_ns.response(404, "Conversation not found")
+
-    @login_required
+    @api.doc("list_chat_messages")
-    @account_initialization_required
+    @api.doc(description="Get chat messages for a conversation with pagination")
    @api.doc(params={"app_id": "Application ID"})
    @api.expect(
        api.parser()
        .add_argument("conversation_id", type=str, required=True, location="args", help="Conversation ID")
        .add_argument("first_id", type=str, location="args", help="First message ID for pagination")
        .add_argument("limit", type=int, location="args", default=20, help="Number of messages to return (1-100)")
    )
    @api.response(200, "Success", message_infinite_scroll_pagination_fields)
    @api.response(404, "Conversation not found")
    @setup_required
    @login_required
    @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
-    @marshal_with(message_infinite_scroll_pagination_model)
+    @account_initialization_required
-    @edit_permission_required
+    @marshal_with(message_infinite_scroll_pagination_fields)
    def get(self, app_model):
-        args = ChatMessagesQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("conversation_id", required=True, type=uuid_value, location="args")
        parser.add_argument("first_id", type=uuid_value, location="args")
        parser.add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
        args = parser.parse_args()
        conversation = (
            db.session.query(Conversation)
-            .where(Conversation.id == args.conversation_id, Conversation.app_id == app_model.id)
+            .where(Conversation.id == args["conversation_id"], Conversation.app_id == app_model.id)
            .first()
        )
        if not conversation:
            raise NotFound("Conversation Not Exists.")
-        if args.first_id:
+        if args["first_id"]:
            first_message = (
                db.session.query(Message)
-                .where(Message.conversation_id == conversation.id, Message.id == args.first_id)
+                .where(Message.conversation_id == conversation.id, Message.id == args["first_id"])
                .first()
            )
@@ -259,7 +98,7 @@ class ChatMessageListApi(Resource):
                    Message.id != first_message.id,
                )
                .order_by(Message.created_at.desc())
-                .limit(args.limit)
+                .limit(args["limit"])
                .all()
            )
        else:
@@ -267,12 +106,12 @@ class ChatMessageListApi(Resource):
                db.session.query(Message)
                .where(Message.conversation_id == conversation.id)
                .order_by(Message.created_at.desc())
-                .limit(args.limit)
+                .limit(args["limit"])
                .all()
            )
        # Initialize has_more based on whether we have a full page
-        if len(history_messages) == args.limit:
+        if len(history_messages) == args["limit"]:
            current_page_first_message = history_messages[-1]
            # Check if there are more messages before the current page
            has_more = db.session.scalar(
@@ -290,28 +129,40 @@ class ChatMessageListApi(Resource):
        history_messages = list(reversed(history_messages))
-        return InfiniteScrollPagination(data=history_messages, limit=args.limit, has_more=has_more)
+        return InfiniteScrollPagination(data=history_messages, limit=args["limit"], has_more=has_more)
@console_ns.route("/apps/<uuid:app_id>/feedbacks")
 class MessageFeedbackApi(Resource):
-    @console_ns.doc("create_message_feedback")
+    @api.doc("create_message_feedback")
-    @console_ns.doc(description="Create or update message feedback (like/dislike)")
+    @api.doc(description="Create or update message feedback (like/dislike)")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[MessageFeedbackPayload.__name__])
+    @api.expect(
-    @console_ns.response(200, "Feedback updated successfully")
+        api.model(
-    @console_ns.response(404, "Message not found")
+            "MessageFeedbackRequest",
-    @console_ns.response(403, "Insufficient permissions")
+            {
                "message_id": fields.String(required=True, description="Message ID"),
                "rating": fields.String(enum=["like", "dislike"], description="Feedback rating"),
            },
        )
    )
    @api.response(200, "Feedback updated successfully")
    @api.response(404, "Message not found")
    @api.response(403, "Insufficient permissions")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    def post(self, app_model):
-        current_user, _ = current_account_with_tenant()
+        if current_user is None:
            raise Forbidden()
-        args = MessageFeedbackPayload.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
        parser.add_argument("message_id", required=True, type=uuid_value, location="json")
        parser.add_argument("rating", type=str, choices=["like", "dislike", None], location="json")
        args = parser.parse_args()
-        message_id = str(args.message_id)
+        message_id = str(args["message_id"])
        message = db.session.query(Message).where(Message.id == message_id, Message.app_id == app_model.id).first()
@@ -320,21 +171,18 @@ class MessageFeedbackApi(Resource):
        feedback = message.admin_feedback
-        if not args.rating and feedback:
+        if not args["rating"] and feedback:
            db.session.delete(feedback)
-        elif args.rating and feedback:
+        elif args["rating"] and feedback:
-            feedback.rating = args.rating
+            feedback.rating = args["rating"]
-        elif not args.rating and not feedback:
+        elif not args["rating"] and not feedback:
            raise ValueError("rating cannot be None when feedback not exists")
        else:
            rating_value = args.rating
            if rating_value is None:
                raise ValueError("rating is required to create feedback")
            feedback = MessageFeedback(
                app_id=app_model.id,
                conversation_id=message.conversation_id,
                message_id=message.id,
-                rating=rating_value,
+                rating=args["rating"],
                from_source="admin",
                from_account_id=current_user.id,
            )
@@ -345,15 +193,56 @@ class MessageFeedbackApi(Resource):
        return {"result": "success"}
@console_ns.route("/apps/<uuid:app_id>/annotations")
 class MessageAnnotationApi(Resource):
    @api.doc("create_message_annotation")
    @api.doc(description="Create message annotation")
    @api.doc(params={"app_id": "Application ID"})
    @api.expect(
        api.model(
            "MessageAnnotationRequest",
            {
                "message_id": fields.String(description="Message ID"),
                "question": fields.String(required=True, description="Question text"),
                "answer": fields.String(required=True, description="Answer text"),
                "annotation_reply": fields.Raw(description="Annotation reply"),
            },
        )
    )
    @api.response(200, "Annotation created successfully", annotation_fields)
    @api.response(403, "Insufficient permissions")
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_resource_check("annotation")
    @get_app_model
    @marshal_with(annotation_fields)
    def post(self, app_model):
        if not isinstance(current_user, Account):
            raise Forbidden()
        if not current_user.has_edit_permission:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("message_id", required=False, type=uuid_value, location="json")
        parser.add_argument("question", required=True, type=str, location="json")
        parser.add_argument("answer", required=True, type=str, location="json")
        parser.add_argument("annotation_reply", required=False, type=dict, location="json")
        args = parser.parse_args()
        annotation = AppAnnotationService.up_insert_app_annotation_from_message(args, app_model.id)
        return annotation
@console_ns.route("/apps/<uuid:app_id>/annotations/count")
 class MessageAnnotationCountApi(Resource):
-    @console_ns.doc("get_annotation_count")
+    @api.doc("get_annotation_count")
-    @console_ns.doc(description="Get count of message annotations for the app")
+    @api.doc(description="Get count of message annotations for the app")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(
+    @api.response(
        200,
        "Annotation count retrieved successfully",
-        console_ns.model("AnnotationCountResponse", {"count": fields.Integer(description="Number of annotations")}),
+        api.model("AnnotationCountResponse", {"count": fields.Integer(description="Number of annotations")}),
    )
    @get_app_model
    @setup_required
@@ -367,23 +256,20 @@ class MessageAnnotationCountApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/chat-messages/<uuid:message_id>/suggested-questions")
 class MessageSuggestedQuestionApi(Resource):
-    @console_ns.doc("get_message_suggested_questions")
+    @api.doc("get_message_suggested_questions")
-    @console_ns.doc(description="Get suggested questions for a message")
+    @api.doc(description="Get suggested questions for a message")
-    @console_ns.doc(params={"app_id": "Application ID", "message_id": "Message ID"})
+    @api.doc(params={"app_id": "Application ID", "message_id": "Message ID"})
-    @console_ns.response(
+    @api.response(
        200,
        "Suggested questions retrieved successfully",
-        console_ns.model(
+        api.model("SuggestedQuestionsResponse", {"data": fields.List(fields.String(description="Suggested question"))}),
            "SuggestedQuestionsResponse", {"data": fields.List(fields.String(description="Suggested question"))}
        ),
    )
-    @console_ns.response(404, "Message or conversation not found")
+    @api.response(404, "Message or conversation not found")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
    def get(self, app_model, message_id):
        current_user, _ = current_account_with_tenant()
        message_id = str(message_id)
        try:
@@ -411,59 +297,19 @@ class MessageSuggestedQuestionApi(Resource):
        return {"data": questions}
@console_ns.route("/apps/<uuid:app_id>/feedbacks/export")
 class MessageFeedbackExportApi(Resource):
    @console_ns.doc("export_feedbacks")
    @console_ns.doc(description="Export user feedback data for Google Sheets")
    @console_ns.doc(params={"app_id": "Application ID"})
    @console_ns.expect(console_ns.models[FeedbackExportQuery.__name__])
    @console_ns.response(200, "Feedback data exported successfully")
    @console_ns.response(400, "Invalid parameters")
    @console_ns.response(500, "Internal server error")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, app_model):
        args = FeedbackExportQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
        # Import the service function
        from services.feedback_service import FeedbackService
        try:
            export_data = FeedbackService.export_feedbacks(
                app_id=app_model.id,
                from_source=args.from_source,
                rating=args.rating,
                has_comment=args.has_comment,
                start_date=args.start_date,
                end_date=args.end_date,
                format_type=args.format,
            )
            return export_data
        except ValueError as e:
            logger.exception("Parameter validation error in feedback export")
            return {"error": f"Parameter validation error: {str(e)}"}, 400
        except Exception as e:
            logger.exception("Error exporting feedback data")
            raise InternalServerError(str(e))
@console_ns.route("/apps/<uuid:app_id>/messages/<uuid:message_id>")
 class MessageApi(Resource):
-    @console_ns.doc("get_message")
+    @api.doc("get_message")
-    @console_ns.doc(description="Get message details by ID")
+    @api.doc(description="Get message details by ID")
-    @console_ns.doc(params={"app_id": "Application ID", "message_id": "Message ID"})
+    @api.doc(params={"app_id": "Application ID", "message_id": "Message ID"})
-    @console_ns.response(200, "Message retrieved successfully", message_detail_model)
+    @api.response(200, "Message retrieved successfully", message_detail_fields)
-    @console_ns.response(404, "Message not found")
+    @api.response(404, "Message not found")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(message_detail_model)
+    @get_app_model
-    def get(self, app_model, message_id: str):
+    @marshal_with(message_detail_fields)
    def get(self, app_model, message_id):
        message_id = str(message_id)
        message = db.session.query(Message).where(Message.id == message_id, Message.app_id == app_model.id).first()
@@ -2,29 +2,32 @@ import json
 from typing import cast
 from flask import request
 from flask_login import current_user
 from flask_restx import Resource, fields
 from werkzeug.exceptions import Forbidden
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
-from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
+from controllers.console.wraps import account_initialization_required, setup_required
 from core.agent.entities import AgentToolEntity
 from core.tools.tool_manager import ToolManager
 from core.tools.utils.configuration import ToolParameterConfigurationManager
 from events.app_event import app_model_config_was_updated
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models.account import Account
 from models.model import AppMode, AppModelConfig
 from services.app_model_config_service import AppModelConfigService
@console_ns.route("/apps/<uuid:app_id>/model-config")
 class ModelConfigResource(Resource):
-    @console_ns.doc("update_app_model_config")
+    @api.doc("update_app_model_config")
-    @console_ns.doc(description="Update application model configuration")
+    @api.doc(description="Update application model configuration")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "ModelConfigRequest",
            {
                "provider": fields.String(description="Model provider"),
@@ -42,20 +45,25 @@ class ModelConfigResource(Resource):
            },
        )
    )
-    @console_ns.response(200, "Model configuration updated successfully")
+    @api.response(200, "Model configuration updated successfully")
-    @console_ns.response(400, "Invalid configuration")
+    @api.response(400, "Invalid configuration")
-    @console_ns.response(404, "App not found")
+    @api.response(404, "App not found")
    @setup_required
    @login_required
    @edit_permission_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.AGENT_CHAT, AppMode.CHAT, AppMode.COMPLETION])
    def post(self, app_model):
        """Modify app model config"""
-        current_user, current_tenant_id = current_account_with_tenant()
+        if not isinstance(current_user, Account):
            raise Forbidden()
        if not current_user.has_edit_permission:
            raise Forbidden()
        assert current_user.current_tenant_id is not None, "The tenant information should be loaded."
        # validate config
        model_configuration = AppModelConfigService.validate_configuration(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            config=cast(dict, request.json),
            app_mode=AppMode.value_of(app_model.mode),
        )
@@ -87,12 +95,12 @@ class ModelConfigResource(Resource):
                # get tool
                try:
                    tool_runtime = ToolManager.get_agent_tool_runtime(
-                        tenant_id=current_tenant_id,
+                        tenant_id=current_user.current_tenant_id,
                        app_id=app_model.id,
                        agent_tool=agent_tool_entity,
                    )
                    manager = ToolParameterConfigurationManager(
-                        tenant_id=current_tenant_id,
+                        tenant_id=current_user.current_tenant_id,
                        tool_runtime=tool_runtime,
                        provider_name=agent_tool_entity.provider_id,
                        provider_type=agent_tool_entity.provider_type,
@@ -126,7 +134,7 @@ class ModelConfigResource(Resource):
                else:
                    try:
                        tool_runtime = ToolManager.get_agent_tool_runtime(
-                            tenant_id=current_tenant_id,
+                            tenant_id=current_user.current_tenant_id,
                            app_id=app_model.id,
                            agent_tool=agent_tool_entity,
                        )
@@ -134,7 +142,7 @@ class ModelConfigResource(Resource):
                        continue
                manager = ToolParameterConfigurationManager(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
                    tool_runtime=tool_runtime,
                    provider_name=agent_tool_entity.provider_id,
                    provider_type=agent_tool_entity.provider_type,
@@ -1,7 +1,7 @@
 from flask_restx import Resource, fields, reqparse
 from werkzeug.exceptions import BadRequest
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.error import TracingConfigCheckError, TracingConfigIsExist, TracingConfigNotExist
 from controllers.console.wraps import account_initialization_required, setup_required
 from libs.login import login_required
@@ -14,23 +14,24 @@ class TraceAppConfigApi(Resource):
    Manage trace app configurations
    """
-    @console_ns.doc("get_trace_app_config")
+    @api.doc("get_trace_app_config")
-    @console_ns.doc(description="Get tracing configuration for an application")
+    @api.doc(description="Get tracing configuration for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.parser().add_argument(
+        api.parser().add_argument(
            "tracing_provider", type=str, required=True, location="args", help="Tracing provider name"
        )
    )
-    @console_ns.response(
+    @api.response(
        200, "Tracing configuration retrieved successfully", fields.Raw(description="Tracing configuration data")
    )
-    @console_ns.response(400, "Invalid request parameters")
+    @api.response(400, "Invalid request parameters")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, app_id):
-        parser = reqparse.RequestParser().add_argument("tracing_provider", type=str, required=True, location="args")
+        parser = reqparse.RequestParser()
        parser.add_argument("tracing_provider", type=str, required=True, location="args")
        args = parser.parse_args()
        try:
@@ -41,11 +42,11 @@ class TraceAppConfigApi(Resource):
        except Exception as e:
            raise BadRequest(str(e))
-    @console_ns.doc("create_trace_app_config")
+    @api.doc("create_trace_app_config")
-    @console_ns.doc(description="Create a new tracing configuration for an application")
+    @api.doc(description="Create a new tracing configuration for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "TraceConfigCreateRequest",
            {
                "tracing_provider": fields.String(required=True, description="Tracing provider name"),
@@ -53,20 +54,18 @@ class TraceAppConfigApi(Resource):
            },
        )
    )
-    @console_ns.response(
+    @api.response(
        201, "Tracing configuration created successfully", fields.Raw(description="Created configuration data")
    )
-    @console_ns.response(400, "Invalid request parameters or configuration already exists")
+    @api.response(400, "Invalid request parameters or configuration already exists")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self, app_id):
        """Create a new trace app configuration"""
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("tracing_provider", type=str, required=True, location="json")
-            .add_argument("tracing_provider", type=str, required=True, location="json")
+        parser.add_argument("tracing_config", type=dict, required=True, location="json")
            .add_argument("tracing_config", type=dict, required=True, location="json")
        )
        args = parser.parse_args()
        try:
@@ -81,11 +80,11 @@ class TraceAppConfigApi(Resource):
        except Exception as e:
            raise BadRequest(str(e))
-    @console_ns.doc("update_trace_app_config")
+    @api.doc("update_trace_app_config")
-    @console_ns.doc(description="Update an existing tracing configuration for an application")
+    @api.doc(description="Update an existing tracing configuration for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "TraceConfigUpdateRequest",
            {
                "tracing_provider": fields.String(required=True, description="Tracing provider name"),
@@ -93,18 +92,16 @@ class TraceAppConfigApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "Tracing configuration updated successfully", fields.Raw(description="Success response"))
+    @api.response(200, "Tracing configuration updated successfully", fields.Raw(description="Success response"))
-    @console_ns.response(400, "Invalid request parameters or configuration not found")
+    @api.response(400, "Invalid request parameters or configuration not found")
    @setup_required
    @login_required
    @account_initialization_required
    def patch(self, app_id):
        """Update an existing trace app configuration"""
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("tracing_provider", type=str, required=True, location="json")
-            .add_argument("tracing_provider", type=str, required=True, location="json")
+        parser.add_argument("tracing_config", type=dict, required=True, location="json")
            .add_argument("tracing_config", type=dict, required=True, location="json")
        )
        args = parser.parse_args()
        try:
@@ -117,22 +114,23 @@ class TraceAppConfigApi(Resource):
        except Exception as e:
            raise BadRequest(str(e))
-    @console_ns.doc("delete_trace_app_config")
+    @api.doc("delete_trace_app_config")
-    @console_ns.doc(description="Delete an existing tracing configuration for an application")
+    @api.doc(description="Delete an existing tracing configuration for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.parser().add_argument(
+        api.parser().add_argument(
            "tracing_provider", type=str, required=True, location="args", help="Tracing provider name"
        )
    )
-    @console_ns.response(204, "Tracing configuration deleted successfully")
+    @api.response(204, "Tracing configuration deleted successfully")
-    @console_ns.response(400, "Invalid request parameters or configuration not found")
+    @api.response(400, "Invalid request parameters or configuration not found")
    @setup_required
    @login_required
    @account_initialization_required
    def delete(self, app_id):
        """Delete an existing trace app configuration"""
-        parser = reqparse.RequestParser().add_argument("tracing_provider", type=str, required=True, location="args")
+        parser = reqparse.RequestParser()
        parser.add_argument("tracing_provider", type=str, required=True, location="args")
        args = parser.parse_args()
        try:
@@ -1,61 +1,48 @@
 from flask_login import current_user
 from flask_restx import Resource, fields, marshal_with, reqparse
-from werkzeug.exceptions import NotFound
+from werkzeug.exceptions import Forbidden, NotFound
 from constants.languages import supported_language
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
-from controllers.console.wraps import (
+from controllers.console.wraps import account_initialization_required, setup_required
    account_initialization_required,
    edit_permission_required,
    is_admin_or_owner_required,
    setup_required,
 )
 from extensions.ext_database import db
 from fields.app_fields import app_site_fields
 from libs.datetime_utils import naive_utc_now
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
-from models import Site
+from models import Account, Site
 # Register model for flask_restx to avoid dict type issues in Swagger
 app_site_model = console_ns.model("AppSite", app_site_fields)
 def parse_app_site_args():
-    parser = (
+    parser = reqparse.RequestParser()
-        reqparse.RequestParser()
+    parser.add_argument("title", type=str, required=False, location="json")
-        .add_argument("title", type=str, required=False, location="json")
+    parser.add_argument("icon_type", type=str, required=False, location="json")
-        .add_argument("icon_type", type=str, required=False, location="json")
+    parser.add_argument("icon", type=str, required=False, location="json")
-        .add_argument("icon", type=str, required=False, location="json")
+    parser.add_argument("icon_background", type=str, required=False, location="json")
-        .add_argument("icon_background", type=str, required=False, location="json")
+    parser.add_argument("description", type=str, required=False, location="json")
-        .add_argument("description", type=str, required=False, location="json")
+    parser.add_argument("default_language", type=supported_language, required=False, location="json")
-        .add_argument("default_language", type=supported_language, required=False, location="json")
+    parser.add_argument("chat_color_theme", type=str, required=False, location="json")
-        .add_argument("chat_color_theme", type=str, required=False, location="json")
+    parser.add_argument("chat_color_theme_inverted", type=bool, required=False, location="json")
-        .add_argument("chat_color_theme_inverted", type=bool, required=False, location="json")
+    parser.add_argument("customize_domain", type=str, required=False, location="json")
-        .add_argument("customize_domain", type=str, required=False, location="json")
+    parser.add_argument("copyright", type=str, required=False, location="json")
-        .add_argument("copyright", type=str, required=False, location="json")
+    parser.add_argument("privacy_policy", type=str, required=False, location="json")
-        .add_argument("privacy_policy", type=str, required=False, location="json")
+    parser.add_argument("custom_disclaimer", type=str, required=False, location="json")
-        .add_argument("custom_disclaimer", type=str, required=False, location="json")
+    parser.add_argument(
-        .add_argument(
+        "customize_token_strategy", type=str, choices=["must", "allow", "not_allow"], required=False, location="json"
            "customize_token_strategy",
            type=str,
            choices=["must", "allow", "not_allow"],
            required=False,
            location="json",
        )
        .add_argument("prompt_public", type=bool, required=False, location="json")
        .add_argument("show_workflow_steps", type=bool, required=False, location="json")
        .add_argument("use_icon_as_answer_icon", type=bool, required=False, location="json")
    )
    parser.add_argument("prompt_public", type=bool, required=False, location="json")
    parser.add_argument("show_workflow_steps", type=bool, required=False, location="json")
    parser.add_argument("use_icon_as_answer_icon", type=bool, required=False, location="json")
    return parser.parse_args()
@console_ns.route("/apps/<uuid:app_id>/site")
 class AppSite(Resource):
-    @console_ns.doc("update_app_site")
+    @api.doc("update_app_site")
-    @console_ns.doc(description="Update application site configuration")
+    @api.doc(description="Update application site configuration")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "AppSiteRequest",
            {
                "title": fields.String(description="Site title"),
@@ -79,18 +66,21 @@ class AppSite(Resource):
            },
        )
    )
-    @console_ns.response(200, "Site configuration updated successfully", app_site_model)
+    @api.response(200, "Site configuration updated successfully", app_site_fields)
-    @console_ns.response(403, "Insufficient permissions")
+    @api.response(403, "Insufficient permissions")
-    @console_ns.response(404, "App not found")
+    @api.response(404, "App not found")
    @setup_required
    @login_required
    @edit_permission_required
    @account_initialization_required
    @get_app_model
-    @marshal_with(app_site_model)
+    @marshal_with(app_site_fields)
    def post(self, app_model):
        args = parse_app_site_args()
-        current_user, _ = current_account_with_tenant()
+
        # The role of the current user in the ta table must be editor, admin, or owner
        if not current_user.is_editor:
            raise Forbidden()
        site = db.session.query(Site).where(Site.app_id == app_model.id).first()
        if not site:
            raise NotFound
@@ -117,6 +107,8 @@ class AppSite(Resource):
            if value is not None:
                setattr(site, attr_name, value)
        if not isinstance(current_user, Account):
            raise ValueError("current_user must be an Account instance")
        site.updated_by = current_user.id
        site.updated_at = naive_utc_now()
        db.session.commit()
@@ -126,26 +118,30 @@ class AppSite(Resource):
@console_ns.route("/apps/<uuid:app_id>/site/access-token-reset")
 class AppSiteAccessTokenReset(Resource):
-    @console_ns.doc("reset_app_site_access_token")
+    @api.doc("reset_app_site_access_token")
-    @console_ns.doc(description="Reset access token for application site")
+    @api.doc(description="Reset access token for application site")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Access token reset successfully", app_site_model)
+    @api.response(200, "Access token reset successfully", app_site_fields)
-    @console_ns.response(403, "Insufficient permissions (admin/owner required)")
+    @api.response(403, "Insufficient permissions (admin/owner required)")
-    @console_ns.response(404, "App or site not found")
+    @api.response(404, "App or site not found")
    @setup_required
    @login_required
    @is_admin_or_owner_required
    @account_initialization_required
    @get_app_model
-    @marshal_with(app_site_model)
+    @marshal_with(app_site_fields)
    def post(self, app_model):
-        current_user, _ = current_account_with_tenant()
+        # The role of the current user in the ta table must be admin or owner
        if not current_user.is_admin_or_owner:
            raise Forbidden()
        site = db.session.query(Site).where(Site.app_id == app_model.id).first()
        if not site:
            raise NotFound
        site.code = Site.generate_code(16)
        if not isinstance(current_user, Account):
            raise ValueError("current_user must be an Account instance")
        site.updated_by = current_user.id
        site.updated_at = naive_utc_now()
        db.session.commit()
@@ -1,48 +1,33 @@
 from datetime import datetime
 from decimal import Decimal
 import pytz
 import sqlalchemy as sa
-from flask import abort, jsonify, request
+from flask import jsonify
-from flask_restx import Resource, fields
+from flask_login import current_user
-from pydantic import BaseModel, Field, field_validator
+from flask_restx import Resource, fields, reqparse
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 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
-from libs.helper import convert_datetime_to_date
+from libs.login import login_required
-from libs.login import current_account_with_tenant, login_required
+from models import AppMode, Message
 from models import AppMode
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class StatisticTimeRangeQuery(BaseModel):
    start: str | None = Field(default=None, description="Start date (YYYY-MM-DD HH:MM)")
    end: str | None = Field(default=None, description="End date (YYYY-MM-DD HH:MM)")
    @field_validator("start", "end", mode="before")
    @classmethod
    def empty_string_to_none(cls, value: str | None) -> str | None:
        if value == "":
            return None
        return value
 console_ns.schema_model(
    StatisticTimeRangeQuery.__name__,
    StatisticTimeRangeQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
@console_ns.route("/apps/<uuid:app_id>/statistics/daily-messages")
 class DailyMessageStatistic(Resource):
-    @console_ns.doc("get_daily_message_statistics")
+    @api.doc("get_daily_message_statistics")
-    @console_ns.doc(description="Get daily message statistics for an application")
+    @api.doc(description="Get daily message statistics for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[StatisticTimeRangeQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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 message statistics retrieved successfully",
        fields.List(fields.Raw(description="Daily message count data")),
@@ -52,13 +37,15 @@ class DailyMessageStatistic(Resource):
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.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 = """SELECT
-        sql_query = f"""SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    {converted_created_at} AS date,
    COUNT(*) AS message_count
 FROM
    messages
@@ -66,18 +53,27 @@ 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:
+        timezone = pytz.timezone(account.timezone)
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
-        except ValueError as e:
+
-            abort(400, description=str(e))
+        if args["start"]:
            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
            start_datetime = start_datetime.replace(second=0)
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
        if start_datetime_utc:
            sql_query += " AND created_at >= :start"
            arg_dict["start"] = start_datetime_utc
-        if end_datetime_utc:
+        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND created_at < :end"
            arg_dict["end"] = end_datetime_utc
@@ -95,11 +91,15 @@ WHERE
@console_ns.route("/apps/<uuid:app_id>/statistics/daily-conversations")
 class DailyConversationStatistic(Resource):
-    @console_ns.doc("get_daily_conversation_statistics")
+    @api.doc("get_daily_conversation_statistics")
-    @console_ns.doc(description="Get daily conversation statistics for an application")
+    @api.doc(description="Get daily conversation statistics for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[StatisticTimeRangeQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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",
        fields.List(fields.Raw(description="Daily conversation count data")),
@@ -109,53 +109,63 @@ class DailyConversationStatistic(Resource):
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.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")
+        timezone = pytz.timezone(account.timezone)
-        sql_query = f"""SELECT
+        utc_timezone = pytz.utc
    {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:
+        stmt = (
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+            sa.select(
-        except ValueError as e:
+                sa.func.date(
-            abort(400, description=str(e))
+                    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:
+        if args["start"]:
-            sql_query += " AND created_at >= :start"
+            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
-            arg_dict["start"] = start_datetime_utc
+            start_datetime = start_datetime.replace(second=0)
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
            stmt = stmt.where(Message.created_at >= start_datetime_utc)
-        if end_datetime_utc:
+        if args["end"]:
-            sql_query += " AND created_at < :end"
+            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
-            arg_dict["end"] = end_datetime_utc
+            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            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)
+            rs = conn.execute(stmt, {"tz": account.timezone})
-            for i in rs:
+            for row in rs:
-                response_data.append({"date": str(i.date), "conversation_count": i.conversation_count})
+                response_data.append({"date": str(row.date), "conversation_count": row.conversation_count})
        return jsonify({"data": response_data})
@console_ns.route("/apps/<uuid:app_id>/statistics/daily-end-users")
 class DailyTerminalsStatistic(Resource):
-    @console_ns.doc("get_daily_terminals_statistics")
+    @api.doc("get_daily_terminals_statistics")
-    @console_ns.doc(description="Get daily terminal/end-user statistics for an application")
+    @api.doc(description="Get daily terminal/end-user statistics for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[StatisticTimeRangeQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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",
        fields.List(fields.Raw(description="Daily terminal count data")),
@@ -165,13 +175,15 @@ class DailyTerminalsStatistic(Resource):
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.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 = """SELECT
-        sql_query = f"""SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    {converted_created_at} AS date,
    COUNT(DISTINCT messages.from_end_user_id) AS terminal_count
 FROM
    messages
@@ -179,18 +191,27 @@ 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:
+        timezone = pytz.timezone(account.timezone)
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
-        except ValueError as e:
+
-            abort(400, description=str(e))
+        if args["start"]:
            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
            start_datetime = start_datetime.replace(second=0)
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
        if start_datetime_utc:
            sql_query += " AND created_at >= :start"
            arg_dict["start"] = start_datetime_utc
-        if end_datetime_utc:
+        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND created_at < :end"
            arg_dict["end"] = end_datetime_utc
@@ -208,11 +229,15 @@ WHERE
@console_ns.route("/apps/<uuid:app_id>/statistics/token-costs")
 class DailyTokenCostStatistic(Resource):
-    @console_ns.doc("get_daily_token_cost_statistics")
+    @api.doc("get_daily_token_cost_statistics")
-    @console_ns.doc(description="Get daily token cost statistics for an application")
+    @api.doc(description="Get daily token cost statistics for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[StatisticTimeRangeQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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",
        fields.List(fields.Raw(description="Daily token cost data")),
@@ -222,13 +247,15 @@ class DailyTokenCostStatistic(Resource):
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.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 = """SELECT
-        sql_query = f"""SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    {converted_created_at} AS date,
    (SUM(messages.message_tokens) + SUM(messages.answer_tokens)) AS token_count,
    SUM(total_price) AS total_price
 FROM
@@ -237,18 +264,27 @@ 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:
+        timezone = pytz.timezone(account.timezone)
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
-        except ValueError as e:
+
-            abort(400, description=str(e))
+        if args["start"]:
            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
            start_datetime = start_datetime.replace(second=0)
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
        if start_datetime_utc:
            sql_query += " AND created_at >= :start"
            arg_dict["start"] = start_datetime_utc
-        if end_datetime_utc:
+        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND created_at < :end"
            arg_dict["end"] = end_datetime_utc
@@ -268,11 +304,15 @@ WHERE
@console_ns.route("/apps/<uuid:app_id>/statistics/average-session-interactions")
 class AverageSessionInteractionStatistic(Resource):
-    @console_ns.doc("get_average_session_interaction_statistics")
+    @api.doc("get_average_session_interaction_statistics")
-    @console_ns.doc(description="Get average session interaction statistics for an application")
+    @api.doc(description="Get average session interaction statistics for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[StatisticTimeRangeQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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",
        fields.List(fields.Raw(description="Average session interaction data")),
@@ -282,13 +322,15 @@ class AverageSessionInteractionStatistic(Resource):
    @account_initialization_required
    @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.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 = """SELECT
-        sql_query = f"""SELECT
+    DATE(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    {converted_created_at} AS date,
    AVG(subquery.message_count) AS interactions
 FROM
    (
@@ -304,18 +346,27 @@ FROM
            c.app_id = :app_id
            AND m.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:
+        timezone = pytz.timezone(account.timezone)
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
-        except ValueError as e:
+
-            abort(400, description=str(e))
+        if args["start"]:
            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
            start_datetime = start_datetime.replace(second=0)
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
        if start_datetime_utc:
            sql_query += " AND c.created_at >= :start"
            arg_dict["start"] = start_datetime_utc
-        if end_datetime_utc:
+        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND c.created_at < :end"
            arg_dict["end"] = end_datetime_utc
@@ -344,11 +395,15 @@ ORDER BY
@console_ns.route("/apps/<uuid:app_id>/statistics/user-satisfaction-rate")
 class UserSatisfactionRateStatistic(Resource):
-    @console_ns.doc("get_user_satisfaction_rate_statistics")
+    @api.doc("get_user_satisfaction_rate_statistics")
-    @console_ns.doc(description="Get user satisfaction rate statistics for an application")
+    @api.doc(description="Get user satisfaction rate statistics for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[StatisticTimeRangeQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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",
        fields.List(fields.Raw(description="User satisfaction rate data")),
@@ -358,13 +413,15 @@ class UserSatisfactionRateStatistic(Resource):
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.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 = """SELECT
-        sql_query = f"""SELECT
+    DATE(DATE_TRUNC('day', m.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    {converted_created_at} AS date,
    COUNT(m.id) AS message_count,
    COUNT(mf.id) AS feedback_count
 FROM
@@ -376,18 +433,27 @@ WHERE
    m.app_id = :app_id
    AND m.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:
+        timezone = pytz.timezone(account.timezone)
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
-        except ValueError as e:
+
-            abort(400, description=str(e))
+        if args["start"]:
            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
            start_datetime = start_datetime.replace(second=0)
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
        if start_datetime_utc:
            sql_query += " AND m.created_at >= :start"
            arg_dict["start"] = start_datetime_utc
-        if end_datetime_utc:
+        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND m.created_at < :end"
            arg_dict["end"] = end_datetime_utc
@@ -410,11 +476,15 @@ WHERE
@console_ns.route("/apps/<uuid:app_id>/statistics/average-response-time")
 class AverageResponseTimeStatistic(Resource):
-    @console_ns.doc("get_average_response_time_statistics")
+    @api.doc("get_average_response_time_statistics")
-    @console_ns.doc(description="Get average response time statistics for an application")
+    @api.doc(description="Get average response time statistics for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[StatisticTimeRangeQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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",
        fields.List(fields.Raw(description="Average response time data")),
@@ -424,13 +494,15 @@ class AverageResponseTimeStatistic(Resource):
    @account_initialization_required
    @get_app_model(mode=AppMode.COMPLETION)
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.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 = """SELECT
-        sql_query = f"""SELECT
+    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    {converted_created_at} AS date,
    AVG(provider_response_latency) AS latency
 FROM
    messages
@@ -438,18 +510,27 @@ 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:
+        timezone = pytz.timezone(account.timezone)
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
-        except ValueError as e:
+
-            abort(400, description=str(e))
+        if args["start"]:
            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
            start_datetime = start_datetime.replace(second=0)
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
        if start_datetime_utc:
            sql_query += " AND created_at >= :start"
            arg_dict["start"] = start_datetime_utc
-        if end_datetime_utc:
+        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND created_at < :end"
            arg_dict["end"] = end_datetime_utc
@@ -467,11 +548,15 @@ WHERE
@console_ns.route("/apps/<uuid:app_id>/statistics/tokens-per-second")
 class TokensPerSecondStatistic(Resource):
-    @console_ns.doc("get_tokens_per_second_statistics")
+    @api.doc("get_tokens_per_second_statistics")
-    @console_ns.doc(description="Get tokens per second statistics for an application")
+    @api.doc(description="Get tokens per second statistics for an application")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[StatisticTimeRangeQuery.__name__])
+    @api.expect(
-    @console_ns.response(
+        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",
        fields.List(fields.Raw(description="Tokens per second data")),
@@ -481,12 +566,15 @@ class TokensPerSecondStatistic(Resource):
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
-        converted_created_at = convert_datetime_to_date("created_at")
+        parser = reqparse.RequestParser()
-        sql_query = f"""SELECT
+        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
-    {converted_created_at} AS date,
+        parser.add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        args = parser.parse_args()
        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))
@@ -497,18 +585,27 @@ 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:
+        timezone = pytz.timezone(account.timezone)
-            start_datetime_utc, end_datetime_utc = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
-        except ValueError as e:
+
-            abort(400, description=str(e))
+        if args["start"]:
            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
            start_datetime = start_datetime.replace(second=0)
            start_datetime_timezone = timezone.localize(start_datetime)
            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
        if start_datetime_utc:
            sql_query += " AND created_at >= :start"
            arg_dict["start"] = start_datetime_utc
-        if end_datetime_utc:
+        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND created_at < :end"
            arg_dict["end"] = end_datetime_utc
@@ -1,85 +1,82 @@
 from datetime import datetime
 from dateutil.parser import isoparse
-from flask import request
+from flask_restx import Resource, marshal_with, reqparse
-from flask_restx import Resource, marshal_with
+from flask_restx.inputs import int_range
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy.orm import Session
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from core.workflow.enums import WorkflowExecutionStatus
 from extensions.ext_database import db
-from fields.workflow_app_log_fields import build_workflow_app_log_pagination_model
+from fields.workflow_app_log_fields import workflow_app_log_pagination_fields
 from libs.login import login_required
 from models import App
 from models.model import AppMode
 from services.workflow_app_service import WorkflowAppService
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class WorkflowAppLogQuery(BaseModel):
    keyword: str | None = Field(default=None, description="Search keyword for filtering logs")
    status: WorkflowExecutionStatus | None = Field(
        default=None, description="Execution status filter (succeeded, failed, stopped, partial-succeeded)"
    )
    created_at__before: datetime | None = Field(default=None, description="Filter logs created before this timestamp")
    created_at__after: datetime | None = Field(default=None, description="Filter logs created after this timestamp")
    created_by_end_user_session_id: str | None = Field(default=None, description="Filter by end user session ID")
    created_by_account: str | None = Field(default=None, description="Filter by account")
    detail: bool = Field(default=False, description="Whether to return detailed logs")
    page: int = Field(default=1, ge=1, le=99999, description="Page number (1-99999)")
    limit: int = Field(default=20, ge=1, le=100, description="Number of items per page (1-100)")
    @field_validator("created_at__before", "created_at__after", mode="before")
    @classmethod
    def parse_datetime(cls, value: str | None) -> datetime | None:
        if value in (None, ""):
            return None
        return isoparse(value)  # type: ignore
    @field_validator("detail", mode="before")
    @classmethod
    def parse_bool(cls, value: bool | str | None) -> bool:
        if isinstance(value, bool):
            return value
        if value is None:
            return False
        lowered = value.lower()
        if lowered in {"1", "true", "yes", "on"}:
            return True
        if lowered in {"0", "false", "no", "off"}:
            return False
        raise ValueError("Invalid boolean value for detail")
 console_ns.schema_model(
    WorkflowAppLogQuery.__name__, WorkflowAppLogQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
 )
 # Register model for flask_restx to avoid dict type issues in Swagger
 workflow_app_log_pagination_model = build_workflow_app_log_pagination_model(console_ns)
@console_ns.route("/apps/<uuid:app_id>/workflow-app-logs")
 class WorkflowAppLogApi(Resource):
-    @console_ns.doc("get_workflow_app_logs")
+    @api.doc("get_workflow_app_logs")
-    @console_ns.doc(description="Get workflow application execution logs")
+    @api.doc(description="Get workflow application execution logs")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.expect(console_ns.models[WorkflowAppLogQuery.__name__])
+    @api.doc(
-    @console_ns.response(200, "Workflow app logs retrieved successfully", workflow_app_log_pagination_model)
+        params={
            "keyword": "Search keyword for filtering logs",
            "status": "Filter by execution status (succeeded, failed, stopped, partial-succeeded)",
            "created_at__before": "Filter logs created before this timestamp",
            "created_at__after": "Filter logs created after this timestamp",
            "created_by_end_user_session_id": "Filter by end user session ID",
            "created_by_account": "Filter by account",
            "page": "Page number (1-99999)",
            "limit": "Number of items per page (1-100)",
        }
    )
    @api.response(200, "Workflow app logs retrieved successfully", workflow_app_log_pagination_fields)
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.WORKFLOW])
-    @marshal_with(workflow_app_log_pagination_model)
+    @marshal_with(workflow_app_log_pagination_fields)
    def get(self, app_model: App):
        """
        Get workflow app logs
        """
-        args = WorkflowAppLogQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("keyword", type=str, location="args")
        parser.add_argument(
            "status", type=str, choices=["succeeded", "failed", "stopped", "partial-succeeded"], location="args"
        )
        parser.add_argument(
            "created_at__before", type=str, location="args", help="Filter logs created before this timestamp"
        )
        parser.add_argument(
            "created_at__after", type=str, location="args", help="Filter logs created after this timestamp"
        )
        parser.add_argument(
            "created_by_end_user_session_id",
            type=str,
            location="args",
            required=False,
            default=None,
        )
        parser.add_argument(
            "created_by_account",
            type=str,
            location="args",
            required=False,
            default=None,
        )
        parser.add_argument("page", type=int_range(1, 99999), default=1, location="args")
        parser.add_argument("limit", type=int_range(1, 100), default=20, location="args")
        args = parser.parse_args()
        args.status = WorkflowExecutionStatus(args.status) if args.status else None
        if args.created_at__before:
            args.created_at__before = isoparse(args.created_at__before)
        if args.created_at__after:
            args.created_at__after = isoparse(args.created_at__after)
        # get paginate workflow app logs
        workflow_app_service = WorkflowAppService()
@@ -93,7 +90,6 @@ class WorkflowAppLogApi(Resource):
                created_at_after=args.created_at__after,
                page=args.page,
                limit=args.limit,
                detail=args.detail,
                created_by_end_user_session_id=args.created_by_end_user_session_id,
                created_by_account=args.created_by_account,
            )
@@ -1,18 +1,17 @@
 import logging
-from collections.abc import Callable
+from typing import NoReturn
 from functools import wraps
 from typing import NoReturn, ParamSpec, TypeVar
 from flask import Response
 from flask_restx import Resource, fields, inputs, marshal, marshal_with, reqparse
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.error import (
    DraftWorkflowNotExist,
 )
 from controllers.console.app.wraps import get_app_model
-from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
+from controllers.console.wraps import account_initialization_required, setup_required
 from controllers.web.error import InvalidArgumentError, NotFoundError
 from core.file import helpers as file_helpers
 from core.variables.segment_group import SegmentGroup
@@ -22,8 +21,9 @@ from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIAB
 from extensions.ext_database import db
 from factories.file_factory import build_from_mapping, build_from_mappings
 from factories.variable_factory import build_segment_with_type
-from libs.login import login_required
+from libs.login import current_user, login_required
 from models import App, AppMode
 from models.account import Account
 from models.workflow import WorkflowDraftVariable
 from services.workflow_draft_variable_service import WorkflowDraftVariableList, WorkflowDraftVariableService
 from services.workflow_service import WorkflowService
@@ -58,18 +58,16 @@ def _serialize_var_value(variable: WorkflowDraftVariable):
 def _create_pagination_parser():
-    parser = (
+    parser = reqparse.RequestParser()
-        reqparse.RequestParser()
+    parser.add_argument(
-        .add_argument(
+        "page",
-            "page",
+        type=inputs.int_range(1, 100_000),
-            type=inputs.int_range(1, 100_000),
+        required=False,
-            required=False,
+        default=1,
-            default=1,
+        location="args",
-            location="args",
+        help="the page of data requested",
            help="the page of data requested",
        )
        .add_argument("limit", type=inputs.int_range(1, 100), required=False, default=20, location="args")
    )
    parser.add_argument("limit", type=inputs.int_range(1, 100), required=False, default=20, location="args")
    return parser
@@ -141,42 +139,8 @@ _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS = {
    "items": fields.List(fields.Nested(_WORKFLOW_DRAFT_VARIABLE_FIELDS), attribute=_get_items),
 }
 # Register models for flask_restx to avoid dict type issues in Swagger
 workflow_draft_variable_without_value_model = console_ns.model(
    "WorkflowDraftVariableWithoutValue", _WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS
 )
-workflow_draft_variable_model = console_ns.model("WorkflowDraftVariable", _WORKFLOW_DRAFT_VARIABLE_FIELDS)
+def _api_prerequisite(f):
 workflow_draft_env_variable_model = console_ns.model("WorkflowDraftEnvVariable", _WORKFLOW_DRAFT_ENV_VARIABLE_FIELDS)
 workflow_draft_env_variable_list_fields_copy = _WORKFLOW_DRAFT_ENV_VARIABLE_LIST_FIELDS.copy()
 workflow_draft_env_variable_list_fields_copy["items"] = fields.List(fields.Nested(workflow_draft_env_variable_model))
 workflow_draft_env_variable_list_model = console_ns.model(
    "WorkflowDraftEnvVariableList", workflow_draft_env_variable_list_fields_copy
 )
 workflow_draft_variable_list_without_value_fields_copy = _WORKFLOW_DRAFT_VARIABLE_LIST_WITHOUT_VALUE_FIELDS.copy()
 workflow_draft_variable_list_without_value_fields_copy["items"] = fields.List(
    fields.Nested(workflow_draft_variable_without_value_model), attribute=_get_items
 )
 workflow_draft_variable_list_without_value_model = console_ns.model(
    "WorkflowDraftVariableListWithoutValue", workflow_draft_variable_list_without_value_fields_copy
 )
 workflow_draft_variable_list_fields_copy = _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS.copy()
 workflow_draft_variable_list_fields_copy["items"] = fields.List(
    fields.Nested(workflow_draft_variable_model), attribute=_get_items
 )
 workflow_draft_variable_list_model = console_ns.model(
    "WorkflowDraftVariableList", workflow_draft_variable_list_fields_copy
 )
 P = ParamSpec("P")
 R = TypeVar("R")
 def _api_prerequisite(f: Callable[P, R]):
    """Common prerequisites for all draft workflow variable APIs.
    It ensures the following conditions are satisfied:
@@ -190,10 +154,11 @@ def _api_prerequisite(f: Callable[P, R]):
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @wraps(f)
+    def wrapper(*args, **kwargs):
-    def wrapper(*args: P.args, **kwargs: P.kwargs):
+        assert isinstance(current_user, Account)
        if not current_user.has_edit_permission:
            raise Forbidden()
        return f(*args, **kwargs)
    return wrapper
@@ -201,16 +166,13 @@ def _api_prerequisite(f: Callable[P, R]):
@console_ns.route("/apps/<uuid:app_id>/workflows/draft/variables")
 class WorkflowVariableCollectionApi(Resource):
-    @console_ns.expect(_create_pagination_parser())
+    @api.doc("get_workflow_variables")
-    @console_ns.doc("get_workflow_variables")
+    @api.doc(description="Get draft workflow variables")
-    @console_ns.doc(description="Get draft workflow variables")
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"page": "Page number (1-100000)", "limit": "Number of items per page (1-100)"})
-    @console_ns.doc(params={"page": "Page number (1-100000)", "limit": "Number of items per page (1-100)"})
+    @api.response(200, "Workflow variables retrieved successfully", _WORKFLOW_DRAFT_VARIABLE_LIST_WITHOUT_VALUE_FIELDS)
    @console_ns.response(
        200, "Workflow variables retrieved successfully", workflow_draft_variable_list_without_value_model
    )
    @_api_prerequisite
-    @marshal_with(workflow_draft_variable_list_without_value_model)
+    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_WITHOUT_VALUE_FIELDS)
    def get(self, app_model: App):
        """
        Get draft workflow
@@ -237,9 +199,9 @@ class WorkflowVariableCollectionApi(Resource):
        return workflow_vars
-    @console_ns.doc("delete_workflow_variables")
+    @api.doc("delete_workflow_variables")
-    @console_ns.doc(description="Delete all draft workflow variables")
+    @api.doc(description="Delete all draft workflow variables")
-    @console_ns.response(204, "Workflow variables deleted successfully")
+    @api.response(204, "Workflow variables deleted successfully")
    @_api_prerequisite
    def delete(self, app_model: App):
        draft_var_srv = WorkflowDraftVariableService(
@@ -270,12 +232,12 @@ def validate_node_id(node_id: str) -> NoReturn | None:
@console_ns.route("/apps/<uuid:app_id>/workflows/draft/nodes/<string:node_id>/variables")
 class NodeVariableCollectionApi(Resource):
-    @console_ns.doc("get_node_variables")
+    @api.doc("get_node_variables")
-    @console_ns.doc(description="Get variables for a specific node")
+    @api.doc(description="Get variables for a specific node")
-    @console_ns.doc(params={"app_id": "Application ID", "node_id": "Node ID"})
+    @api.doc(params={"app_id": "Application ID", "node_id": "Node ID"})
-    @console_ns.response(200, "Node variables retrieved successfully", workflow_draft_variable_list_model)
+    @api.response(200, "Node variables retrieved successfully", _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
    @_api_prerequisite
-    @marshal_with(workflow_draft_variable_list_model)
+    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
    def get(self, app_model: App, node_id: str):
        validate_node_id(node_id)
        with Session(bind=db.engine, expire_on_commit=False) as session:
@@ -286,9 +248,9 @@ class NodeVariableCollectionApi(Resource):
        return node_vars
-    @console_ns.doc("delete_node_variables")
+    @api.doc("delete_node_variables")
-    @console_ns.doc(description="Delete all variables for a specific node")
+    @api.doc(description="Delete all variables for a specific node")
-    @console_ns.response(204, "Node variables deleted successfully")
+    @api.response(204, "Node variables deleted successfully")
    @_api_prerequisite
    def delete(self, app_model: App, node_id: str):
        validate_node_id(node_id)
@@ -303,13 +265,13 @@ class VariableApi(Resource):
    _PATCH_NAME_FIELD = "name"
    _PATCH_VALUE_FIELD = "value"
-    @console_ns.doc("get_variable")
+    @api.doc("get_variable")
-    @console_ns.doc(description="Get a specific workflow variable")
+    @api.doc(description="Get a specific workflow variable")
-    @console_ns.doc(params={"app_id": "Application ID", "variable_id": "Variable ID"})
+    @api.doc(params={"app_id": "Application ID", "variable_id": "Variable ID"})
-    @console_ns.response(200, "Variable retrieved successfully", workflow_draft_variable_model)
+    @api.response(200, "Variable retrieved successfully", _WORKFLOW_DRAFT_VARIABLE_FIELDS)
-    @console_ns.response(404, "Variable not found")
+    @api.response(404, "Variable not found")
    @_api_prerequisite
-    @marshal_with(workflow_draft_variable_model)
+    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_FIELDS)
    def get(self, app_model: App, variable_id: str):
        draft_var_srv = WorkflowDraftVariableService(
            session=db.session(),
@@ -321,10 +283,10 @@ class VariableApi(Resource):
            raise NotFoundError(description=f"variable not found, id={variable_id}")
        return variable
-    @console_ns.doc("update_variable")
+    @api.doc("update_variable")
-    @console_ns.doc(description="Update a workflow variable")
+    @api.doc(description="Update a workflow variable")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "UpdateVariableRequest",
            {
                "name": fields.String(description="Variable name"),
@@ -332,10 +294,10 @@ class VariableApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "Variable updated successfully", workflow_draft_variable_model)
+    @api.response(200, "Variable updated successfully", _WORKFLOW_DRAFT_VARIABLE_FIELDS)
-    @console_ns.response(404, "Variable not found")
+    @api.response(404, "Variable not found")
    @_api_prerequisite
-    @marshal_with(workflow_draft_variable_model)
+    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_FIELDS)
    def patch(self, app_model: App, variable_id: str):
        # Request payload for file types:
        #
@@ -358,11 +320,10 @@ class VariableApi(Resource):
        #         "upload_file_id": "1602650a-4fe4-423c-85a2-af76c083e3c4"
        #     }
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(self._PATCH_NAME_FIELD, type=str, required=False, nullable=True, location="json")
-            .add_argument(self._PATCH_NAME_FIELD, type=str, required=False, nullable=True, location="json")
+        # Parse 'value' field as-is to maintain its original data structure
-            .add_argument(self._PATCH_VALUE_FIELD, type=lambda x: x, required=False, nullable=True, location="json")
+        parser.add_argument(self._PATCH_VALUE_FIELD, type=lambda x: x, required=False, nullable=True, location="json")
        )
        draft_var_srv = WorkflowDraftVariableService(
            session=db.session(),
@@ -397,10 +358,10 @@ class VariableApi(Resource):
        db.session.commit()
        return variable
-    @console_ns.doc("delete_variable")
+    @api.doc("delete_variable")
-    @console_ns.doc(description="Delete a workflow variable")
+    @api.doc(description="Delete a workflow variable")
-    @console_ns.response(204, "Variable deleted successfully")
+    @api.response(204, "Variable deleted successfully")
-    @console_ns.response(404, "Variable not found")
+    @api.response(404, "Variable not found")
    @_api_prerequisite
    def delete(self, app_model: App, variable_id: str):
        draft_var_srv = WorkflowDraftVariableService(
@@ -418,12 +379,12 @@ class VariableApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/workflows/draft/variables/<uuid:variable_id>/reset")
 class VariableResetApi(Resource):
-    @console_ns.doc("reset_variable")
+    @api.doc("reset_variable")
-    @console_ns.doc(description="Reset a workflow variable to its default value")
+    @api.doc(description="Reset a workflow variable to its default value")
-    @console_ns.doc(params={"app_id": "Application ID", "variable_id": "Variable ID"})
+    @api.doc(params={"app_id": "Application ID", "variable_id": "Variable ID"})
-    @console_ns.response(200, "Variable reset successfully", workflow_draft_variable_model)
+    @api.response(200, "Variable reset successfully", _WORKFLOW_DRAFT_VARIABLE_FIELDS)
-    @console_ns.response(204, "Variable reset (no content)")
+    @api.response(204, "Variable reset (no content)")
-    @console_ns.response(404, "Variable not found")
+    @api.response(404, "Variable not found")
    @_api_prerequisite
    def put(self, app_model: App, variable_id: str):
        draft_var_srv = WorkflowDraftVariableService(
@@ -447,7 +408,7 @@ class VariableResetApi(Resource):
        if resetted is None:
            return Response("", 204)
        else:
-            return marshal(resetted, workflow_draft_variable_model)
+            return marshal(resetted, _WORKFLOW_DRAFT_VARIABLE_FIELDS)
 def _get_variable_list(app_model: App, node_id) -> WorkflowDraftVariableList:
@@ -466,13 +427,13 @@ def _get_variable_list(app_model: App, node_id) -> WorkflowDraftVariableList:
@console_ns.route("/apps/<uuid:app_id>/workflows/draft/conversation-variables")
 class ConversationVariableCollectionApi(Resource):
-    @console_ns.doc("get_conversation_variables")
+    @api.doc("get_conversation_variables")
-    @console_ns.doc(description="Get conversation variables for workflow")
+    @api.doc(description="Get conversation variables for workflow")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Conversation variables retrieved successfully", workflow_draft_variable_list_model)
+    @api.response(200, "Conversation variables retrieved successfully", _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
-    @console_ns.response(404, "Draft workflow not found")
+    @api.response(404, "Draft workflow not found")
    @_api_prerequisite
-    @marshal_with(workflow_draft_variable_list_model)
+    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
    def get(self, app_model: App):
        # NOTE(QuantumGhost): Prefill conversation variables into the draft variables table
        # so their IDs can be returned to the caller.
@@ -488,23 +449,23 @@ class ConversationVariableCollectionApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/workflows/draft/system-variables")
 class SystemVariableCollectionApi(Resource):
-    @console_ns.doc("get_system_variables")
+    @api.doc("get_system_variables")
-    @console_ns.doc(description="Get system variables for workflow")
+    @api.doc(description="Get system variables for workflow")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "System variables retrieved successfully", workflow_draft_variable_list_model)
+    @api.response(200, "System variables retrieved successfully", _WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
    @_api_prerequisite
-    @marshal_with(workflow_draft_variable_list_model)
+    @marshal_with(_WORKFLOW_DRAFT_VARIABLE_LIST_FIELDS)
    def get(self, app_model: App):
        return _get_variable_list(app_model, SYSTEM_VARIABLE_NODE_ID)
@console_ns.route("/apps/<uuid:app_id>/workflows/draft/environment-variables")
 class EnvironmentVariableCollectionApi(Resource):
-    @console_ns.doc("get_environment_variables")
+    @api.doc("get_environment_variables")
-    @console_ns.doc(description="Get environment variables for workflow")
+    @api.doc(description="Get environment variables for workflow")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Environment variables retrieved successfully")
+    @api.response(200, "Environment variables retrieved successfully")
-    @console_ns.response(404, "Draft workflow not found")
+    @api.response(404, "Draft workflow not found")
    @_api_prerequisite
    def get(self, app_model: App):
        """
@@ -1,341 +1,90 @@
-from typing import Literal, cast
+from typing import cast
-from flask import request
+from flask_login import current_user
-from flask_restx import Resource, fields, marshal_with
+from flask_restx import Resource, marshal_with, reqparse
-from pydantic import BaseModel, Field, field_validator
+from flask_restx.inputs import int_range
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from fields.end_user_fields import simple_end_user_fields
 from fields.member_fields import simple_account_fields
 from fields.workflow_run_fields import (
    advanced_chat_workflow_run_for_list_fields,
    advanced_chat_workflow_run_pagination_fields,
    workflow_run_count_fields,
    workflow_run_detail_fields,
    workflow_run_for_list_fields,
    workflow_run_node_execution_fields,
    workflow_run_node_execution_list_fields,
    workflow_run_pagination_fields,
 )
 from libs.custom_inputs import time_duration
 from libs.helper import uuid_value
-from libs.login import current_user, login_required
+from libs.login import login_required
-from models import Account, App, AppMode, EndUser, WorkflowRunTriggeredFrom
+from models import Account, App, AppMode, EndUser
 from services.workflow_run_service import WorkflowRunService
 # Workflow run status choices for filtering
 WORKFLOW_RUN_STATUS_CHOICES = ["running", "succeeded", "failed", "stopped", "partial-succeeded"]
 # Register models for flask_restx to avoid dict type issues in Swagger
 # Register in dependency order: base models first, then dependent models
 # Base models
 simple_account_model = console_ns.model("SimpleAccount", simple_account_fields)
 simple_end_user_model = console_ns.model("SimpleEndUser", simple_end_user_fields)
 # Models that depend on simple_account_fields
 workflow_run_for_list_fields_copy = workflow_run_for_list_fields.copy()
 workflow_run_for_list_fields_copy["created_by_account"] = fields.Nested(
    simple_account_model, attribute="created_by_account", allow_null=True
 )
 workflow_run_for_list_model = console_ns.model("WorkflowRunForList", workflow_run_for_list_fields_copy)
 advanced_chat_workflow_run_for_list_fields_copy = advanced_chat_workflow_run_for_list_fields.copy()
 advanced_chat_workflow_run_for_list_fields_copy["created_by_account"] = fields.Nested(
    simple_account_model, attribute="created_by_account", allow_null=True
 )
 advanced_chat_workflow_run_for_list_model = console_ns.model(
    "AdvancedChatWorkflowRunForList", advanced_chat_workflow_run_for_list_fields_copy
 )
 workflow_run_detail_fields_copy = workflow_run_detail_fields.copy()
 workflow_run_detail_fields_copy["created_by_account"] = fields.Nested(
    simple_account_model, attribute="created_by_account", allow_null=True
 )
 workflow_run_detail_fields_copy["created_by_end_user"] = fields.Nested(
    simple_end_user_model, attribute="created_by_end_user", allow_null=True
 )
 workflow_run_detail_model = console_ns.model("WorkflowRunDetail", workflow_run_detail_fields_copy)
 workflow_run_node_execution_fields_copy = workflow_run_node_execution_fields.copy()
 workflow_run_node_execution_fields_copy["created_by_account"] = fields.Nested(
    simple_account_model, attribute="created_by_account", allow_null=True
 )
 workflow_run_node_execution_fields_copy["created_by_end_user"] = fields.Nested(
    simple_end_user_model, attribute="created_by_end_user", allow_null=True
 )
 workflow_run_node_execution_model = console_ns.model(
    "WorkflowRunNodeExecution", workflow_run_node_execution_fields_copy
 )
 # Simple models without nested dependencies
 workflow_run_count_model = console_ns.model("WorkflowRunCount", workflow_run_count_fields)
 # Pagination models that depend on list models
 advanced_chat_workflow_run_pagination_fields_copy = advanced_chat_workflow_run_pagination_fields.copy()
 advanced_chat_workflow_run_pagination_fields_copy["data"] = fields.List(
    fields.Nested(advanced_chat_workflow_run_for_list_model), attribute="data"
 )
 advanced_chat_workflow_run_pagination_model = console_ns.model(
    "AdvancedChatWorkflowRunPagination", advanced_chat_workflow_run_pagination_fields_copy
 )
 workflow_run_pagination_fields_copy = workflow_run_pagination_fields.copy()
 workflow_run_pagination_fields_copy["data"] = fields.List(fields.Nested(workflow_run_for_list_model), attribute="data")
 workflow_run_pagination_model = console_ns.model("WorkflowRunPagination", workflow_run_pagination_fields_copy)
 workflow_run_node_execution_list_fields_copy = workflow_run_node_execution_list_fields.copy()
 workflow_run_node_execution_list_fields_copy["data"] = fields.List(fields.Nested(workflow_run_node_execution_model))
 workflow_run_node_execution_list_model = console_ns.model(
    "WorkflowRunNodeExecutionList", workflow_run_node_execution_list_fields_copy
 )
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class WorkflowRunListQuery(BaseModel):
    last_id: str | None = Field(default=None, description="Last run ID for pagination")
    limit: int = Field(default=20, ge=1, le=100, description="Number of items per page (1-100)")
    status: Literal["running", "succeeded", "failed", "stopped", "partial-succeeded"] | None = Field(
        default=None, description="Workflow run status filter"
    )
    triggered_from: Literal["debugging", "app-run"] | None = Field(
        default=None, description="Filter by trigger source: debugging or app-run"
    )
    @field_validator("last_id")
    @classmethod
    def validate_last_id(cls, value: str | None) -> str | None:
        if value is None:
            return value
        return uuid_value(value)
 class WorkflowRunCountQuery(BaseModel):
    status: Literal["running", "succeeded", "failed", "stopped", "partial-succeeded"] | None = Field(
        default=None, description="Workflow run status filter"
    )
    time_range: str | None = Field(default=None, description="Time range filter (e.g., 7d, 4h, 30m, 30s)")
    triggered_from: Literal["debugging", "app-run"] | None = Field(
        default=None, description="Filter by trigger source: debugging or app-run"
    )
    @field_validator("time_range")
    @classmethod
    def validate_time_range(cls, value: str | None) -> str | None:
        if value is None:
            return value
        return time_duration(value)
 console_ns.schema_model(
    WorkflowRunListQuery.__name__, WorkflowRunListQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
 )
 console_ns.schema_model(
    WorkflowRunCountQuery.__name__,
    WorkflowRunCountQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
@console_ns.route("/apps/<uuid:app_id>/advanced-chat/workflow-runs")
 class AdvancedChatAppWorkflowRunListApi(Resource):
-    @console_ns.doc("get_advanced_chat_workflow_runs")
+    @api.doc("get_advanced_chat_workflow_runs")
-    @console_ns.doc(description="Get advanced chat workflow run list")
+    @api.doc(description="Get advanced chat workflow run list")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.doc(params={"last_id": "Last run ID for pagination", "limit": "Number of items per page (1-100)"})
+    @api.doc(params={"last_id": "Last run ID for pagination", "limit": "Number of items per page (1-100)"})
-    @console_ns.doc(
+    @api.response(200, "Workflow runs retrieved successfully", advanced_chat_workflow_run_pagination_fields)
        params={"status": "Filter by status (optional): running, succeeded, failed, stopped, partial-succeeded"}
    )
    @console_ns.doc(
        params={"triggered_from": "Filter by trigger source (optional): debugging or app-run. Default: debugging"}
    )
    @console_ns.expect(console_ns.models[WorkflowRunListQuery.__name__])
    @console_ns.response(200, "Workflow runs retrieved successfully", advanced_chat_workflow_run_pagination_model)
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.ADVANCED_CHAT])
-    @marshal_with(advanced_chat_workflow_run_pagination_model)
+    @marshal_with(advanced_chat_workflow_run_pagination_fields)
    def get(self, app_model: App):
        """
        Get advanced chat app workflow run list
        """
-        args_model = WorkflowRunListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
-        args = args_model.model_dump(exclude_none=True)
+        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")
-        # Default to DEBUGGING if not specified
+        args = parser.parse_args()
        triggered_from = (
            WorkflowRunTriggeredFrom(args_model.triggered_from)
            if args_model.triggered_from
            else WorkflowRunTriggeredFrom.DEBUGGING
        )
        workflow_run_service = WorkflowRunService()
-        result = workflow_run_service.get_paginate_advanced_chat_workflow_runs(
+        result = workflow_run_service.get_paginate_advanced_chat_workflow_runs(app_model=app_model, args=args)
            app_model=app_model, args=args, triggered_from=triggered_from
        )
        return result
@console_ns.route("/apps/<uuid:app_id>/advanced-chat/workflow-runs/count")
 class AdvancedChatAppWorkflowRunCountApi(Resource):
    @console_ns.doc("get_advanced_chat_workflow_runs_count")
    @console_ns.doc(description="Get advanced chat workflow runs count statistics")
    @console_ns.doc(params={"app_id": "Application ID"})
    @console_ns.doc(
        params={"status": "Filter by status (optional): running, succeeded, failed, stopped, partial-succeeded"}
    )
    @console_ns.doc(
        params={
            "time_range": (
                "Filter by time range (optional): e.g., 7d (7 days), 4h (4 hours), "
                "30m (30 minutes), 30s (30 seconds). Filters by created_at field."
            )
        }
    )
    @console_ns.doc(
        params={"triggered_from": "Filter by trigger source (optional): debugging or app-run. Default: debugging"}
    )
    @console_ns.response(200, "Workflow runs count retrieved successfully", workflow_run_count_model)
    @console_ns.expect(console_ns.models[WorkflowRunCountQuery.__name__])
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.ADVANCED_CHAT])
    @marshal_with(workflow_run_count_model)
    def get(self, app_model: App):
        """
        Get advanced chat workflow runs count statistics
        """
        args_model = WorkflowRunCountQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
        args = args_model.model_dump(exclude_none=True)
        # Default to DEBUGGING if not specified
        triggered_from = (
            WorkflowRunTriggeredFrom(args_model.triggered_from)
            if args_model.triggered_from
            else WorkflowRunTriggeredFrom.DEBUGGING
        )
        workflow_run_service = WorkflowRunService()
        result = workflow_run_service.get_workflow_runs_count(
            app_model=app_model,
            status=args.get("status"),
            time_range=args.get("time_range"),
            triggered_from=triggered_from,
        )
        return result
@console_ns.route("/apps/<uuid:app_id>/workflow-runs")
 class WorkflowRunListApi(Resource):
-    @console_ns.doc("get_workflow_runs")
+    @api.doc("get_workflow_runs")
-    @console_ns.doc(description="Get workflow run list")
+    @api.doc(description="Get workflow run list")
-    @console_ns.doc(params={"app_id": "Application ID"})
+    @api.doc(params={"app_id": "Application ID"})
-    @console_ns.doc(params={"last_id": "Last run ID for pagination", "limit": "Number of items per page (1-100)"})
+    @api.doc(params={"last_id": "Last run ID for pagination", "limit": "Number of items per page (1-100)"})
-    @console_ns.doc(
+    @api.response(200, "Workflow runs retrieved successfully", workflow_run_pagination_fields)
        params={"status": "Filter by status (optional): running, succeeded, failed, stopped, partial-succeeded"}
    )
    @console_ns.doc(
        params={"triggered_from": "Filter by trigger source (optional): debugging or app-run. Default: debugging"}
    )
    @console_ns.response(200, "Workflow runs retrieved successfully", workflow_run_pagination_model)
    @console_ns.expect(console_ns.models[WorkflowRunListQuery.__name__])
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_pagination_model)
+    @marshal_with(workflow_run_pagination_fields)
    def get(self, app_model: App):
        """
        Get workflow run list
        """
-        args_model = WorkflowRunListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
-        args = args_model.model_dump(exclude_none=True)
+        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")
-        # Default to DEBUGGING for workflow if not specified (backward compatibility)
+        args = parser.parse_args()
        triggered_from = (
            WorkflowRunTriggeredFrom(args_model.triggered_from)
            if args_model.triggered_from
            else WorkflowRunTriggeredFrom.DEBUGGING
        )
        workflow_run_service = WorkflowRunService()
-        result = workflow_run_service.get_paginate_workflow_runs(
+        result = workflow_run_service.get_paginate_workflow_runs(app_model=app_model, args=args)
            app_model=app_model, args=args, triggered_from=triggered_from
        )
        return result
@console_ns.route("/apps/<uuid:app_id>/workflow-runs/count")
 class WorkflowRunCountApi(Resource):
    @console_ns.doc("get_workflow_runs_count")
    @console_ns.doc(description="Get workflow runs count statistics")
    @console_ns.doc(params={"app_id": "Application ID"})
    @console_ns.doc(
        params={"status": "Filter by status (optional): running, succeeded, failed, stopped, partial-succeeded"}
    )
    @console_ns.doc(
        params={
            "time_range": (
                "Filter by time range (optional): e.g., 7d (7 days), 4h (4 hours), "
                "30m (30 minutes), 30s (30 seconds). Filters by created_at field."
            )
        }
    )
    @console_ns.doc(
        params={"triggered_from": "Filter by trigger source (optional): debugging or app-run. Default: debugging"}
    )
    @console_ns.response(200, "Workflow runs count retrieved successfully", workflow_run_count_model)
    @console_ns.expect(console_ns.models[WorkflowRunCountQuery.__name__])
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
    @marshal_with(workflow_run_count_model)
    def get(self, app_model: App):
        """
        Get workflow runs count statistics
        """
        args_model = WorkflowRunCountQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
        args = args_model.model_dump(exclude_none=True)
        # Default to DEBUGGING for workflow if not specified (backward compatibility)
        triggered_from = (
            WorkflowRunTriggeredFrom(args_model.triggered_from)
            if args_model.triggered_from
            else WorkflowRunTriggeredFrom.DEBUGGING
        )
        workflow_run_service = WorkflowRunService()
        result = workflow_run_service.get_workflow_runs_count(
            app_model=app_model,
            status=args.get("status"),
            time_range=args.get("time_range"),
            triggered_from=triggered_from,
        )
        return result
@console_ns.route("/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>")
 class WorkflowRunDetailApi(Resource):
-    @console_ns.doc("get_workflow_run_detail")
+    @api.doc("get_workflow_run_detail")
-    @console_ns.doc(description="Get workflow run detail")
+    @api.doc(description="Get workflow run detail")
-    @console_ns.doc(params={"app_id": "Application ID", "run_id": "Workflow run ID"})
+    @api.doc(params={"app_id": "Application ID", "run_id": "Workflow run ID"})
-    @console_ns.response(200, "Workflow run detail retrieved successfully", workflow_run_detail_model)
+    @api.response(200, "Workflow run detail retrieved successfully", workflow_run_detail_fields)
-    @console_ns.response(404, "Workflow run not found")
+    @api.response(404, "Workflow run not found")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_detail_model)
+    @marshal_with(workflow_run_detail_fields)
    def get(self, app_model: App, run_id):
        """
        Get workflow run detail
@@ -350,16 +99,16 @@ class WorkflowRunDetailApi(Resource):
@console_ns.route("/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>/node-executions")
 class WorkflowRunNodeExecutionListApi(Resource):
-    @console_ns.doc("get_workflow_run_node_executions")
+    @api.doc("get_workflow_run_node_executions")
-    @console_ns.doc(description="Get workflow run node execution list")
+    @api.doc(description="Get workflow run node execution list")
-    @console_ns.doc(params={"app_id": "Application ID", "run_id": "Workflow run ID"})
+    @api.doc(params={"app_id": "Application ID", "run_id": "Workflow run ID"})
-    @console_ns.response(200, "Node executions retrieved successfully", workflow_run_node_execution_list_model)
+    @api.response(200, "Node executions retrieved successfully", workflow_run_node_execution_list_fields)
-    @console_ns.response(404, "Workflow run not found")
+    @api.response(404, "Workflow run not found")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_node_execution_list_model)
+    @marshal_with(workflow_run_node_execution_list_fields)
    def get(self, app_model: App, run_id):
        """
        Get workflow run node execution list
@@ -1,194 +1,311 @@
-from flask import abort, jsonify, request
+from datetime import datetime
-from flask_restx import Resource
+from decimal import Decimal
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy.orm import sessionmaker
-from controllers.console import console_ns
+import pytz
 import sqlalchemy as sa
 from flask import jsonify
 from flask_login import current_user
 from flask_restx import Resource, reqparse
 from controllers.console import api, console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from extensions.ext_database import db
-from libs.datetime_utils import parse_time_range
+from libs.helper import DatetimeString
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models.enums import WorkflowRunTriggeredFrom
 from models.model import AppMode
 from repositories.factory import DifyAPIRepositoryFactory
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class WorkflowStatisticQuery(BaseModel):
    start: str | None = Field(default=None, description="Start date and time (YYYY-MM-DD HH:MM)")
    end: str | None = Field(default=None, description="End date and time (YYYY-MM-DD HH:MM)")
    @field_validator("start", "end", mode="before")
    @classmethod
    def blank_to_none(cls, value: str | None) -> str | None:
        if value == "":
            return None
        return value
 console_ns.schema_model(
    WorkflowStatisticQuery.__name__,
    WorkflowStatisticQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
 )
@console_ns.route("/apps/<uuid:app_id>/workflow/statistics/daily-conversations")
 class WorkflowDailyRunsStatistic(Resource):
-    def __init__(self, *args, **kwargs):
+    @api.doc("get_workflow_daily_runs_statistic")
-        super().__init__(*args, **kwargs)
+    @api.doc(description="Get workflow daily runs statistics")
-        session_maker = sessionmaker(bind=db.engine, expire_on_commit=False)
+    @api.doc(params={"app_id": "Application ID"})
-        self._workflow_run_repo = DifyAPIRepositoryFactory.create_api_workflow_run_repository(session_maker)
+    @api.doc(params={"start": "Start date and time (YYYY-MM-DD HH:MM)", "end": "End date and time (YYYY-MM-DD HH:MM)"})
-
+    @api.response(200, "Daily runs statistics retrieved successfully")
    @console_ns.doc("get_workflow_daily_runs_statistic")
    @console_ns.doc(description="Get workflow daily runs statistics")
    @console_ns.doc(params={"app_id": "Application ID"})
    @console_ns.expect(console_ns.models[WorkflowStatisticQuery.__name__])
    @console_ns.response(200, "Daily runs statistics retrieved successfully")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        args = parser.parse_args()
-        assert account.timezone is not None
+        sql_query = """SELECT
    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    COUNT(id) AS runs
 FROM
    workflow_runs
 WHERE
    app_id = :app_id
    AND triggered_from = :triggered_from"""
        arg_dict = {
            "tz": account.timezone,
            "app_id": app_model.id,
            "triggered_from": WorkflowRunTriggeredFrom.APP_RUN,
        }
-        try:
+        timezone = pytz.timezone(account.timezone)
-            start_date, end_date = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
        except ValueError as e:
            abort(400, description=str(e))
-        response_data = self._workflow_run_repo.get_daily_runs_statistics(
+        if args["start"]:
-            tenant_id=app_model.tenant_id,
+            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
-            app_id=app_model.id,
+            start_datetime = start_datetime.replace(second=0)
-            triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+
-            start_date=start_date,
+            start_datetime_timezone = timezone.localize(start_datetime)
-            end_date=end_date,
+            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
-            timezone=account.timezone,
+
-        )
+            sql_query += " AND created_at >= :start"
            arg_dict["start"] = start_datetime_utc
        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND created_at < :end"
            arg_dict["end"] = end_datetime_utc
        sql_query += " 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), "runs": i.runs})
        return jsonify({"data": response_data})
@console_ns.route("/apps/<uuid:app_id>/workflow/statistics/daily-terminals")
 class WorkflowDailyTerminalsStatistic(Resource):
-    def __init__(self, *args, **kwargs):
+    @api.doc("get_workflow_daily_terminals_statistic")
-        super().__init__(*args, **kwargs)
+    @api.doc(description="Get workflow daily terminals statistics")
-        session_maker = sessionmaker(bind=db.engine, expire_on_commit=False)
+    @api.doc(params={"app_id": "Application ID"})
-        self._workflow_run_repo = DifyAPIRepositoryFactory.create_api_workflow_run_repository(session_maker)
+    @api.doc(params={"start": "Start date and time (YYYY-MM-DD HH:MM)", "end": "End date and time (YYYY-MM-DD HH:MM)"})
-
+    @api.response(200, "Daily terminals statistics retrieved successfully")
    @console_ns.doc("get_workflow_daily_terminals_statistic")
    @console_ns.doc(description="Get workflow daily terminals statistics")
    @console_ns.doc(params={"app_id": "Application ID"})
    @console_ns.expect(console_ns.models[WorkflowStatisticQuery.__name__])
    @console_ns.response(200, "Daily terminals statistics retrieved successfully")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        args = parser.parse_args()
-        assert account.timezone is not None
+        sql_query = """SELECT
    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    COUNT(DISTINCT workflow_runs.created_by) AS terminal_count
 FROM
    workflow_runs
 WHERE
    app_id = :app_id
    AND triggered_from = :triggered_from"""
        arg_dict = {
            "tz": account.timezone,
            "app_id": app_model.id,
            "triggered_from": WorkflowRunTriggeredFrom.APP_RUN,
        }
-        try:
+        timezone = pytz.timezone(account.timezone)
-            start_date, end_date = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
        except ValueError as e:
            abort(400, description=str(e))
-        response_data = self._workflow_run_repo.get_daily_terminals_statistics(
+        if args["start"]:
-            tenant_id=app_model.tenant_id,
+            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
-            app_id=app_model.id,
+            start_datetime = start_datetime.replace(second=0)
-            triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+
-            start_date=start_date,
+            start_datetime_timezone = timezone.localize(start_datetime)
-            end_date=end_date,
+            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
-            timezone=account.timezone,
+
-        )
+            sql_query += " AND created_at >= :start"
            arg_dict["start"] = start_datetime_utc
        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND created_at < :end"
            arg_dict["end"] = end_datetime_utc
        sql_query += " 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), "terminal_count": i.terminal_count})
        return jsonify({"data": response_data})
@console_ns.route("/apps/<uuid:app_id>/workflow/statistics/token-costs")
 class WorkflowDailyTokenCostStatistic(Resource):
-    def __init__(self, *args, **kwargs):
+    @api.doc("get_workflow_daily_token_cost_statistic")
-        super().__init__(*args, **kwargs)
+    @api.doc(description="Get workflow daily token cost statistics")
-        session_maker = sessionmaker(bind=db.engine, expire_on_commit=False)
+    @api.doc(params={"app_id": "Application ID"})
-        self._workflow_run_repo = DifyAPIRepositoryFactory.create_api_workflow_run_repository(session_maker)
+    @api.doc(params={"start": "Start date and time (YYYY-MM-DD HH:MM)", "end": "End date and time (YYYY-MM-DD HH:MM)"})
-
+    @api.response(200, "Daily token cost statistics retrieved successfully")
    @console_ns.doc("get_workflow_daily_token_cost_statistic")
    @console_ns.doc(description="Get workflow daily token cost statistics")
    @console_ns.doc(params={"app_id": "Application ID"})
    @console_ns.expect(console_ns.models[WorkflowStatisticQuery.__name__])
    @console_ns.response(200, "Daily token cost statistics retrieved successfully")
    @get_app_model
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        args = parser.parse_args()
-        assert account.timezone is not None
+        sql_query = """SELECT
    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
    SUM(workflow_runs.total_tokens) AS token_count
 FROM
    workflow_runs
 WHERE
    app_id = :app_id
    AND triggered_from = :triggered_from"""
        arg_dict = {
            "tz": account.timezone,
            "app_id": app_model.id,
            "triggered_from": WorkflowRunTriggeredFrom.APP_RUN,
        }
-        try:
+        timezone = pytz.timezone(account.timezone)
-            start_date, end_date = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
        except ValueError as e:
            abort(400, description=str(e))
-        response_data = self._workflow_run_repo.get_daily_token_cost_statistics(
+        if args["start"]:
-            tenant_id=app_model.tenant_id,
+            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
-            app_id=app_model.id,
+            start_datetime = start_datetime.replace(second=0)
-            triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+
-            start_date=start_date,
+            start_datetime_timezone = timezone.localize(start_datetime)
-            end_date=end_date,
+            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
-            timezone=account.timezone,
+
-        )
+            sql_query += " AND created_at >= :start"
            arg_dict["start"] = start_datetime_utc
        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query += " AND created_at < :end"
            arg_dict["end"] = end_datetime_utc
        sql_query += " 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),
                        "token_count": i.token_count,
                    }
                )
        return jsonify({"data": response_data})
@console_ns.route("/apps/<uuid:app_id>/workflow/statistics/average-app-interactions")
 class WorkflowAverageAppInteractionStatistic(Resource):
-    def __init__(self, *args, **kwargs):
+    @api.doc("get_workflow_average_app_interaction_statistic")
-        super().__init__(*args, **kwargs)
+    @api.doc(description="Get workflow average app interaction statistics")
-        session_maker = sessionmaker(bind=db.engine, expire_on_commit=False)
+    @api.doc(params={"app_id": "Application ID"})
-        self._workflow_run_repo = DifyAPIRepositoryFactory.create_api_workflow_run_repository(session_maker)
+    @api.doc(params={"start": "Start date and time (YYYY-MM-DD HH:MM)", "end": "End date and time (YYYY-MM-DD HH:MM)"})
-
+    @api.response(200, "Average app interaction statistics retrieved successfully")
    @console_ns.doc("get_workflow_average_app_interaction_statistic")
    @console_ns.doc(description="Get workflow average app interaction statistics")
    @console_ns.doc(params={"app_id": "Application ID"})
    @console_ns.expect(console_ns.models[WorkflowStatisticQuery.__name__])
    @console_ns.response(200, "Average app interaction statistics retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=[AppMode.WORKFLOW])
    def get(self, app_model):
-        account, _ = current_account_with_tenant()
+        account = current_user
-        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("start", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        parser.add_argument("end", type=DatetimeString("%Y-%m-%d %H:%M"), location="args")
        args = parser.parse_args()
-        assert account.timezone is not None
+        sql_query = """SELECT
    AVG(sub.interactions) AS interactions,
    sub.date
 FROM
    (
        SELECT
            DATE(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
            c.created_by,
            COUNT(c.id) AS interactions
        FROM
            workflow_runs c
        WHERE
            c.app_id = :app_id
            AND c.triggered_from = :triggered_from
            {{start}}
            {{end}}
        GROUP BY
            date, c.created_by
    ) sub
 GROUP BY
    sub.date"""
        arg_dict = {
            "tz": account.timezone,
            "app_id": app_model.id,
            "triggered_from": WorkflowRunTriggeredFrom.APP_RUN,
        }
-        try:
+        timezone = pytz.timezone(account.timezone)
-            start_date, end_date = parse_time_range(args.start, args.end, account.timezone)
+        utc_timezone = pytz.utc
        except ValueError as e:
            abort(400, description=str(e))
-        response_data = self._workflow_run_repo.get_average_app_interaction_statistics(
+        if args["start"]:
-            tenant_id=app_model.tenant_id,
+            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
-            app_id=app_model.id,
+            start_datetime = start_datetime.replace(second=0)
-            triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+
-            start_date=start_date,
+            start_datetime_timezone = timezone.localize(start_datetime)
-            end_date=end_date,
+            start_datetime_utc = start_datetime_timezone.astimezone(utc_timezone)
-            timezone=account.timezone,
+
-        )
+            sql_query = sql_query.replace("{{start}}", " AND c.created_at >= :start")
            arg_dict["start"] = start_datetime_utc
        else:
            sql_query = sql_query.replace("{{start}}", "")
        if args["end"]:
            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
            end_datetime = end_datetime.replace(second=0)
            end_datetime_timezone = timezone.localize(end_datetime)
            end_datetime_utc = end_datetime_timezone.astimezone(utc_timezone)
            sql_query = sql_query.replace("{{end}}", " AND c.created_at < :end")
            arg_dict["end"] = end_datetime_utc
        else:
            sql_query = sql_query.replace("{{end}}", "")
        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), "interactions": float(i.interactions.quantize(Decimal("0.01")))}
                )
        return jsonify({"data": response_data})
@@ -1,65 +1,44 @@
 import logging
-from flask import request
+from flask_restx import Resource, marshal_with, reqparse
 from flask_restx import Resource, marshal_with
 from pydantic import BaseModel
 from sqlalchemy import select
 from sqlalchemy.orm import Session
-from werkzeug.exceptions import NotFound
+from werkzeug.exceptions import Forbidden, NotFound
 from configs import dify_config
 from controllers.console import api
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from extensions.ext_database import db
 from fields.workflow_trigger_fields import trigger_fields, triggers_list_fields, webhook_trigger_fields
 from libs.login import current_user, login_required
-from models.enums import AppTriggerStatus
+from models.model import Account, AppMode
-from models.model import Account, App, AppMode
+from models.workflow import AppTrigger, AppTriggerStatus, WorkflowWebhookTrigger
 from models.trigger import AppTrigger, WorkflowWebhookTrigger
 from .. import console_ns
 from ..app.wraps import get_app_model
 from ..wraps import account_initialization_required, edit_permission_required, setup_required
 logger = logging.getLogger(__name__)
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class Parser(BaseModel):
    node_id: str
 class ParserEnable(BaseModel):
    trigger_id: str
    enable_trigger: bool
 console_ns.schema_model(Parser.__name__, Parser.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
 console_ns.schema_model(
    ParserEnable.__name__, ParserEnable.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
 )
@console_ns.route("/apps/<uuid:app_id>/workflows/triggers/webhook")
 class WebhookTriggerApi(Resource):
    """Webhook Trigger API"""
    @console_ns.expect(console_ns.models[Parser.__name__])
    @setup_required
    @login_required
    @account_initialization_required
    @get_app_model(mode=AppMode.WORKFLOW)
    @marshal_with(webhook_trigger_fields)
-    def get(self, app_model: App):
+    def get(self, app_model):
        """Get webhook trigger for a node"""
-        args = Parser.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        parser = reqparse.RequestParser()
        parser.add_argument("node_id", type=str, required=True, help="Node ID is required")
        args = parser.parse_args()
-        node_id = args.node_id
+        node_id = args["node_id"]
        with Session(db.engine) as session:
            # Get webhook trigger for this app and node
            webhook_trigger = (
                session.query(WorkflowWebhookTrigger)
-                .where(
+                .filter(
                    WorkflowWebhookTrigger.app_id == app_model.id,
                    WorkflowWebhookTrigger.node_id == node_id,
                )
@@ -69,10 +48,14 @@ class WebhookTriggerApi(Resource):
            if not webhook_trigger:
                raise NotFound("Webhook trigger not found for this node")
            # Add computed fields for marshal_with
            base_url = dify_config.SERVICE_API_URL
            webhook_trigger.webhook_url = f"{base_url}/triggers/webhook/{webhook_trigger.webhook_id}"  # type: ignore
            webhook_trigger.webhook_debug_url = f"{base_url}/triggers/webhook-debug/{webhook_trigger.webhook_id}"  # type: ignore
            return webhook_trigger
@console_ns.route("/apps/<uuid:app_id>/triggers")
 class AppTriggersApi(Resource):
    """App Triggers list API"""
@@ -81,7 +64,7 @@ class AppTriggersApi(Resource):
    @account_initialization_required
    @get_app_model(mode=AppMode.WORKFLOW)
    @marshal_with(triggers_list_fields)
-    def get(self, app_model: App):
+    def get(self, app_model):
        """Get app triggers list"""
        assert isinstance(current_user, Account)
        assert current_user.current_tenant_id is not None
@@ -112,22 +95,26 @@ class AppTriggersApi(Resource):
        return {"data": triggers}
@console_ns.route("/apps/<uuid:app_id>/trigger-enable")
 class AppTriggerEnableApi(Resource):
    @console_ns.expect(console_ns.models[ParserEnable.__name__], validate=True)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_app_model(mode=AppMode.WORKFLOW)
    @marshal_with(trigger_fields)
-    def post(self, app_model: App):
+    def post(self, app_model):
        """Update app trigger (enable/disable)"""
-        args = ParserEnable.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
        parser.add_argument("trigger_id", type=str, required=True, nullable=False, location="json")
        parser.add_argument("enable_trigger", type=bool, required=True, nullable=False, location="json")
        args = parser.parse_args()
        assert isinstance(current_user, Account)
        assert current_user.current_tenant_id is not None
        if not current_user.has_edit_permission:
            raise Forbidden()
        trigger_id = args["trigger_id"]
        trigger_id = args.trigger_id
        with Session(db.engine) as session:
            # Find the trigger using select
            trigger = session.execute(
@@ -142,7 +129,7 @@ class AppTriggerEnableApi(Resource):
                raise NotFound("Trigger not found")
            # Update status based on enable_trigger boolean
-            trigger.status = AppTriggerStatus.ENABLED if args.enable_trigger else AppTriggerStatus.DISABLED
+            trigger.status = AppTriggerStatus.ENABLED if args["enable_trigger"] else AppTriggerStatus.DISABLED
            session.commit()
            session.refresh(trigger)
@@ -155,3 +142,8 @@ class AppTriggerEnableApi(Resource):
            trigger.icon = ""  # type: ignore
        return trigger
 api.add_resource(WebhookTriggerApi, "/apps/<uuid:app_id>/workflows/triggers/webhook")
 api.add_resource(AppTriggersApi, "/apps/<uuid:app_id>/triggers")
 api.add_resource(AppTriggerEnableApi, "/apps/<uuid:app_id>/trigger-enable")
@@ -4,29 +4,28 @@ from typing import ParamSpec, TypeVar, Union
 from controllers.console.app.error import AppNotFoundError
 from extensions.ext_database import db
-from libs.login import current_account_with_tenant
+from libs.login import current_user
 from models import App, AppMode
 from models.account import Account
 P = ParamSpec("P")
 R = TypeVar("R")
 P1 = ParamSpec("P1")
 R1 = TypeVar("R1")
 def _load_app_model(app_id: str) -> App | None:
-    _, current_tenant_id = current_account_with_tenant()
+    assert isinstance(current_user, Account)
    app_model = (
        db.session.query(App)
-        .where(App.id == app_id, App.tenant_id == current_tenant_id, App.status == "normal")
+        .where(App.id == app_id, App.tenant_id == current_user.current_tenant_id, App.status == "normal")
        .first()
    )
    return app_model
 def get_app_model(view: Callable[P, R] | None = None, *, mode: Union[AppMode, list[AppMode], None] = None):
-    def decorator(view_func: Callable[P1, R1]):
+    def decorator(view_func: Callable[P, R]):
        @wraps(view_func)
-        def decorated_view(*args: P1.args, **kwargs: P1.kwargs):
+        def decorated_view(*args: P.args, **kwargs: P.kwargs):
            if not kwargs.get("app_id"):
                raise ValueError("missing app_id in path parameters")
@@ -2,31 +2,35 @@ from flask import request
 from flask_restx import Resource, fields, reqparse
 from constants.languages import supported_language
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.error import AlreadyActivateError
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from libs.helper import StrLen, email, extract_remote_ip, timezone
-from models import AccountStatus
+from models.account import AccountStatus
 from services.account_service import AccountService, RegisterService
-active_check_parser = (
+active_check_parser = reqparse.RequestParser()
-    reqparse.RequestParser()
+active_check_parser.add_argument(
-    .add_argument("workspace_id", type=str, required=False, nullable=True, location="args", help="Workspace ID")
+    "workspace_id", type=str, required=False, nullable=True, location="args", help="Workspace ID"
-    .add_argument("email", type=email, required=False, nullable=True, location="args", help="Email address")
+)
-    .add_argument("token", type=str, required=True, nullable=False, location="args", help="Activation token")
+active_check_parser.add_argument(
    "email", type=email, required=False, nullable=True, location="args", help="Email address"
 )
 active_check_parser.add_argument(
    "token", type=str, required=True, nullable=False, location="args", help="Activation token"
 )
@console_ns.route("/activate/check")
 class ActivateCheckApi(Resource):
-    @console_ns.doc("check_activation_token")
+    @api.doc("check_activation_token")
-    @console_ns.doc(description="Check if activation token is valid")
+    @api.doc(description="Check if activation token is valid")
-    @console_ns.expect(active_check_parser)
+    @api.expect(active_check_parser)
-    @console_ns.response(
+    @api.response(
        200,
        "Success",
-        console_ns.model(
+        api.model(
            "ActivationCheckResponse",
            {
                "is_valid": fields.Boolean(description="Whether token is valid"),
@@ -56,26 +60,26 @@ class ActivateCheckApi(Resource):
            return {"is_valid": False}
-active_parser = (
+active_parser = reqparse.RequestParser()
-    reqparse.RequestParser()
+active_parser.add_argument("workspace_id", type=str, required=False, nullable=True, location="json")
-    .add_argument("workspace_id", type=str, required=False, nullable=True, location="json")
+active_parser.add_argument("email", type=email, required=False, nullable=True, location="json")
-    .add_argument("email", type=email, required=False, nullable=True, location="json")
+active_parser.add_argument("token", type=str, required=True, nullable=False, location="json")
-    .add_argument("token", type=str, required=True, nullable=False, location="json")
+active_parser.add_argument("name", type=StrLen(30), required=True, nullable=False, location="json")
-    .add_argument("name", type=StrLen(30), required=True, nullable=False, location="json")
+active_parser.add_argument(
-    .add_argument("interface_language", type=supported_language, required=True, nullable=False, location="json")
+    "interface_language", type=supported_language, required=True, nullable=False, location="json"
    .add_argument("timezone", type=timezone, required=True, nullable=False, location="json")
 )
 active_parser.add_argument("timezone", type=timezone, required=True, nullable=False, location="json")
@console_ns.route("/activate")
 class ActivateApi(Resource):
-    @console_ns.doc("activate_account")
+    @api.doc("activate_account")
-    @console_ns.doc(description="Activate account with invitation token")
+    @api.doc(description="Activate account with invitation token")
-    @console_ns.expect(active_parser)
+    @api.expect(active_parser)
-    @console_ns.response(
+    @api.response(
        200,
        "Account activated successfully",
-        console_ns.model(
+        api.model(
            "ActivationResponse",
            {
                "result": fields.String(description="Operation result"),
@@ -83,7 +87,7 @@ class ActivateApi(Resource):
            },
        ),
    )
-    @console_ns.response(400, "Already activated or invalid token")
+    @api.response(400, "Already activated or invalid token")
    def post(self):
        args = active_parser.parse_args()
@@ -1,9 +1,10 @@
 from flask_login import current_user
 from flask_restx import Resource, reqparse
 from werkzeug.exceptions import Forbidden
 from controllers.console import console_ns
 from controllers.console.auth.error import ApiKeyAuthFailedError
-from controllers.console.wraps import is_admin_or_owner_required
+from libs.login import login_required
 from libs.login import current_account_with_tenant, login_required
 from services.auth.api_key_auth_service import ApiKeyAuthService
 from ..wraps import account_initialization_required, setup_required
@@ -15,8 +16,7 @@ class ApiKeyAuthDataSource(Resource):
    @login_required
    @account_initialization_required
    def get(self):
-        _, current_tenant_id = current_account_with_tenant()
+        data_source_api_key_bindings = ApiKeyAuthService.get_provider_auth_list(current_user.current_tenant_id)
        data_source_api_key_bindings = ApiKeyAuthService.get_provider_auth_list(current_tenant_id)
        if data_source_api_key_bindings:
            return {
                "sources": [
@@ -39,20 +39,18 @@ class ApiKeyAuthDataSourceBinding(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @is_admin_or_owner_required
    def post(self):
        # The role of the current user in the table must be admin or owner
-        _, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_admin_or_owner:
-        parser = (
+            raise Forbidden()
-            reqparse.RequestParser()
+        parser = reqparse.RequestParser()
-            .add_argument("category", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("category", type=str, required=True, nullable=False, location="json")
-            .add_argument("provider", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("provider", type=str, required=True, nullable=False, location="json")
-            .add_argument("credentials", type=dict, required=True, nullable=False, location="json")
+        parser.add_argument("credentials", type=dict, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        ApiKeyAuthService.validate_api_key_auth_args(args)
        try:
-            ApiKeyAuthService.create_provider_auth(current_tenant_id, args)
+            ApiKeyAuthService.create_provider_auth(current_user.current_tenant_id, args)
        except Exception as e:
            raise ApiKeyAuthFailedError(str(e))
        return {"result": "success"}, 200
@@ -63,11 +61,11 @@ class ApiKeyAuthDataSourceBindingDelete(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @is_admin_or_owner_required
    def delete(self, binding_id):
        # The role of the current user in the table must be admin or owner
-        _, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_admin_or_owner:
            raise Forbidden()
-        ApiKeyAuthService.delete_provider_auth(current_tenant_id, binding_id)
+        ApiKeyAuthService.delete_provider_auth(current_user.current_tenant_id, binding_id)
        return {"result": "success"}, 204
@@ -2,11 +2,12 @@ import logging
 import httpx
 from flask import current_app, redirect, request
 from flask_login import current_user
 from flask_restx import Resource, fields
 from werkzeug.exceptions import Forbidden
 from configs import dify_config
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.wraps import is_admin_or_owner_required
 from libs.login import login_required
 from libs.oauth_data_source import NotionOAuth
@@ -29,22 +30,23 @@ def get_oauth_providers():
@console_ns.route("/oauth/data-source/<string:provider>")
 class OAuthDataSource(Resource):
-    @console_ns.doc("oauth_data_source")
+    @api.doc("oauth_data_source")
-    @console_ns.doc(description="Get OAuth authorization URL for data source provider")
+    @api.doc(description="Get OAuth authorization URL for data source provider")
-    @console_ns.doc(params={"provider": "Data source provider name (notion)"})
+    @api.doc(params={"provider": "Data source provider name (notion)"})
-    @console_ns.response(
+    @api.response(
        200,
        "Authorization URL or internal setup success",
-        console_ns.model(
+        api.model(
            "OAuthDataSourceResponse",
            {"data": fields.Raw(description="Authorization URL or 'internal' for internal setup")},
        ),
    )
-    @console_ns.response(400, "Invalid provider")
+    @api.response(400, "Invalid provider")
-    @console_ns.response(403, "Admin privileges required")
+    @api.response(403, "Admin privileges required")
    @is_admin_or_owner_required
    def get(self, provider: str):
        # The role of the current user in the table must be admin or owner
        if not current_user.is_admin_or_owner:
            raise Forbidden()
        OAUTH_DATASOURCE_PROVIDERS = get_oauth_providers()
        with current_app.app_context():
            oauth_provider = OAUTH_DATASOURCE_PROVIDERS.get(provider)
@@ -63,17 +65,17 @@ class OAuthDataSource(Resource):
@console_ns.route("/oauth/data-source/callback/<string:provider>")
 class OAuthDataSourceCallback(Resource):
-    @console_ns.doc("oauth_data_source_callback")
+    @api.doc("oauth_data_source_callback")
-    @console_ns.doc(description="Handle OAuth callback from data source provider")
+    @api.doc(description="Handle OAuth callback from data source provider")
-    @console_ns.doc(
+    @api.doc(
        params={
            "provider": "Data source provider name (notion)",
            "code": "Authorization code from OAuth provider",
            "error": "Error message from OAuth provider",
        }
    )
-    @console_ns.response(302, "Redirect to console with result")
+    @api.response(302, "Redirect to console with result")
-    @console_ns.response(400, "Invalid provider")
+    @api.response(400, "Invalid provider")
    def get(self, provider: str):
        OAUTH_DATASOURCE_PROVIDERS = get_oauth_providers()
        with current_app.app_context():
@@ -94,17 +96,17 @@ class OAuthDataSourceCallback(Resource):
@console_ns.route("/oauth/data-source/binding/<string:provider>")
 class OAuthDataSourceBinding(Resource):
-    @console_ns.doc("oauth_data_source_binding")
+    @api.doc("oauth_data_source_binding")
-    @console_ns.doc(description="Bind OAuth data source with authorization code")
+    @api.doc(description="Bind OAuth data source with authorization code")
-    @console_ns.doc(
+    @api.doc(
        params={"provider": "Data source provider name (notion)", "code": "Authorization code from OAuth provider"}
    )
-    @console_ns.response(
+    @api.response(
        200,
        "Data source binding success",
-        console_ns.model("OAuthDataSourceBindingResponse", {"result": fields.String(description="Operation result")}),
+        api.model("OAuthDataSourceBindingResponse", {"result": fields.String(description="Operation result")}),
    )
-    @console_ns.response(400, "Invalid provider or code")
+    @api.response(400, "Invalid provider or code")
    def get(self, provider: str):
        OAUTH_DATASOURCE_PROVIDERS = get_oauth_providers()
        with current_app.app_context():
@@ -128,15 +130,15 @@ class OAuthDataSourceBinding(Resource):
@console_ns.route("/oauth/data-source/<string:provider>/<uuid:binding_id>/sync")
 class OAuthDataSourceSync(Resource):
-    @console_ns.doc("oauth_data_source_sync")
+    @api.doc("oauth_data_source_sync")
-    @console_ns.doc(description="Sync data from OAuth data source")
+    @api.doc(description="Sync data from OAuth data source")
-    @console_ns.doc(params={"provider": "Data source provider name (notion)", "binding_id": "Data source binding ID"})
+    @api.doc(params={"provider": "Data source provider name (notion)", "binding_id": "Data source binding ID"})
-    @console_ns.response(
+    @api.response(
        200,
        "Data source sync success",
-        console_ns.model("OAuthDataSourceSyncResponse", {"result": fields.String(description="Operation result")}),
+        api.model("OAuthDataSourceSyncResponse", {"result": fields.String(description="Operation result")}),
    )
-    @console_ns.response(400, "Invalid provider or sync failed")
+    @api.response(400, "Invalid provider or sync failed")
    @setup_required
    @login_required
    @account_initialization_required
@@ -19,7 +19,7 @@ from controllers.console.wraps import email_password_login_enabled, email_regist
 from extensions.ext_database import db
 from libs.helper import email, extract_remote_ip
 from libs.password import valid_password
-from models import Account
+from models.account import Account
 from services.account_service import AccountService
 from services.billing_service import BillingService
 from services.errors.account import AccountNotFoundError, AccountRegisterError
@@ -31,11 +31,9 @@ class EmailRegisterSendEmailApi(Resource):
    @email_password_login_enabled
    @email_register_enabled
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("email", type=email, required=True, location="json")
-            .add_argument("email", type=email, required=True, location="json")
+        parser.add_argument("language", type=str, required=False, location="json")
            .add_argument("language", type=str, required=False, location="json")
        )
        args = parser.parse_args()
        ip_address = extract_remote_ip(request)
@@ -61,12 +59,10 @@ class EmailRegisterCheckApi(Resource):
    @email_password_login_enabled
    @email_register_enabled
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("email", type=str, required=True, location="json")
-            .add_argument("email", type=str, required=True, location="json")
+        parser.add_argument("code", type=str, required=True, location="json")
-            .add_argument("code", type=str, required=True, location="json")
+        parser.add_argument("token", type=str, required=True, nullable=False, location="json")
            .add_argument("token", type=str, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        user_email = args["email"]
@@ -104,12 +100,10 @@ class EmailRegisterResetApi(Resource):
    @email_password_login_enabled
    @email_register_enabled
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("token", type=str, required=True, nullable=False, location="json")
-            .add_argument("token", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("new_password", type=valid_password, required=True, nullable=False, location="json")
-            .add_argument("new_password", type=valid_password, required=True, nullable=False, location="json")
+        parser.add_argument("password_confirm", type=valid_password, required=True, nullable=False, location="json")
            .add_argument("password_confirm", type=valid_password, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        # Validate passwords match
@@ -6,7 +6,7 @@ from flask_restx import Resource, fields, reqparse
 from sqlalchemy import select
 from sqlalchemy.orm import Session
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.auth.error import (
    EmailCodeError,
    EmailPasswordResetLimitError,
@@ -20,17 +20,17 @@ from events.tenant_event import tenant_was_created
 from extensions.ext_database import db
 from libs.helper import email, extract_remote_ip
 from libs.password import hash_password, valid_password
-from models import Account
+from models.account import Account
 from services.account_service import AccountService, TenantService
 from services.feature_service import FeatureService
@console_ns.route("/forgot-password")
 class ForgotPasswordSendEmailApi(Resource):
-    @console_ns.doc("send_forgot_password_email")
+    @api.doc("send_forgot_password_email")
-    @console_ns.doc(description="Send password reset email")
+    @api.doc(description="Send password reset email")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "ForgotPasswordEmailRequest",
            {
                "email": fields.String(required=True, description="Email address"),
@@ -38,10 +38,10 @@ class ForgotPasswordSendEmailApi(Resource):
            },
        )
    )
-    @console_ns.response(
+    @api.response(
        200,
        "Email sent successfully",
-        console_ns.model(
+        api.model(
            "ForgotPasswordEmailResponse",
            {
                "result": fields.String(description="Operation result"),
@@ -50,15 +50,13 @@ class ForgotPasswordSendEmailApi(Resource):
            },
        ),
    )
-    @console_ns.response(400, "Invalid email or rate limit exceeded")
+    @api.response(400, "Invalid email or rate limit exceeded")
    @setup_required
    @email_password_login_enabled
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("email", type=email, required=True, location="json")
-            .add_argument("email", type=email, required=True, location="json")
+        parser.add_argument("language", type=str, required=False, location="json")
            .add_argument("language", type=str, required=False, location="json")
        )
        args = parser.parse_args()
        ip_address = extract_remote_ip(request)
@@ -85,10 +83,10 @@ class ForgotPasswordSendEmailApi(Resource):
@console_ns.route("/forgot-password/validity")
 class ForgotPasswordCheckApi(Resource):
-    @console_ns.doc("check_forgot_password_code")
+    @api.doc("check_forgot_password_code")
-    @console_ns.doc(description="Verify password reset code")
+    @api.doc(description="Verify password reset code")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "ForgotPasswordCheckRequest",
            {
                "email": fields.String(required=True, description="Email address"),
@@ -97,10 +95,10 @@ class ForgotPasswordCheckApi(Resource):
            },
        )
    )
-    @console_ns.response(
+    @api.response(
        200,
        "Code verified successfully",
-        console_ns.model(
+        api.model(
            "ForgotPasswordCheckResponse",
            {
                "is_valid": fields.Boolean(description="Whether code is valid"),
@@ -109,16 +107,14 @@ class ForgotPasswordCheckApi(Resource):
            },
        ),
    )
-    @console_ns.response(400, "Invalid code or token")
+    @api.response(400, "Invalid code or token")
    @setup_required
    @email_password_login_enabled
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("email", type=str, required=True, location="json")
-            .add_argument("email", type=str, required=True, location="json")
+        parser.add_argument("code", type=str, required=True, location="json")
-            .add_argument("code", type=str, required=True, location="json")
+        parser.add_argument("token", type=str, required=True, nullable=False, location="json")
            .add_argument("token", type=str, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        user_email = args["email"]
@@ -152,10 +148,10 @@ class ForgotPasswordCheckApi(Resource):
@console_ns.route("/forgot-password/resets")
 class ForgotPasswordResetApi(Resource):
-    @console_ns.doc("reset_password")
+    @api.doc("reset_password")
-    @console_ns.doc(description="Reset password with verification token")
+    @api.doc(description="Reset password with verification token")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "ForgotPasswordResetRequest",
            {
                "token": fields.String(required=True, description="Verification token"),
@@ -164,21 +160,19 @@ class ForgotPasswordResetApi(Resource):
            },
        )
    )
-    @console_ns.response(
+    @api.response(
        200,
        "Password reset successfully",
-        console_ns.model("ForgotPasswordResetResponse", {"result": fields.String(description="Operation result")}),
+        api.model("ForgotPasswordResetResponse", {"result": fields.String(description="Operation result")}),
    )
-    @console_ns.response(400, "Invalid token or password mismatch")
+    @api.response(400, "Invalid token or password mismatch")
    @setup_required
    @email_password_login_enabled
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("token", type=str, required=True, nullable=False, location="json")
-            .add_argument("token", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("new_password", type=valid_password, required=True, nullable=False, location="json")
-            .add_argument("new_password", type=valid_password, required=True, nullable=False, location="json")
+        parser.add_argument("password_confirm", type=valid_password, required=True, nullable=False, location="json")
            .add_argument("password_confirm", type=valid_password, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        # Validate passwords match
@@ -1,10 +1,12 @@
 from typing import cast
 import flask_login
-from flask import make_response, request
+from flask import request
 from flask_restx import Resource, reqparse
 import services
 from configs import dify_config
-from constants.languages import get_valid_language
+from constants.languages import languages
 from controllers.console import console_ns
 from controllers.console.auth.error import (
    AuthenticationFailedError,
@@ -24,16 +26,7 @@ from controllers.console.error import (
 from controllers.console.wraps import email_password_login_enabled, setup_required
 from events.tenant_event import tenant_was_created
 from libs.helper import email, extract_remote_ip
-from libs.login import current_account_with_tenant
+from models.account import Account
 from libs.token import (
    clear_access_token_from_cookie,
    clear_csrf_token_from_cookie,
    clear_refresh_token_from_cookie,
    extract_refresh_token,
    set_access_token_to_cookie,
    set_csrf_token_to_cookie,
    set_refresh_token_to_cookie,
 )
 from services.account_service import AccountService, RegisterService, TenantService
 from services.billing_service import BillingService
 from services.errors.account import AccountRegisterError
@@ -49,13 +42,11 @@ class LoginApi(Resource):
    @email_password_login_enabled
    def post(self):
        """Authenticate user and login."""
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("email", type=email, required=True, location="json")
-            .add_argument("email", type=email, required=True, location="json")
+        parser.add_argument("password", type=str, required=True, location="json")
-            .add_argument("password", type=str, required=True, location="json")
+        parser.add_argument("remember_me", type=bool, required=False, default=False, location="json")
-            .add_argument("remember_me", type=bool, required=False, default=False, location="json")
+        parser.add_argument("invite_token", type=str, required=False, default=None, location="json")
            .add_argument("invite_token", type=str, required=False, default=None, location="json")
        )
        args = parser.parse_args()
        if dify_config.BILLING_ENABLED and BillingService.is_email_in_freeze(args["email"]):
@@ -98,36 +89,19 @@ class LoginApi(Resource):
        token_pair = AccountService.login(account=account, ip_address=extract_remote_ip(request))
        AccountService.reset_login_error_rate_limit(args["email"])
-
+        return {"result": "success", "data": token_pair.model_dump()}
        # Create response with cookies instead of returning tokens in body
        response = make_response({"result": "success"})
        set_access_token_to_cookie(request, response, token_pair.access_token)
        set_refresh_token_to_cookie(request, response, token_pair.refresh_token)
        set_csrf_token_to_cookie(request, response, token_pair.csrf_token)
        return response
@console_ns.route("/logout")
 class LogoutApi(Resource):
    @setup_required
-    def post(self):
+    def get(self):
-        current_user, _ = current_account_with_tenant()
+        account = cast(Account, flask_login.current_user)
        account = current_user
        if isinstance(account, flask_login.AnonymousUserMixin):
-            response = make_response({"result": "success"})
+            return {"result": "success"}
-        else:
+        AccountService.logout(account=account)
-            AccountService.logout(account=account)
+        flask_login.logout_user()
-            flask_login.logout_user()
+        return {"result": "success"}
            response = make_response({"result": "success"})
        # Clear cookies on logout
        clear_access_token_from_cookie(response)
        clear_refresh_token_from_cookie(response)
        clear_csrf_token_from_cookie(response)
        return response
@console_ns.route("/reset-password")
@@ -135,11 +109,9 @@ class ResetPasswordSendEmailApi(Resource):
    @setup_required
    @email_password_login_enabled
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("email", type=email, required=True, location="json")
-            .add_argument("email", type=email, required=True, location="json")
+        parser.add_argument("language", type=str, required=False, location="json")
            .add_argument("language", type=str, required=False, location="json")
        )
        args = parser.parse_args()
        if args["language"] is not None and args["language"] == "zh-Hans":
@@ -165,11 +137,9 @@ class ResetPasswordSendEmailApi(Resource):
 class EmailCodeLoginSendEmailApi(Resource):
    @setup_required
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("email", type=email, required=True, location="json")
-            .add_argument("email", type=email, required=True, location="json")
+        parser.add_argument("language", type=str, required=False, location="json")
            .add_argument("language", type=str, required=False, location="json")
        )
        args = parser.parse_args()
        ip_address = extract_remote_ip(request)
@@ -200,17 +170,13 @@ class EmailCodeLoginSendEmailApi(Resource):
 class EmailCodeLoginApi(Resource):
    @setup_required
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("email", type=str, required=True, location="json")
-            .add_argument("email", type=str, required=True, location="json")
+        parser.add_argument("code", type=str, required=True, location="json")
-            .add_argument("code", type=str, required=True, location="json")
+        parser.add_argument("token", type=str, required=True, location="json")
            .add_argument("token", type=str, required=True, location="json")
            .add_argument("language", type=str, required=False, location="json")
        )
        args = parser.parse_args()
        user_email = args["email"]
        language = args["language"]
        token_data = AccountService.get_email_code_login_data(args["token"])
        if token_data is None:
@@ -244,9 +210,7 @@ class EmailCodeLoginApi(Resource):
        if account is None:
            try:
                account = AccountService.create_account_and_tenant(
-                    email=user_email,
+                    email=user_email, name=user_email, interface_language=languages[0]
                    name=user_email,
                    interface_language=get_valid_language(language),
                )
            except WorkSpaceNotAllowedCreateError:
                raise NotAllowedCreateWorkspace()
@@ -256,36 +220,18 @@ class EmailCodeLoginApi(Resource):
                raise WorkspacesLimitExceeded()
        token_pair = AccountService.login(account, ip_address=extract_remote_ip(request))
        AccountService.reset_login_error_rate_limit(args["email"])
-
+        return {"result": "success", "data": token_pair.model_dump()}
        # Create response with cookies instead of returning tokens in body
        response = make_response({"result": "success"})
        set_csrf_token_to_cookie(request, response, token_pair.csrf_token)
        # Set HTTP-only secure cookies for tokens
        set_access_token_to_cookie(request, response, token_pair.access_token)
        set_refresh_token_to_cookie(request, response, token_pair.refresh_token)
        return response
@console_ns.route("/refresh-token")
 class RefreshTokenApi(Resource):
    def post(self):
-        # Get refresh token from cookie instead of request body
+        parser = reqparse.RequestParser()
-        refresh_token = extract_refresh_token(request)
+        parser.add_argument("refresh_token", type=str, required=True, location="json")
-
+        args = parser.parse_args()
        if not refresh_token:
            return {"result": "fail", "message": "No refresh token provided"}, 401
        try:
-            new_token_pair = AccountService.refresh_token(refresh_token)
+            new_token_pair = AccountService.refresh_token(args["refresh_token"])
-
+            return {"result": "success", "data": new_token_pair.model_dump()}
            # Create response with new cookies
            response = make_response({"result": "success"})
            # Update cookies with new tokens
            set_csrf_token_to_cookie(request, response, new_token_pair.csrf_token)
            set_access_token_to_cookie(request, response, new_token_pair.access_token)
            set_refresh_token_to_cookie(request, response, new_token_pair.refresh_token)
            return response
        except Exception as e:
-            return {"result": "fail", "message": str(e)}, 401
+            return {"result": "fail", "data": str(e)}, 401
@@ -14,19 +14,15 @@ from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from libs.helper import extract_remote_ip
 from libs.oauth import GitHubOAuth, GoogleOAuth, OAuthUserInfo
-from libs.token import (
+from models import Account
-    set_access_token_to_cookie,
+from models.account import AccountStatus
    set_csrf_token_to_cookie,
    set_refresh_token_to_cookie,
 )
 from models import Account, AccountStatus
 from services.account_service import AccountService, RegisterService, TenantService
 from services.billing_service import BillingService
 from services.errors.account import AccountNotFoundError, AccountRegisterError
 from services.errors.workspace import WorkSpaceNotAllowedCreateError, WorkSpaceNotFoundError
 from services.feature_service import FeatureService
-from .. import console_ns
+from .. import api, console_ns
 logger = logging.getLogger(__name__)
@@ -56,13 +52,11 @@ def get_oauth_providers():
@console_ns.route("/oauth/login/<provider>")
 class OAuthLogin(Resource):
-    @console_ns.doc("oauth_login")
+    @api.doc("oauth_login")
-    @console_ns.doc(description="Initiate OAuth login process")
+    @api.doc(description="Initiate OAuth login process")
-    @console_ns.doc(
+    @api.doc(params={"provider": "OAuth provider name (github/google)", "invite_token": "Optional invitation token"})
-        params={"provider": "OAuth provider name (github/google)", "invite_token": "Optional invitation token"}
+    @api.response(302, "Redirect to OAuth authorization URL")
-    )
+    @api.response(400, "Invalid provider")
    @console_ns.response(302, "Redirect to OAuth authorization URL")
    @console_ns.response(400, "Invalid provider")
    def get(self, provider: str):
        invite_token = request.args.get("invite_token") or None
        OAUTH_PROVIDERS = get_oauth_providers()
@@ -77,17 +71,17 @@ class OAuthLogin(Resource):
@console_ns.route("/oauth/authorize/<provider>")
 class OAuthCallback(Resource):
-    @console_ns.doc("oauth_callback")
+    @api.doc("oauth_callback")
-    @console_ns.doc(description="Handle OAuth callback and complete login process")
+    @api.doc(description="Handle OAuth callback and complete login process")
-    @console_ns.doc(
+    @api.doc(
        params={
            "provider": "OAuth provider name (github/google)",
            "code": "Authorization code from OAuth provider",
            "state": "Optional state parameter (used for invite token)",
        }
    )
-    @console_ns.response(302, "Redirect to console with access token")
+    @api.response(302, "Redirect to console with access token")
-    @console_ns.response(400, "OAuth process failed")
+    @api.response(400, "OAuth process failed")
    def get(self, provider: str):
        OAUTH_PROVIDERS = get_oauth_providers()
        with current_app.app_context():
@@ -159,12 +153,9 @@ class OAuthCallback(Resource):
            ip_address=extract_remote_ip(request),
        )
-        response = redirect(f"{dify_config.CONSOLE_WEB_URL}")
+        return redirect(
-
+            f"{dify_config.CONSOLE_WEB_URL}?access_token={token_pair.access_token}&refresh_token={token_pair.refresh_token}"
-        set_access_token_to_cookie(request, response, token_pair.access_token)
+        )
        set_refresh_token_to_cookie(request, response, token_pair.refresh_token)
        set_csrf_token_to_cookie(request, response, token_pair.csrf_token)
        return response
 def _get_account_by_openid_or_email(provider: str, user_info: OAuthUserInfo) -> Account | None:
@@ -1,15 +1,16 @@
 from collections.abc import Callable
 from functools import wraps
-from typing import Concatenate, ParamSpec, TypeVar
+from typing import Concatenate, ParamSpec, TypeVar, cast
 import flask_login
 from flask import jsonify, request
 from flask_restx import Resource, reqparse
 from werkzeug.exceptions import BadRequest, NotFound
 from controllers.console.wraps import account_initialization_required, setup_required
 from core.model_runtime.utils.encoders import jsonable_encoder
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
-from models import Account
+from models.account import Account
 from models.model import OAuthProviderApp
 from services.oauth_server import OAUTH_ACCESS_TOKEN_EXPIRES_IN, OAuthGrantType, OAuthServerService
@@ -23,7 +24,8 @@ T = TypeVar("T")
 def oauth_server_client_id_required(view: Callable[Concatenate[T, OAuthProviderApp, P], R]):
    @wraps(view)
    def decorated(self: T, *args: P.args, **kwargs: P.kwargs):
-        parser = reqparse.RequestParser().add_argument("client_id", type=str, required=True, location="json")
+        parser = reqparse.RequestParser()
        parser.add_argument("client_id", type=str, required=True, location="json")
        parsed_args = parser.parse_args()
        client_id = parsed_args.get("client_id")
        if not client_id:
@@ -89,7 +91,8 @@ class OAuthServerAppApi(Resource):
    @setup_required
    @oauth_server_client_id_required
    def post(self, oauth_provider_app: OAuthProviderApp):
-        parser = reqparse.RequestParser().add_argument("redirect_uri", type=str, required=True, location="json")
+        parser = reqparse.RequestParser()
        parser.add_argument("redirect_uri", type=str, required=True, location="json")
        parsed_args = parser.parse_args()
        redirect_uri = parsed_args.get("redirect_uri")
@@ -113,8 +116,7 @@ class OAuthServerUserAuthorizeApi(Resource):
    @account_initialization_required
    @oauth_server_client_id_required
    def post(self, oauth_provider_app: OAuthProviderApp):
-        current_user, _ = current_account_with_tenant()
+        account = cast(Account, flask_login.current_user)
        account = current_user
        user_account_id = account.id
        code = OAuthServerService.sign_oauth_authorization_code(oauth_provider_app.client_id, user_account_id)
@@ -130,14 +132,12 @@ class OAuthServerUserTokenApi(Resource):
    @setup_required
    @oauth_server_client_id_required
    def post(self, oauth_provider_app: OAuthProviderApp):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("grant_type", type=str, required=True, location="json")
-            .add_argument("grant_type", type=str, required=True, location="json")
+        parser.add_argument("code", type=str, required=False, location="json")
-            .add_argument("code", type=str, required=False, location="json")
+        parser.add_argument("client_secret", type=str, required=False, location="json")
-            .add_argument("client_secret", type=str, required=False, location="json")
+        parser.add_argument("redirect_uri", type=str, required=False, location="json")
-            .add_argument("redirect_uri", type=str, required=False, location="json")
+        parser.add_argument("refresh_token", type=str, required=False, location="json")
            .add_argument("refresh_token", type=str, required=False, location="json")
        )
        parsed_args = parser.parse_args()
        try:
@@ -1,12 +1,9 @@
-import base64
+from flask_restx import Resource, reqparse
 from flask_restx import Resource, fields, reqparse
 from werkzeug.exceptions import BadRequest
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, only_edition_cloud, setup_required
-from enums.cloud_plan import CloudPlan
+from libs.login import current_user, login_required
-from libs.login import current_account_with_tenant, login_required
+from models.model import Account
 from services.billing_service import BillingService
@@ -17,21 +14,17 @@ class Subscription(Resource):
    @account_initialization_required
    @only_edition_cloud
    def get(self):
-        current_user, current_tenant_id = current_account_with_tenant()
+        parser = reqparse.RequestParser()
-        parser = (
+        parser.add_argument("plan", type=str, required=True, location="args", choices=["professional", "team"])
-            reqparse.RequestParser()
+        parser.add_argument("interval", type=str, required=True, location="args", choices=["month", "year"])
            .add_argument(
                "plan",
                type=str,
                required=True,
                location="args",
                choices=[CloudPlan.PROFESSIONAL, CloudPlan.TEAM],
            )
            .add_argument("interval", type=str, required=True, location="args", choices=["month", "year"])
        )
        args = parser.parse_args()
        assert isinstance(current_user, Account)
        BillingService.is_tenant_owner_or_admin(current_user)
-        return BillingService.get_subscription(args["plan"], args["interval"], current_user.email, current_tenant_id)
+        assert current_user.current_tenant_id is not None
        return BillingService.get_subscription(
            args["plan"], args["interval"], current_user.email, current_user.current_tenant_id
        )
@console_ns.route("/billing/invoices")
@@ -41,40 +34,7 @@ class Invoices(Resource):
    @account_initialization_required
    @only_edition_cloud
    def get(self):
-        current_user, current_tenant_id = current_account_with_tenant()
+        assert isinstance(current_user, Account)
        BillingService.is_tenant_owner_or_admin(current_user)
-        return BillingService.get_invoices(current_user.email, current_tenant_id)
+        assert current_user.current_tenant_id is not None
-
+        return BillingService.get_invoices(current_user.email, current_user.current_tenant_id)
@console_ns.route("/billing/partners/<string:partner_key>/tenants")
 class PartnerTenants(Resource):
    @console_ns.doc("sync_partner_tenants_bindings")
    @console_ns.doc(description="Sync partner tenants bindings")
    @console_ns.doc(params={"partner_key": "Partner key"})
    @console_ns.expect(
        console_ns.model(
            "SyncPartnerTenantsBindingsRequest",
            {"click_id": fields.String(required=True, description="Click Id from partner referral link")},
        )
    )
    @console_ns.response(200, "Tenants synced to partner successfully")
    @console_ns.response(400, "Invalid partner information")
    @setup_required
    @login_required
    @account_initialization_required
    @only_edition_cloud
    def put(self, partner_key: str):
        current_user, _ = current_account_with_tenant()
        parser = reqparse.RequestParser().add_argument("click_id", required=True, type=str, location="json")
        args = parser.parse_args()
        try:
            click_id = args["click_id"]
            decoded_partner_key = base64.b64decode(partner_key).decode("utf-8")
        except Exception:
            raise BadRequest("Invalid partner_key")
        if not click_id or not decoded_partner_key or not current_user.id:
            raise BadRequest("Invalid partner information")
        return BillingService.sync_partner_tenants_bindings(current_user.id, decoded_partner_key, click_id)
@@ -2,7 +2,8 @@ from flask import request
 from flask_restx import Resource, reqparse
 from libs.helper import extract_remote_ip
-from libs.login import current_account_with_tenant, login_required
+from libs.login import current_user, login_required
 from models.account import Account
 from services.billing_service import BillingService
 from .. import console_ns
@@ -16,16 +17,19 @@ class ComplianceApi(Resource):
    @account_initialization_required
    @only_edition_cloud
    def get(self):
-        current_user, current_tenant_id = current_account_with_tenant()
+        assert isinstance(current_user, Account)
-        parser = reqparse.RequestParser().add_argument("doc_name", type=str, required=True, location="args")
+        assert current_user.current_tenant_id is not None
        parser = reqparse.RequestParser()
        parser.add_argument("doc_name", type=str, required=True, location="args")
        args = parser.parse_args()
        ip_address = extract_remote_ip(request)
        device_info = request.headers.get("User-Agent", "Unknown device")
        return BillingService.get_compliance_download_link(
            doc_name=args.doc_name,
            account_id=current_user.id,
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            ip=ip_address,
            device_info=device_info,
        )
@@ -3,6 +3,7 @@ from collections.abc import Generator
 from typing import cast
 from flask import request
 from flask_login import current_user
 from flask_restx import Resource, marshal_with, reqparse
 from sqlalchemy import select
 from sqlalchemy.orm import Session
@@ -19,7 +20,7 @@ from core.rag.extractor.notion_extractor import NotionExtractor
 from extensions.ext_database import db
 from fields.data_source_fields import integrate_list_fields, integrate_notion_info_list_fields
 from libs.datetime_utils import naive_utc_now
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models import DataSourceOauthBinding, Document
 from services.dataset_service import DatasetService, DocumentService
 from services.datasource_provider_service import DatasourceProviderService
@@ -36,12 +37,10 @@ class DataSourceApi(Resource):
    @account_initialization_required
    @marshal_with(integrate_list_fields)
    def get(self):
        _, current_tenant_id = current_account_with_tenant()
        # get workspace data source integrates
        data_source_integrates = db.session.scalars(
            select(DataSourceOauthBinding).where(
-                DataSourceOauthBinding.tenant_id == current_tenant_id,
+                DataSourceOauthBinding.tenant_id == current_user.current_tenant_id,
                DataSourceOauthBinding.disabled == False,
            )
        ).all()
@@ -121,15 +120,13 @@ class DataSourceNotionListApi(Resource):
    @account_initialization_required
    @marshal_with(integrate_notion_info_list_fields)
    def get(self):
        current_user, current_tenant_id = current_account_with_tenant()
        dataset_id = request.args.get("dataset_id", default=None, type=str)
        credential_id = request.args.get("credential_id", default=None, type=str)
        if not credential_id:
            raise ValueError("Credential id is required.")
        datasource_provider_service = DatasourceProviderService()
        credential = datasource_provider_service.get_datasource_credentials(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            credential_id=credential_id,
            provider="notion_datasource",
            plugin_id="langgenius/notion_datasource",
@@ -149,7 +146,7 @@ class DataSourceNotionListApi(Resource):
                documents = session.scalars(
                    select(Document).filter_by(
                        dataset_id=dataset_id,
-                        tenant_id=current_tenant_id,
+                        tenant_id=current_user.current_tenant_id,
                        data_source_type="notion_import",
                        enabled=True,
                    )
@@ -164,7 +161,7 @@ class DataSourceNotionListApi(Resource):
            datasource_runtime = DatasourceManager.get_datasource_runtime(
                provider_id="langgenius/notion_datasource/notion_datasource",
                datasource_name="notion_datasource",
-                tenant_id=current_tenant_id,
+                tenant_id=current_user.current_tenant_id,
                datasource_type=DatasourceProviderType.ONLINE_DOCUMENT,
            )
            datasource_provider_service = DatasourceProviderService()
@@ -213,14 +210,12 @@ class DataSourceNotionApi(Resource):
    @login_required
    @account_initialization_required
    def get(self, workspace_id, page_id, page_type):
        _, current_tenant_id = current_account_with_tenant()
        credential_id = request.args.get("credential_id", default=None, type=str)
        if not credential_id:
            raise ValueError("Credential id is required.")
        datasource_provider_service = DatasourceProviderService()
        credential = datasource_provider_service.get_datasource_credentials(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            credential_id=credential_id,
            provider="notion_datasource",
            plugin_id="langgenius/notion_datasource",
@@ -234,7 +229,7 @@ class DataSourceNotionApi(Resource):
            notion_obj_id=page_id,
            notion_page_type=page_type,
            notion_access_token=credential.get("integration_secret"),
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
        )
        text_docs = extractor.extract()
@@ -244,14 +239,12 @@ class DataSourceNotionApi(Resource):
    @login_required
    @account_initialization_required
    def post(self):
-        _, current_tenant_id = current_account_with_tenant()
+        parser = reqparse.RequestParser()
-
+        parser.add_argument("notion_info_list", type=list, required=True, nullable=True, location="json")
-        parser = (
+        parser.add_argument("process_rule", type=dict, required=True, nullable=True, location="json")
-            reqparse.RequestParser()
+        parser.add_argument("doc_form", type=str, default="text_model", required=False, nullable=False, location="json")
-            .add_argument("notion_info_list", type=list, required=True, nullable=True, location="json")
+        parser.add_argument(
-            .add_argument("process_rule", type=dict, required=True, nullable=True, location="json")
+            "doc_language", type=str, default="English", required=False, nullable=False, location="json"
            .add_argument("doc_form", type=str, default="text_model", required=False, nullable=False, location="json")
            .add_argument("doc_language", type=str, default="English", required=False, nullable=False, location="json")
        )
        args = parser.parse_args()
        # validate args
@@ -270,7 +263,7 @@ class DataSourceNotionApi(Resource):
                            "notion_workspace_id": workspace_id,
                            "notion_obj_id": page["page_id"],
                            "notion_page_type": page["type"],
-                            "tenant_id": current_tenant_id,
+                            "tenant_id": current_user.current_tenant_id,
                        }
                    ),
                    document_model=args["doc_form"],
@@ -278,7 +271,7 @@ class DataSourceNotionApi(Resource):
                extract_settings.append(extract_setting)
        indexing_runner = IndexingRunner()
        response = indexing_runner.indexing_estimate(
-            current_tenant_id,
+            current_user.current_tenant_id,
            extract_settings,
            args["process_rule"],
            args["doc_form"],
@@ -1,24 +1,21 @@
 from typing import Any, cast
 from flask import request
 from flask_login import current_user
 from flask_restx import Resource, fields, marshal, marshal_with, reqparse
 from sqlalchemy import select
 from werkzeug.exceptions import Forbidden, NotFound
 import services
 from configs import dify_config
-from controllers.console import console_ns
+from controllers.console import api, console_ns
-from controllers.console.apikey import (
+from controllers.console.apikey import api_key_fields, api_key_list
    api_key_item_model,
    api_key_list_model,
 )
 from controllers.console.app.error import ProviderNotInitializeError
 from controllers.console.datasets.error import DatasetInUseError, DatasetNameDuplicateError, IndexingEstimateError
 from controllers.console.wraps import (
    account_initialization_required,
    cloud_edition_billing_rate_limit_check,
    enterprise_license_required,
    is_admin_or_owner_required,
    setup_required,
 )
 from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
@@ -30,83 +27,18 @@ from core.rag.extractor.entity.datasource_type import DatasourceType
 from core.rag.extractor.entity.extract_setting import ExtractSetting, NotionInfo, WebsiteInfo
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from extensions.ext_database import db
-from fields.app_fields import app_detail_kernel_fields, related_app_list
+from fields.app_fields import related_app_list
-from fields.dataset_fields import (
+from fields.dataset_fields import dataset_detail_fields, dataset_query_detail_fields
    dataset_detail_fields,
    dataset_fields,
    dataset_query_detail_fields,
    dataset_retrieval_model_fields,
    doc_metadata_fields,
    external_knowledge_info_fields,
    external_retrieval_model_fields,
    icon_info_fields,
    keyword_setting_fields,
    reranking_model_fields,
    tag_fields,
    vector_setting_fields,
    weighted_score_fields,
 )
 from fields.document_fields import document_status_fields
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from libs.validators import validate_description_length
 from models import ApiToken, Dataset, Document, DocumentSegment, UploadFile
 from models.account import Account
 from models.dataset import DatasetPermissionEnum
 from models.provider_ids import ModelProviderID
 from services.dataset_service import DatasetPermissionService, DatasetService, DocumentService
 def _get_or_create_model(model_name: str, field_def):
    existing = console_ns.models.get(model_name)
    if existing is None:
        existing = console_ns.model(model_name, field_def)
    return existing
 # Register models for flask_restx to avoid dict type issues in Swagger
 dataset_base_model = _get_or_create_model("DatasetBase", dataset_fields)
 tag_model = _get_or_create_model("Tag", tag_fields)
 keyword_setting_model = _get_or_create_model("DatasetKeywordSetting", keyword_setting_fields)
 vector_setting_model = _get_or_create_model("DatasetVectorSetting", vector_setting_fields)
 weighted_score_fields_copy = weighted_score_fields.copy()
 weighted_score_fields_copy["keyword_setting"] = fields.Nested(keyword_setting_model)
 weighted_score_fields_copy["vector_setting"] = fields.Nested(vector_setting_model)
 weighted_score_model = _get_or_create_model("DatasetWeightedScore", weighted_score_fields_copy)
 reranking_model = _get_or_create_model("DatasetRerankingModel", reranking_model_fields)
 dataset_retrieval_model_fields_copy = dataset_retrieval_model_fields.copy()
 dataset_retrieval_model_fields_copy["reranking_model"] = fields.Nested(reranking_model)
 dataset_retrieval_model_fields_copy["weights"] = fields.Nested(weighted_score_model, allow_null=True)
 dataset_retrieval_model = _get_or_create_model("DatasetRetrievalModel", dataset_retrieval_model_fields_copy)
 external_knowledge_info_model = _get_or_create_model("ExternalKnowledgeInfo", external_knowledge_info_fields)
 external_retrieval_model = _get_or_create_model("ExternalRetrievalModel", external_retrieval_model_fields)
 doc_metadata_model = _get_or_create_model("DatasetDocMetadata", doc_metadata_fields)
 icon_info_model = _get_or_create_model("DatasetIconInfo", icon_info_fields)
 dataset_detail_fields_copy = dataset_detail_fields.copy()
 dataset_detail_fields_copy["retrieval_model_dict"] = fields.Nested(dataset_retrieval_model)
 dataset_detail_fields_copy["tags"] = fields.List(fields.Nested(tag_model))
 dataset_detail_fields_copy["external_knowledge_info"] = fields.Nested(external_knowledge_info_model)
 dataset_detail_fields_copy["external_retrieval_model"] = fields.Nested(external_retrieval_model, allow_null=True)
 dataset_detail_fields_copy["doc_metadata"] = fields.List(fields.Nested(doc_metadata_model))
 dataset_detail_fields_copy["icon_info"] = fields.Nested(icon_info_model)
 dataset_detail_model = _get_or_create_model("DatasetDetail", dataset_detail_fields_copy)
 dataset_query_detail_model = _get_or_create_model("DatasetQueryDetail", dataset_query_detail_fields)
 app_detail_kernel_model = _get_or_create_model("AppDetailKernel", app_detail_kernel_fields)
 related_app_list_copy = related_app_list.copy()
 related_app_list_copy["data"] = fields.List(fields.Nested(app_detail_kernel_model))
 related_app_list_model = _get_or_create_model("RelatedAppList", related_app_list_copy)
 def _validate_name(name: str) -> str:
    if not name or len(name) < 1 or len(name) > 40:
        raise ValueError("Name must be between 1 to 40 characters.")
@@ -188,9 +120,9 @@ def _get_retrieval_methods_by_vector_type(vector_type: str | None, is_mock: bool
@console_ns.route("/datasets")
 class DatasetListApi(Resource):
-    @console_ns.doc("get_datasets")
+    @api.doc("get_datasets")
-    @console_ns.doc(description="Get list of datasets")
+    @api.doc(description="Get list of datasets")
-    @console_ns.doc(
+    @api.doc(
        params={
            "page": "Page number (default: 1)",
            "limit": "Number of items per page (default: 20)",
@@ -200,13 +132,12 @@ class DatasetListApi(Resource):
            "include_all": "Include all datasets (default: false)",
        }
    )
-    @console_ns.response(200, "Datasets retrieved successfully")
+    @api.response(200, "Datasets retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
    @enterprise_license_required
    def get(self):
        current_user, current_tenant_id = current_account_with_tenant()
        page = request.args.get("page", default=1, type=int)
        limit = request.args.get("limit", default=20, type=int)
        ids = request.args.getlist("ids")
@@ -215,15 +146,15 @@ class DatasetListApi(Resource):
        tag_ids = request.args.getlist("tag_ids")
        include_all = request.args.get("include_all", default="false").lower() == "true"
        if ids:
-            datasets, total = DatasetService.get_datasets_by_ids(ids, current_tenant_id)
+            datasets, total = DatasetService.get_datasets_by_ids(ids, current_user.current_tenant_id)
        else:
            datasets, total = DatasetService.get_datasets(
-                page, limit, current_tenant_id, current_user, search, tag_ids, include_all
+                page, limit, current_user.current_tenant_id, current_user, search, tag_ids, include_all
            )
        # check embedding setting
        provider_manager = ProviderManager()
-        configurations = provider_manager.get_configurations(tenant_id=current_tenant_id)
+        configurations = provider_manager.get_configurations(tenant_id=current_user.current_tenant_id)
        embedding_models = configurations.get_models(model_type=ModelType.TEXT_EMBEDDING, only_active=True)
@@ -253,10 +184,10 @@ class DatasetListApi(Resource):
        response = {"data": data, "has_more": len(datasets) == limit, "limit": limit, "total": total, "page": page}
        return response, 200
-    @console_ns.doc("create_dataset")
+    @api.doc("create_dataset")
-    @console_ns.doc(description="Create a new dataset")
+    @api.doc(description="Create a new dataset")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "CreateDatasetRequest",
            {
                "name": fields.String(required=True, description="Dataset name (1-40 characters)"),
@@ -269,60 +200,57 @@ class DatasetListApi(Resource):
            },
        )
    )
-    @console_ns.response(201, "Dataset created successfully")
+    @api.response(201, "Dataset created successfully")
-    @console_ns.response(400, "Invalid request parameters")
+    @api.response(400, "Invalid request parameters")
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_rate_limit_check("knowledge")
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(
-            .add_argument(
+            "name",
-                "name",
+            nullable=False,
-                nullable=False,
+            required=True,
-                required=True,
+            help="type is required. Name must be between 1 to 40 characters.",
-                help="type is required. Name must be between 1 to 40 characters.",
+            type=_validate_name,
-                type=_validate_name,
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "description",
-                "description",
+            type=validate_description_length,
-                type=validate_description_length,
+            nullable=True,
-                nullable=True,
+            required=False,
-                required=False,
+            default="",
-                default="",
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "indexing_technique",
-                "indexing_technique",
+            type=str,
-                type=str,
+            location="json",
-                location="json",
+            choices=Dataset.INDEXING_TECHNIQUE_LIST,
-                choices=Dataset.INDEXING_TECHNIQUE_LIST,
+            nullable=True,
-                nullable=True,
+            help="Invalid indexing technique.",
-                help="Invalid indexing technique.",
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "external_knowledge_api_id",
-                "external_knowledge_api_id",
+            type=str,
-                type=str,
+            nullable=True,
-                nullable=True,
+            required=False,
-                required=False,
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "provider",
-                "provider",
+            type=str,
-                type=str,
+            nullable=True,
-                nullable=True,
+            choices=Dataset.PROVIDER_LIST,
-                choices=Dataset.PROVIDER_LIST,
+            required=False,
-                required=False,
+            default="vendor",
-                default="vendor",
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "external_knowledge_id",
-                "external_knowledge_id",
+            type=str,
-                type=str,
+            nullable=True,
-                nullable=True,
+            required=False,
                required=False,
            )
        )
        args = parser.parse_args()
        current_user, current_tenant_id = current_account_with_tenant()
        # The role of the current user in the ta table must be admin, owner, or editor, or dataset_operator
        if not current_user.is_dataset_editor:
@@ -330,11 +258,11 @@ class DatasetListApi(Resource):
        try:
            dataset = DatasetService.create_empty_dataset(
-                tenant_id=current_tenant_id,
+                tenant_id=current_user.current_tenant_id,
                name=args["name"],
                description=args["description"],
                indexing_technique=args["indexing_technique"],
-                account=current_user,
+                account=cast(Account, current_user),
                permission=DatasetPermissionEnum.ONLY_ME,
                provider=args["provider"],
                external_knowledge_api_id=args["external_knowledge_api_id"],
@@ -348,17 +276,16 @@ class DatasetListApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>")
 class DatasetApi(Resource):
-    @console_ns.doc("get_dataset")
+    @api.doc("get_dataset")
-    @console_ns.doc(description="Get dataset details")
+    @api.doc(description="Get dataset details")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.response(200, "Dataset retrieved successfully", dataset_detail_model)
+    @api.response(200, "Dataset retrieved successfully", dataset_detail_fields)
-    @console_ns.response(404, "Dataset not found")
+    @api.response(404, "Dataset not found")
-    @console_ns.response(403, "Permission denied")
+    @api.response(403, "Permission denied")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, dataset_id):
        current_user, current_tenant_id = current_account_with_tenant()
        dataset_id_str = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id_str)
        if dataset is None:
@@ -378,7 +305,7 @@ class DatasetApi(Resource):
        # check embedding setting
        provider_manager = ProviderManager()
-        configurations = provider_manager.get_configurations(tenant_id=current_tenant_id)
+        configurations = provider_manager.get_configurations(tenant_id=current_user.current_tenant_id)
        embedding_models = configurations.get_models(model_type=ModelType.TEXT_EMBEDDING, only_active=True)
@@ -397,10 +324,10 @@ class DatasetApi(Resource):
        return data, 200
-    @console_ns.doc("update_dataset")
+    @api.doc("update_dataset")
-    @console_ns.doc(description="Update dataset details")
+    @api.doc(description="Update dataset details")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "UpdateDatasetRequest",
            {
                "name": fields.String(description="Dataset name"),
@@ -411,9 +338,9 @@ class DatasetApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "Dataset updated successfully", dataset_detail_model)
+    @api.response(200, "Dataset updated successfully", dataset_detail_fields)
-    @console_ns.response(404, "Dataset not found")
+    @api.response(404, "Dataset not found")
-    @console_ns.response(403, "Permission denied")
+    @api.response(403, "Permission denied")
    @setup_required
    @login_required
    @account_initialization_required
@@ -424,76 +351,73 @@ class DatasetApi(Resource):
        if dataset is None:
            raise NotFound("Dataset not found.")
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(
-            .add_argument(
+            "name",
-                "name",
+            nullable=False,
-                nullable=False,
+            help="type is required. Name must be between 1 to 40 characters.",
-                help="type is required. Name must be between 1 to 40 characters.",
+            type=_validate_name,
-                type=_validate_name,
+        )
-            )
+        parser.add_argument("description", location="json", store_missing=False, type=validate_description_length)
-            .add_argument("description", location="json", store_missing=False, type=validate_description_length)
+        parser.add_argument(
-            .add_argument(
+            "indexing_technique",
-                "indexing_technique",
+            type=str,
-                type=str,
+            location="json",
-                location="json",
+            choices=Dataset.INDEXING_TECHNIQUE_LIST,
-                choices=Dataset.INDEXING_TECHNIQUE_LIST,
+            nullable=True,
-                nullable=True,
+            help="Invalid indexing technique.",
-                help="Invalid indexing technique.",
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "permission",
-                "permission",
+            type=str,
-                type=str,
+            location="json",
-                location="json",
+            choices=(DatasetPermissionEnum.ONLY_ME, DatasetPermissionEnum.ALL_TEAM, DatasetPermissionEnum.PARTIAL_TEAM),
-                choices=(
+            help="Invalid permission.",
-                    DatasetPermissionEnum.ONLY_ME,
+        )
-                    DatasetPermissionEnum.ALL_TEAM,
+        parser.add_argument("embedding_model", type=str, location="json", help="Invalid embedding model.")
-                    DatasetPermissionEnum.PARTIAL_TEAM,
+        parser.add_argument(
-                ),
+            "embedding_model_provider", type=str, location="json", help="Invalid embedding model provider."
-                help="Invalid permission.",
+        )
-            )
+        parser.add_argument("retrieval_model", type=dict, location="json", help="Invalid retrieval model.")
-            .add_argument("embedding_model", type=str, location="json", help="Invalid embedding model.")
+        parser.add_argument("partial_member_list", type=list, location="json", help="Invalid parent user list.")
-            .add_argument(
+
-                "embedding_model_provider", type=str, location="json", help="Invalid embedding model provider."
+        parser.add_argument(
-            )
+            "external_retrieval_model",
-            .add_argument("retrieval_model", type=dict, location="json", help="Invalid retrieval model.")
+            type=dict,
-            .add_argument("partial_member_list", type=list, location="json", help="Invalid parent user list.")
+            required=False,
-            .add_argument(
+            nullable=True,
-                "external_retrieval_model",
+            location="json",
-                type=dict,
+            help="Invalid external retrieval model.",
-                required=False,
+        )
-                nullable=True,
+
-                location="json",
+        parser.add_argument(
-                help="Invalid external retrieval model.",
+            "external_knowledge_id",
-            )
+            type=str,
-            .add_argument(
+            required=False,
-                "external_knowledge_id",
+            nullable=True,
-                type=str,
+            location="json",
-                required=False,
+            help="Invalid external knowledge id.",
-                nullable=True,
+        )
-                location="json",
+
-                help="Invalid external knowledge id.",
+        parser.add_argument(
-            )
+            "external_knowledge_api_id",
-            .add_argument(
+            type=str,
-                "external_knowledge_api_id",
+            required=False,
-                type=str,
+            nullable=True,
-                required=False,
+            location="json",
-                nullable=True,
+            help="Invalid external knowledge api id.",
-                location="json",
+        )
-                help="Invalid external knowledge api id.",
+
-            )
+        parser.add_argument(
-            .add_argument(
+            "icon_info",
-                "icon_info",
+            type=dict,
-                type=dict,
+            required=False,
-                required=False,
+            nullable=True,
-                nullable=True,
+            location="json",
-                location="json",
+            help="Invalid icon info.",
                help="Invalid icon info.",
            )
        )
        args = parser.parse_args()
        data = request.get_json()
        current_user, current_tenant_id = current_account_with_tenant()
        # check embedding model setting
        if (
@@ -516,7 +440,7 @@ class DatasetApi(Resource):
            raise NotFound("Dataset not found.")
        result_data = cast(dict[str, Any], marshal(dataset, dataset_detail_fields))
-        tenant_id = current_tenant_id
+        tenant_id = current_user.current_tenant_id
        if data.get("partial_member_list") and data.get("permission") == "partial_members":
            DatasetPermissionService.update_partial_member_list(
@@ -540,9 +464,9 @@ class DatasetApi(Resource):
    @cloud_edition_billing_rate_limit_check("knowledge")
    def delete(self, dataset_id):
        dataset_id_str = str(dataset_id)
        current_user, _ = current_account_with_tenant()
-        if not (current_user.has_edit_permission or current_user.is_dataset_operator):
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not (current_user.is_editor or current_user.is_dataset_operator):
            raise Forbidden()
        try:
@@ -557,10 +481,10 @@ class DatasetApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/use-check")
 class DatasetUseCheckApi(Resource):
-    @console_ns.doc("check_dataset_use")
+    @api.doc("check_dataset_use")
-    @console_ns.doc(description="Check if dataset is in use")
+    @api.doc(description="Check if dataset is in use")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.response(200, "Dataset use status retrieved successfully")
+    @api.response(200, "Dataset use status retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
@@ -573,15 +497,14 @@ class DatasetUseCheckApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/queries")
 class DatasetQueryApi(Resource):
-    @console_ns.doc("get_dataset_queries")
+    @api.doc("get_dataset_queries")
-    @console_ns.doc(description="Get dataset query history")
+    @api.doc(description="Get dataset query history")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.response(200, "Query history retrieved successfully", dataset_query_detail_model)
+    @api.response(200, "Query history retrieved successfully", dataset_query_detail_fields)
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, dataset_id):
        current_user, _ = current_account_with_tenant()
        dataset_id_str = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id_str)
        if dataset is None:
@@ -598,7 +521,7 @@ class DatasetQueryApi(Resource):
        dataset_queries, total = DatasetService.get_dataset_queries(dataset_id=dataset.id, page=page, per_page=limit)
        response = {
-            "data": marshal(dataset_queries, dataset_query_detail_model),
+            "data": marshal(dataset_queries, dataset_query_detail_fields),
            "has_more": len(dataset_queries) == limit,
            "limit": limit,
            "total": total,
@@ -609,38 +532,39 @@ class DatasetQueryApi(Resource):
@console_ns.route("/datasets/indexing-estimate")
 class DatasetIndexingEstimateApi(Resource):
-    @console_ns.doc("estimate_dataset_indexing")
+    @api.doc("estimate_dataset_indexing")
-    @console_ns.doc(description="Estimate dataset indexing cost")
+    @api.doc(description="Estimate dataset indexing cost")
-    @console_ns.response(200, "Indexing estimate calculated successfully")
+    @api.response(200, "Indexing estimate calculated successfully")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("info_list", type=dict, required=True, nullable=True, location="json")
-            .add_argument("info_list", type=dict, required=True, nullable=True, location="json")
+        parser.add_argument("process_rule", type=dict, required=True, nullable=True, location="json")
-            .add_argument("process_rule", type=dict, required=True, nullable=True, location="json")
+        parser.add_argument(
-            .add_argument(
+            "indexing_technique",
-                "indexing_technique",
+            type=str,
-                type=str,
+            required=True,
-                required=True,
+            choices=Dataset.INDEXING_TECHNIQUE_LIST,
-                choices=Dataset.INDEXING_TECHNIQUE_LIST,
+            nullable=True,
-                nullable=True,
+            location="json",
-                location="json",
+        )
-            )
+        parser.add_argument("doc_form", type=str, default="text_model", required=False, nullable=False, location="json")
-            .add_argument("doc_form", type=str, default="text_model", required=False, nullable=False, location="json")
+        parser.add_argument("dataset_id", type=str, required=False, nullable=False, location="json")
-            .add_argument("dataset_id", type=str, required=False, nullable=False, location="json")
+        parser.add_argument(
-            .add_argument("doc_language", type=str, default="English", required=False, nullable=False, location="json")
+            "doc_language", type=str, default="English", required=False, nullable=False, location="json"
        )
        args = parser.parse_args()
        _, current_tenant_id = current_account_with_tenant()
        # validate args
        DocumentService.estimate_args_validate(args)
        extract_settings = []
        if args["info_list"]["data_source_type"] == "upload_file":
            file_ids = args["info_list"]["file_info_list"]["file_ids"]
            file_details = db.session.scalars(
-                select(UploadFile).where(UploadFile.tenant_id == current_tenant_id, UploadFile.id.in_(file_ids))
+                select(UploadFile).where(
                    UploadFile.tenant_id == current_user.current_tenant_id, UploadFile.id.in_(file_ids)
                )
            ).all()
            if file_details is None:
@@ -668,7 +592,7 @@ class DatasetIndexingEstimateApi(Resource):
                                "notion_workspace_id": workspace_id,
                                "notion_obj_id": page["page_id"],
                                "notion_page_type": page["type"],
-                                "tenant_id": current_tenant_id,
+                                "tenant_id": current_user.current_tenant_id,
                            }
                        ),
                        document_model=args["doc_form"],
@@ -684,7 +608,7 @@ class DatasetIndexingEstimateApi(Resource):
                            "provider": website_info_list["provider"],
                            "job_id": website_info_list["job_id"],
                            "url": url,
-                            "tenant_id": current_tenant_id,
+                            "tenant_id": current_user.current_tenant_id,
                            "mode": "crawl",
                            "only_main_content": website_info_list["only_main_content"],
                        }
@@ -697,7 +621,7 @@ class DatasetIndexingEstimateApi(Resource):
        indexing_runner = IndexingRunner()
        try:
            response = indexing_runner.indexing_estimate(
-                current_tenant_id,
+                current_user.current_tenant_id,
                extract_settings,
                args["process_rule"],
                args["doc_form"],
@@ -719,16 +643,15 @@ class DatasetIndexingEstimateApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/related-apps")
 class DatasetRelatedAppListApi(Resource):
-    @console_ns.doc("get_dataset_related_apps")
+    @api.doc("get_dataset_related_apps")
-    @console_ns.doc(description="Get applications related to dataset")
+    @api.doc(description="Get applications related to dataset")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.response(200, "Related apps retrieved successfully", related_app_list_model)
+    @api.response(200, "Related apps retrieved successfully", related_app_list)
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(related_app_list_model)
+    @marshal_with(related_app_list)
    def get(self, dataset_id):
        current_user, _ = current_account_with_tenant()
        dataset_id_str = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id_str)
        if dataset is None:
@@ -752,18 +675,19 @@ class DatasetRelatedAppListApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/indexing-status")
 class DatasetIndexingStatusApi(Resource):
-    @console_ns.doc("get_dataset_indexing_status")
+    @api.doc("get_dataset_indexing_status")
-    @console_ns.doc(description="Get dataset indexing status")
+    @api.doc(description="Get dataset indexing status")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.response(200, "Indexing status retrieved successfully")
+    @api.response(200, "Indexing status retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, dataset_id):
        _, current_tenant_id = current_account_with_tenant()
        dataset_id = str(dataset_id)
        documents = db.session.scalars(
-            select(Document).where(Document.dataset_id == dataset_id, Document.tenant_id == current_tenant_id)
+            select(Document).where(
                Document.dataset_id == dataset_id, Document.tenant_id == current_user.current_tenant_id
            )
        ).all()
        documents_status = []
        for document in documents:
@@ -807,36 +731,38 @@ class DatasetApiKeyApi(Resource):
    token_prefix = "dataset-"
    resource_type = "dataset"
-    @console_ns.doc("get_dataset_api_keys")
+    @api.doc("get_dataset_api_keys")
-    @console_ns.doc(description="Get dataset API keys")
+    @api.doc(description="Get dataset API keys")
-    @console_ns.response(200, "API keys retrieved successfully", api_key_list_model)
+    @api.response(200, "API keys retrieved successfully", api_key_list)
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(api_key_list_model)
+    @marshal_with(api_key_list)
    def get(self):
        _, current_tenant_id = current_account_with_tenant()
        keys = db.session.scalars(
-            select(ApiToken).where(ApiToken.type == self.resource_type, ApiToken.tenant_id == current_tenant_id)
+            select(ApiToken).where(
                ApiToken.type == self.resource_type, ApiToken.tenant_id == current_user.current_tenant_id
            )
        ).all()
        return {"items": keys}
    @setup_required
    @login_required
    @is_admin_or_owner_required
    @account_initialization_required
-    @marshal_with(api_key_item_model)
+    @marshal_with(api_key_fields)
    def post(self):
-        _, current_tenant_id = current_account_with_tenant()
+        # The role of the current user in the ta table must be admin or owner
        if not current_user.is_admin_or_owner:
            raise Forbidden()
        current_key_count = (
            db.session.query(ApiToken)
-            .where(ApiToken.type == self.resource_type, ApiToken.tenant_id == current_tenant_id)
+            .where(ApiToken.type == self.resource_type, ApiToken.tenant_id == current_user.current_tenant_id)
            .count()
        )
        if current_key_count >= self.max_keys:
-            console_ns.abort(
+            api.abort(
                400,
                message=f"Cannot create more than {self.max_keys} API keys for this resource type.",
                code="max_keys_exceeded",
@@ -844,7 +770,7 @@ class DatasetApiKeyApi(Resource):
        key = ApiToken.generate_api_key(self.token_prefix, 24)
        api_token = ApiToken()
-        api_token.tenant_id = current_tenant_id
+        api_token.tenant_id = current_user.current_tenant_id
        api_token.token = key
        api_token.type = self.resource_type
        db.session.add(api_token)
@@ -856,21 +782,24 @@ class DatasetApiKeyApi(Resource):
 class DatasetApiDeleteApi(Resource):
    resource_type = "dataset"
-    @console_ns.doc("delete_dataset_api_key")
+    @api.doc("delete_dataset_api_key")
-    @console_ns.doc(description="Delete dataset API key")
+    @api.doc(description="Delete dataset API key")
-    @console_ns.doc(params={"api_key_id": "API key ID"})
+    @api.doc(params={"api_key_id": "API key ID"})
-    @console_ns.response(204, "API key deleted successfully")
+    @api.response(204, "API key deleted successfully")
    @setup_required
    @login_required
    @is_admin_or_owner_required
    @account_initialization_required
    def delete(self, api_key_id):
        _, current_tenant_id = current_account_with_tenant()
        api_key_id = str(api_key_id)
        # The role of the current user in the ta table must be admin or owner
        if not current_user.is_admin_or_owner:
            raise Forbidden()
        key = (
            db.session.query(ApiToken)
            .where(
-                ApiToken.tenant_id == current_tenant_id,
+                ApiToken.tenant_id == current_user.current_tenant_id,
                ApiToken.type == self.resource_type,
                ApiToken.id == api_key_id,
            )
@@ -878,7 +807,7 @@ class DatasetApiDeleteApi(Resource):
        )
        if key is None:
-            console_ns.abort(404, message="API key not found")
+            api.abort(404, message="API key not found")
        db.session.query(ApiToken).where(ApiToken.id == api_key_id).delete()
        db.session.commit()
@@ -901,9 +830,9 @@ class DatasetEnableApiApi(Resource):
@console_ns.route("/datasets/api-base-info")
 class DatasetApiBaseUrlApi(Resource):
-    @console_ns.doc("get_dataset_api_base_info")
+    @api.doc("get_dataset_api_base_info")
-    @console_ns.doc(description="Get dataset API base information")
+    @api.doc(description="Get dataset API base information")
-    @console_ns.response(200, "API base info retrieved successfully")
+    @api.response(200, "API base info retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
@@ -913,9 +842,9 @@ class DatasetApiBaseUrlApi(Resource):
@console_ns.route("/datasets/retrieval-setting")
 class DatasetRetrievalSettingApi(Resource):
-    @console_ns.doc("get_dataset_retrieval_setting")
+    @api.doc("get_dataset_retrieval_setting")
-    @console_ns.doc(description="Get dataset retrieval settings")
+    @api.doc(description="Get dataset retrieval settings")
-    @console_ns.response(200, "Retrieval settings retrieved successfully")
+    @api.response(200, "Retrieval settings retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
@@ -926,10 +855,10 @@ class DatasetRetrievalSettingApi(Resource):
@console_ns.route("/datasets/retrieval-setting/<string:vector_type>")
 class DatasetRetrievalSettingMockApi(Resource):
-    @console_ns.doc("get_dataset_retrieval_setting_mock")
+    @api.doc("get_dataset_retrieval_setting_mock")
-    @console_ns.doc(description="Get mock dataset retrieval settings by vector type")
+    @api.doc(description="Get mock dataset retrieval settings by vector type")
-    @console_ns.doc(params={"vector_type": "Vector store type"})
+    @api.doc(params={"vector_type": "Vector store type"})
-    @console_ns.response(200, "Mock retrieval settings retrieved successfully")
+    @api.response(200, "Mock retrieval settings retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
@@ -939,11 +868,11 @@ class DatasetRetrievalSettingMockApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/error-docs")
 class DatasetErrorDocs(Resource):
-    @console_ns.doc("get_dataset_error_docs")
+    @api.doc("get_dataset_error_docs")
-    @console_ns.doc(description="Get dataset error documents")
+    @api.doc(description="Get dataset error documents")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.response(200, "Error documents retrieved successfully")
+    @api.response(200, "Error documents retrieved successfully")
-    @console_ns.response(404, "Dataset not found")
+    @api.response(404, "Dataset not found")
    @setup_required
    @login_required
    @account_initialization_required
@@ -959,17 +888,16 @@ class DatasetErrorDocs(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/permission-part-users")
 class DatasetPermissionUserListApi(Resource):
-    @console_ns.doc("get_dataset_permission_users")
+    @api.doc("get_dataset_permission_users")
-    @console_ns.doc(description="Get dataset permission user list")
+    @api.doc(description="Get dataset permission user list")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.response(200, "Permission users retrieved successfully")
+    @api.response(200, "Permission users retrieved successfully")
-    @console_ns.response(404, "Dataset not found")
+    @api.response(404, "Dataset not found")
-    @console_ns.response(403, "Permission denied")
+    @api.response(403, "Permission denied")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, dataset_id):
        current_user, _ = current_account_with_tenant()
        dataset_id_str = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id_str)
        if dataset is None:
@@ -988,11 +916,11 @@ class DatasetPermissionUserListApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/auto-disable-logs")
 class DatasetAutoDisableLogApi(Resource):
-    @console_ns.doc("get_dataset_auto_disable_logs")
+    @api.doc("get_dataset_auto_disable_logs")
-    @console_ns.doc(description="Get dataset auto disable logs")
+    @api.doc(description="Get dataset auto disable logs")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.response(200, "Auto disable logs retrieved successfully")
+    @api.response(200, "Auto disable logs retrieved successfully")
-    @console_ns.response(404, "Dataset not found")
+    @api.response(404, "Dataset not found")
    @setup_required
    @login_required
    @account_initialization_required
@@ -6,12 +6,13 @@ from typing import Literal, cast
 import sqlalchemy as sa
 from flask import request
 from flask_login import current_user
 from flask_restx import Resource, fields, marshal, marshal_with, reqparse
 from sqlalchemy import asc, desc, select
 from werkzeug.exceptions import Forbidden, NotFound
 import services
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.app.error import (
    ProviderModelCurrentlyNotSupportError,
    ProviderNotInitializeError,
@@ -45,17 +46,16 @@ from core.plugin.impl.exc import PluginDaemonClientSideError
 from core.rag.extractor.entity.datasource_type import DatasourceType
 from core.rag.extractor.entity.extract_setting import ExtractSetting, NotionInfo, WebsiteInfo
 from extensions.ext_database import db
 from fields.dataset_fields import dataset_fields
 from fields.document_fields import (
    dataset_and_document_fields,
    document_fields,
    document_metadata_fields,
    document_status_fields,
    document_with_segments_fields,
 )
 from libs.datetime_utils import naive_utc_now
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models import Dataset, DatasetProcessRule, Document, DocumentSegment, UploadFile
 from models.account import Account
 from models.dataset import DocumentPipelineExecutionLog
 from services.dataset_service import DatasetService, DocumentService
 from services.entities.knowledge_entities.knowledge_entities import KnowledgeConfig
@@ -63,39 +63,8 @@ from services.entities.knowledge_entities.knowledge_entities import KnowledgeCon
 logger = logging.getLogger(__name__)
 def _get_or_create_model(model_name: str, field_def):
    existing = console_ns.models.get(model_name)
    if existing is None:
        existing = console_ns.model(model_name, field_def)
    return existing
 # Register models for flask_restx to avoid dict type issues in Swagger
 dataset_model = _get_or_create_model("Dataset", dataset_fields)
 document_metadata_model = _get_or_create_model("DocumentMetadata", document_metadata_fields)
 document_fields_copy = document_fields.copy()
 document_fields_copy["doc_metadata"] = fields.List(
    fields.Nested(document_metadata_model), attribute="doc_metadata_details"
 )
 document_model = _get_or_create_model("Document", document_fields_copy)
 document_with_segments_fields_copy = document_with_segments_fields.copy()
 document_with_segments_fields_copy["doc_metadata"] = fields.List(
    fields.Nested(document_metadata_model), attribute="doc_metadata_details"
 )
 document_with_segments_model = _get_or_create_model("DocumentWithSegments", document_with_segments_fields_copy)
 dataset_and_document_fields_copy = dataset_and_document_fields.copy()
 dataset_and_document_fields_copy["dataset"] = fields.Nested(dataset_model)
 dataset_and_document_fields_copy["documents"] = fields.List(fields.Nested(document_model))
 dataset_and_document_model = _get_or_create_model("DatasetAndDocument", dataset_and_document_fields_copy)
 class DocumentResource(Resource):
    def get_document(self, dataset_id: str, document_id: str) -> Document:
        current_user, current_tenant_id = current_account_with_tenant()
        dataset = DatasetService.get_dataset(dataset_id)
        if not dataset:
            raise NotFound("Dataset not found.")
@@ -110,13 +79,12 @@ class DocumentResource(Resource):
        if not document:
            raise NotFound("Document not found.")
-        if document.tenant_id != current_tenant_id:
+        if document.tenant_id != current_user.current_tenant_id:
            raise Forbidden("No permission.")
        return document
    def get_batch_documents(self, dataset_id: str, batch: str) -> Sequence[Document]:
        current_user, _ = current_account_with_tenant()
        dataset = DatasetService.get_dataset(dataset_id)
        if not dataset:
            raise NotFound("Dataset not found.")
@@ -136,15 +104,14 @@ class DocumentResource(Resource):
@console_ns.route("/datasets/process-rule")
 class GetProcessRuleApi(Resource):
-    @console_ns.doc("get_process_rule")
+    @api.doc("get_process_rule")
-    @console_ns.doc(description="Get dataset document processing rules")
+    @api.doc(description="Get dataset document processing rules")
-    @console_ns.doc(params={"document_id": "Document ID (optional)"})
+    @api.doc(params={"document_id": "Document ID (optional)"})
-    @console_ns.response(200, "Process rules retrieved successfully")
+    @api.response(200, "Process rules retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self):
        current_user, _ = current_account_with_tenant()
        req_data = request.args
        document_id = req_data.get("document_id")
@@ -184,9 +151,9 @@ class GetProcessRuleApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/documents")
 class DatasetDocumentListApi(Resource):
-    @console_ns.doc("get_dataset_documents")
+    @api.doc("get_dataset_documents")
-    @console_ns.doc(description="Get documents in a dataset")
+    @api.doc(description="Get documents in a dataset")
-    @console_ns.doc(
+    @api.doc(
        params={
            "dataset_id": "Dataset ID",
            "page": "Page number (default: 1)",
@@ -194,20 +161,18 @@ class DatasetDocumentListApi(Resource):
            "keyword": "Search keyword",
            "sort": "Sort order (default: -created_at)",
            "fetch": "Fetch full details (default: false)",
            "status": "Filter documents by display status",
        }
    )
-    @console_ns.response(200, "Documents retrieved successfully")
+    @api.response(200, "Documents retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
-    def get(self, dataset_id: str):
+    def get(self, dataset_id):
-        current_user, current_tenant_id = current_account_with_tenant()
+        dataset_id = str(dataset_id)
        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)
        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")
@@ -234,10 +199,7 @@ class DatasetDocumentListApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
-        query = select(Document).filter_by(dataset_id=str(dataset_id), tenant_id=current_tenant_id)
+        query = select(Document).filter_by(dataset_id=str(dataset_id), tenant_id=current_user.current_tenant_id)
        if status:
            query = DocumentService.apply_display_status_filter(query, status)
        if search:
            search = f"%{search}%"
@@ -307,11 +269,10 @@ class DatasetDocumentListApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(dataset_and_document_model)
+    @marshal_with(dataset_and_document_fields)
    @cloud_edition_billing_resource_check("vector_space")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def post(self, dataset_id):
        current_user, _ = current_account_with_tenant()
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -328,20 +289,20 @@ class DatasetDocumentListApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(
-            .add_argument(
+            "indexing_technique", type=str, choices=Dataset.INDEXING_TECHNIQUE_LIST, nullable=False, location="json"
-                "indexing_technique", type=str, choices=Dataset.INDEXING_TECHNIQUE_LIST, nullable=False, location="json"
+        )
-            )
+        parser.add_argument("data_source", type=dict, required=False, location="json")
-            .add_argument("data_source", type=dict, required=False, location="json")
+        parser.add_argument("process_rule", type=dict, required=False, location="json")
-            .add_argument("process_rule", type=dict, required=False, location="json")
+        parser.add_argument("duplicate", type=bool, default=True, nullable=False, location="json")
-            .add_argument("duplicate", type=bool, default=True, nullable=False, location="json")
+        parser.add_argument("original_document_id", type=str, required=False, location="json")
-            .add_argument("original_document_id", type=str, required=False, location="json")
+        parser.add_argument("doc_form", type=str, default="text_model", required=False, nullable=False, location="json")
-            .add_argument("doc_form", type=str, default="text_model", required=False, nullable=False, location="json")
+        parser.add_argument("retrieval_model", type=dict, required=False, nullable=False, location="json")
-            .add_argument("retrieval_model", type=dict, required=False, nullable=False, location="json")
+        parser.add_argument("embedding_model", type=str, required=False, nullable=True, location="json")
-            .add_argument("embedding_model", type=str, required=False, nullable=True, location="json")
+        parser.add_argument("embedding_model_provider", type=str, required=False, nullable=True, location="json")
-            .add_argument("embedding_model_provider", type=str, required=False, nullable=True, location="json")
+        parser.add_argument(
-            .add_argument("doc_language", type=str, default="English", required=False, nullable=False, location="json")
+            "doc_language", type=str, default="English", required=False, nullable=False, location="json"
        )
        args = parser.parse_args()
        knowledge_config = KnowledgeConfig.model_validate(args)
@@ -388,10 +349,10 @@ class DatasetDocumentListApi(Resource):
@console_ns.route("/datasets/init")
 class DatasetInitApi(Resource):
-    @console_ns.doc("init_dataset")
+    @api.doc("init_dataset")
-    @console_ns.doc(description="Initialize dataset with documents")
+    @api.doc(description="Initialize dataset with documents")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "DatasetInitRequest",
            {
                "upload_file_id": fields.String(required=True, description="Upload file ID"),
@@ -401,38 +362,37 @@ class DatasetInitApi(Resource):
            },
        )
    )
-    @console_ns.response(201, "Dataset initialized successfully", dataset_and_document_model)
+    @api.response(201, "Dataset initialized successfully", dataset_and_document_fields)
-    @console_ns.response(400, "Invalid request parameters")
+    @api.response(400, "Invalid request parameters")
    @setup_required
    @login_required
    @account_initialization_required
-    @marshal_with(dataset_and_document_model)
+    @marshal_with(dataset_and_document_fields)
    @cloud_edition_billing_resource_check("vector_space")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def post(self):
        # The role of the current user in the ta table must be admin, owner, dataset_operator, or editor
        current_user, current_tenant_id = current_account_with_tenant()
        if not current_user.is_dataset_editor:
            raise Forbidden()
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(
-            .add_argument(
+            "indexing_technique",
-                "indexing_technique",
+            type=str,
-                type=str,
+            choices=Dataset.INDEXING_TECHNIQUE_LIST,
-                choices=Dataset.INDEXING_TECHNIQUE_LIST,
+            required=True,
-                required=True,
+            nullable=False,
-                nullable=False,
+            location="json",
                location="json",
            )
            .add_argument("data_source", type=dict, required=True, nullable=True, location="json")
            .add_argument("process_rule", type=dict, required=True, nullable=True, location="json")
            .add_argument("doc_form", type=str, default="text_model", required=False, nullable=False, location="json")
            .add_argument("doc_language", type=str, default="English", required=False, nullable=False, location="json")
            .add_argument("retrieval_model", type=dict, required=False, nullable=False, location="json")
            .add_argument("embedding_model", type=str, required=False, nullable=True, location="json")
            .add_argument("embedding_model_provider", type=str, required=False, nullable=True, location="json")
        )
        parser.add_argument("data_source", type=dict, required=True, nullable=True, location="json")
        parser.add_argument("process_rule", type=dict, required=True, nullable=True, location="json")
        parser.add_argument("doc_form", type=str, default="text_model", required=False, nullable=False, location="json")
        parser.add_argument(
            "doc_language", type=str, default="English", required=False, nullable=False, location="json"
        )
        parser.add_argument("retrieval_model", type=dict, required=False, nullable=False, location="json")
        parser.add_argument("embedding_model", type=str, required=False, nullable=True, location="json")
        parser.add_argument("embedding_model_provider", type=str, required=False, nullable=True, location="json")
        args = parser.parse_args()
        knowledge_config = KnowledgeConfig.model_validate(args)
@@ -442,7 +402,7 @@ class DatasetInitApi(Resource):
            try:
                model_manager = ModelManager()
                model_manager.get_model_instance(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
                    provider=args["embedding_model_provider"],
                    model_type=ModelType.TEXT_EMBEDDING,
                    model=args["embedding_model"],
@@ -459,9 +419,9 @@ class DatasetInitApi(Resource):
        try:
            dataset, documents, batch = DocumentService.save_document_without_dataset_id(
-                tenant_id=current_tenant_id,
+                tenant_id=current_user.current_tenant_id,
                knowledge_config=knowledge_config,
-                account=current_user,
+                account=cast(Account, current_user),
            )
        except ProviderTokenNotInitError as ex:
            raise ProviderNotInitializeError(ex.description)
@@ -477,17 +437,16 @@ class DatasetInitApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/indexing-estimate")
 class DocumentIndexingEstimateApi(DocumentResource):
-    @console_ns.doc("estimate_document_indexing")
+    @api.doc("estimate_document_indexing")
-    @console_ns.doc(description="Estimate document indexing cost")
+    @api.doc(description="Estimate document indexing cost")
-    @console_ns.doc(params={"dataset_id": "Dataset ID", "document_id": "Document ID"})
+    @api.doc(params={"dataset_id": "Dataset ID", "document_id": "Document ID"})
-    @console_ns.response(200, "Indexing estimate calculated successfully")
+    @api.response(200, "Indexing estimate calculated successfully")
-    @console_ns.response(404, "Document not found")
+    @api.response(404, "Document not found")
-    @console_ns.response(400, "Document already finished")
+    @api.response(400, "Document already finished")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, dataset_id, document_id):
        _, current_tenant_id = current_account_with_tenant()
        dataset_id = str(dataset_id)
        document_id = str(document_id)
        document = self.get_document(dataset_id, document_id)
@@ -523,7 +482,7 @@ class DocumentIndexingEstimateApi(DocumentResource):
                try:
                    estimate_response = indexing_runner.indexing_estimate(
-                        current_tenant_id,
+                        current_user.current_tenant_id,
                        [extract_setting],
                        data_process_rule_dict,
                        document.doc_form,
@@ -552,7 +511,6 @@ class DocumentBatchIndexingEstimateApi(DocumentResource):
    @login_required
    @account_initialization_required
    def get(self, dataset_id, batch):
        _, current_tenant_id = current_account_with_tenant()
        dataset_id = str(dataset_id)
        batch = str(batch)
        documents = self.get_batch_documents(dataset_id, batch)
@@ -572,7 +530,7 @@ class DocumentBatchIndexingEstimateApi(DocumentResource):
                file_id = data_source_info["upload_file_id"]
                file_detail = (
                    db.session.query(UploadFile)
-                    .where(UploadFile.tenant_id == current_tenant_id, UploadFile.id == file_id)
+                    .where(UploadFile.tenant_id == current_user.current_tenant_id, UploadFile.id == file_id)
                    .first()
                )
@@ -595,7 +553,7 @@ class DocumentBatchIndexingEstimateApi(DocumentResource):
                            "notion_workspace_id": data_source_info["notion_workspace_id"],
                            "notion_obj_id": data_source_info["notion_page_id"],
                            "notion_page_type": data_source_info["type"],
-                            "tenant_id": current_tenant_id,
+                            "tenant_id": current_user.current_tenant_id,
                        }
                    ),
                    document_model=document.doc_form,
@@ -611,7 +569,7 @@ class DocumentBatchIndexingEstimateApi(DocumentResource):
                            "provider": data_source_info["provider"],
                            "job_id": data_source_info["job_id"],
                            "url": data_source_info["url"],
-                            "tenant_id": current_tenant_id,
+                            "tenant_id": current_user.current_tenant_id,
                            "mode": data_source_info["mode"],
                            "only_main_content": data_source_info["only_main_content"],
                        }
@@ -625,7 +583,7 @@ class DocumentBatchIndexingEstimateApi(DocumentResource):
            indexing_runner = IndexingRunner()
            try:
                response = indexing_runner.indexing_estimate(
-                    current_tenant_id,
+                    current_user.current_tenant_id,
                    extract_settings,
                    data_process_rule_dict,
                    document.doc_form,
@@ -692,11 +650,11 @@ class DocumentBatchIndexingStatusApi(DocumentResource):
@console_ns.route("/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/indexing-status")
 class DocumentIndexingStatusApi(DocumentResource):
-    @console_ns.doc("get_document_indexing_status")
+    @api.doc("get_document_indexing_status")
-    @console_ns.doc(description="Get document indexing status")
+    @api.doc(description="Get document indexing status")
-    @console_ns.doc(params={"dataset_id": "Dataset ID", "document_id": "Document ID"})
+    @api.doc(params={"dataset_id": "Dataset ID", "document_id": "Document ID"})
-    @console_ns.response(200, "Indexing status retrieved successfully")
+    @api.response(200, "Indexing status retrieved successfully")
-    @console_ns.response(404, "Document not found")
+    @api.response(404, "Document not found")
    @setup_required
    @login_required
    @account_initialization_required
@@ -742,17 +700,17 @@ class DocumentIndexingStatusApi(DocumentResource):
 class DocumentApi(DocumentResource):
    METADATA_CHOICES = {"all", "only", "without"}
-    @console_ns.doc("get_document")
+    @api.doc("get_document")
-    @console_ns.doc(description="Get document details")
+    @api.doc(description="Get document details")
-    @console_ns.doc(
+    @api.doc(
        params={
            "dataset_id": "Dataset ID",
            "document_id": "Document ID",
            "metadata": "Metadata inclusion (all/only/without)",
        }
    )
-    @console_ns.response(200, "Document retrieved successfully")
+    @api.response(200, "Document retrieved successfully")
-    @console_ns.response(404, "Document not found")
+    @api.response(404, "Document not found")
    @setup_required
    @login_required
    @account_initialization_required
@@ -782,7 +740,7 @@ class DocumentApi(DocumentResource):
                "name": document.name,
                "created_from": document.created_from,
                "created_by": document.created_by,
-                "created_at": int(document.created_at.timestamp()),
+                "created_at": document.created_at.timestamp(),
                "tokens": document.tokens,
                "indexing_status": document.indexing_status,
                "completed_at": int(document.completed_at.timestamp()) if document.completed_at else None,
@@ -815,7 +773,7 @@ class DocumentApi(DocumentResource):
                "name": document.name,
                "created_from": document.created_from,
                "created_by": document.created_by,
-                "created_at": int(document.created_at.timestamp()),
+                "created_at": document.created_at.timestamp(),
                "tokens": document.tokens,
                "indexing_status": document.indexing_status,
                "completed_at": int(document.completed_at.timestamp()) if document.completed_at else None,
@@ -863,20 +821,19 @@ class DocumentApi(DocumentResource):
@console_ns.route("/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/processing/<string:action>")
 class DocumentProcessingApi(DocumentResource):
-    @console_ns.doc("update_document_processing")
+    @api.doc("update_document_processing")
-    @console_ns.doc(description="Update document processing status (pause/resume)")
+    @api.doc(description="Update document processing status (pause/resume)")
-    @console_ns.doc(
+    @api.doc(
        params={"dataset_id": "Dataset ID", "document_id": "Document ID", "action": "Action to perform (pause/resume)"}
    )
-    @console_ns.response(200, "Processing status updated successfully")
+    @api.response(200, "Processing status updated successfully")
-    @console_ns.response(404, "Document not found")
+    @api.response(404, "Document not found")
-    @console_ns.response(400, "Invalid action")
+    @api.response(400, "Invalid action")
    @setup_required
    @login_required
    @account_initialization_required
    @cloud_edition_billing_rate_limit_check("knowledge")
    def patch(self, dataset_id, document_id, action: Literal["pause", "resume"]):
        current_user, _ = current_account_with_tenant()
        dataset_id = str(dataset_id)
        document_id = str(document_id)
        document = self.get_document(dataset_id, document_id)
@@ -908,11 +865,11 @@ class DocumentProcessingApi(DocumentResource):
@console_ns.route("/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/metadata")
 class DocumentMetadataApi(DocumentResource):
-    @console_ns.doc("update_document_metadata")
+    @api.doc("update_document_metadata")
-    @console_ns.doc(description="Update document metadata")
+    @api.doc(description="Update document metadata")
-    @console_ns.doc(params={"dataset_id": "Dataset ID", "document_id": "Document ID"})
+    @api.doc(params={"dataset_id": "Dataset ID", "document_id": "Document ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "UpdateDocumentMetadataRequest",
            {
                "doc_type": fields.String(description="Document type"),
@@ -920,14 +877,13 @@ class DocumentMetadataApi(DocumentResource):
            },
        )
    )
-    @console_ns.response(200, "Document metadata updated successfully")
+    @api.response(200, "Document metadata updated successfully")
-    @console_ns.response(404, "Document not found")
+    @api.response(404, "Document not found")
-    @console_ns.response(403, "Permission denied")
+    @api.response(403, "Permission denied")
    @setup_required
    @login_required
    @account_initialization_required
    def put(self, dataset_id, document_id):
        current_user, _ = current_account_with_tenant()
        dataset_id = str(dataset_id)
        document_id = str(document_id)
        document = self.get_document(dataset_id, document_id)
@@ -975,7 +931,6 @@ class DocumentStatusApi(DocumentResource):
    @cloud_edition_billing_resource_check("vector_space")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def patch(self, dataset_id, action: Literal["enable", "disable", "archive", "un_archive"]):
        current_user, _ = current_account_with_tenant()
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
        if dataset is None:
@@ -1079,9 +1034,8 @@ class DocumentRetryApi(DocumentResource):
    def post(self, dataset_id):
        """retry document."""
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
-            "document_ids", type=list, required=True, nullable=False, location="json"
+        parser.add_argument("document_ids", type=list, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -1123,14 +1077,14 @@ class DocumentRenameApi(DocumentResource):
    @marshal_with(document_fields)
    def post(self, dataset_id, document_id):
        # The role of the current user in the ta table must be admin, owner, editor, or dataset_operator
        current_user, _ = current_account_with_tenant()
        if not current_user.is_dataset_editor:
            raise Forbidden()
        dataset = DatasetService.get_dataset(dataset_id)
        if not dataset:
            raise NotFound("Dataset not found.")
-        DatasetService.check_dataset_operator_permission(current_user, dataset)
+        DatasetService.check_dataset_operator_permission(cast(Account, current_user), dataset)
-        parser = reqparse.RequestParser().add_argument("name", type=str, required=True, nullable=False, location="json")
+        parser = reqparse.RequestParser()
        parser.add_argument("name", type=str, required=True, nullable=False, location="json")
        args = parser.parse_args()
        try:
@@ -1148,7 +1102,6 @@ class WebsiteDocumentSyncApi(DocumentResource):
    @account_initialization_required
    def get(self, dataset_id, document_id):
        """sync website document."""
        _, current_tenant_id = current_account_with_tenant()
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
        if not dataset:
@@ -1157,7 +1110,7 @@ class WebsiteDocumentSyncApi(DocumentResource):
        document = DocumentService.get_document(dataset.id, document_id)
        if not document:
            raise NotFound("Document not found.")
-        if document.tenant_id != current_tenant_id:
+        if document.tenant_id != current_user.current_tenant_id:
            raise Forbidden("No permission.")
        if document.data_source_type != "website_crawl":
            raise ValueError("Document is not a website document.")
@@ -1,6 +1,7 @@
 import uuid
 from flask import request
 from flask_login import current_user
 from flask_restx import Resource, marshal, reqparse
 from sqlalchemy import select
 from werkzeug.exceptions import Forbidden, NotFound
@@ -26,7 +27,7 @@ from core.model_runtime.entities.model_entities import ModelType
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.segment_fields import child_chunk_fields, segment_fields
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models.dataset import ChildChunk, DocumentSegment
 from models.model import UploadFile
 from services.dataset_service import DatasetService, DocumentService, SegmentService
@@ -42,8 +43,6 @@ class DatasetDocumentSegmentListApi(Resource):
    @login_required
    @account_initialization_required
    def get(self, dataset_id, document_id):
        current_user, current_tenant_id = current_account_with_tenant()
        dataset_id = str(dataset_id)
        document_id = str(document_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -60,15 +59,13 @@ class DatasetDocumentSegmentListApi(Resource):
        if not document:
            raise NotFound("Document not found.")
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("limit", type=int, default=20, location="args")
-            .add_argument("limit", type=int, default=20, location="args")
+        parser.add_argument("status", type=str, action="append", default=[], location="args")
-            .add_argument("status", type=str, action="append", default=[], location="args")
+        parser.add_argument("hit_count_gte", type=int, default=None, location="args")
-            .add_argument("hit_count_gte", type=int, default=None, location="args")
+        parser.add_argument("enabled", type=str, default="all", location="args")
-            .add_argument("enabled", type=str, default="all", location="args")
+        parser.add_argument("keyword", type=str, default=None, location="args")
-            .add_argument("keyword", type=str, default=None, location="args")
+        parser.add_argument("page", type=int, default=1, location="args")
            .add_argument("page", type=int, default=1, location="args")
        )
        args = parser.parse_args()
@@ -82,7 +79,7 @@ class DatasetDocumentSegmentListApi(Resource):
            select(DocumentSegment)
            .where(
                DocumentSegment.document_id == str(document_id),
-                DocumentSegment.tenant_id == current_tenant_id,
+                DocumentSegment.tenant_id == current_user.current_tenant_id,
            )
            .order_by(DocumentSegment.position.asc())
        )
@@ -118,8 +115,6 @@ class DatasetDocumentSegmentListApi(Resource):
    @account_initialization_required
    @cloud_edition_billing_rate_limit_check("knowledge")
    def delete(self, dataset_id, document_id):
        current_user, _ = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -153,8 +148,6 @@ class DatasetDocumentSegmentApi(Resource):
    @cloud_edition_billing_resource_check("vector_space")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def patch(self, dataset_id, document_id, action):
        current_user, current_tenant_id = current_account_with_tenant()
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
        if not dataset:
@@ -178,7 +171,7 @@ class DatasetDocumentSegmentApi(Resource):
            try:
                model_manager = ModelManager()
                model_manager.get_model_instance(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
                    provider=dataset.embedding_model_provider,
                    model_type=ModelType.TEXT_EMBEDDING,
                    model=dataset.embedding_model,
@@ -211,8 +204,6 @@ class DatasetDocumentSegmentAddApi(Resource):
    @cloud_edition_billing_knowledge_limit_check("add_segment")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def post(self, dataset_id, document_id):
        current_user, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -230,7 +221,7 @@ class DatasetDocumentSegmentAddApi(Resource):
            try:
                model_manager = ModelManager()
                model_manager.get_model_instance(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
                    provider=dataset.embedding_model_provider,
                    model_type=ModelType.TEXT_EMBEDDING,
                    model=dataset.embedding_model,
@@ -246,12 +237,10 @@ class DatasetDocumentSegmentAddApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
        # validate args
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("content", type=str, required=True, nullable=False, location="json")
-            .add_argument("content", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("answer", type=str, required=False, nullable=True, location="json")
-            .add_argument("answer", type=str, required=False, nullable=True, location="json")
+        parser.add_argument("keywords", type=list, required=False, nullable=True, location="json")
            .add_argument("keywords", type=list, required=False, nullable=True, location="json")
        )
        args = parser.parse_args()
        SegmentService.segment_create_args_validate(args, document)
        segment = SegmentService.create_segment(args, document, dataset)
@@ -266,8 +255,6 @@ class DatasetDocumentSegmentUpdateApi(Resource):
    @cloud_edition_billing_resource_check("vector_space")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def patch(self, dataset_id, document_id, segment_id):
        current_user, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -285,7 +272,7 @@ class DatasetDocumentSegmentUpdateApi(Resource):
            try:
                model_manager = ModelManager()
                model_manager.get_model_instance(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
                    provider=dataset.embedding_model_provider,
                    model_type=ModelType.TEXT_EMBEDDING,
                    model=dataset.embedding_model,
@@ -300,7 +287,7 @@ class DatasetDocumentSegmentUpdateApi(Resource):
        segment_id = str(segment_id)
        segment = (
            db.session.query(DocumentSegment)
-            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_tenant_id)
+            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_user.current_tenant_id)
            .first()
        )
        if not segment:
@@ -313,14 +300,12 @@ class DatasetDocumentSegmentUpdateApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
        # validate args
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("content", type=str, required=True, nullable=False, location="json")
-            .add_argument("content", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("answer", type=str, required=False, nullable=True, location="json")
-            .add_argument("answer", type=str, required=False, nullable=True, location="json")
+        parser.add_argument("keywords", type=list, required=False, nullable=True, location="json")
-            .add_argument("keywords", type=list, required=False, nullable=True, location="json")
+        parser.add_argument(
-            .add_argument(
+            "regenerate_child_chunks", type=bool, required=False, nullable=True, default=False, location="json"
                "regenerate_child_chunks", type=bool, required=False, nullable=True, default=False, location="json"
            )
        )
        args = parser.parse_args()
        SegmentService.segment_create_args_validate(args, document)
@@ -332,8 +317,6 @@ class DatasetDocumentSegmentUpdateApi(Resource):
    @account_initialization_required
    @cloud_edition_billing_rate_limit_check("knowledge")
    def delete(self, dataset_id, document_id, segment_id):
        current_user, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -350,7 +333,7 @@ class DatasetDocumentSegmentUpdateApi(Resource):
        segment_id = str(segment_id)
        segment = (
            db.session.query(DocumentSegment)
-            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_tenant_id)
+            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_user.current_tenant_id)
            .first()
        )
        if not segment:
@@ -378,8 +361,6 @@ class DatasetDocumentSegmentBatchImportApi(Resource):
    @cloud_edition_billing_knowledge_limit_check("add_segment")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def post(self, dataset_id, document_id):
        current_user, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -391,9 +372,8 @@ class DatasetDocumentSegmentBatchImportApi(Resource):
        if not document:
            raise NotFound("Document not found.")
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
-            "upload_file_id", type=str, required=True, nullable=False, location="json"
+        parser.add_argument("upload_file_id", type=str, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        upload_file_id = args["upload_file_id"]
@@ -416,7 +396,7 @@ class DatasetDocumentSegmentBatchImportApi(Resource):
                upload_file_id,
                dataset_id,
                document_id,
-                current_tenant_id,
+                current_user.current_tenant_id,
                current_user.id,
            )
        except Exception as e:
@@ -447,8 +427,6 @@ class ChildChunkAddApi(Resource):
    @cloud_edition_billing_knowledge_limit_check("add_segment")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def post(self, dataset_id, document_id, segment_id):
        current_user, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -463,7 +441,7 @@ class ChildChunkAddApi(Resource):
        segment_id = str(segment_id)
        segment = (
            db.session.query(DocumentSegment)
-            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_tenant_id)
+            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_user.current_tenant_id)
            .first()
        )
        if not segment:
@@ -475,7 +453,7 @@ class ChildChunkAddApi(Resource):
            try:
                model_manager = ModelManager()
                model_manager.get_model_instance(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
                    provider=dataset.embedding_model_provider,
                    model_type=ModelType.TEXT_EMBEDDING,
                    model=dataset.embedding_model,
@@ -491,9 +469,8 @@ class ChildChunkAddApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
        # validate args
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
-            "content", type=str, required=True, nullable=False, location="json"
+        parser.add_argument("content", type=str, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        try:
            content = args["content"]
@@ -506,8 +483,6 @@ class ChildChunkAddApi(Resource):
    @login_required
    @account_initialization_required
    def get(self, dataset_id, document_id, segment_id):
        _, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -524,17 +499,15 @@ class ChildChunkAddApi(Resource):
        segment_id = str(segment_id)
        segment = (
            db.session.query(DocumentSegment)
-            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_tenant_id)
+            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_user.current_tenant_id)
            .first()
        )
        if not segment:
            raise NotFound("Segment not found.")
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("limit", type=int, default=20, location="args")
-            .add_argument("limit", type=int, default=20, location="args")
+        parser.add_argument("keyword", type=str, default=None, location="args")
-            .add_argument("keyword", type=str, default=None, location="args")
+        parser.add_argument("page", type=int, default=1, location="args")
            .add_argument("page", type=int, default=1, location="args")
        )
        args = parser.parse_args()
@@ -557,8 +530,6 @@ class ChildChunkAddApi(Resource):
    @cloud_edition_billing_resource_check("vector_space")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def patch(self, dataset_id, document_id, segment_id):
        current_user, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -575,7 +546,7 @@ class ChildChunkAddApi(Resource):
        segment_id = str(segment_id)
        segment = (
            db.session.query(DocumentSegment)
-            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_tenant_id)
+            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_user.current_tenant_id)
            .first()
        )
        if not segment:
@@ -588,9 +559,8 @@ class ChildChunkAddApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
        # validate args
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
-            "chunks", type=list, required=True, nullable=False, location="json"
+        parser.add_argument("chunks", type=list, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        try:
            chunks_data = args["chunks"]
@@ -610,8 +580,6 @@ class ChildChunkUpdateApi(Resource):
    @account_initialization_required
    @cloud_edition_billing_rate_limit_check("knowledge")
    def delete(self, dataset_id, document_id, segment_id, child_chunk_id):
        current_user, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -628,7 +596,7 @@ class ChildChunkUpdateApi(Resource):
        segment_id = str(segment_id)
        segment = (
            db.session.query(DocumentSegment)
-            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_tenant_id)
+            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_user.current_tenant_id)
            .first()
        )
        if not segment:
@@ -639,7 +607,7 @@ class ChildChunkUpdateApi(Resource):
            db.session.query(ChildChunk)
            .where(
                ChildChunk.id == str(child_chunk_id),
-                ChildChunk.tenant_id == current_tenant_id,
+                ChildChunk.tenant_id == current_user.current_tenant_id,
                ChildChunk.segment_id == segment.id,
                ChildChunk.document_id == document_id,
            )
@@ -666,8 +634,6 @@ class ChildChunkUpdateApi(Resource):
    @cloud_edition_billing_resource_check("vector_space")
    @cloud_edition_billing_rate_limit_check("knowledge")
    def patch(self, dataset_id, document_id, segment_id, child_chunk_id):
        current_user, current_tenant_id = current_account_with_tenant()
        # check dataset
        dataset_id = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id)
@@ -684,7 +650,7 @@ class ChildChunkUpdateApi(Resource):
        segment_id = str(segment_id)
        segment = (
            db.session.query(DocumentSegment)
-            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_tenant_id)
+            .where(DocumentSegment.id == str(segment_id), DocumentSegment.tenant_id == current_user.current_tenant_id)
            .first()
        )
        if not segment:
@@ -695,7 +661,7 @@ class ChildChunkUpdateApi(Resource):
            db.session.query(ChildChunk)
            .where(
                ChildChunk.id == str(child_chunk_id),
-                ChildChunk.tenant_id == current_tenant_id,
+                ChildChunk.tenant_id == current_user.current_tenant_id,
                ChildChunk.segment_id == segment.id,
                ChildChunk.document_id == document_id,
            )
@@ -711,9 +677,8 @@ class ChildChunkUpdateApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
        # validate args
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
-            "content", type=str, required=True, nullable=False, location="json"
+        parser.add_argument("content", type=str, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        try:
            content = args["content"]
@@ -1,76 +1,23 @@
 from typing import cast
 from flask import request
 from flask_login import current_user
 from flask_restx import Resource, fields, marshal, reqparse
 from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 import services
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.datasets.error import DatasetNameDuplicateError
-from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
+from controllers.console.wraps import account_initialization_required, setup_required
-from fields.dataset_fields import (
+from fields.dataset_fields import dataset_detail_fields
-    dataset_detail_fields,
+from libs.login import login_required
-    dataset_retrieval_model_fields,
+from models.account import Account
    doc_metadata_fields,
    external_knowledge_info_fields,
    external_retrieval_model_fields,
    icon_info_fields,
    keyword_setting_fields,
    reranking_model_fields,
    tag_fields,
    vector_setting_fields,
    weighted_score_fields,
 )
 from libs.login import current_account_with_tenant, login_required
 from services.dataset_service import DatasetService
 from services.external_knowledge_service import ExternalDatasetService
 from services.hit_testing_service import HitTestingService
 from services.knowledge_service import ExternalDatasetTestService
 def _get_or_create_model(model_name: str, field_def):
    existing = console_ns.models.get(model_name)
    if existing is None:
        existing = console_ns.model(model_name, field_def)
    return existing
 def _build_dataset_detail_model():
    keyword_setting_model = _get_or_create_model("DatasetKeywordSetting", keyword_setting_fields)
    vector_setting_model = _get_or_create_model("DatasetVectorSetting", vector_setting_fields)
    weighted_score_fields_copy = weighted_score_fields.copy()
    weighted_score_fields_copy["keyword_setting"] = fields.Nested(keyword_setting_model)
    weighted_score_fields_copy["vector_setting"] = fields.Nested(vector_setting_model)
    weighted_score_model = _get_or_create_model("DatasetWeightedScore", weighted_score_fields_copy)
    reranking_model = _get_or_create_model("DatasetRerankingModel", reranking_model_fields)
    dataset_retrieval_model_fields_copy = dataset_retrieval_model_fields.copy()
    dataset_retrieval_model_fields_copy["reranking_model"] = fields.Nested(reranking_model)
    dataset_retrieval_model_fields_copy["weights"] = fields.Nested(weighted_score_model, allow_null=True)
    dataset_retrieval_model = _get_or_create_model("DatasetRetrievalModel", dataset_retrieval_model_fields_copy)
    tag_model = _get_or_create_model("Tag", tag_fields)
    doc_metadata_model = _get_or_create_model("DatasetDocMetadata", doc_metadata_fields)
    external_knowledge_info_model = _get_or_create_model("ExternalKnowledgeInfo", external_knowledge_info_fields)
    external_retrieval_model = _get_or_create_model("ExternalRetrievalModel", external_retrieval_model_fields)
    icon_info_model = _get_or_create_model("DatasetIconInfo", icon_info_fields)
    dataset_detail_fields_copy = dataset_detail_fields.copy()
    dataset_detail_fields_copy["retrieval_model_dict"] = fields.Nested(dataset_retrieval_model)
    dataset_detail_fields_copy["tags"] = fields.List(fields.Nested(tag_model))
    dataset_detail_fields_copy["external_knowledge_info"] = fields.Nested(external_knowledge_info_model)
    dataset_detail_fields_copy["external_retrieval_model"] = fields.Nested(external_retrieval_model, allow_null=True)
    dataset_detail_fields_copy["doc_metadata"] = fields.List(fields.Nested(doc_metadata_model))
    dataset_detail_fields_copy["icon_info"] = fields.Nested(icon_info_model)
    return _get_or_create_model("DatasetDetail", dataset_detail_fields_copy)
 try:
    dataset_detail_model = console_ns.models["DatasetDetail"]
 except KeyError:
    dataset_detail_model = _build_dataset_detail_model()
 def _validate_name(name: str) -> str:
    if not name or len(name) < 1 or len(name) > 100:
        raise ValueError("Name must be between 1 to 100 characters.")
@@ -79,27 +26,26 @@ def _validate_name(name: str) -> str:
@console_ns.route("/datasets/external-knowledge-api")
 class ExternalApiTemplateListApi(Resource):
-    @console_ns.doc("get_external_api_templates")
+    @api.doc("get_external_api_templates")
-    @console_ns.doc(description="Get external knowledge API templates")
+    @api.doc(description="Get external knowledge API templates")
-    @console_ns.doc(
+    @api.doc(
        params={
            "page": "Page number (default: 1)",
            "limit": "Number of items per page (default: 20)",
            "keyword": "Search keyword",
        }
    )
-    @console_ns.response(200, "External API templates retrieved successfully")
+    @api.response(200, "External API templates retrieved successfully")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self):
        _, current_tenant_id = current_account_with_tenant()
        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)
        external_knowledge_apis, total = ExternalDatasetService.get_external_knowledge_apis(
-            page, limit, current_tenant_id, search
+            page, limit, current_user.current_tenant_id, search
        )
        response = {
            "data": [item.to_dict() for item in external_knowledge_apis],
@@ -114,23 +60,20 @@ class ExternalApiTemplateListApi(Resource):
    @login_required
    @account_initialization_required
    def post(self):
-        current_user, current_tenant_id = current_account_with_tenant()
+        parser = reqparse.RequestParser()
-        parser = (
+        parser.add_argument(
-            reqparse.RequestParser()
+            "name",
-            .add_argument(
+            nullable=False,
-                "name",
+            required=True,
-                nullable=False,
+            help="Name is required. Name must be between 1 to 100 characters.",
-                required=True,
+            type=_validate_name,
-                help="Name is required. Name must be between 1 to 100 characters.",
+        )
-                type=_validate_name,
+        parser.add_argument(
-            )
+            "settings",
-            .add_argument(
+            type=dict,
-                "settings",
+            location="json",
-                type=dict,
+            nullable=False,
-                location="json",
+            required=True,
                nullable=False,
                required=True,
            )
        )
        args = parser.parse_args()
@@ -142,7 +85,7 @@ class ExternalApiTemplateListApi(Resource):
        try:
            external_knowledge_api = ExternalDatasetService.create_external_knowledge_api(
-                tenant_id=current_tenant_id, user_id=current_user.id, args=args
+                tenant_id=current_user.current_tenant_id, user_id=current_user.id, args=args
            )
        except services.errors.dataset.DatasetNameDuplicateError:
            raise DatasetNameDuplicateError()
@@ -152,11 +95,11 @@ class ExternalApiTemplateListApi(Resource):
@console_ns.route("/datasets/external-knowledge-api/<uuid:external_knowledge_api_id>")
 class ExternalApiTemplateApi(Resource):
-    @console_ns.doc("get_external_api_template")
+    @api.doc("get_external_api_template")
-    @console_ns.doc(description="Get external knowledge API template details")
+    @api.doc(description="Get external knowledge API template details")
-    @console_ns.doc(params={"external_knowledge_api_id": "External knowledge API ID"})
+    @api.doc(params={"external_knowledge_api_id": "External knowledge API ID"})
-    @console_ns.response(200, "External API template retrieved successfully")
+    @api.response(200, "External API template retrieved successfully")
-    @console_ns.response(404, "Template not found")
+    @api.response(404, "Template not found")
    @setup_required
    @login_required
    @account_initialization_required
@@ -172,31 +115,28 @@ class ExternalApiTemplateApi(Resource):
    @login_required
    @account_initialization_required
    def patch(self, external_knowledge_api_id):
        current_user, current_tenant_id = current_account_with_tenant()
        external_knowledge_api_id = str(external_knowledge_api_id)
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(
-            .add_argument(
+            "name",
-                "name",
+            nullable=False,
-                nullable=False,
+            required=True,
-                required=True,
+            help="type is required. Name must be between 1 to 100 characters.",
-                help="type is required. Name must be between 1 to 100 characters.",
+            type=_validate_name,
-                type=_validate_name,
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "settings",
-                "settings",
+            type=dict,
-                type=dict,
+            location="json",
-                location="json",
+            nullable=False,
-                nullable=False,
+            required=True,
                required=True,
            )
        )
        args = parser.parse_args()
        ExternalDatasetService.validate_api_list(args["settings"])
        external_knowledge_api = ExternalDatasetService.update_external_knowledge_api(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            user_id=current_user.id,
            external_knowledge_api_id=external_knowledge_api_id,
            args=args,
@@ -208,22 +148,22 @@ class ExternalApiTemplateApi(Resource):
    @login_required
    @account_initialization_required
    def delete(self, external_knowledge_api_id):
        current_user, current_tenant_id = current_account_with_tenant()
        external_knowledge_api_id = str(external_knowledge_api_id)
-        if not (current_user.has_edit_permission or current_user.is_dataset_operator):
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not (current_user.is_editor or current_user.is_dataset_operator):
            raise Forbidden()
-        ExternalDatasetService.delete_external_knowledge_api(current_tenant_id, external_knowledge_api_id)
+        ExternalDatasetService.delete_external_knowledge_api(current_user.current_tenant_id, external_knowledge_api_id)
        return {"result": "success"}, 204
@console_ns.route("/datasets/external-knowledge-api/<uuid:external_knowledge_api_id>/use-check")
 class ExternalApiUseCheckApi(Resource):
-    @console_ns.doc("check_external_api_usage")
+    @api.doc("check_external_api_usage")
-    @console_ns.doc(description="Check if external knowledge API is being used")
+    @api.doc(description="Check if external knowledge API is being used")
-    @console_ns.doc(params={"external_knowledge_api_id": "External knowledge API ID"})
+    @api.doc(params={"external_knowledge_api_id": "External knowledge API ID"})
-    @console_ns.response(200, "Usage check completed successfully")
+    @api.response(200, "Usage check completed successfully")
    @setup_required
    @login_required
    @account_initialization_required
@@ -238,10 +178,10 @@ class ExternalApiUseCheckApi(Resource):
@console_ns.route("/datasets/external")
 class ExternalDatasetCreateApi(Resource):
-    @console_ns.doc("create_external_dataset")
+    @api.doc("create_external_dataset")
-    @console_ns.doc(description="Create external knowledge dataset")
+    @api.doc(description="Create external knowledge dataset")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "CreateExternalDatasetRequest",
            {
                "external_knowledge_api_id": fields.String(required=True, description="External knowledge API ID"),
@@ -251,30 +191,29 @@ class ExternalDatasetCreateApi(Resource):
            },
        )
    )
-    @console_ns.response(201, "External dataset created successfully", dataset_detail_model)
+    @api.response(201, "External dataset created successfully", dataset_detail_fields)
-    @console_ns.response(400, "Invalid parameters")
+    @api.response(400, "Invalid parameters")
-    @console_ns.response(403, "Permission denied")
+    @api.response(403, "Permission denied")
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self):
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_editor:
-        parser = (
+            raise Forbidden()
-            reqparse.RequestParser()
+
-            .add_argument("external_knowledge_api_id", type=str, required=True, nullable=False, location="json")
+        parser = reqparse.RequestParser()
-            .add_argument("external_knowledge_id", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("external_knowledge_api_id", type=str, required=True, nullable=False, location="json")
-            .add_argument(
+        parser.add_argument("external_knowledge_id", type=str, required=True, nullable=False, location="json")
-                "name",
+        parser.add_argument(
-                nullable=False,
+            "name",
-                required=True,
+            nullable=False,
-                help="name is required. Name must be between 1 to 100 characters.",
+            required=True,
-                type=_validate_name,
+            help="name is required. Name must be between 1 to 100 characters.",
-            )
+            type=_validate_name,
            .add_argument("description", type=str, required=False, nullable=True, location="json")
            .add_argument("external_retrieval_model", type=dict, required=False, location="json")
        )
        parser.add_argument("description", type=str, required=False, nullable=True, location="json")
        parser.add_argument("external_retrieval_model", type=dict, required=False, location="json")
        args = parser.parse_args()
@@ -284,7 +223,7 @@ class ExternalDatasetCreateApi(Resource):
        try:
            dataset = ExternalDatasetService.create_external_dataset(
-                tenant_id=current_tenant_id,
+                tenant_id=current_user.current_tenant_id,
                user_id=current_user.id,
                args=args,
            )
@@ -296,11 +235,11 @@ class ExternalDatasetCreateApi(Resource):
@console_ns.route("/datasets/<uuid:dataset_id>/external-hit-testing")
 class ExternalKnowledgeHitTestingApi(Resource):
-    @console_ns.doc("test_external_knowledge_retrieval")
+    @api.doc("test_external_knowledge_retrieval")
-    @console_ns.doc(description="Test external knowledge retrieval for dataset")
+    @api.doc(description="Test external knowledge retrieval for dataset")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "ExternalHitTestingRequest",
            {
                "query": fields.String(required=True, description="Query text for testing"),
@@ -309,14 +248,13 @@ class ExternalKnowledgeHitTestingApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "External hit testing completed successfully")
+    @api.response(200, "External hit testing completed successfully")
-    @console_ns.response(404, "Dataset not found")
+    @api.response(404, "Dataset not found")
-    @console_ns.response(400, "Invalid parameters")
+    @api.response(400, "Invalid parameters")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self, dataset_id):
        current_user, _ = current_account_with_tenant()
        dataset_id_str = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id_str)
        if dataset is None:
@@ -327,12 +265,10 @@ class ExternalKnowledgeHitTestingApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("query", type=str, location="json")
-            .add_argument("query", type=str, location="json")
+        parser.add_argument("external_retrieval_model", type=dict, required=False, location="json")
-            .add_argument("external_retrieval_model", type=dict, required=False, location="json")
+        parser.add_argument("metadata_filtering_conditions", type=dict, required=False, location="json")
            .add_argument("metadata_filtering_conditions", type=dict, required=False, location="json")
        )
        args = parser.parse_args()
        HitTestingService.hit_testing_args_check(args)
@@ -341,7 +277,7 @@ class ExternalKnowledgeHitTestingApi(Resource):
            response = HitTestingService.external_retrieve(
                dataset=dataset,
                query=args["query"],
-                account=current_user,
+                account=cast(Account, current_user),
                external_retrieval_model=args["external_retrieval_model"],
                metadata_filtering_conditions=args["metadata_filtering_conditions"],
            )
@@ -354,10 +290,10 @@ class ExternalKnowledgeHitTestingApi(Resource):
@console_ns.route("/test/retrieval")
 class BedrockRetrievalApi(Resource):
    # this api is only for internal testing
-    @console_ns.doc("bedrock_retrieval_test")
+    @api.doc("bedrock_retrieval_test")
-    @console_ns.doc(description="Bedrock retrieval test (internal use only)")
+    @api.doc(description="Bedrock retrieval test (internal use only)")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "BedrockRetrievalTestRequest",
            {
                "retrieval_setting": fields.Raw(required=True, description="Retrieval settings"),
@@ -366,19 +302,17 @@ class BedrockRetrievalApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "Bedrock retrieval test completed")
+    @api.response(200, "Bedrock retrieval test completed")
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("retrieval_setting", nullable=False, required=True, type=dict, location="json")
-            .add_argument("retrieval_setting", nullable=False, required=True, type=dict, location="json")
+        parser.add_argument(
-            .add_argument(
+            "query",
-                "query",
+            nullable=False,
-                nullable=False,
+            required=True,
-                required=True,
+            type=str,
                type=str,
            )
            .add_argument("knowledge_id", nullable=False, required=True, type=str)
        )
        parser.add_argument("knowledge_id", nullable=False, required=True, type=str)
        args = parser.parse_args()
        # Call the knowledge retrieval service
@@ -1,6 +1,6 @@
 from flask_restx import Resource, fields
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.datasets.hit_testing_base import DatasetsHitTestingBase
 from controllers.console.wraps import (
    account_initialization_required,
@@ -12,11 +12,11 @@ from libs.login import login_required
@console_ns.route("/datasets/<uuid:dataset_id>/hit-testing")
 class HitTestingApi(Resource, DatasetsHitTestingBase):
-    @console_ns.doc("test_dataset_retrieval")
+    @api.doc("test_dataset_retrieval")
-    @console_ns.doc(description="Test dataset knowledge retrieval")
+    @api.doc(description="Test dataset knowledge retrieval")
-    @console_ns.doc(params={"dataset_id": "Dataset ID"})
+    @api.doc(params={"dataset_id": "Dataset ID"})
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "HitTestingRequest",
            {
                "query": fields.String(required=True, description="Query text for testing"),
@@ -26,9 +26,9 @@ class HitTestingApi(Resource, DatasetsHitTestingBase):
            },
        )
    )
-    @console_ns.response(200, "Hit testing completed successfully")
+    @api.response(200, "Hit testing completed successfully")
-    @console_ns.response(404, "Dataset not found")
+    @api.response(404, "Dataset not found")
-    @console_ns.response(400, "Invalid parameters")
+    @api.response(400, "Invalid parameters")
    @setup_required
    @login_required
    @account_initialization_required
@@ -48,12 +48,11 @@ class DatasetsHitTestingBase:
    @staticmethod
    def parse_args():
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+
-            .add_argument("query", type=str, location="json")
+        parser.add_argument("query", type=str, location="json")
-            .add_argument("retrieval_model", type=dict, required=False, location="json")
+        parser.add_argument("retrieval_model", type=dict, required=False, location="json")
-            .add_argument("external_retrieval_model", type=dict, required=False, location="json")
+        parser.add_argument("external_retrieval_model", type=dict, required=False, location="json")
        )
        return parser.parse_args()
    @staticmethod
@@ -1,12 +1,13 @@
 from typing import Literal
 from flask_login import current_user
 from flask_restx import Resource, marshal_with, reqparse
 from werkzeug.exceptions import NotFound
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, enterprise_license_required, setup_required
 from fields.dataset_fields import dataset_metadata_fields
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from services.dataset_service import DatasetService
 from services.entities.knowledge_entities.knowledge_entities import (
    MetadataArgs,
@@ -23,12 +24,9 @@ class DatasetMetadataCreateApi(Resource):
    @enterprise_license_required
    @marshal_with(dataset_metadata_fields)
    def post(self, dataset_id):
-        current_user, _ = current_account_with_tenant()
+        parser = reqparse.RequestParser()
-        parser = (
+        parser.add_argument("type", type=str, required=True, nullable=False, location="json")
-            reqparse.RequestParser()
+        parser.add_argument("name", type=str, required=True, nullable=False, location="json")
            .add_argument("type", type=str, required=True, nullable=False, location="json")
            .add_argument("name", type=str, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        metadata_args = MetadataArgs.model_validate(args)
@@ -61,8 +59,8 @@ class DatasetMetadataApi(Resource):
    @enterprise_license_required
    @marshal_with(dataset_metadata_fields)
    def patch(self, dataset_id, metadata_id):
-        current_user, _ = current_account_with_tenant()
+        parser = reqparse.RequestParser()
-        parser = reqparse.RequestParser().add_argument("name", type=str, required=True, nullable=False, location="json")
+        parser.add_argument("name", type=str, required=True, nullable=False, location="json")
        args = parser.parse_args()
        name = args["name"]
@@ -81,7 +79,6 @@ class DatasetMetadataApi(Resource):
    @account_initialization_required
    @enterprise_license_required
    def delete(self, dataset_id, metadata_id):
        current_user, _ = current_account_with_tenant()
        dataset_id_str = str(dataset_id)
        metadata_id_str = str(metadata_id)
        dataset = DatasetService.get_dataset(dataset_id_str)
@@ -111,7 +108,6 @@ class DatasetMetadataBuiltInFieldActionApi(Resource):
    @account_initialization_required
    @enterprise_license_required
    def post(self, dataset_id, action: Literal["enable", "disable"]):
        current_user, _ = current_account_with_tenant()
        dataset_id_str = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id_str)
        if dataset is None:
@@ -132,16 +128,14 @@ class DocumentMetadataEditApi(Resource):
    @account_initialization_required
    @enterprise_license_required
    def post(self, dataset_id):
        current_user, _ = current_account_with_tenant()
        dataset_id_str = str(dataset_id)
        dataset = DatasetService.get_dataset(dataset_id_str)
        if dataset is None:
            raise NotFound("Dataset not found.")
        DatasetService.check_dataset_permission(dataset, current_user)
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
-            "operation_data", type=list, required=True, nullable=False, location="json"
+        parser.add_argument("operation_data", type=list, required=True, nullable=False, location="json")
        )
        args = parser.parse_args()
        metadata_args = MetadataOperationData.model_validate(args)
@@ -1,15 +1,19 @@
 from flask import make_response, redirect, request
 from flask_login import current_user
 from flask_restx import Resource, reqparse
 from werkzeug.exceptions import Forbidden, NotFound
 from configs import dify_config
 from controllers.console import console_ns
-from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
+from controllers.console.wraps import (
    account_initialization_required,
    setup_required,
 )
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.utils.encoders import jsonable_encoder
 from core.plugin.impl.oauth import OAuthHandler
 from libs.helper import StrLen
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models.provider_ids import DatasourceProviderID
 from services.datasource_provider_service import DatasourceProviderService
 from services.plugin.oauth_service import OAuthProxyService
@@ -20,11 +24,11 @@ class DatasourcePluginOAuthAuthorizationUrl(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def get(self, provider_id: str):
-        current_user, current_tenant_id = current_account_with_tenant()
+        user = current_user
-
+        tenant_id = user.current_tenant_id
-        tenant_id = current_tenant_id
+        if not current_user.is_editor:
            raise Forbidden()
        credential_id = request.args.get("credential_id")
        datasource_provider_id = DatasourceProviderID(provider_id)
@@ -48,7 +52,7 @@ class DatasourcePluginOAuthAuthorizationUrl(Resource):
        redirect_uri = f"{dify_config.CONSOLE_API_URL}/console/api/oauth/plugin/{provider_id}/datasource/callback"
        authorization_url_response = oauth_handler.get_authorization_url(
            tenant_id=tenant_id,
-            user_id=current_user.id,
+            user_id=user.id,
            plugin_id=plugin_id,
            provider=provider_name,
            redirect_uri=redirect_uri,
@@ -121,30 +125,27 @@ 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):
    @console_ns.expect(parser_datasource)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self, provider_id: str):
-        _, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_editor:
            raise Forbidden()
-        args = parser_datasource.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument(
            "name", type=StrLen(max_length=100), required=False, nullable=True, location="json", default=None
        )
        parser.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()
        try:
            datasource_provider_service.add_datasource_api_key_provider(
-                tenant_id=current_tenant_id,
+                tenant_id=current_user.current_tenant_id,
                provider_id=datasource_provider_id,
                credentials=args["credentials"],
                name=args["name"],
@@ -159,39 +160,31 @@ class DatasourceAuth(Resource):
    def get(self, provider_id: str):
        datasource_provider_id = DatasourceProviderID(provider_id)
        datasource_provider_service = DatasourceProviderService()
        _, current_tenant_id = current_account_with_tenant()
        datasources = datasource_provider_service.list_datasource_credentials(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            provider=datasource_provider_id.provider_name,
            plugin_id=datasource_provider_id.plugin_id,
        )
        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):
    @console_ns.expect(parser_datasource_delete)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self, provider_id: str):
        _, current_tenant_id = current_account_with_tenant()
        datasource_provider_id = DatasourceProviderID(provider_id)
        plugin_id = datasource_provider_id.plugin_id
        provider_name = datasource_provider_id.provider_name
-
+        if not current_user.is_editor:
-        args = parser_datasource_delete.parse_args()
+            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.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,
+            tenant_id=current_user.current_tenant_id,
            auth_id=args["credential_id"],
            provider=provider_name,
            plugin_id=plugin_id,
@@ -199,30 +192,23 @@ 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):
    @console_ns.expect(parser_datasource_update)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self, provider_id: str):
        _, current_tenant_id = current_account_with_tenant()
        datasource_provider_id = DatasourceProviderID(provider_id)
-        args = parser_datasource_update.parse_args()
+        parser = reqparse.RequestParser()
-
+        parser.add_argument("credentials", type=dict, required=False, nullable=True, location="json")
        parser.add_argument("name", type=StrLen(max_length=100), required=False, nullable=True, location="json")
        parser.add_argument("credential_id", type=str, required=True, nullable=False, location="json")
        args = parser.parse_args()
        if not current_user.is_editor:
            raise Forbidden()
        datasource_provider_service = DatasourceProviderService()
        datasource_provider_service.update_datasource_credentials(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            auth_id=args["credential_id"],
            provider=datasource_provider_id.provider_name,
            plugin_id=datasource_provider_id.plugin_id,
@@ -238,10 +224,10 @@ class DatasourceAuthListApi(Resource):
    @login_required
    @account_initialization_required
    def get(self):
        _, current_tenant_id = current_account_with_tenant()
        datasource_provider_service = DatasourceProviderService()
-        datasources = datasource_provider_service.get_all_datasource_credentials(tenant_id=current_tenant_id)
+        datasources = datasource_provider_service.get_all_datasource_credentials(
            tenant_id=current_user.current_tenant_id
        )
        return {"result": jsonable_encoder(datasources)}, 200
@@ -251,35 +237,29 @@ class DatasourceHardCodeAuthListApi(Resource):
    @login_required
    @account_initialization_required
    def get(self):
        _, current_tenant_id = current_account_with_tenant()
        datasource_provider_service = DatasourceProviderService()
-        datasources = datasource_provider_service.get_hard_code_datasource_credentials(tenant_id=current_tenant_id)
+        datasources = datasource_provider_service.get_hard_code_datasource_credentials(
            tenant_id=current_user.current_tenant_id
        )
        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):
    @console_ns.expect(parser_datasource_custom)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self, provider_id: str):
-        _, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_editor:
-
+            raise Forbidden()
-        args = parser_datasource_custom.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("client_params", type=dict, required=False, nullable=True, location="json")
        parser.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(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            datasource_provider_id=datasource_provider_id,
            client_params=args.get("client_params", {}),
            enabled=args.get("enable_oauth_custom_client", False),
@@ -290,63 +270,52 @@ class DatasourceAuthOauthCustomClient(Resource):
    @login_required
    @account_initialization_required
    def delete(self, provider_id: str):
        _, current_tenant_id = current_account_with_tenant()
        datasource_provider_id = DatasourceProviderID(provider_id)
        datasource_provider_service = DatasourceProviderService()
        datasource_provider_service.remove_oauth_custom_client_params(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            datasource_provider_id=datasource_provider_id,
        )
        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):
    @console_ns.expect(parser_default)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self, provider_id: str):
-        _, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_editor:
-
+            raise Forbidden()
-        args = parser_default.parse_args()
+        parser = reqparse.RequestParser()
        parser.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(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            datasource_provider_id=datasource_provider_id,
            credential_id=args["id"],
        )
        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):
    @console_ns.expect(parser_update_name)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    def post(self, provider_id: str):
-        _, current_tenant_id = current_account_with_tenant()
+        if not current_user.is_editor:
-
+            raise Forbidden()
-        args = parser_update_name.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("name", type=StrLen(max_length=100), required=True, nullable=False, location="json")
        parser.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(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            datasource_provider_id=datasource_provider_id,
            name=args["name"],
            credential_id=args["credential_id"],
@@ -1,7 +1,7 @@
 from flask_restx import (  # type: ignore
    Resource,  # type: ignore
    reqparse,
 )
 from pydantic import BaseModel
 from werkzeug.exceptions import Forbidden
 from controllers.console import console_ns
@@ -12,21 +12,9 @@ from models import Account
 from models.dataset import Pipeline
 from services.rag_pipeline.rag_pipeline import RagPipelineService
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 class Parser(BaseModel):
    inputs: dict
    datasource_type: str
    credential_id: str | None = None
 console_ns.schema_model(Parser.__name__, Parser.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/datasource/nodes/<string:node_id>/preview")
 class DataSourceContentPreviewApi(Resource):
    @console_ns.expect(console_ns.models[Parser.__name__], validate=True)
    @setup_required
    @login_required
    @account_initialization_required
@@ -38,10 +26,19 @@ class DataSourceContentPreviewApi(Resource):
        if not isinstance(current_user, Account):
            raise Forbidden()
-        args = Parser.model_validate(console_ns.payload)
+        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, required=True, nullable=False, location="json")
        parser.add_argument("datasource_type", type=str, required=True, location="json")
        parser.add_argument("credential_id", type=str, required=False, location="json")
        args = parser.parse_args()
        inputs = args.get("inputs")
        if inputs is None:
            raise ValueError("missing inputs")
        datasource_type = args.get("datasource_type")
        if datasource_type is None:
            raise ValueError("missing datasource_type")
        inputs = args.inputs
        datasource_type = args.datasource_type
        rag_pipeline_service = RagPipelineService()
        preview_content = rag_pipeline_service.run_datasource_node_preview(
            pipeline=pipeline,
@@ -50,6 +47,6 @@ class DataSourceContentPreviewApi(Resource):
            account=current_user,
            datasource_type=datasource_type,
            is_published=True,
-            credential_id=args.credential_id,
+            credential_id=args.get("credential_id"),
        )
        return preview_content, 200
@@ -66,28 +66,26 @@ class CustomizedPipelineTemplateApi(Resource):
    @account_initialization_required
    @enterprise_license_required
    def patch(self, template_id: str):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(
-            .add_argument(
+            "name",
-                "name",
+            nullable=False,
-                nullable=False,
+            required=True,
-                required=True,
+            help="Name must be between 1 to 40 characters.",
-                help="Name must be between 1 to 40 characters.",
+            type=_validate_name,
-                type=_validate_name,
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "description",
-                "description",
+            type=_validate_description_length,
-                type=_validate_description_length,
+            nullable=True,
-                nullable=True,
+            required=False,
-                required=False,
+            default="",
-                default="",
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "icon_info",
-                "icon_info",
+            type=dict,
-                type=dict,
+            location="json",
-                location="json",
+            nullable=True,
                nullable=True,
            )
        )
        args = parser.parse_args()
        pipeline_template_info = PipelineTemplateInfoEntity.model_validate(args)
@@ -125,28 +123,26 @@ class PublishCustomizedPipelineTemplateApi(Resource):
    @enterprise_license_required
    @knowledge_pipeline_publish_enabled
    def post(self, pipeline_id: str):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(
-            .add_argument(
+            "name",
-                "name",
+            nullable=False,
-                nullable=False,
+            required=True,
-                required=True,
+            help="Name must be between 1 to 40 characters.",
-                help="Name must be between 1 to 40 characters.",
+            type=_validate_name,
-                type=_validate_name,
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "description",
-                "description",
+            type=_validate_description_length,
-                type=_validate_description_length,
+            nullable=True,
-                nullable=True,
+            required=False,
-                required=False,
+            default="",
-                default="",
+        )
-            )
+        parser.add_argument(
-            .add_argument(
+            "icon_info",
-                "icon_info",
+            type=dict,
-                type=dict,
+            location="json",
-                location="json",
+            nullable=True,
                nullable=True,
            )
        )
        args = parser.parse_args()
        rag_pipeline_service = RagPipelineService()
@@ -1,3 +1,4 @@
 from flask_login import current_user
 from flask_restx import Resource, marshal, reqparse
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden
@@ -12,7 +13,7 @@ from controllers.console.wraps import (
 )
 from extensions.ext_database import db
 from fields.dataset_fields import dataset_detail_fields
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models.dataset import DatasetPermissionEnum
 from services.dataset_service import DatasetPermissionService, DatasetService
 from services.entities.knowledge_entities.rag_pipeline_entities import IconInfo, RagPipelineDatasetCreateEntity
@@ -26,7 +27,9 @@ class CreateRagPipelineDatasetApi(Resource):
    @account_initialization_required
    @cloud_edition_billing_rate_limit_check("knowledge")
    def post(self):
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
        parser.add_argument(
            "yaml_content",
            type=str,
            nullable=False,
@@ -35,7 +38,7 @@ class CreateRagPipelineDatasetApi(Resource):
        )
        args = parser.parse_args()
-        current_user, current_tenant_id = current_account_with_tenant()
+
        # The role of the current user in the ta table must be admin, owner, or editor, or dataset_operator
        if not current_user.is_dataset_editor:
            raise Forbidden()
@@ -55,12 +58,12 @@ class CreateRagPipelineDatasetApi(Resource):
            with Session(db.engine) as session:
                rag_pipeline_dsl_service = RagPipelineDslService(session)
                import_info = rag_pipeline_dsl_service.create_rag_pipeline_dataset(
-                    tenant_id=current_tenant_id,
+                    tenant_id=current_user.current_tenant_id,
                    rag_pipeline_dataset_create_entity=rag_pipeline_dataset_create_entity,
                )
            if rag_pipeline_dataset_create_entity.permission == "partial_members":
                DatasetPermissionService.update_partial_member_list(
-                    current_tenant_id,
+                    current_user.current_tenant_id,
                    import_info["dataset_id"],
                    rag_pipeline_dataset_create_entity.partial_member_list,
                )
@@ -78,12 +81,10 @@ class CreateEmptyRagPipelineDatasetApi(Resource):
    @cloud_edition_billing_rate_limit_check("knowledge")
    def post(self):
        # The role of the current user in the ta table must be admin, owner, or editor, or dataset_operator
        current_user, current_tenant_id = current_account_with_tenant()
        if not current_user.is_dataset_editor:
            raise Forbidden()
        dataset = DatasetService.create_empty_rag_pipeline_dataset(
-            tenant_id=current_tenant_id,
+            tenant_id=current_user.current_tenant_id,
            rag_pipeline_dataset_create_entity=RagPipelineDatasetCreateEntity(
                name="",
                description="",
@@ -23,7 +23,7 @@ from extensions.ext_database import db
 from factories.file_factory import build_from_mapping, build_from_mappings
 from factories.variable_factory import build_segment_with_type
 from libs.login import current_user, login_required
-from models import Account
+from models.account import Account
 from models.dataset import Pipeline
 from models.workflow import WorkflowDraftVariable
 from services.rag_pipeline.rag_pipeline import RagPipelineService
@@ -33,18 +33,16 @@ logger = logging.getLogger(__name__)
 def _create_pagination_parser():
-    parser = (
+    parser = reqparse.RequestParser()
-        reqparse.RequestParser()
+    parser.add_argument(
-        .add_argument(
+        "page",
-            "page",
+        type=inputs.int_range(1, 100_000),
-            type=inputs.int_range(1, 100_000),
+        required=False,
-            required=False,
+        default=1,
-            default=1,
+        location="args",
-            location="args",
+        help="the page of data requested",
            help="the page of data requested",
        )
        .add_argument("limit", type=inputs.int_range(1, 100), required=False, default=20, location="args")
    )
    parser.add_argument("limit", type=inputs.int_range(1, 100), required=False, default=20, location="args")
    return parser
@@ -208,11 +206,10 @@ class RagPipelineVariableApi(Resource):
        #         "upload_file_id": "1602650a-4fe4-423c-85a2-af76c083e3c4"
        #     }
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(self._PATCH_NAME_FIELD, type=str, required=False, nullable=True, location="json")
-            .add_argument(self._PATCH_NAME_FIELD, type=str, required=False, nullable=True, location="json")
+        # Parse 'value' field as-is to maintain its original data structure
-            .add_argument(self._PATCH_VALUE_FIELD, type=lambda x: x, required=False, nullable=True, location="json")
+        parser.add_argument(self._PATCH_VALUE_FIELD, type=lambda x: x, required=False, nullable=True, location="json")
        )
        draft_var_srv = WorkflowDraftVariableService(
            session=db.session(),
@@ -1,16 +1,20 @@
 from typing import cast
 from flask_login import current_user  # type: ignore
 from flask_restx import Resource, marshal_with, reqparse  # type: ignore
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden
 from controllers.console import console_ns
 from controllers.console.datasets.wraps import get_rag_pipeline
 from controllers.console.wraps import (
    account_initialization_required,
    edit_permission_required,
    setup_required,
 )
 from extensions.ext_database import db
 from fields.rag_pipeline_fields import pipeline_import_check_dependencies_fields, pipeline_import_fields
-from libs.login import current_account_with_tenant, login_required
+from libs.login import login_required
 from models import Account
 from models.dataset import Pipeline
 from services.app_dsl_service import ImportStatus
 from services.rag_pipeline.rag_pipeline_dsl_service import RagPipelineDslService
@@ -21,31 +25,29 @@ class RagPipelineImportApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @marshal_with(pipeline_import_fields)
    def post(self):
        # Check user role first
-        current_user, _ = current_account_with_tenant()
+        if not current_user.is_editor:
            raise Forbidden()
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("mode", type=str, required=True, location="json")
-            .add_argument("mode", type=str, required=True, location="json")
+        parser.add_argument("yaml_content", type=str, location="json")
-            .add_argument("yaml_content", type=str, location="json")
+        parser.add_argument("yaml_url", type=str, location="json")
-            .add_argument("yaml_url", type=str, location="json")
+        parser.add_argument("name", type=str, location="json")
-            .add_argument("name", type=str, location="json")
+        parser.add_argument("description", type=str, location="json")
-            .add_argument("description", type=str, location="json")
+        parser.add_argument("icon_type", type=str, location="json")
-            .add_argument("icon_type", type=str, location="json")
+        parser.add_argument("icon", type=str, location="json")
-            .add_argument("icon", type=str, location="json")
+        parser.add_argument("icon_background", type=str, location="json")
-            .add_argument("icon_background", type=str, location="json")
+        parser.add_argument("pipeline_id", type=str, location="json")
            .add_argument("pipeline_id", type=str, location="json")
        )
        args = parser.parse_args()
        # Create service with session
        with Session(db.engine) as session:
            import_service = RagPipelineDslService(session)
            # Import app
-            account = current_user
+            account = cast(Account, current_user)
            result = import_service.import_rag_pipeline(
                account=account,
                import_mode=args["mode"],
@@ -70,16 +72,17 @@ class RagPipelineImportConfirmApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @marshal_with(pipeline_import_fields)
    def post(self, import_id):
-        current_user, _ = current_account_with_tenant()
+        # Check user role first
        if not current_user.is_editor:
            raise Forbidden()
        # Create service with session
        with Session(db.engine) as session:
            import_service = RagPipelineDslService(session)
            # Confirm import
-            account = current_user
+            account = cast(Account, current_user)
            result = import_service.confirm_import(import_id=import_id, account=account)
            session.commit()
@@ -95,9 +98,11 @@ class RagPipelineImportCheckDependenciesApi(Resource):
    @login_required
    @get_rag_pipeline
    @account_initialization_required
    @edit_permission_required
    @marshal_with(pipeline_import_check_dependencies_fields)
    def get(self, pipeline: Pipeline):
        if not current_user.is_editor:
            raise Forbidden()
        with Session(db.engine) as session:
            import_service = RagPipelineDslService(session)
            result = import_service.check_dependencies(pipeline=pipeline)
@@ -111,10 +116,13 @@ class RagPipelineExportApi(Resource):
    @login_required
    @get_rag_pipeline
    @account_initialization_required
    @edit_permission_required
    def get(self, pipeline: Pipeline):
-        # Add include_secret params
+        if not current_user.is_editor:
-        parser = reqparse.RequestParser().add_argument("include_secret", type=str, default="false", location="args")
+            raise Forbidden()
            # Add include_secret params
        parser = reqparse.RequestParser()
        parser.add_argument("include_secret", type=str, default="false", location="args")
        args = parser.parse_args()
        with Session(db.engine) as session:
@@ -18,7 +18,6 @@ from controllers.console.app.error import (
 from controllers.console.datasets.wraps import get_rag_pipeline
 from controllers.console.wraps import (
    account_initialization_required,
    edit_permission_required,
    setup_required,
 )
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
@@ -37,8 +36,8 @@ from fields.workflow_run_fields import (
 )
 from libs import helper
 from libs.helper import TimestampField, uuid_value
-from libs.login import current_account_with_tenant, current_user, login_required
+from libs.login import current_user, login_required
-from models import Account
+from models.account import Account
 from models.dataset import Pipeline
 from models.model import EndUser
 from services.errors.app import WorkflowHashNotEqualError
@@ -57,12 +56,15 @@ class DraftRagPipelineApi(Resource):
    @login_required
    @account_initialization_required
    @get_rag_pipeline
    @edit_permission_required
    @marshal_with(workflow_fields)
    def get(self, pipeline: Pipeline):
        """
        Get draft rag pipeline's workflow
        """
        # The role of the current user in the ta table must be admin, owner, or editor
        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        # fetch draft workflow by app_model
        rag_pipeline_service = RagPipelineService()
        workflow = rag_pipeline_service.get_draft_workflow(pipeline=pipeline)
@@ -77,25 +79,23 @@ class DraftRagPipelineApi(Resource):
    @login_required
    @account_initialization_required
    @get_rag_pipeline
    @edit_permission_required
    def post(self, pipeline: Pipeline):
        """
        Sync draft workflow
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        content_type = request.headers.get("Content-Type", "")
        if "application/json" in content_type:
-            parser = (
+            parser = reqparse.RequestParser()
-                reqparse.RequestParser()
+            parser.add_argument("graph", type=dict, required=True, nullable=False, location="json")
-                .add_argument("graph", type=dict, required=True, nullable=False, location="json")
+            parser.add_argument("hash", type=str, required=False, location="json")
-                .add_argument("hash", type=str, required=False, location="json")
+            parser.add_argument("environment_variables", type=list, required=False, location="json")
-                .add_argument("environment_variables", type=list, required=False, location="json")
+            parser.add_argument("conversation_variables", type=list, required=False, location="json")
-                .add_argument("conversation_variables", type=list, required=False, location="json")
+            parser.add_argument("rag_pipeline_variables", type=list, required=False, location="json")
                .add_argument("rag_pipeline_variables", type=list, required=False, location="json")
            )
            args = parser.parse_args()
        elif "text/plain" in content_type:
            try:
@@ -148,25 +148,23 @@ 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):
    @console_ns.expect(parser_run)
    @setup_required
    @login_required
    @account_initialization_required
    @get_rag_pipeline
    @edit_permission_required
    def post(self, pipeline: Pipeline, node_id: str):
        """
        Run draft workflow iteration node
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_run.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, location="json")
        args = parser.parse_args()
        try:
            response = PipelineGenerateService.generate_single_iteration(
@@ -187,20 +185,21 @@ class RagPipelineDraftRunIterationNodeApi(Resource):
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/loop/nodes/<string:node_id>/run")
 class RagPipelineDraftRunLoopNodeApi(Resource):
    @console_ns.expect(parser_run)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    def post(self, pipeline: Pipeline, node_id: str):
        """
        Run draft workflow loop node
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_run.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, location="json")
        args = parser.parse_args()
        try:
            response = PipelineGenerateService.generate_single_loop(
@@ -219,31 +218,26 @@ 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):
    @console_ns.expect(parser_draft_run)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    def post(self, pipeline: Pipeline):
        """
        Run draft workflow
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_draft_run.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, required=True, nullable=False, location="json")
        parser.add_argument("datasource_type", type=str, required=True, location="json")
        parser.add_argument("datasource_info_list", type=list, required=True, location="json")
        parser.add_argument("start_node_id", type=str, required=True, location="json")
        args = parser.parse_args()
        try:
            response = PipelineGenerateService.generate(
@@ -259,34 +253,29 @@ 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):
    @console_ns.expect(parser_published_run)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    def post(self, pipeline: Pipeline):
        """
        Run published workflow
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_published_run.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, required=True, nullable=False, location="json")
        parser.add_argument("datasource_type", type=str, required=True, location="json")
        parser.add_argument("datasource_info_list", type=list, required=True, location="json")
        parser.add_argument("start_node_id", type=str, required=True, location="json")
        parser.add_argument("is_preview", type=bool, required=True, location="json", default=False)
        parser.add_argument("response_mode", type=str, required=True, location="json", default="streaming")
        parser.add_argument("original_document_id", type=str, required=False, location="json")
        args = parser.parse_args()
        streaming = args["response_mode"] == "streaming"
@@ -314,16 +303,15 @@ class PublishedRagPipelineRunApi(Resource):
 #         Run rag pipeline datasource
 #         """
 #         # The role of the current user in the ta table must be admin, owner, or editor
-#         if not current_user.has_edit_permission:
+#         if not current_user.is_editor:
 #             raise Forbidden()
 #
 #         if not isinstance(current_user, Account):
 #             raise Forbidden()
 #
-#         parser = (reqparse.RequestParser()
+#         parser = reqparse.RequestParser()
-#             .add_argument("job_id", type=str, required=True, nullable=False, location="json")
+#         parser.add_argument("job_id", type=str, required=True, nullable=False, location="json")
-#             .add_argument("datasource_type", type=str, required=True, location="json")
+#         parser.add_argument("datasource_type", type=str, required=True, location="json")
 #         )
 #         args = parser.parse_args()
 #
 #         job_id = args.get("job_id")
@@ -356,16 +344,15 @@ class PublishedRagPipelineRunApi(Resource):
 #         Run rag pipeline datasource
 #         """
 #         # The role of the current user in the ta table must be admin, owner, or editor
-#         if not current_user.has_edit_permission:
+#         if not current_user.is_editor:
 #             raise Forbidden()
 #
 #         if not isinstance(current_user, Account):
 #             raise Forbidden()
 #
-#         parser = (reqparse.RequestParser()
+#         parser = reqparse.RequestParser()
-#             .add_argument("job_id", type=str, required=True, nullable=False, location="json")
+#         parser.add_argument("job_id", type=str, required=True, nullable=False, location="json")
-#             .add_argument("datasource_type", type=str, required=True, location="json")
+#         parser.add_argument("datasource_type", type=str, required=True, location="json")
 #         )
 #         args = parser.parse_args()
 #
 #         job_id = args.get("job_id")
@@ -387,30 +374,25 @@ 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):
    @console_ns.expect(parser_rag_run)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    def post(self, pipeline: Pipeline, node_id: str):
        """
        Run rag pipeline datasource
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_rag_run.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, required=True, nullable=False, location="json")
        parser.add_argument("datasource_type", type=str, required=True, location="json")
        parser.add_argument("credential_id", type=str, required=False, location="json")
        args = parser.parse_args()
        inputs = args.get("inputs")
        if inputs is None:
@@ -437,10 +419,8 @@ class RagPipelinePublishedDatasourceNodeRunApi(Resource):
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/datasource/nodes/<string:node_id>/run")
 class RagPipelineDraftDatasourceNodeRunApi(Resource):
    @console_ns.expect(parser_rag_run)
    @setup_required
    @login_required
    @edit_permission_required
    @account_initialization_required
    @get_rag_pipeline
    def post(self, pipeline: Pipeline, node_id: str):
@@ -448,9 +428,14 @@ class RagPipelineDraftDatasourceNodeRunApi(Resource):
        Run rag pipeline datasource
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_rag_run.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, required=True, nullable=False, location="json")
        parser.add_argument("datasource_type", type=str, required=True, location="json")
        parser.add_argument("credential_id", type=str, required=False, location="json")
        args = parser.parse_args()
        inputs = args.get("inputs")
        if inputs is None:
@@ -475,17 +460,10 @@ 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):
    @console_ns.expect(parser_run_api)
    @setup_required
    @login_required
    @edit_permission_required
    @account_initialization_required
    @get_rag_pipeline
    @marshal_with(workflow_run_node_execution_fields)
@@ -494,9 +472,12 @@ class RagPipelineDraftNodeRunApi(Resource):
        Run draft workflow node
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_run_api.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("inputs", type=dict, required=True, nullable=False, location="json")
        args = parser.parse_args()
        inputs = args.get("inputs")
        if inputs == None:
@@ -517,7 +498,6 @@ class RagPipelineDraftNodeRunApi(Resource):
 class RagPipelineTaskStopApi(Resource):
    @setup_required
    @login_required
    @edit_permission_required
    @account_initialization_required
    @get_rag_pipeline
    def post(self, pipeline: Pipeline, task_id: str):
@@ -525,7 +505,8 @@ class RagPipelineTaskStopApi(Resource):
        Stop workflow task
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        AppQueueManager.set_stop_flag(task_id, InvokeFrom.DEBUGGER, current_user.id)
@@ -537,7 +518,6 @@ class PublishedRagPipelineApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    @marshal_with(workflow_fields)
    def get(self, pipeline: Pipeline):
@@ -545,6 +525,8 @@ class PublishedRagPipelineApi(Resource):
        Get published pipeline
        """
        # The role of the current user in the ta table must be admin, owner, or editor
        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        if not pipeline.is_published:
            return None
        # fetch published workflow by pipeline
@@ -557,14 +539,15 @@ class PublishedRagPipelineApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    def post(self, pipeline: Pipeline):
        """
        Publish workflow
        """
        # The role of the current user in the ta table must be admin, owner, or editor
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        rag_pipeline_service = RagPipelineService()
        with Session(db.engine) as session:
            pipeline = session.merge(pipeline)
@@ -591,33 +574,37 @@ class DefaultRagPipelineBlockConfigsApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    def get(self, pipeline: Pipeline):
        """
        Get default block config
        """
        # The role of the current user in the ta table must be admin, owner, or editor
        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        # Get default block configs
        rag_pipeline_service = RagPipelineService()
        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):
    @console_ns.expect(parser_default)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    def get(self, pipeline: Pipeline, block_type: str):
        """
        Get default block config
        """
-        args = parser_default.parse_args()
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("q", type=str, location="args")
        args = parser.parse_args()
        q = args.get("q")
@@ -633,33 +620,28 @@ 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):
    @console_ns.expect(parser_wf)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    @marshal_with(workflow_pagination_fields)
    def get(self, pipeline: Pipeline):
        """
        Get published workflows
        """
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_wf.parse_args()
+        parser = reqparse.RequestParser()
-        page = args["page"]
+        parser.add_argument("page", type=inputs.int_range(1, 99999), required=False, default=1, location="args")
-        limit = args["limit"]
+        parser.add_argument("limit", type=inputs.int_range(1, 100), required=False, default=20, location="args")
        parser.add_argument("user_id", type=str, required=False, location="args")
        parser.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)
@@ -687,20 +669,11 @@ 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):
    @console_ns.expect(parser_wf_id)
    @setup_required
    @login_required
    @account_initialization_required
    @edit_permission_required
    @get_rag_pipeline
    @marshal_with(workflow_fields)
    def patch(self, pipeline: Pipeline, workflow_id: str):
@@ -708,15 +681,20 @@ class RagPipelineByIdApi(Resource):
        Update workflow attributes
        """
        # Check permission
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
-        args = parser_wf_id.parse_args()
+        parser = reqparse.RequestParser()
        parser.add_argument("marked_name", type=str, required=False, location="json")
        parser.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 = {}
@@ -749,22 +727,22 @@ 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):
    @console_ns.expect(parser_parameters)
    @setup_required
    @login_required
    @account_initialization_required
    @get_rag_pipeline
    @edit_permission_required
    def get(self, pipeline: Pipeline):
        """
        Get second step parameters of rag pipeline
        """
-        args = parser_parameters.parse_args()
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.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")
@@ -777,17 +755,20 @@ class PublishedRagPipelineSecondStepApi(Resource):
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/pre-processing/parameters")
 class PublishedRagPipelineFirstStepApi(Resource):
    @console_ns.expect(parser_parameters)
    @setup_required
    @login_required
    @account_initialization_required
    @get_rag_pipeline
    @edit_permission_required
    def get(self, pipeline: Pipeline):
        """
        Get first step parameters of rag pipeline
        """
-        args = parser_parameters.parse_args()
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.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")
@@ -800,17 +781,20 @@ class PublishedRagPipelineFirstStepApi(Resource):
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/pre-processing/parameters")
 class DraftRagPipelineFirstStepApi(Resource):
    @console_ns.expect(parser_parameters)
    @setup_required
    @login_required
    @account_initialization_required
    @get_rag_pipeline
    @edit_permission_required
    def get(self, pipeline: Pipeline):
        """
        Get first step parameters of rag pipeline
        """
-        args = parser_parameters.parse_args()
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.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")
@@ -823,17 +807,20 @@ class DraftRagPipelineFirstStepApi(Resource):
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/processing/parameters")
 class DraftRagPipelineSecondStepApi(Resource):
    @console_ns.expect(parser_parameters)
    @setup_required
    @login_required
    @account_initialization_required
    @get_rag_pipeline
    @edit_permission_required
    def get(self, pipeline: Pipeline):
        """
        Get second step parameters of rag pipeline
        """
-        args = parser_parameters.parse_args()
+        # The role of the current user in the ta table must be admin, owner, or editor
        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.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")
@@ -845,16 +832,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):
    @console_ns.expect(parser_wf_run)
    @setup_required
    @login_required
    @account_initialization_required
@@ -864,7 +843,10 @@ class RagPipelineWorkflowRunListApi(Resource):
        """
        Get workflow run list
        """
-        args = parser_wf_run.parse_args()
+        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")
        args = parser.parse_args()
        rag_pipeline_service = RagPipelineService()
        result = rag_pipeline_service.get_rag_pipeline_paginate_workflow_runs(pipeline=pipeline, args=args)
@@ -898,7 +880,7 @@ class RagPipelineWorkflowRunNodeExecutionListApi(Resource):
    @account_initialization_required
    @get_rag_pipeline
    @marshal_with(workflow_run_node_execution_list_fields)
-    def get(self, pipeline: Pipeline, run_id: str):
+    def get(self, pipeline: Pipeline, run_id):
        """
        Get workflow run node execution list
        """
@@ -921,8 +903,14 @@ class DatasourceListApi(Resource):
    @login_required
    @account_initialization_required
    def get(self):
-        _, current_tenant_id = current_account_with_tenant()
+        user = current_user
-        return jsonable_encoder(RagPipelineManageService.list_rag_pipeline_datasources(current_tenant_id))
+        if not isinstance(user, Account):
            raise Forbidden()
        tenant_id = user.current_tenant_id
        if not tenant_id:
            raise Forbidden()
        return jsonable_encoder(RagPipelineManageService.list_rag_pipeline_datasources(tenant_id))
@console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/last-run")
@@ -952,8 +940,9 @@ class RagPipelineTransformApi(Resource):
    @setup_required
    @login_required
    @account_initialization_required
-    def post(self, dataset_id: str):
+    def post(self, dataset_id):
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account):
            raise Forbidden()
        if not (current_user.has_edit_permission or current_user.is_dataset_operator):
            raise Forbidden()
@@ -964,30 +953,26 @@ 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):
    @console_ns.expect(parser_var)
    @setup_required
    @login_required
    @account_initialization_required
    @get_rag_pipeline
    @edit_permission_required
    @marshal_with(workflow_run_node_execution_fields)
    def post(self, pipeline: Pipeline):
        """
        Set datasource variables
        """
-        current_user, _ = current_account_with_tenant()
+        if not isinstance(current_user, Account) or not current_user.has_edit_permission:
-        args = parser_var.parse_args()
+            raise Forbidden()
        parser = reqparse.RequestParser()
        parser.add_argument("datasource_type", type=str, required=True, location="json")
        parser.add_argument("datasource_info", type=dict, required=True, location="json")
        parser.add_argument("start_node_id", type=str, required=True, location="json")
        parser.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(
@@ -1004,11 +989,6 @@ class RagPipelineRecommendedPluginApi(Resource):
    @login_required
    @account_initialization_required
    def get(self):
        parser = reqparse.RequestParser()
        parser.add_argument('type', type=str, location='args', required=False, default='all')
        args = parser.parse_args()
        type = args["type"]
        rag_pipeline_service = RagPipelineService()
-        recommended_plugins = rag_pipeline_service.get_recommended_plugins(type)
+        recommended_plugins = rag_pipeline_service.get_recommended_plugins()
        return recommended_plugins
@@ -1,6 +1,6 @@
 from flask_restx import Resource, fields, reqparse
-from controllers.console import console_ns
+from controllers.console import api, console_ns
 from controllers.console.datasets.error import WebsiteCrawlError
 from controllers.console.wraps import account_initialization_required, setup_required
 from libs.login import login_required
@@ -9,10 +9,10 @@ from services.website_service import WebsiteCrawlApiRequest, WebsiteCrawlStatusA
@console_ns.route("/website/crawl")
 class WebsiteCrawlApi(Resource):
-    @console_ns.doc("crawl_website")
+    @api.doc("crawl_website")
-    @console_ns.doc(description="Crawl website content")
+    @api.doc(description="Crawl website content")
-    @console_ns.expect(
+    @api.expect(
-        console_ns.model(
+        api.model(
            "WebsiteCrawlRequest",
            {
                "provider": fields.String(
@@ -25,25 +25,23 @@ class WebsiteCrawlApi(Resource):
            },
        )
    )
-    @console_ns.response(200, "Website crawl initiated successfully")
+    @api.response(200, "Website crawl initiated successfully")
-    @console_ns.response(400, "Invalid crawl parameters")
+    @api.response(400, "Invalid crawl parameters")
    @setup_required
    @login_required
    @account_initialization_required
    def post(self):
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument(
-            .add_argument(
+            "provider",
-                "provider",
+            type=str,
-                type=str,
+            choices=["firecrawl", "watercrawl", "jinareader"],
-                choices=["firecrawl", "watercrawl", "jinareader"],
+            required=True,
-                required=True,
+            nullable=True,
-                nullable=True,
+            location="json",
                location="json",
            )
            .add_argument("url", type=str, required=True, nullable=True, location="json")
            .add_argument("options", type=dict, required=True, nullable=True, location="json")
        )
        parser.add_argument("url", type=str, required=True, nullable=True, location="json")
        parser.add_argument("options", type=dict, required=True, nullable=True, location="json")
        args = parser.parse_args()
        # Create typed request and validate
@@ -62,17 +60,18 @@ class WebsiteCrawlApi(Resource):
@console_ns.route("/website/crawl/status/<string:job_id>")
 class WebsiteCrawlStatusApi(Resource):
-    @console_ns.doc("get_crawl_status")
+    @api.doc("get_crawl_status")
-    @console_ns.doc(description="Get website crawl status")
+    @api.doc(description="Get website crawl status")
-    @console_ns.doc(params={"job_id": "Crawl job ID", "provider": "Crawl provider (firecrawl/watercrawl/jinareader)"})
+    @api.doc(params={"job_id": "Crawl job ID", "provider": "Crawl provider (firecrawl/watercrawl/jinareader)"})
-    @console_ns.response(200, "Crawl status retrieved successfully")
+    @api.response(200, "Crawl status retrieved successfully")
-    @console_ns.response(404, "Crawl job not found")
+    @api.response(404, "Crawl job not found")
-    @console_ns.response(400, "Invalid provider")
+    @api.response(400, "Invalid provider")
    @setup_required
    @login_required
    @account_initialization_required
    def get(self, job_id: str):
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
        parser.add_argument(
            "provider", type=str, choices=["firecrawl", "watercrawl", "jinareader"], required=True, location="args"
        )
        args = parser.parse_args()
@@ -1,40 +1,46 @@
 from collections.abc import Callable
 from functools import wraps
 from typing import ParamSpec, TypeVar
 from controllers.console.datasets.error import PipelineNotFoundError
 from extensions.ext_database import db
-from libs.login import current_account_with_tenant
+from libs.login import current_user
 from models.account import Account
 from models.dataset import Pipeline
 P = ParamSpec("P")
 R = TypeVar("R")
 def get_rag_pipeline(
    view: Callable | None = None,
 ):
    def decorator(view_func):
        @wraps(view_func)
        def decorated_view(*args, **kwargs):
            if not kwargs.get("pipeline_id"):
                raise ValueError("missing pipeline_id in path parameters")
-def get_rag_pipeline(view_func: Callable[P, R]):
+            if not isinstance(current_user, Account):
-    @wraps(view_func)
+                raise ValueError("current_user is not an account")
    def decorated_view(*args: P.args, **kwargs: P.kwargs):
        if not kwargs.get("pipeline_id"):
            raise ValueError("missing pipeline_id in path parameters")
-        _, current_tenant_id = current_account_with_tenant()
+            pipeline_id = kwargs.get("pipeline_id")
            pipeline_id = str(pipeline_id)
-        pipeline_id = kwargs.get("pipeline_id")
+            del kwargs["pipeline_id"]
        pipeline_id = str(pipeline_id)
-        del kwargs["pipeline_id"]
+            pipeline = (
                db.session.query(Pipeline)
                .where(Pipeline.id == pipeline_id, Pipeline.tenant_id == current_user.current_tenant_id)
                .first()
            )
-        pipeline = (
+            if not pipeline:
-            db.session.query(Pipeline)
+                raise PipelineNotFoundError()
            .where(Pipeline.id == pipeline_id, Pipeline.tenant_id == current_tenant_id)
            .first()
        )
-        if not pipeline:
+            kwargs["pipeline"] = pipeline
            raise PipelineNotFoundError()
-        kwargs["pipeline"] = pipeline
+            return view_func(*args, **kwargs)
-        return view_func(*args, **kwargs)
+        return decorated_view
-    return decorated_view
+    if view is None:
        return decorator
    else:
        return decorator(view)
@@ -81,13 +81,11 @@ class ChatTextApi(InstalledAppResource):
        app_model = installed_app.app
        try:
-            parser = (
+            parser = reqparse.RequestParser()
-                reqparse.RequestParser()
+            parser.add_argument("message_id", type=str, required=False, location="json")
-                .add_argument("message_id", type=str, required=False, location="json")
+            parser.add_argument("voice", type=str, location="json")
-                .add_argument("voice", type=str, location="json")
+            parser.add_argument("text", type=str, location="json")
-                .add_argument("text", type=str, location="json")
+            parser.add_argument("streaming", type=bool, location="json")
                .add_argument("streaming", type=bool, location="json")
            )
            args = parser.parse_args()
            message_id = args.get("message_id", None)
@@ -15,6 +15,7 @@ from controllers.console.app.error import (
 from controllers.console.explore.error import NotChatAppError, NotCompletionAppError
 from controllers.console.explore.wraps import InstalledAppResource
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.errors.error import (
    ModelCurrentlyNotSupportError,
@@ -30,7 +31,6 @@ from libs.login import current_user
 from models import Account
 from models.model import AppMode
 from services.app_generate_service import AppGenerateService
 from services.app_task_service import AppTaskService
 from services.errors.llm import InvokeRateLimitError
 from .. import console_ns
@@ -46,17 +46,15 @@ logger = logging.getLogger(__name__)
 class CompletionApi(InstalledAppResource):
    def post(self, installed_app):
        app_model = installed_app.app
-        if app_model.mode != AppMode.COMPLETION:
+        if app_model.mode != "completion":
            raise NotCompletionAppError()
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("inputs", type=dict, required=True, location="json")
-            .add_argument("inputs", type=dict, required=True, location="json")
+        parser.add_argument("query", type=str, location="json", default="")
-            .add_argument("query", type=str, location="json", default="")
+        parser.add_argument("files", type=list, required=False, location="json")
-            .add_argument("files", type=list, required=False, location="json")
+        parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
-            .add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
+        parser.add_argument("retriever_from", type=str, required=False, default="explore_app", location="json")
            .add_argument("retriever_from", type=str, required=False, default="explore_app", location="json")
        )
        args = parser.parse_args()
        streaming = args["response_mode"] == "streaming"
@@ -102,18 +100,12 @@ class CompletionApi(InstalledAppResource):
 class CompletionStopApi(InstalledAppResource):
    def post(self, installed_app, task_id):
        app_model = installed_app.app
-        if app_model.mode != AppMode.COMPLETION:
+        if app_model.mode != "completion":
            raise NotCompletionAppError()
        if not isinstance(current_user, Account):
            raise ValueError("current_user must be an Account instance")
-
+        AppQueueManager.set_stop_flag(task_id, InvokeFrom.EXPLORE, current_user.id)
        AppTaskService.stop_task(
            task_id=task_id,
            invoke_from=InvokeFrom.EXPLORE,
            user_id=current_user.id,
            app_mode=AppMode.value_of(app_model.mode),
        )
        return {"result": "success"}, 200
@@ -129,15 +121,13 @@ class ChatApi(InstalledAppResource):
        if app_mode not in {AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT}:
            raise NotChatAppError()
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("inputs", type=dict, required=True, location="json")
-            .add_argument("inputs", type=dict, required=True, location="json")
+        parser.add_argument("query", type=str, required=True, location="json")
-            .add_argument("query", type=str, required=True, location="json")
+        parser.add_argument("files", type=list, required=False, location="json")
-            .add_argument("files", type=list, required=False, location="json")
+        parser.add_argument("conversation_id", type=uuid_value, location="json")
-            .add_argument("conversation_id", type=uuid_value, location="json")
+        parser.add_argument("parent_message_id", type=uuid_value, required=False, location="json")
-            .add_argument("parent_message_id", type=uuid_value, required=False, location="json")
+        parser.add_argument("retriever_from", type=str, required=False, default="explore_app", location="json")
            .add_argument("retriever_from", type=str, required=False, default="explore_app", location="json")
        )
        args = parser.parse_args()
        args["auto_generate_name"] = False
@@ -190,12 +180,6 @@ class ChatStopApi(InstalledAppResource):
        if not isinstance(current_user, Account):
            raise ValueError("current_user must be an Account instance")
-
+        AppQueueManager.set_stop_flag(task_id, InvokeFrom.EXPLORE, current_user.id)
        AppTaskService.stop_task(
            task_id=task_id,
            invoke_from=InvokeFrom.EXPLORE,
            user_id=current_user.id,
            app_mode=app_mode,
        )
        return {"result": "success"}, 200
@@ -31,12 +31,10 @@ class ConversationListApi(InstalledAppResource):
        if app_mode not in {AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT}:
            raise NotChatAppError()
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("last_id", type=uuid_value, location="args")
-            .add_argument("last_id", type=uuid_value, location="args")
+        parser.add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
-            .add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
+        parser.add_argument("pinned", type=str, choices=["true", "false", None], location="args")
            .add_argument("pinned", type=str, choices=["true", "false", None], location="args")
        )
        args = parser.parse_args()
        pinned = None
@@ -96,11 +94,9 @@ class ConversationRenameApi(InstalledAppResource):
        conversation_id = str(c_id)
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("name", type=str, required=False, location="json")
-            .add_argument("name", type=str, required=False, location="json")
+        parser.add_argument("auto_generate", type=bool, required=False, default=False, location="json")
            .add_argument("auto_generate", type=bool, required=False, default=False, location="json")
        )
        args = parser.parse_args()
        try:
@@ -12,9 +12,10 @@ from controllers.console.wraps import account_initialization_required, cloud_edi
 from extensions.ext_database import db
 from fields.installed_app_fields import installed_app_list_fields
 from libs.datetime_utils import naive_utc_now
-from libs.login import current_account_with_tenant, login_required
+from libs.login import current_user, login_required
-from models import App, InstalledApp, RecommendedApp
+from models import Account, App, InstalledApp, RecommendedApp
 from services.account_service import TenantService
 from services.app_service import AppService
 from services.enterprise.enterprise_service import EnterpriseService
 from services.feature_service import FeatureService
@@ -28,7 +29,9 @@ class InstalledAppsListApi(Resource):
    @marshal_with(installed_app_list_fields)
    def get(self):
        app_id = request.args.get("app_id", default=None, type=str)
-        current_user, current_tenant_id = current_account_with_tenant()
+        if not isinstance(current_user, Account):
            raise ValueError("current_user must be an Account instance")
        current_tenant_id = current_user.current_tenant_id
        if app_id:
            installed_apps = db.session.scalars(
@@ -66,26 +69,31 @@ class InstalledAppsListApi(Resource):
            # Pre-filter out apps without setting or with sso_verified
            filtered_installed_apps = []
            app_id_to_app_code = {}
            for installed_app in installed_app_list:
                app_id = installed_app["app"].id
                webapp_setting = webapp_settings.get(app_id)
                if not webapp_setting or webapp_setting.access_mode == "sso_verified":
                    continue
                app_code = AppService.get_app_code_by_id(str(app_id))
                app_id_to_app_code[app_id] = app_code
                filtered_installed_apps.append(installed_app)
            app_codes = list(app_id_to_app_code.values())
            # Batch permission check
            app_ids = [installed_app["app"].id for installed_app in filtered_installed_apps]
            permissions = EnterpriseService.WebAppAuth.batch_is_user_allowed_to_access_webapps(
                user_id=user_id,
-                app_ids=app_ids,
+                app_codes=app_codes,
            )
            # Keep only allowed apps
            res = []
            for installed_app in filtered_installed_apps:
                app_id = installed_app["app"].id
-                if permissions.get(app_id):
+                app_code = app_id_to_app_code[app_id]
                if permissions.get(app_code):
                    res.append(installed_app)
            installed_app_list = res
@@ -105,15 +113,17 @@ class InstalledAppsListApi(Resource):
    @account_initialization_required
    @cloud_edition_billing_resource_check("apps")
    def post(self):
-        parser = reqparse.RequestParser().add_argument("app_id", type=str, required=True, help="Invalid app_id")
+        parser = reqparse.RequestParser()
        parser.add_argument("app_id", type=str, required=True, help="Invalid app_id")
        args = parser.parse_args()
        recommended_app = db.session.query(RecommendedApp).where(RecommendedApp.app_id == args["app_id"]).first()
        if recommended_app is None:
            raise NotFound("App not found")
-        _, current_tenant_id = current_account_with_tenant()
+        if not isinstance(current_user, Account):
-
+            raise ValueError("current_user must be an Account instance")
        current_tenant_id = current_user.current_tenant_id
        app = db.session.query(App).where(App.id == args["app_id"]).first()
        if app is None:
@@ -153,8 +163,9 @@ class InstalledAppApi(InstalledAppResource):
    """
    def delete(self, installed_app):
-        _, current_tenant_id = current_account_with_tenant()
+        if not isinstance(current_user, Account):
-        if installed_app.app_owner_tenant_id == current_tenant_id:
+            raise ValueError("current_user must be an Account instance")
        if installed_app.app_owner_tenant_id == current_user.current_tenant_id:
            raise BadRequest("You can't uninstall an app owned by the current tenant")
        db.session.delete(installed_app)
@@ -163,7 +174,8 @@ class InstalledAppApi(InstalledAppResource):
        return {"result": "success", "message": "App uninstalled successfully"}, 204
    def patch(self, installed_app):
-        parser = reqparse.RequestParser().add_argument("is_pinned", type=inputs.boolean)
+        parser = reqparse.RequestParser()
        parser.add_argument("is_pinned", type=inputs.boolean)
        args = parser.parse_args()
        commit_args = False
@@ -23,7 +23,8 @@ from core.model_runtime.errors.invoke import InvokeError
 from fields.message_fields import message_infinite_scroll_pagination_fields
 from libs import helper
 from libs.helper import uuid_value
-from libs.login import current_account_with_tenant
+from libs.login import current_user
 from models import Account
 from models.model import AppMode
 from services.app_generate_service import AppGenerateService
 from services.errors.app import MoreLikeThisDisabledError
@@ -47,22 +48,21 @@ logger = logging.getLogger(__name__)
 class MessageListApi(InstalledAppResource):
    @marshal_with(message_infinite_scroll_pagination_fields)
    def get(self, installed_app):
        current_user, _ = current_account_with_tenant()
        app_model = installed_app.app
        app_mode = AppMode.value_of(app_model.mode)
        if app_mode not in {AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT}:
            raise NotChatAppError()
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("conversation_id", required=True, type=uuid_value, location="args")
-            .add_argument("conversation_id", required=True, type=uuid_value, location="args")
+        parser.add_argument("first_id", type=uuid_value, location="args")
-            .add_argument("first_id", type=uuid_value, location="args")
+        parser.add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
            .add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
        )
        args = parser.parse_args()
        try:
            if not isinstance(current_user, Account):
                raise ValueError("current_user must be an Account instance")
            return MessageService.pagination_by_first_id(
                app_model, current_user, args["conversation_id"], args["first_id"], args["limit"]
            )
@@ -78,19 +78,18 @@ class MessageListApi(InstalledAppResource):
 )
 class MessageFeedbackApi(InstalledAppResource):
    def post(self, installed_app, message_id):
        current_user, _ = current_account_with_tenant()
        app_model = installed_app.app
        message_id = str(message_id)
-        parser = (
+        parser = reqparse.RequestParser()
-            reqparse.RequestParser()
+        parser.add_argument("rating", type=str, choices=["like", "dislike", None], location="json")
-            .add_argument("rating", type=str, choices=["like", "dislike", None], location="json")
+        parser.add_argument("content", type=str, location="json")
            .add_argument("content", type=str, location="json")
        )
        args = parser.parse_args()
        try:
            if not isinstance(current_user, Account):
                raise ValueError("current_user must be an Account instance")
            MessageService.create_feedback(
                app_model=app_model,
                message_id=message_id,
@@ -110,14 +109,14 @@ class MessageFeedbackApi(InstalledAppResource):
 )
 class MessageMoreLikeThisApi(InstalledAppResource):
    def get(self, installed_app, message_id):
        current_user, _ = current_account_with_tenant()
        app_model = installed_app.app
        if app_model.mode != "completion":
            raise NotCompletionAppError()
        message_id = str(message_id)
-        parser = reqparse.RequestParser().add_argument(
+        parser = reqparse.RequestParser()
        parser.add_argument(
            "response_mode", type=str, required=True, choices=["blocking", "streaming"], location="args"
        )
        args = parser.parse_args()
@@ -125,6 +124,8 @@ class MessageMoreLikeThisApi(InstalledAppResource):
        streaming = args["response_mode"] == "streaming"
        try:
            if not isinstance(current_user, Account):
                raise ValueError("current_user must be an Account instance")
            response = AppGenerateService.generate_more_like_this(
                app_model=app_model,
                user=current_user,
@@ -158,7 +159,6 @@ class MessageMoreLikeThisApi(InstalledAppResource):
 )
 class MessageSuggestedQuestionApi(InstalledAppResource):
    def get(self, installed_app, message_id):
        current_user, _ = current_account_with_tenant()
        app_model = installed_app.app
        app_mode = AppMode.value_of(app_model.mode)
        if app_mode not in {AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT}:
@@ -167,6 +167,8 @@ class MessageSuggestedQuestionApi(InstalledAppResource):
        message_id = str(message_id)
        try:
            if not isinstance(current_user, Account):
                raise ValueError("current_user must be an Account instance")
            questions = MessageService.get_suggested_questions_after_answer(
                app_model=app_model, user=current_user, message_id=message_id, invoke_from=InvokeFrom.EXPLORE
            )
--- a/Show More
+++ b/Show More