fix model runtime quota

.github/workflows/api-tests.yml

@@ -27,18 +27,19 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install Poetry
+        uses: abatilo/actions-poetry@v3
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'poetry'
           cache-dependency-path: |
             api/pyproject.toml
             api/poetry.lock
 
-      - name: Install Poetry
-        uses: abatilo/actions-poetry@v3
-
-      - name: Check Poetry lockfile
+      - name: Poetry check
         run: |
           poetry check -C api --lock
           poetry show -C api
@@ -46,9 +47,6 @@ jobs:
       - name: Install dependencies
         run: poetry install -C api --with dev
 
-      - name: Check dependencies in pyproject.toml
-        run: poetry run -C api bash dev/pytest/pytest_artifacts.sh
-
       - name: Run Unit tests
         run: poetry run -C api bash dev/pytest/pytest_unit_tests.sh
 
@@ -78,7 +76,7 @@ jobs:
       - name: Run Workflow
         run: poetry run -C api bash dev/pytest/pytest_workflow.sh
 
-      - name: Set up Vector Stores (Weaviate, Qdrant, PGVector, Milvus, PgVecto-RS, Chroma, MyScale, ElasticSearch)
+      - name: Set up Vector Stores (Weaviate, Qdrant, PGVector, Milvus, PgVecto-RS, Chroma, MyScale)
         uses: hoverkraft-tech/compose-action@v2.0.0
         with:
           compose-file: |
@@ -92,6 +90,5 @@ jobs:
             pgvecto-rs
             pgvector
             chroma
-            elasticsearch
       - name: Test Vector Stores
         run: poetry run -C api bash dev/pytest/pytest_vdb.sh

.github/workflows/build-push.yml

@@ -125,7 +125,7 @@ jobs:
         with:
           images: ${{ env[matrix.image_name_env] }}
           tags: |
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, '-') }}
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
             type=ref,event=branch
             type=sha,enable=true,priority=100,prefix=,suffix=,format=long
             type=raw,value=${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/') }}

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

@@ -23,17 +23,18 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install Poetry
+        uses: abatilo/actions-poetry@v3
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'poetry'
           cache-dependency-path: |
             api/pyproject.toml
             api/poetry.lock
 
-      - name: Install Poetry
-        uses: abatilo/actions-poetry@v3
-
       - name: Install dependencies
         run: poetry install -C api
 

.github/workflows/expose_service_ports.sh

@@ -6,6 +6,5 @@ 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
 yq eval '.services.pgvector.ports += ["5433:5432"]' -i docker/docker-compose.yaml
 yq eval '.services["pgvecto-rs"].ports += ["5431:5432"]' -i docker/docker-compose.yaml
-yq eval '.services["elasticsearch"].ports += ["9200:9200"]' -i docker/docker-compose.yaml
 
-echo "Ports exposed for sandbox, weaviate, qdrant, chroma, milvus, pgvector, pgvecto-rs, elasticsearch"
+echo "Ports exposed for sandbox, weaviate, qdrant, chroma, milvus, pgvector, pgvecto-rs."

.github/workflows/style.yml

@@ -20,20 +20,19 @@ jobs:
 
       - name: Check changed files
         id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v44
         with:
           files: api/**
 
+      - name: Install Poetry
+        uses: abatilo/actions-poetry@v3
+
       - name: Set up Python
         uses: actions/setup-python@v5
         if: steps.changed-files.outputs.any_changed == 'true'
         with:
           python-version: '3.10'
 
-      - name: Install Poetry
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: abatilo/actions-poetry@v3
-
       - name: Python dependencies
         if: steps.changed-files.outputs.any_changed == 'true'
         run: poetry install -C api --only lint
@@ -46,10 +45,6 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         run: poetry run -C api dotenv-linter ./api/.env.example ./web/.env.example
 
-      - name: Ruff formatter check
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: poetry run -C api ruff format --check ./api
-
       - name: Lint hints
         if: failure()
         run: echo "Please run 'dev/reformat' to fix the fixable linting errors."
@@ -67,7 +62,7 @@ jobs:
 
       - name: Check changed files
         id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v44
         with:
           files: web/**
 
@@ -98,7 +93,7 @@ jobs:
 
       - name: Check changed files
         id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v44
         with:
           files: |
             **.sh
@@ -108,7 +103,7 @@ jobs:
             dev/**
 
       - name: Super-linter
-        uses: super-linter/super-linter/slim@v7
+        uses: super-linter/super-linter/slim@v6
         if: steps.changed-files.outputs.any_changed == 'true'
         env:
           BASH_SEVERITY: warning

.github/workflows/translate-i18n-base-on-english.yml

@@ -1,54 +0,0 @@
-name: Check i18n Files and Create PR
-
-on:
-  pull_request:
-    types: [closed]
-    branches: [main]
-
-jobs:
-  check-and-update:
-    if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: web
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 2 # last 2 commits
-
-      - name: Check for file changes in i18n/en-US
-        id: check_files
-        run: |
-          recent_commit_sha=$(git rev-parse HEAD)
-          second_recent_commit_sha=$(git rev-parse HEAD~1)
-          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
-          else
-            echo "FILES_CHANGED=false" >> $GITHUB_ENV
-          fi
-
-      - name: Set up Node.js
-        if: env.FILES_CHANGED == 'true'
-        uses: actions/setup-node@v2
-        with:
-          node-version: 'lts/*'
-
-      - name: Install dependencies
-        if: env.FILES_CHANGED == 'true'
-        run: yarn install --frozen-lockfile
-
-      - name: Run npm script
-        if: env.FILES_CHANGED == 'true'
-        run: npm run auto-gen-i18n
-
-      - name: Create Pull Request
-        if: env.FILES_CHANGED == 'true'
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: Update i18n files based on en-US changes
-          title: 'chore: translate i18n files'
-          body: This PR was automatically created to update i18n files based on changes in en-US locale.
-          branch: chore/automated-i18n-updates

.github/workflows/web-tests.yml

@@ -1,46 +0,0 @@
-name: Web Tests
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - web/**
-
-concurrency:
-  group: web-tests-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    name: Web Tests
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./web
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Check changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v45
-        with:
-          files: web/**
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        if: steps.changed-files.outputs.any_changed == 'true'
-        with:
-          node-version: 20
-          cache: yarn
-          cache-dependency-path: ./web/package.json
-
-      - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: yarn install --frozen-lockfile
-
-      - name: Run tests
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: yarn test

.gitignore

@@ -153,9 +153,6 @@ docker-legacy/volumes/etcd/*
 docker-legacy/volumes/minio/*
 docker-legacy/volumes/milvus/*
 docker-legacy/volumes/chroma/*
-docker-legacy/volumes/opensearch/data/*
-docker-legacy/volumes/pgvectors/data/*
-docker-legacy/volumes/pgvector/data/*
 
 docker/volumes/app/storage/*
 docker/volumes/certbot/*
@@ -167,16 +164,8 @@ docker/volumes/etcd/*
 docker/volumes/minio/*
 docker/volumes/milvus/*
 docker/volumes/chroma/*
-docker/volumes/opensearch/data/*
-docker/volumes/myscale/data/*
-docker/volumes/myscale/log/*
-docker/volumes/unstructured/*
-docker/volumes/pgvector/data/*
-docker/volumes/pgvecto_rs/data/*
 
 docker/nginx/conf.d/default.conf
-docker/nginx/ssl/*
-!docker/nginx/ssl/.gitkeep
 docker/middleware.env
 
 sdks/python-client/build
@@ -189,4 +178,3 @@ pyrightconfig.json
 api/.vscode
 
 .idea/
-.vscode

.idea/vcs.xml

@@ -12,6 +12,5 @@
   </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
-</project>
+</project>

.vscode/launch.json

@@ -1,19 +1,12 @@
 {
     "version": "0.2.0",
-    "compounds": [
-        {
-            "name": "Launch Flask and Celery",
-            "configurations": ["Python: Flask", "Python: Celery"]
-        }
-    ],
     "configurations": [
         {
             "name": "Python: Flask",
-            "consoleName": "Flask",
             "type": "debugpy",
             "request": "launch",
-            "python": "${workspaceFolder}/.venv/bin/python",
-            "cwd": "${workspaceFolder}",
+            "python": "${workspaceFolder}/api/.venv/bin/python",
+            "cwd": "${workspaceFolder}/api",
             "envFile": ".env",
             "module": "flask",
             "justMyCode": true,
@@ -24,16 +17,16 @@
             },
             "args": [
                 "run",
-                "--port=5001"
+                "--host=0.0.0.0",
+                "--port=5001",
             ]
         },
         {
             "name": "Python: Celery",
-            "consoleName": "Celery",
             "type": "debugpy",
             "request": "launch",
-            "python": "${workspaceFolder}/.venv/bin/python",
-            "cwd": "${workspaceFolder}",
+            "python": "${workspaceFolder}/api/.venv/bin/python",
+            "cwd": "${workspaceFolder}/api",
             "module": "celery",
             "justMyCode": true,
             "envFile": ".env",
@@ -52,10 +45,10 @@
                 "-c",
                 "1",
                 "--loglevel",
-                "DEBUG",
+                "info",
                 "-Q",
                 "dataset,generation,mail,ops_trace,app_deletion"
             ]
-        }
+        },
     ]
-}
+}

CONTRIBUTING.md

@@ -8,7 +8,7 @@ In terms of licensing, please take a minute to read our short [License and Contr
 
 ## Before you jump in
 
-[Find](https://github.com/langgenius/dify/issues?q=is:issue+is:open) an existing issue, or [open](https://github.com/langgenius/dify/issues/new/choose) a new one. We categorize issues into 2 types:
+[Find](https://github.com/langgenius/dify/issues?q=is:issue+is:closed) an existing issue, or [open](https://github.com/langgenius/dify/issues/new/choose) a new one. We categorize issues into 2 types:
 
 ### Feature requests:
 

CONTRIBUTING_CN.md

@@ -8,7 +8,7 @@
 
 ## 在开始之前
 
-[查找](https://github.com/langgenius/dify/issues?q=is:issue+is:open)现有问题，或 [创建](https://github.com/langgenius/dify/issues/new/choose) 一个新问题。我们将问题分为两类：
+[查找](https://github.com/langgenius/dify/issues?q=is:issue+is:closed)现有问题，或 [创建](https://github.com/langgenius/dify/issues/new/choose) 一个新问题。我们将问题分为两类：
 
 ### 功能请求：
 
@@ -36,7 +36,7 @@
   | 被团队成员标记为高优先级的功能    | 高优先级   |
   | 在 [community feedback board](https://github.com/langgenius/dify/discussions/categories/feedbacks) 内反馈的常见功能请求 | 中等优先级 |
   | 非核心功能和小幅改进                     | 低优先级    |
-  | 有价值但不紧急                                   | 未来功能  |
+  | 有价值当不紧急                                   | 未来功能  |
 
 ### 其他任何事情（例如 bug 报告、性能优化、拼写错误更正）：
 * 立即开始编码。
@@ -138,7 +138,7 @@ Dify 的后端使用 Python 编写，使用 [Flask](https://flask.palletsproject
 ├── models                // 描述数据模型和 API 响应的形状
 ├── public                // 如 favicon 等元资源
 ├── service               // 定义 API 操作的形状
-├── test
+├── test                  
 ├── types                 // 函数参数和返回值的描述
 └── utils                 // 共享的实用函数
 ```

CONTRIBUTING_JA.md

@@ -10,7 +10,7 @@ Dify にコントリビュートしたいとお考えなのですね。それは
 
 ## 飛び込む前に
 
-[既存の Issue](https://github.com/langgenius/dify/issues?q=is:issue+is:open) を探すか、[新しい Issue](https://github.com/langgenius/dify/issues/new/choose) を作成してください。私たちは Issue を 2 つのタイプに分類しています。
+[既存の Issue](https://github.com/langgenius/dify/issues?q=is:issue+is:closed) を探すか、[新しい Issue](https://github.com/langgenius/dify/issues/new/choose) を作成してください。私たちは Issue を 2 つのタイプに分類しています。
 
 ### 機能リクエスト
 

CONTRIBUTING_VI.md

@@ -1,156 +0,0 @@
-Thật tuyệt vời khi bạn muốn đóng góp cho Dify! Chúng tôi rất mong chờ được thấy những gì bạn sẽ làm. Là một startup với nguồn nhân lực và tài chính hạn chế, chúng tôi có tham vọng lớn là thiết kế quy trình trực quan nhất để xây dựng và quản lý các ứng dụng LLM. Mọi sự giúp đỡ từ cộng đồng đều rất quý giá đối với chúng tôi.
-
-Chúng tôi cần linh hoạt và làm việc nhanh chóng, nhưng đồng thời cũng muốn đảm bảo các cộng tác viên như bạn có trải nghiệm đóng góp thuận lợi nhất có thể. Chúng tôi đã tạo ra hướng dẫn đóng góp này nhằm giúp bạn làm quen với codebase và cách chúng tôi làm việc với các cộng tác viên, để bạn có thể nhanh chóng bắt tay vào phần thú vị.
-
-Hướng dẫn này, cũng như bản thân Dify, đang trong quá trình cải tiến liên tục. Chúng tôi rất cảm kích sự thông cảm của bạn nếu đôi khi nó không theo kịp dự án thực tế, và chúng tôi luôn hoan nghênh mọi phản hồi để cải thiện.
-
-Về vấn đề cấp phép, xin vui lòng dành chút thời gian đọc qua [Thỏa thuận Cấp phép và Đóng góp](./LICENSE) ngắn gọn của chúng tôi. Cộng đồng cũng tuân thủ [quy tắc ứng xử](https://github.com/langgenius/.github/blob/main/CODE_OF_CONDUCT.md).
-
-## Trước khi bắt đầu
-
-[Tìm kiếm](https://github.com/langgenius/dify/issues?q=is:issue+is:open) một vấn đề hiện có, hoặc [tạo mới](https://github.com/langgenius/dify/issues/new/choose) một vấn đề. Chúng tôi phân loại các vấn đề thành 2 loại:
-
-### Yêu cầu tính năng:
-
-* Nếu bạn đang tạo một yêu cầu tính năng mới, chúng tôi muốn bạn giải thích tính năng đề xuất sẽ đạt được điều gì và cung cấp càng nhiều thông tin chi tiết càng tốt. [@perzeusss](https://github.com/perzeuss) đã tạo một [Trợ lý Yêu cầu Tính năng](https://udify.app/chat/MK2kVSnw1gakVwMX) rất hữu ích để giúp bạn soạn thảo nhu cầu của mình. Hãy thử dùng nó nhé.
-
-* Nếu bạn muốn chọn một vấn đề từ danh sách hiện có, chỉ cần để lại bình luận dưới vấn đề đó nói rằng bạn sẽ làm.
-
-  Một thành viên trong nhóm làm việc trong lĩnh vực liên quan sẽ được thông báo. Nếu mọi thứ ổn, họ sẽ cho phép bạn bắt đầu code. Chúng tôi yêu cầu bạn chờ đợi cho đến lúc đó trước khi bắt tay vào làm tính năng, để không lãng phí công sức của bạn nếu chúng tôi đề xuất thay đổi.
-
-  Tùy thuộc vào lĩnh vực mà tính năng đề xuất thuộc về, bạn có thể nói chuyện với các thành viên khác nhau trong nhóm. Dưới đây là danh sách các lĩnh vực mà các thành viên trong nhóm chúng tôi đang làm việc hiện tại:
-
-  | Thành viên                                                   | Phạm vi                                              |
-  | ------------------------------------------------------------ | ---------------------------------------------------- |
-  | [@yeuoly](https://github.com/Yeuoly)                         | Thiết kế kiến trúc Agents                            |
-  | [@jyong](https://github.com/JohnJyong)                       | Thiết kế quy trình RAG                               |
-  | [@GarfieldDai](https://github.com/GarfieldDai)               | Xây dựng quy trình làm việc                          |
-  | [@iamjoel](https://github.com/iamjoel) & [@zxhlyh](https://github.com/zxhlyh) | Làm cho giao diện người dùng dễ sử dụng              |
-  | [@guchenhe](https://github.com/guchenhe) & [@crazywoola](https://github.com/crazywoola) | Trải nghiệm nhà phát triển, đầu mối liên hệ cho mọi vấn đề |
-  | [@takatost](https://github.com/takatost)                     | Định hướng và kiến trúc tổng thể sản phẩm            |
-
-  Cách chúng tôi ưu tiên:
-
-  | Loại tính năng                                               | Mức độ ưu tiên |
-  | ------------------------------------------------------------ | -------------- |
-  | Tính năng ưu tiên cao được gắn nhãn bởi thành viên trong nhóm | Ưu tiên cao    |
-  | Yêu cầu tính năng phổ biến từ [bảng phản hồi cộng đồng](https://github.com/langgenius/dify/discussions/categories/feedbacks) của chúng tôi | Ưu tiên trung bình |
-  | Tính năng không quan trọng và cải tiến nhỏ                   | Ưu tiên thấp   |
-  | Có giá trị nhưng không cấp bách                              | Tính năng tương lai |
-
-### Những vấn đề khác (ví dụ: báo cáo lỗi, tối ưu hiệu suất, sửa lỗi chính tả):
-
-* Bắt đầu code ngay lập tức.
-
-  Cách chúng tôi ưu tiên:
-
-  | Loại vấn đề                                                  | Mức độ ưu tiên |
-  | ------------------------------------------------------------ | -------------- |
-  | Lỗi trong các chức năng chính (không thể đăng nhập, ứng dụng không hoạt động, lỗ hổng bảo mật) | Nghiêm trọng   |
-  | Lỗi không quan trọng, cải thiện hiệu suất                    | Ưu tiên trung bình |
-  | Sửa lỗi nhỏ (lỗi chính tả, giao diện người dùng gây nhầm lẫn nhưng vẫn hoạt động) | Ưu tiên thấp   |
-
-
-## Cài đặt
-
-Dưới đây là các bước để thiết lập Dify cho việc phát triển:
-
-### 1. Fork repository này
-
-### 2. Clone repository
-
- Clone repository đã fork từ terminal của bạn:
-
-```
-git clone git@github.com:<tên_người_dùng_github>/dify.git
-```
-
-### 3. Kiểm tra các phụ thuộc
-
-Dify yêu cầu các phụ thuộc sau để build, hãy đảm bảo chúng đã được cài đặt trên hệ thống của bạn:
-
-- [Docker](https://www.docker.com/)
-- [Docker Compose](https://docs.docker.com/compose/install/)
-- [Node.js v18.x (LTS)](http://nodejs.org)
-- [npm](https://www.npmjs.com/) phiên bản 8.x.x hoặc [Yarn](https://yarnpkg.com/)
-- [Python](https://www.python.org/) phiên bản 3.10.x
-
-### 4. Cài đặt
-
-Dify bao gồm một backend và một frontend. Đi đến thư mục backend bằng lệnh `cd api/`, sau đó làm theo hướng dẫn trong [README của Backend](api/README.md) để cài đặt. Trong một terminal khác, đi đến thư mục frontend bằng lệnh `cd web/`, sau đó làm theo hướng dẫn trong [README của Frontend](web/README.md) để cài đặt.
-
-Kiểm tra [FAQ về cài đặt](https://docs.dify.ai/learn-more/faq/self-host-faq) để xem danh sách các vấn đề thường gặp và các bước khắc phục.
-
-### 5. Truy cập Dify trong trình duyệt của bạn
-
-Để xác nhận cài đặt của bạn, hãy truy cập [http://localhost:3000](http://localhost:3000) (địa chỉ mặc định, hoặc URL và cổng bạn đã cấu hình) trong trình duyệt. Bạn sẽ thấy Dify đang chạy.
-
-## Phát triển
-
-Nếu bạn đang thêm một nhà cung cấp mô hình, [hướng dẫn này](https://github.com/langgenius/dify/blob/main/api/core/model_runtime/README.md) dành cho bạn.
-
-Nếu bạn đang thêm một nhà cung cấp công cụ cho Agent hoặc Workflow, [hướng dẫn này](./api/core/tools/README.md) dành cho bạn.
-
-Để giúp bạn nhanh chóng định hướng phần đóng góp của mình, dưới đây là một bản phác thảo ngắn gọn về cấu trúc backend & frontend của Dify:
-
-### Backend
-
-Backend của Dify được viết bằng Python sử dụng [Flask](https://flask.palletsprojects.com/en/3.0.x/). Nó sử dụng [SQLAlchemy](https://www.sqlalchemy.org/) cho ORM và [Celery](https://docs.celeryq.dev/en/stable/getting-started/introduction.html) cho hàng đợi tác vụ. Logic xác thực được thực hiện thông qua Flask-login.
-
-```
-[api/]
-├── constants             // Các cài đặt hằng số được sử dụng trong toàn bộ codebase.
-├── controllers           // Định nghĩa các route API và logic xử lý yêu cầu.           
-├── core                  // Điều phối ứng dụng cốt lõi, tích hợp mô hình và công cụ.
-├── docker                // Cấu hình liên quan đến Docker & containerization.
-├── events                // Xử lý và xử lý sự kiện
-├── extensions            // Mở rộng với các framework/nền tảng bên thứ 3.
-├── fields                // Định nghĩa trường cho serialization/marshalling.
-├── libs                  // Thư viện và tiện ích có thể tái sử dụng.
-├── migrations            // Script cho việc di chuyển cơ sở dữ liệu.
-├── models                // Mô hình cơ sở dữ liệu & định nghĩa schema.
-├── services              // Xác định logic nghiệp vụ.
-├── storage               // Lưu trữ khóa riêng tư.      
-├── tasks                 // Xử lý các tác vụ bất đồng bộ và công việc nền.
-└── tests
-```
-
-### Frontend
-
-Website được khởi tạo trên boilerplate [Next.js](https://nextjs.org/) bằng Typescript và sử dụng [Tailwind CSS](https://tailwindcss.com/) cho styling. [React-i18next](https://react.i18next.com/) được sử dụng cho việc quốc tế hóa.
-
-```
-[web/]
-├── app                   // layouts, pages và components
-│   ├── (commonLayout)    // layout chung được sử dụng trong toàn bộ ứng dụng
-│   ├── (shareLayout)     // layouts được chia sẻ cụ thể cho các phiên dựa trên token 
-│   ├── activate          // trang kích hoạt
-│   ├── components        // được chia sẻ bởi các trang và layouts
-│   ├── install           // trang cài đặt
-│   ├── signin            // trang đăng nhập
-│   └── styles            // styles được chia sẻ toàn cục
-├── assets                // Tài nguyên tĩnh
-├── bin                   // scripts chạy ở bước build
-├── config                // cài đặt và tùy chọn có thể điều chỉnh 
-├── context               // contexts được chia sẻ bởi các phần khác nhau của ứng dụng
-├── dictionaries          // File dịch cho từng ngôn ngữ 
-├── docker                // cấu hình container
-├── hooks                 // Hooks có thể tái sử dụng
-├── i18n                  // Cấu hình quốc tế hóa
-├── models                // mô tả các mô hình dữ liệu & hình dạng của phản hồi API
-├── public                // tài nguyên meta như favicon
-├── service               // xác định hình dạng của các hành động API
-├── test                  
-├── types                 // mô tả các tham số hàm và giá trị trả về
-└── utils                 // Các hàm tiện ích được chia sẻ
-```
-
-## Gửi PR của bạn
-
-Cuối cùng, đã đến lúc mở một pull request (PR) đến repository của chúng tôi. Đối với các tính năng lớn, chúng tôi sẽ merge chúng vào nhánh `deploy/dev` để kiểm tra trước khi đưa vào nhánh `main`. Nếu bạn gặp vấn đề như xung đột merge hoặc không biết cách mở pull request, hãy xem [hướng dẫn về pull request của GitHub](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests).
-
-Và thế là xong! Khi PR của bạn được merge, bạn sẽ được giới thiệu là một người đóng góp trong [README](https://github.com/langgenius/dify/blob/main/README.md) của chúng tôi.
-
-## Nhận trợ giúp
-
-Nếu bạn gặp khó khăn hoặc có câu hỏi cấp bách trong quá trình đóng góp, hãy đặt câu hỏi của bạn trong vấn đề GitHub liên quan, hoặc tham gia [Discord](https://discord.gg/8Tpq4AcN9c) của chúng tôi để trò chuyện nhanh chóng.

LICENSE

@@ -4,11 +4,10 @@ Dify is licensed under the Apache License 2.0, with the following additional con
 
 1. Dify may be utilized commercially, including as a backend service for other applications or as an application development platform for enterprises. Should the conditions below be met, a commercial license must be obtained from the producer:
 
-a. Multi-tenant service: Unless explicitly authorized by Dify in writing, you may not use the Dify source code to operate a multi-tenant environment. 
+a. Multi-tenant SaaS service: Unless explicitly authorized by Dify in writing, you may not use the Dify source code to operate a multi-tenant environment. 
     - Tenant Definition: Within the context of Dify, one tenant corresponds to one workspace. The workspace provides a separated area for each tenant's data and configurations.
-    
-b. LOGO and copyright information: In the process of using Dify's frontend, you may not remove or modify the LOGO or copyright information in the Dify console or applications. This restriction is inapplicable to uses of Dify that do not involve its frontend.
-    - Frontend Definition: For the purposes of this license, the "frontend" of Dify includes all components located in the `web/` directory when running Dify from the raw source code, or the "web" image when running Dify with Docker.
+
+b. LOGO and copyright information: In the process of using Dify's frontend components, you may not remove or modify the LOGO or copyright information in the Dify console or applications. This restriction is inapplicable to uses of Dify that do not involve its frontend components.
 
 Please contact business@dify.ai by email to inquire about licensing matters.
 

README.md

@@ -17,7 +17,7 @@
             alt="chat on Discord"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="follow on X(Twitter)"></a>
+            alt="follow on Twitter"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -168,7 +168,7 @@ Star Dify on GitHub and be instantly notified of new releases.
 > Before installing Dify, make sure your machine meets the following minimum system requirements:
 > 
 >- CPU >= 2 Core
->- RAM >= 4 GiB
+>- RAM >= 4GB
 
 </br>
 
@@ -196,14 +196,10 @@ If you'd like to configure a highly-available setup, there are community-contrib
 
 #### Using Terraform for Deployment
 
-Deploy Dify to Cloud Platform with a single click using [terraform](https://www.terraform.io/)
-
 ##### Azure Global
+Deploy Dify to Azure with a single click using [terraform](https://www.terraform.io/).
 - [Azure Terraform by @nikawang](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [Google Cloud Terraform by @sotazum](https://github.com/DeNA/dify-google-cloud-terraform)
-
 ## Contributing
 
 For those who'd like to contribute code, see our [Contribution Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md). 
@@ -223,7 +219,7 @@ At the same time, please consider supporting Dify by sharing it on social media
 * [Github Discussion](https://github.com/langgenius/dify/discussions). Best for: sharing feedback and asking questions.
 * [GitHub Issues](https://github.com/langgenius/dify/issues). Best for: bugs you encounter using Dify.AI, and feature proposals. See our [Contribution Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
 * [Discord](https://discord.gg/FngNHpbcY7). Best for: sharing your applications and hanging out with the community.
-* [X(Twitter)](https://twitter.com/dify_ai). Best for: sharing your applications and hanging out with the community.
+* [Twitter](https://twitter.com/dify_ai). Best for: sharing your applications and hanging out with the community.
 
 ## Star history
 

README_AR.md

@@ -17,7 +17,7 @@
             alt="chat on Discord"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="follow on X(Twitter)"></a>
+            alt="follow on Twitter"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -179,13 +179,10 @@ docker compose up -d
 
 #### استخدام Terraform للتوزيع
 
-انشر Dify إلى منصة السحابة بنقرة واحدة باستخدام [terraform](https://www.terraform.io/)
-
 ##### Azure Global
+استخدم [terraform](https://www.terraform.io/) لنشر Dify على Azure بنقرة واحدة.
 - [Azure Terraform بواسطة @nikawang](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [Google Cloud Terraform بواسطة @sotazum](https://github.com/DeNA/dify-google-cloud-terraform)
 
 ## المساهمة
 

README_CN.md

@@ -17,7 +17,7 @@
             alt="chat on Discord"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="follow on X(Twitter)"></a>
+            alt="follow on Twitter"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -174,7 +174,7 @@ Dify 是一个开源的 LLM 应用开发平台。其直观的界面结合了 AI
 在安装 Dify 之前，请确保您的机器满足以下最低系统要求：
 
 - CPU >= 2 Core
-- RAM >= 4 GiB
+- RAM >= 4GB
 
 ### 快速启动
 
@@ -202,14 +202,10 @@ docker compose up -d
 
 #### 使用 Terraform 部署
 
-使用 [terraform](https://www.terraform.io/) 一键将 Dify 部署到云平台
-
 ##### Azure Global
+使用 [terraform](https://www.terraform.io/) 一键部署 Dify 到 Azure。
 - [Azure Terraform by @nikawang](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [Google Cloud Terraform by @sotazum](https://github.com/DeNA/dify-google-cloud-terraform)
-
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=langgenius/dify&type=Date)](https://star-history.com/#langgenius/dify&Date)
@@ -236,7 +232,7 @@ docker compose up -d
 - [GitHub Issues](https://github.com/langgenius/dify/issues)。👉：使用 Dify.AI 时遇到的错误和问题，请参阅[贡献指南](CONTRIBUTING.md)。
 - [电子邮件支持](mailto:hello@dify.ai?subject=[GitHub]Questions%20About%20Dify)。👉：关于使用 Dify.AI 的问题。
 - [Discord](https://discord.gg/FngNHpbcY7)。👉：分享您的应用程序并与社区交流。
-- [X(Twitter)](https://twitter.com/dify_ai)。👉：分享您的应用程序并与社区交流。
+- [Twitter](https://twitter.com/dify_ai)。👉：分享您的应用程序并与社区交流。
 - [商业许可](mailto:business@dify.ai?subject=[GitHub]Business%20License%20Inquiry)。👉：有关商业用途许可 Dify.AI 的商业咨询。
  - [微信]() 👉：扫描下方二维码，添加微信好友，备注 Dify，我们将邀请您加入 Dify 社区。  
 <img src="./images/wechat.png" alt="wechat" width="100"/>

README_ES.md

@@ -17,7 +17,7 @@
             alt="chat en Discord"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="seguir en X(Twitter)"></a>
+            alt="seguir en Twitter"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Descargas de Docker" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -204,13 +204,10 @@ Si desea configurar una configuración de alta disponibilidad, la comunidad prop
 
 #### Uso de Terraform para el despliegue
 
-Despliega Dify en una plataforma en la nube con un solo clic utilizando [terraform](https://www.terraform.io/)
-
 ##### Azure Global
+Utiliza [terraform](https://www.terraform.io/) para desplegar Dify en Azure con un solo clic.
 - [Azure Terraform por @nikawang](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [Google Cloud Terraform por @sotazum](https://github.com/DeNA/dify-google-cloud-terraform)
 
 ## Contribuir
 
@@ -231,7 +228,7 @@ Al mismo tiempo, considera apoyar a Dify compartiéndolo en redes sociales y en
 * [Discusión en GitHub](https://github.com/langgenius/dify/discussions). Lo mejor para: compartir comentarios y hacer preguntas.
 * [Reporte de problemas en GitHub](https://github.com/langgenius/dify/issues). Lo mejor para: errores que encuentres usando Dify.AI y propuestas de características. Consulta nuestra [Guía de contribución](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
 * [Discord](https://discord.gg/FngNHpbcY7). Lo mejor para: compartir tus aplicaciones y pasar el rato con la comunidad.
-* [X(Twitter)](https://twitter.com/dify_ai). Lo mejor para: compartir tus aplicaciones y pasar el rato con la comunidad.
+* [Twitter](https://twitter.com/dify_ai). Lo mejor para: compartir tus aplicaciones y pasar el rato con la comunidad.
 
 ## Historial de Estrellas
 

README_FR.md

@@ -17,7 +17,7 @@
             alt="chat sur Discord"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="suivre sur X(Twitter)"></a>
+            alt="suivre sur Twitter"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Tirages Docker" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -202,13 +202,10 @@ Si vous souhaitez configurer une configuration haute disponibilité, la communau
 
 #### Utilisation de Terraform pour le déploiement
 
-Déployez Dify sur une plateforme cloud en un clic en utilisant [terraform](https://www.terraform.io/)
-
 ##### Azure Global
+Utilisez [terraform](https://www.terraform.io/) pour déployer Dify sur Azure en un clic.
 - [Azure Terraform par @nikawang](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [Google Cloud Terraform par @sotazum](https://github.com/DeNA/dify-google-cloud-terraform)
 
 ## Contribuer
 
@@ -229,7 +226,7 @@ Dans le même temps, veuillez envisager de soutenir Dify en le partageant sur le
 * [Discussion GitHub](https://github.com/langgenius/dify/discussions). Meilleur pour: partager des commentaires et poser des questions.
 * [Problèmes GitHub](https://github.com/langgenius/dify/issues). Meilleur pour: les bogues que vous rencontrez en utilisant Dify.AI et les propositions de fonctionnalités. Consultez notre [Guide de contribution](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
 * [Discord](https://discord.gg/FngNHpbcY7). Meilleur pour: partager vos applications et passer du temps avec la communauté.
-* [X(Twitter)](https://twitter.com/dify_ai). Meilleur pour: partager vos applications et passer du temps avec la communauté.
+* [Twitter](https://twitter.com/dify_ai). Meilleur pour: partager vos applications et passer du temps avec la communauté.
 
 ## Historique des étoiles
 

README_JA.md

@@ -17,7 +17,7 @@
             alt="Discordでチャット"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="X(Twitter)でフォロー"></a>
+            alt="Twitterでフォロー"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -68,7 +68,7 @@ DifyはオープンソースのLLMアプリケーション開発プラットフ
   プロンプトの作成、モデルパフォーマンスの比較が行え、チャットベースのアプリに音声合成などの機能も追加できます。
 
 **4. RAGパイプライン**: 
-  ドキュメントの取り込みから検索までをカバーする広範なRAG機能ができます。ほかにもPDF、PPT、その他の一般的なドキュメントフォーマットからのテキスト抽出のサポートも提供します。
+  ドキュメントの取り込みから検索までをカバーする広範なRAG機能ができます。ほかにもPDF、PPT、その他の一般的なドキュメントフォーマットからのテキスト抽出のサーポイントも提供します。
 
 **5. エージェント機能**: 
   LLM Function CallingやReActに基づくエージェントの定義が可能で、AIエージェント用のプリビルトまたはカスタムツールを追加できます。Difyには、Google検索、DALL·E、Stable Diffusion、WolframAlphaなどのAIエージェント用の50以上の組み込みツールが提供します。
@@ -201,13 +201,10 @@ docker compose up -d
 
 #### Terraformを使用したデプロイ
 
-[terraform](https://www.terraform.io/) を使用して、ワンクリックでDifyをクラウドプラットフォームにデプロイします
-
 ##### Azure Global
-- [@nikawangによるAzure Terraform](https://github.com/nikawang/dify-azure-terraform)
+[terraform](https://www.terraform.io/) を使用して、AzureにDifyをワンクリックでデプロイします。
+- [nikawangのAzure Terraform](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [@sotazumによるGoogle Cloud Terraform](https://github.com/DeNA/dify-google-cloud-terraform)
 
 ## 貢献
 
@@ -228,7 +225,7 @@ docker compose up -d
 * [Github Discussion](https://github.com/langgenius/dify/discussions). 主に: フィードバックの共有や質問。
 * [GitHub Issues](https://github.com/langgenius/dify/issues). 主に: Dify.AIを使用する際に発生するエラーや問題については、[貢献ガイド](CONTRIBUTING_JA.md)を参照してください
 * [Discord](https://discord.gg/FngNHpbcY7). 主に: アプリケーションの共有やコミュニティとの交流。
-* [X(Twitter)](https://twitter.com/dify_ai). 主に: アプリケーションの共有やコミュニティとの交流。
+* [Twitter](https://twitter.com/dify_ai). 主に: アプリケーションの共有やコミュニティとの交流。
 
 
 

README_KL.md

@@ -17,7 +17,7 @@
             alt="chat on Discord"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="follow on X(Twitter)"></a>
+            alt="follow on Twitter"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -202,13 +202,10 @@ If you'd like to configure a highly-available setup, there are community-contrib
 
 #### Terraform atorlugu pilersitsineq
 
-wa'logh nIqHom neH ghun deployment toy'wI' [terraform](https://www.terraform.io/) lo'laH.
-
 ##### Azure Global
-- [Azure Terraform mung @nikawang](https://github.com/nikawang/dify-azure-terraform)
+Atoruk [terraform](https://www.terraform.io/) Dify-mik Azure-mut ataatsikkut ikkussuilluarlugu.
+- [Azure Terraform atorlugu @nikawang](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [Google Cloud Terraform qachlot @sotazum](https://github.com/DeNA/dify-google-cloud-terraform)
 
 ## Contributing
 
@@ -231,7 +228,7 @@ At the same time, please consider supporting Dify by sharing it on social media
 ). Best for: sharing feedback and asking questions.
 * [GitHub Issues](https://github.com/langgenius/dify/issues). Best for: bugs you encounter using Dify.AI, and feature proposals. See our [Contribution Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
 * [Discord](https://discord.gg/FngNHpbcY7). Best for: sharing your applications and hanging out with the community.
-* [X(Twitter)](https://twitter.com/dify_ai). Best for: sharing your applications and hanging out with the community.
+* [Twitter](https://twitter.com/dify_ai). Best for: sharing your applications and hanging out with the community.
 
 ## Star History
 

README_KR.md

@@ -17,7 +17,7 @@
             alt="chat on Discord"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="follow on X(Twitter)"></a>
+            alt="follow on Twitter"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -39,6 +39,7 @@
   <a href="./README_AR.md"><img alt="README بالعربية" src="https://img.shields.io/badge/العربية-d9d9d9"></a>
   <a href="./README_TR.md"><img alt="Türkçe README" src="https://img.shields.io/badge/Türkçe-d9d9d9"></a>
   <a href="./README_VI.md"><img alt="README Tiếng Việt" src="https://img.shields.io/badge/Ti%E1%BA%BFng%20Vi%E1%BB%87t-d9d9d9"></a>
+
 </p>
 
 
@@ -194,14 +195,10 @@ Dify를 Kubernetes에 배포하고 프리미엄 스케일링 설정을 구성했
 
 #### Terraform을 사용한 배포
 
-[terraform](https://www.terraform.io/)을 사용하여 단 한 번의 클릭으로 Dify를 클라우드 플랫폼에 배포하십시오
-
 ##### Azure Global
+[terraform](https://www.terraform.io/)을 사용하여 Azure에 Dify를 원클릭으로 배포하세요.
 - [nikawang의 Azure Terraform](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [sotazum의 Google Cloud Terraform](https://github.com/DeNA/dify-google-cloud-terraform)
-
 ## 기여
 
 코드에 기여하고 싶은 분들은 [기여 가이드](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md)를 참조하세요.

README_TR.md

@@ -17,7 +17,7 @@
             alt="Discord'da sohbet et"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="X(Twitter)'da takip et"></a>
+            alt="Twitter'da takip et"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Docker Çekmeleri" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -200,13 +200,9 @@ Yüksek kullanılabilirliğe sahip bir kurulum yapılandırmak isterseniz, Dify'
 
 #### Dağıtım için Terraform Kullanımı
 
-Dify'ı bulut platformuna tek tıklamayla dağıtın [terraform](https://www.terraform.io/) kullanarak
-
 ##### Azure Global
-- [Azure Terraform tarafından @nikawang](https://github.com/nikawang/dify-azure-terraform)
-
-##### Google Cloud
-- [Google Cloud Terraform tarafından @sotazum](https://github.com/DeNA/dify-google-cloud-terraform)
+[Terraform](https://www.terraform.io/) kullanarak Dify'ı Azure'a tek tıklamayla dağıtın.
+- [@nikawang tarafından Azure Terraform](https://github.com/nikawang/dify-azure-terraform)
 
 ## Katkıda Bulunma
 
@@ -226,7 +222,7 @@ Aynı zamanda, lütfen Dify'ı sosyal medyada, etkinliklerde ve konferanslarda p
 * [Github Tartışmaları](https://github.com/langgenius/dify/discussions). En uygun: geri bildirim paylaşmak ve soru sormak için.
 * [GitHub Sorunları](https://github.com/langgenius/dify/issues). En uygun: Dify.AI kullanırken karşılaştığınız hatalar ve özellik önerileri için. [Katkı Kılavuzumuza](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) bakın.
 * [Discord](https://discord.gg/FngNHpbcY7). En uygun: uygulamalarınızı paylaşmak ve toplulukla vakit geçirmek için.
-* [X(Twitter)](https://twitter.com/dify_ai). En uygun: uygulamalarınızı paylaşmak ve toplulukla vakit geçirmek için.
+* [Twitter](https://twitter.com/dify_ai). En uygun: uygulamalarınızı paylaşmak ve toplulukla vakit geçirmek için.
 
 ## Star history
 

README_VI.md

@@ -17,7 +17,7 @@
             alt="chat trên Discord"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">
         <img src="https://img.shields.io/twitter/follow/dify_ai?logo=X&color=%20%23f5f5f5"
-            alt="theo dõi trên X(Twitter)"></a>
+            alt="theo dõi trên Twitter"></a>
     <a href="https://hub.docker.com/u/langgenius" target="_blank">
         <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/langgenius/dify-web?labelColor=%20%23FDB062&color=%20%23f79009"></a>
     <a href="https://github.com/langgenius/dify/graphs/commit-activity" target="_blank">
@@ -152,7 +152,7 @@ Nhanh chóng chạy Dify trong môi trường của bạn với [hướng dẫn
 Sử dụng [tài liệu](https://docs.dify.ai) của chúng tôi để tham khảo thêm và nhận hướng dẫn chi tiết hơn.
 
 - **Dify cho doanh nghiệp / tổ chức</br>**
-Chúng tôi cung cấp các tính năng bổ sung tập trung vào doanh nghiệp. [Ghi lại câu hỏi của bạn cho chúng tôi thông qua chatbot này](https://udify.app/chat/22L1zSxg6yW1cWQg) hoặc [gửi email cho chúng tôi](mailto:business@dify.ai?subject=[GitHub]Business%20License%20Inquiry) để thảo luận về nhu cầu doanh nghiệp. </br>
+Chúng tôi cung cấp các tính năng bổ sung tập trung vào doanh nghiệp. [Lên lịch cuộc họp với chúng tôi](https://cal.com/guchenhe/30min) hoặc [gửi email cho chúng tôi](mailto:business@dify.ai?subject=[GitHub]Business%20License%20Inquiry) để thảo luận về nhu cầu doanh nghiệp. </br>
   > Đối với các công ty khởi nghiệp và doanh nghiệp nhỏ sử dụng AWS, hãy xem [Dify Premium trên AWS Marketplace](https://aws.amazon.com/marketplace/pp/prodview-t22mebxzwjhu6) và triển khai nó vào AWS VPC của riêng bạn chỉ với một cú nhấp chuột. Đây là một AMI giá cả phải chăng với tùy chọn tạo ứng dụng với logo và thương hiệu tùy chỉnh.
 
 
@@ -196,14 +196,10 @@ Nếu bạn muốn cấu hình một cài đặt có độ sẵn sàng cao, có
 
 #### Sử dụng Terraform để Triển khai
 
-Triển khai Dify lên nền tảng đám mây với một cú nhấp chuột bằng cách sử dụng [terraform](https://www.terraform.io/)
-
 ##### Azure Global
+Triển khai Dify lên Azure chỉ với một cú nhấp chuột bằng cách sử dụng [terraform](https://www.terraform.io/).
 - [Azure Terraform bởi @nikawang](https://github.com/nikawang/dify-azure-terraform)
 
-##### Google Cloud
-- [Google Cloud Terraform bởi @sotazum](https://github.com/DeNA/dify-google-cloud-terraform)
-
 ## Đóng góp
 
 Đối với những người muốn đóng góp mã, xem [Hướng dẫn Đóng góp](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) của chúng tôi. 
@@ -223,7 +219,24 @@ Triển khai Dify lên nền tảng đám mây với một cú nhấp chuột b
 * [Thảo luận GitHub](https://github.com/langgenius/dify/discussions). Tốt nhất cho: chia sẻ phản hồi và đặt câu hỏi.
 * [Vấn đề GitHub](https://github.com/langgenius/dify/issues). Tốt nhất cho: lỗi bạn gặp phải khi sử dụng Dify.AI và đề xuất tính năng. Xem [Hướng dẫn Đóng góp](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) của chúng tôi.
 * [Discord](https://discord.gg/FngNHpbcY7). Tốt nhất cho: chia sẻ ứng dụng của bạn và giao lưu với cộng đồng.
-* [X(Twitter)](https://twitter.com/dify_ai). Tốt nhất cho: chia sẻ ứng dụng của bạn và giao lưu với cộng đồng.
+* [Twitter](https://twitter.com/dify_ai). Tốt nhất cho: chia sẻ ứng dụng của bạn và giao lưu với cộng đồng.
+
+Hoặc, lên lịch cuộc họp trực tiếp với một thành viên trong nhóm:
+
+<table>
+  <tr>
+    <th>Điểm liên hệ</th>
+    <th>Mục đích</th>
+  </tr>
+  <tr>
+    <td><a href='https://cal.com/guchenhe/15min' target='_blank'><img class="schedule-button" src='https://github.com/langgenius/dify/assets/13230914/9ebcd111-1205-4d71-83d5-948d70b809f5' alt='Git-Hub-README-Button-3x' style="width: 180px; height: auto; object-fit: contain;"/></a></td>
+    <td>Yêu cầu kinh doanh & phản hồi sản phẩm</td>
+  </tr>
+  <tr>
+    <td><a href='https://cal.com/pinkbanana' target='_blank'><img class="schedule-button" src='https://github.com/langgenius/dify/assets/13230914/d1edd00a-d7e4-4513-be6c-e57038e143fd' alt='Git-Hub-README-Button-2x' style="width: 180px; height: auto; object-fit: contain;"/></a></td>
+    <td>Đóng góp, vấn đề & yêu cầu tính năng</td>
+  </tr>
+</table>
 
 ## Lịch sử Yêu thích
 

api/.env.example

@@ -20,9 +20,6 @@ FILES_URL=http://127.0.0.1:5001
 # The time in seconds after the signature is rejected
 FILES_ACCESS_TIMEOUT=300
 
-# Access token expiration time in minutes
-ACCESS_TOKEN_EXPIRE_MINUTES=60
-
 # celery configuration
 CELERY_BROKER_URL=redis://:difyai123456@localhost:6379/1
 
@@ -42,7 +39,7 @@ DB_DATABASE=dify
 
 # Storage configuration
 # use for store upload files, private keys...
-# storage type: local, s3, aliyun-oss, azure-blob, baidu-obs, google-storage, huawei-obs, oci-storage, tencent-cos, volcengine-tos, supabase
+# storage type: local, s3, azure-blob, google-storage
 STORAGE_TYPE=local
 STORAGE_LOCAL_PATH=storage
 S3_USE_AWS_MANAGED_IAM=false
@@ -63,8 +60,7 @@ ALIYUN_OSS_SECRET_KEY=your-secret-key
 ALIYUN_OSS_ENDPOINT=your-endpoint
 ALIYUN_OSS_AUTH_VERSION=v1
 ALIYUN_OSS_REGION=your-region
-# Don't start with '/'. OSS doesn't support leading slash in object names.
-ALIYUN_OSS_PATH=your-path
+
 # Google Storage configuration
 GOOGLE_STORAGE_BUCKET_NAME=yout-bucket-name
 GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64=your-google-service-account-json-base64-string
@@ -76,18 +72,6 @@ TENCENT_COS_SECRET_ID=your-secret-id
 TENCENT_COS_REGION=your-region
 TENCENT_COS_SCHEME=your-scheme
 
-# Huawei OBS Storage Configuration
-HUAWEI_OBS_BUCKET_NAME=your-bucket-name
-HUAWEI_OBS_SECRET_KEY=your-secret-key
-HUAWEI_OBS_ACCESS_KEY=your-access-key
-HUAWEI_OBS_SERVER=your-server-url
-
-# Baidu OBS Storage Configuration
-BAIDU_OBS_BUCKET_NAME=your-bucket-name
-BAIDU_OBS_SECRET_KEY=your-secret-key
-BAIDU_OBS_ACCESS_KEY=your-access-key
-BAIDU_OBS_ENDPOINT=your-server-url
-
 # OCI Storage configuration
 OCI_ENDPOINT=your-endpoint
 OCI_BUCKET_NAME=your-bucket-name
@@ -95,23 +79,11 @@ OCI_ACCESS_KEY=your-access-key
 OCI_SECRET_KEY=your-secret-key
 OCI_REGION=your-region
 
-# Volcengine tos Storage configuration
-VOLCENGINE_TOS_ENDPOINT=your-endpoint
-VOLCENGINE_TOS_BUCKET_NAME=your-bucket-name
-VOLCENGINE_TOS_ACCESS_KEY=your-access-key
-VOLCENGINE_TOS_SECRET_KEY=your-secret-key
-VOLCENGINE_TOS_REGION=your-region
-
-# Supabase Storage Configuration
-SUPABASE_BUCKET_NAME=your-bucket-name
-SUPABASE_API_KEY=your-access-key
-SUPABASE_URL=your-server-url
-
 # CORS configuration
 WEB_API_CORS_ALLOW_ORIGINS=http://127.0.0.1:3000,*
 CONSOLE_CORS_ALLOW_ORIGINS=http://127.0.0.1:3000,*
 
-# Vector database configuration, support: weaviate, qdrant, milvus, myscale, relyt, pgvecto_rs, pgvector, pgvector, chroma, opensearch, tidb_vector, vikingdb, upstash
+# Vector database configuration, support: weaviate, qdrant, milvus, myscale, relyt, pgvecto_rs, pgvector, pgvector, chroma, opensearch, tidb_vector
 VECTOR_STORE=weaviate
 
 # Weaviate configuration
@@ -128,10 +100,11 @@ QDRANT_GRPC_ENABLED=false
 QDRANT_GRPC_PORT=6334
 
 # Milvus configuration
-MILVUS_URI=http://127.0.0.1:19530
-MILVUS_TOKEN=
+MILVUS_HOST=127.0.0.1
+MILVUS_PORT=19530
 MILVUS_USER=root
 MILVUS_PASSWORD=Milvus
+MILVUS_SECURE=false
 
 # MyScale configuration
 MYSCALE_HOST=127.0.0.1
@@ -157,12 +130,6 @@ TENCENT_VECTOR_DB_DATABASE=dify
 TENCENT_VECTOR_DB_SHARD=1
 TENCENT_VECTOR_DB_REPLICAS=2
 
-# ElasticSearch configuration
-ELASTICSEARCH_HOST=127.0.0.1
-ELASTICSEARCH_PORT=9200
-ELASTICSEARCH_USERNAME=elastic
-ELASTICSEARCH_PASSWORD=elastic
-
 # PGVECTO_RS configuration
 PGVECTO_RS_HOST=localhost
 PGVECTO_RS_PORT=5431
@@ -176,8 +143,6 @@ PGVECTOR_PORT=5433
 PGVECTOR_USER=postgres
 PGVECTOR_PASSWORD=postgres
 PGVECTOR_DATABASE=postgres
-PGVECTOR_MIN_CONNECTION=1
-PGVECTOR_MAX_CONNECTION=5
 
 # Tidb Vector configuration
 TIDB_VECTOR_HOST=xxx.eu-central-1.xxx.aws.tidbcloud.com
@@ -211,39 +176,14 @@ OPENSEARCH_USER=admin
 OPENSEARCH_PASSWORD=admin
 OPENSEARCH_SECURE=true
 
-# Baidu configuration
-BAIDU_VECTOR_DB_ENDPOINT=http://127.0.0.1:5287
-BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS=30000
-BAIDU_VECTOR_DB_ACCOUNT=root
-BAIDU_VECTOR_DB_API_KEY=dify
-BAIDU_VECTOR_DB_DATABASE=dify
-BAIDU_VECTOR_DB_SHARD=1
-BAIDU_VECTOR_DB_REPLICAS=3
-
-# Upstash configuration
-UPSTASH_VECTOR_URL=your-server-url
-UPSTASH_VECTOR_TOKEN=your-access-token
-
-# ViKingDB configuration
-VIKINGDB_ACCESS_KEY=your-ak
-VIKINGDB_SECRET_KEY=your-sk
-VIKINGDB_REGION=cn-shanghai
-VIKINGDB_HOST=api-vikingdb.xxx.volces.com
-VIKINGDB_SCHEMA=http
-VIKINGDB_CONNECTION_TIMEOUT=30
-VIKINGDB_SOCKET_TIMEOUT=30
-
 # Upload configuration
 UPLOAD_FILE_SIZE_LIMIT=15
 UPLOAD_FILE_BATCH_LIMIT=5
 UPLOAD_IMAGE_FILE_SIZE_LIMIT=10
-UPLOAD_VIDEO_FILE_SIZE_LIMIT=100
-UPLOAD_AUDIO_FILE_SIZE_LIMIT=50
 
 # Model Configuration
 MULTIMODAL_SEND_IMAGE_FORMAT=base64
 PROMPT_GENERATION_MAX_TOKENS=512
-CODE_GENERATION_MAX_TOKENS=1024
 
 # Mail configuration, support: resend, smtp
 MAIL_TYPE=
@@ -301,18 +241,11 @@ API_TOOL_DEFAULT_READ_TIMEOUT=60
 HTTP_REQUEST_MAX_CONNECT_TIMEOUT=300
 HTTP_REQUEST_MAX_READ_TIMEOUT=600
 HTTP_REQUEST_MAX_WRITE_TIMEOUT=600
-HTTP_REQUEST_NODE_MAX_BINARY_SIZE=10485760
-HTTP_REQUEST_NODE_MAX_TEXT_SIZE=1048576
-
-# Respect X-* headers to redirect clients
-RESPECT_XFORWARD_HEADERS_ENABLED=false
+HTTP_REQUEST_NODE_MAX_BINARY_SIZE=10485760 # 10MB
+HTTP_REQUEST_NODE_MAX_TEXT_SIZE=1048576 # 1MB
 
 # Log file path
 LOG_FILE=
-# Log file max size, the unit is MB
-LOG_FILE_MAX_SIZE=20
-# Log file max backup count
-LOG_FILE_BACKUP_COUNT=5
 
 # Indexing configuration
 INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH=1000
@@ -321,7 +254,6 @@ INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH=1000
 WORKFLOW_MAX_EXECUTION_STEPS=500
 WORKFLOW_MAX_EXECUTION_TIME=1200
 WORKFLOW_CALL_MAX_DEPTH=5
-MAX_VARIABLE_SIZE=204800
 
 # App configuration
 APP_MAX_EXECUTION_TIME=1200
@@ -329,16 +261,4 @@ APP_MAX_ACTIVE_REQUESTS=0
 
 
 # Celery beat configuration
-CELERY_BEAT_SCHEDULER_TIME=1
-
-# Position configuration
-POSITION_TOOL_PINS=
-POSITION_TOOL_INCLUDES=
-POSITION_TOOL_EXCLUDES=
-
-POSITION_PROVIDER_PINS=
-POSITION_PROVIDER_INCLUDES=
-POSITION_PROVIDER_EXCLUDES=
-
-# Reset password token expiry minutes
-RESET_PASSWORD_TOKEN_EXPIRY_MINUTES=5
+CELERY_BEAT_SCHEDULER_TIME=1

api/Dockerfile

@@ -5,10 +5,6 @@ WORKDIR /app/api
 
 # Install Poetry
 ENV POETRY_VERSION=1.8.3
-
-# if you located in China, you can use aliyun mirror to speed up
-# RUN pip install --no-cache-dir poetry==${POETRY_VERSION} -i https://mirrors.aliyun.com/pypi/simple/
-
 RUN pip install --no-cache-dir poetry==${POETRY_VERSION}
 
 # Configure Poetry
@@ -20,9 +16,6 @@ ENV POETRY_REQUESTS_TIMEOUT=15
 
 FROM base AS packages
 
-# if you located in China, you can use aliyun mirror to speed up
-# 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 gcc g++ libc-dev libffi-dev libgmp-dev libmpfr-dev libmpc-dev
 
@@ -50,12 +43,10 @@ WORKDIR /app/api
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends curl nodejs libgmp-dev libmpfr-dev libmpc-dev \
-    # if you located in China, you can use aliyun mirror to speed up
-    # && echo "deb http://mirrors.aliyun.com/debian testing main" > /etc/apt/sources.list \
     && echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list \
     && apt-get update \
     # For Security
-    && apt-get install -y --no-install-recommends zlib1g=1:1.3.dfsg+really1.3.1-1 expat=2.6.3-1 libldap-2.5-0=2.5.18+dfsg-3 perl=5.38.2-5 libsqlite3-0=3.46.1-1 \
+    && apt-get install -y --no-install-recommends zlib1g=1:1.3.dfsg+really1.3.1-1 expat=2.6.2-1 libldap-2.5-0=2.5.18+dfsg-2 perl=5.38.2-5 libsqlite3-0=3.46.0-1 \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
@@ -65,7 +56,7 @@ COPY --from=packages ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 
 # Download nltk data
-RUN python -c "import nltk; nltk.download('punkt'); nltk.download('averaged_perceptron_tagger')"
+RUN python -c "import nltk; nltk.download('punkt')"
 
 # Copy source code
 COPY . /app/api/

api/README.md

@@ -65,12 +65,14 @@
 
 8. Start Dify [web](../web) service.
 9. Setup your application by visiting `http://localhost:3000`...
-10. If you need to handle and debug the async tasks (e.g. dataset importing and documents indexing), please start the worker service.
+10. If you need to debug local async processing, please start the worker service.
 
    ```bash
    poetry run python -m celery -A app.celery worker -P gevent -c 1 --loglevel INFO -Q dataset,generation,mail,ops_trace,app_deletion
    ```
 
+   The started celery app handles the async tasks, e.g. dataset importing and documents indexing.
+
 ## Testing
 
 1. Install dependencies for both the backend and the test environment
@@ -85,4 +87,3 @@
    cd ../
    poetry run -C api bash dev/pytest/pytest_all_tests.sh
    ```
-

api/app.py

@@ -1,8 +1,6 @@
 import os
 
-from configs import dify_config
-
-if os.environ.get("DEBUG", "false").lower() != "true":
+if os.environ.get("DEBUG", "false").lower() != 'true':
     from gevent import monkey
 
     monkey.patch_all()
@@ -12,59 +10,264 @@ if os.environ.get("DEBUG", "false").lower() != "true":
     grpc.experimental.gevent.init_gevent()
 
 import json
+import logging
+import sys
 import threading
 import time
 import warnings
+from logging.handlers import RotatingFileHandler
 
-from flask import Response
+from flask import Flask, Response, request
+from flask_cors import CORS
+from werkzeug.exceptions import Unauthorized
 
-from app_factory import create_app
+import contexts
+from commands import register_commands
+from configs import dify_config
 
 # DO NOT REMOVE BELOW
-from events import event_handlers  # noqa: F401
+from events import event_handlers
+from extensions import (
+    ext_celery,
+    ext_code_based_extension,
+    ext_compress,
+    ext_database,
+    ext_hosting_provider,
+    ext_login,
+    ext_mail,
+    ext_migrate,
+    ext_redis,
+    ext_sentry,
+    ext_storage,
+)
 from extensions.ext_database import db
+from extensions.ext_login import login_manager
+from libs.passport import PassportService
 
 # TODO: Find a way to avoid importing models here
-from models import account, dataset, model, source, task, tool, tools, web  # noqa: F401
+from models import account, dataset, model, source, task, tool, tools, web
+from services.account_service import AccountService
 
 # DO NOT REMOVE ABOVE
 
 
 warnings.simplefilter("ignore", ResourceWarning)
 
-os.environ["TZ"] = "UTC"
-# windows platform not support tzset
-if hasattr(time, "tzset"):
+# fix windows platform
+if os.name == "nt":
+    os.system('tzutil /s "UTC"')
+else:
+    os.environ['TZ'] = 'UTC'
     time.tzset()
 
 
+class DifyApp(Flask):
+    pass
+
+
+# -------------
+# Configuration
+# -------------
+
+
+config_type = os.getenv('EDITION', default='SELF_HOSTED')  # ce edition first
+
+
+# ----------------------------
+# Application Factory Function
+# ----------------------------
+
+def create_flask_app_with_configs() -> Flask:
+    """
+    create a raw flask app
+    with configs loaded from .env file
+    """
+    dify_app = DifyApp(__name__)
+    dify_app.config.from_mapping(dify_config.model_dump())
+
+    # populate configs into system environment variables
+    for key, value in dify_app.config.items():
+        if isinstance(value, str):
+            os.environ[key] = value
+        elif isinstance(value, int | float | bool):
+            os.environ[key] = str(value)
+        elif value is None:
+            os.environ[key] = ''
+
+    return dify_app
+
+
+def create_app() -> Flask:
+    app = create_flask_app_with_configs()
+
+    app.secret_key = app.config['SECRET_KEY']
+
+    log_handlers = None
+    log_file = app.config.get('LOG_FILE')
+    if log_file:
+        log_dir = os.path.dirname(log_file)
+        os.makedirs(log_dir, exist_ok=True)
+        log_handlers = [
+            RotatingFileHandler(
+                filename=log_file,
+                maxBytes=1024 * 1024 * 1024,
+                backupCount=5
+            ),
+            logging.StreamHandler(sys.stdout)
+        ]
+
+    logging.basicConfig(
+        level=app.config.get('LOG_LEVEL'),
+        format=app.config.get('LOG_FORMAT'),
+        datefmt=app.config.get('LOG_DATEFORMAT'),
+        handlers=log_handlers,
+        force=True
+    )
+    log_tz = app.config.get('LOG_TZ')
+    if log_tz:
+        from datetime import datetime
+
+        import pytz
+        timezone = pytz.timezone(log_tz)
+
+        def time_converter(seconds):
+            return datetime.utcfromtimestamp(seconds).astimezone(timezone).timetuple()
+
+        for handler in logging.root.handlers:
+            handler.formatter.converter = time_converter
+    initialize_extensions(app)
+    register_blueprints(app)
+    register_commands(app)
+
+    return app
+
+
+def initialize_extensions(app):
+    # Since the application instance is now created, pass it to each Flask
+    # extension instance to bind it to the Flask application instance (app)
+    ext_compress.init_app(app)
+    ext_code_based_extension.init()
+    ext_database.init_app(app)
+    ext_migrate.init(app, db)
+    ext_redis.init_app(app)
+    ext_storage.init_app(app)
+    ext_celery.init_app(app)
+    ext_login.init_app(app)
+    ext_mail.init_app(app)
+    ext_hosting_provider.init_app(app)
+    ext_sentry.init_app(app)
+
+
+# Flask-Login configuration
+@login_manager.request_loader
+def load_user_from_request(request_from_flask_login):
+    """Load user based on the request."""
+    if request.blueprint not in ['console', 'inner_api']:
+        return None
+    # Check if the user_id contains a dot, indicating the old format
+    auth_header = request.headers.get('Authorization', '')
+    if not auth_header:
+        auth_token = request.args.get('_token')
+        if not auth_token:
+            raise Unauthorized('Invalid Authorization token.')
+    else:
+        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.')
+
+    decoded = PassportService().verify(auth_token)
+    user_id = decoded.get('user_id')
+
+    account = AccountService.load_logged_in_account(account_id=user_id, token=auth_token)
+    if account:
+        contexts.tenant_id.set(account.current_tenant_id)
+    return account
+
+
+@login_manager.unauthorized_handler
+def unauthorized_handler():
+    """Handle unauthorized requests."""
+    return Response(json.dumps({
+        'code': 'unauthorized',
+        'message': "Unauthorized."
+    }), status=401, content_type="application/json")
+
+
+# register blueprint routers
+def register_blueprints(app):
+    from controllers.console import bp as console_app_bp
+    from controllers.files import bp as files_bp
+    from controllers.inner_api import bp as inner_api_bp
+    from controllers.service_api import bp as service_api_bp
+    from controllers.web import bp as web_bp
+
+    CORS(service_api_bp,
+         allow_headers=['Content-Type', 'Authorization', 'X-App-Code'],
+         methods=['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'PATCH']
+         )
+    app.register_blueprint(service_api_bp)
+
+    CORS(web_bp,
+         resources={
+             r"/*": {"origins": app.config['WEB_API_CORS_ALLOW_ORIGINS']}},
+         supports_credentials=True,
+         allow_headers=['Content-Type', 'Authorization', 'X-App-Code'],
+         methods=['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'PATCH'],
+         expose_headers=['X-Version', 'X-Env']
+         )
+
+    app.register_blueprint(web_bp)
+
+    CORS(console_app_bp,
+         resources={
+             r"/*": {"origins": app.config['CONSOLE_CORS_ALLOW_ORIGINS']}},
+         supports_credentials=True,
+         allow_headers=['Content-Type', 'Authorization'],
+         methods=['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'PATCH'],
+         expose_headers=['X-Version', 'X-Env']
+         )
+
+    app.register_blueprint(console_app_bp)
+
+    CORS(files_bp,
+         allow_headers=['Content-Type'],
+         methods=['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'PATCH']
+         )
+    app.register_blueprint(files_bp)
+
+    app.register_blueprint(inner_api_bp)
+
+
 # create app
 app = create_app()
 celery = app.extensions["celery"]
 
-if dify_config.TESTING:
+if app.config.get('TESTING'):
     print("App is running in TESTING mode")
 
 
 @app.after_request
 def after_request(response):
     """Add Version headers to the response."""
-    response.set_cookie("remember_token", "", expires=0)
-    response.headers.add("X-Version", dify_config.CURRENT_VERSION)
-    response.headers.add("X-Env", dify_config.DEPLOY_ENV)
+    response.set_cookie('remember_token', '', expires=0)
+    response.headers.add('X-Version', app.config['CURRENT_VERSION'])
+    response.headers.add('X-Env', app.config['DEPLOY_ENV'])
     return response
 
 
-@app.route("/health")
+@app.route('/health')
 def health():
-    return Response(
-        json.dumps({"pid": os.getpid(), "status": "ok", "version": dify_config.CURRENT_VERSION}),
-        status=200,
-        content_type="application/json",
-    )
+    return Response(json.dumps({
+        'pid': os.getpid(),
+        'status': 'ok',
+        'version': app.config['CURRENT_VERSION']
+    }), status=200, content_type="application/json")
 
 
-@app.route("/threads")
+@app.route('/threads')
 def threads():
     num_threads = threading.active_count()
     threads = threading.enumerate()
@@ -75,34 +278,32 @@ def threads():
         thread_id = thread.ident
         is_alive = thread.is_alive()
 
-        thread_list.append(
-            {
-                "name": thread_name,
-                "id": thread_id,
-                "is_alive": is_alive,
-            }
-        )
+        thread_list.append({
+            'name': thread_name,
+            'id': thread_id,
+            'is_alive': is_alive
+        })
 
     return {
-        "pid": os.getpid(),
-        "thread_num": num_threads,
-        "threads": thread_list,
+        'pid': os.getpid(),
+        'thread_num': num_threads,
+        'threads': thread_list
     }
 
 
-@app.route("/db-pool-stat")
+@app.route('/db-pool-stat')
 def pool_stat():
     engine = db.engine
     return {
-        "pid": os.getpid(),
-        "pool_size": engine.pool.size(),
-        "checked_in_connections": engine.pool.checkedin(),
-        "checked_out_connections": engine.pool.checkedout(),
-        "overflow_connections": engine.pool.overflow(),
-        "connection_timeout": engine.pool.timeout(),
-        "recycle_time": db.engine.pool._recycle,
+        'pid': os.getpid(),
+        'pool_size': engine.pool.size(),
+        'checked_in_connections': engine.pool.checkedin(),
+        'checked_out_connections': engine.pool.checkedout(),
+        'overflow_connections': engine.pool.overflow(),
+        'connection_timeout': engine.pool.timeout(),
+        'recycle_time': db.engine.pool._recycle
     }
 
 
-if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=5001)
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=5001)

api/app_factory.py

@@ -1,176 +0,0 @@
-import os
-
-if os.environ.get("DEBUG", "false").lower() != "true":
-    from gevent import monkey
-
-    monkey.patch_all()
-
-    import grpc.experimental.gevent
-
-    grpc.experimental.gevent.init_gevent()
-
-import json
-
-from flask import Flask, Response, request
-from flask_cors import CORS
-from werkzeug.exceptions import Unauthorized
-
-import contexts
-from commands import register_commands
-from configs import dify_config
-from extensions import (
-    ext_celery,
-    ext_code_based_extension,
-    ext_compress,
-    ext_database,
-    ext_hosting_provider,
-    ext_logging,
-    ext_login,
-    ext_mail,
-    ext_migrate,
-    ext_proxy_fix,
-    ext_redis,
-    ext_sentry,
-    ext_storage,
-)
-from extensions.ext_database import db
-from extensions.ext_login import login_manager
-from libs.passport import PassportService
-from services.account_service import AccountService
-
-
-class DifyApp(Flask):
-    pass
-
-
-# ----------------------------
-# Application Factory Function
-# ----------------------------
-def create_flask_app_with_configs() -> Flask:
-    """
-    create a raw flask app
-    with configs loaded from .env file
-    """
-    dify_app = DifyApp(__name__)
-    dify_app.config.from_mapping(dify_config.model_dump())
-
-    # populate configs into system environment variables
-    for key, value in dify_app.config.items():
-        if isinstance(value, str):
-            os.environ[key] = value
-        elif isinstance(value, int | float | bool):
-            os.environ[key] = str(value)
-        elif value is None:
-            os.environ[key] = ""
-
-    return dify_app
-
-
-def create_app() -> Flask:
-    app = create_flask_app_with_configs()
-    app.secret_key = dify_config.SECRET_KEY
-    initialize_extensions(app)
-    register_blueprints(app)
-    register_commands(app)
-
-    return app
-
-
-def initialize_extensions(app):
-    # Since the application instance is now created, pass it to each Flask
-    # extension instance to bind it to the Flask application instance (app)
-    ext_logging.init_app(app)
-    ext_compress.init_app(app)
-    ext_code_based_extension.init()
-    ext_database.init_app(app)
-    ext_migrate.init(app, db)
-    ext_redis.init_app(app)
-    ext_storage.init_app(app)
-    ext_celery.init_app(app)
-    ext_login.init_app(app)
-    ext_mail.init_app(app)
-    ext_hosting_provider.init_app(app)
-    ext_sentry.init_app(app)
-    ext_proxy_fix.init_app(app)
-
-
-# Flask-Login configuration
-@login_manager.request_loader
-def load_user_from_request(request_from_flask_login):
-    """Load user based on the request."""
-    if request.blueprint not in {"console", "inner_api"}:
-        return None
-    # Check if the user_id contains a dot, indicating the old format
-    auth_header = request.headers.get("Authorization", "")
-    if not auth_header:
-        auth_token = request.args.get("_token")
-        if not auth_token:
-            raise Unauthorized("Invalid Authorization token.")
-    else:
-        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.")
-
-    decoded = PassportService().verify(auth_token)
-    user_id = decoded.get("user_id")
-
-    logged_in_account = AccountService.load_logged_in_account(account_id=user_id)
-    if logged_in_account:
-        contexts.tenant_id.set(logged_in_account.current_tenant_id)
-    return logged_in_account
-
-
-@login_manager.unauthorized_handler
-def unauthorized_handler():
-    """Handle unauthorized requests."""
-    return Response(
-        json.dumps({"code": "unauthorized", "message": "Unauthorized."}),
-        status=401,
-        content_type="application/json",
-    )
-
-
-# register blueprint routers
-def register_blueprints(app):
-    from controllers.console import bp as console_app_bp
-    from controllers.files import bp as files_bp
-    from controllers.inner_api import bp as inner_api_bp
-    from controllers.service_api import bp as service_api_bp
-    from controllers.web import bp as web_bp
-
-    CORS(
-        service_api_bp,
-        allow_headers=["Content-Type", "Authorization", "X-App-Code"],
-        methods=["GET", "PUT", "POST", "DELETE", "OPTIONS", "PATCH"],
-    )
-    app.register_blueprint(service_api_bp)
-
-    CORS(
-        web_bp,
-        resources={r"/*": {"origins": dify_config.WEB_API_CORS_ALLOW_ORIGINS}},
-        supports_credentials=True,
-        allow_headers=["Content-Type", "Authorization", "X-App-Code"],
-        methods=["GET", "PUT", "POST", "DELETE", "OPTIONS", "PATCH"],
-        expose_headers=["X-Version", "X-Env"],
-    )
-
-    app.register_blueprint(web_bp)
-
-    CORS(
-        console_app_bp,
-        resources={r"/*": {"origins": dify_config.CONSOLE_CORS_ALLOW_ORIGINS}},
-        supports_credentials=True,
-        allow_headers=["Content-Type", "Authorization"],
-        methods=["GET", "PUT", "POST", "DELETE", "OPTIONS", "PATCH"],
-        expose_headers=["X-Version", "X-Env"],
-    )
-
-    app.register_blueprint(console_app_bp)
-
-    CORS(files_bp, allow_headers=["Content-Type"], methods=["GET", "PUT", "POST", "DELETE", "OPTIONS", "PATCH"])
-    app.register_blueprint(files_bp)
-
-    app.register_blueprint(inner_api_bp)

api/commands.py

@@ -19,7 +19,7 @@ from extensions.ext_redis import redis_client
 from libs.helper import email as email_validate
 from libs.password import hash_password, password_pattern, valid_password
 from libs.rsa import generate_key_pair
-from models import Tenant
+from models.account import Tenant
 from models.dataset import Dataset, DatasetCollectionBinding, DocumentSegment
 from models.dataset import Document as DatasetDocument
 from models.model import Account, App, AppAnnotationSetting, AppMode, Conversation, MessageAnnotation
@@ -27,29 +27,32 @@ from models.provider import Provider, ProviderModel
 from services.account_service import RegisterService, TenantService
 
 
-@click.command("reset-password", help="Reset the account password.")
-@click.option("--email", prompt=True, help="Account email to reset password for")
-@click.option("--new-password", prompt=True, help="New password")
-@click.option("--password-confirm", prompt=True, help="Confirm new password")
+@click.command('reset-password', help='Reset the account password.')
+@click.option('--email', prompt=True, help='The email address of the account whose password you need to reset')
+@click.option('--new-password', prompt=True, help='the new password.')
+@click.option('--password-confirm', prompt=True, help='the new password confirm.')
 def reset_password(email, new_password, password_confirm):
     """
     Reset password of owner account
     Only available in SELF_HOSTED mode
     """
     if str(new_password).strip() != str(password_confirm).strip():
-        click.echo(click.style("Passwords do not match.", fg="red"))
+        click.echo(click.style('sorry. The two passwords do not match.', fg='red'))
         return
 
-    account = db.session.query(Account).filter(Account.email == email).one_or_none()
+    account = db.session.query(Account). \
+        filter(Account.email == email). \
+        one_or_none()
 
     if not account:
-        click.echo(click.style("Account not found for email: {}".format(email), fg="red"))
+        click.echo(click.style('sorry. the account: [{}] not exist .'.format(email), fg='red'))
         return
 
     try:
         valid_password(new_password)
     except:
-        click.echo(click.style("Invalid password. Must match {}".format(password_pattern), fg="red"))
+        click.echo(
+            click.style('sorry. The passwords must match {} '.format(password_pattern), fg='red'))
         return
 
     # generate password salt
@@ -62,87 +65,80 @@ def reset_password(email, new_password, password_confirm):
     account.password = base64_password_hashed
     account.password_salt = base64_salt
     db.session.commit()
-    click.echo(click.style("Password reset successfully.", fg="green"))
+    click.echo(click.style('Congratulations! Password has been reset.', fg='green'))
 
 
-@click.command("reset-email", help="Reset the account email.")
-@click.option("--email", prompt=True, help="Current account email")
-@click.option("--new-email", prompt=True, help="New email")
-@click.option("--email-confirm", prompt=True, help="Confirm new email")
+@click.command('reset-email', help='Reset the account email.')
+@click.option('--email', prompt=True, help='The old email address of the account whose email you need to reset')
+@click.option('--new-email', prompt=True, help='the new email.')
+@click.option('--email-confirm', prompt=True, help='the new email confirm.')
 def reset_email(email, new_email, email_confirm):
     """
     Replace account email
     :return:
     """
     if str(new_email).strip() != str(email_confirm).strip():
-        click.echo(click.style("New emails do not match.", fg="red"))
+        click.echo(click.style('Sorry, new email and confirm email do not match.', fg='red'))
         return
 
-    account = db.session.query(Account).filter(Account.email == email).one_or_none()
+    account = db.session.query(Account). \
+        filter(Account.email == email). \
+        one_or_none()
 
     if not account:
-        click.echo(click.style("Account not found for email: {}".format(email), fg="red"))
+        click.echo(click.style('sorry. the account: [{}] not exist .'.format(email), fg='red'))
         return
 
     try:
         email_validate(new_email)
     except:
-        click.echo(click.style("Invalid email: {}".format(new_email), fg="red"))
+        click.echo(
+            click.style('sorry. {} is not a valid email. '.format(email), fg='red'))
         return
 
     account.email = new_email
     db.session.commit()
-    click.echo(click.style("Email updated successfully.", fg="green"))
+    click.echo(click.style('Congratulations!, email has been reset.', fg='green'))
 
 
-@click.command(
-    "reset-encrypt-key-pair",
-    help="Reset the asymmetric key pair of workspace for encrypt LLM credentials. "
-    "After the reset, all LLM credentials will become invalid, "
-    "requiring re-entry."
-    "Only support SELF_HOSTED mode.",
-)
-@click.confirmation_option(
-    prompt=click.style(
-        "Are you sure you want to reset encrypt key pair? This operation cannot be rolled back!", fg="red"
-    )
-)
+@click.command('reset-encrypt-key-pair', help='Reset the asymmetric key pair of workspace for encrypt LLM credentials. '
+                                              'After the reset, all LLM credentials will become invalid, '
+                                              'requiring re-entry.'
+                                              'Only support SELF_HOSTED mode.')
+@click.confirmation_option(prompt=click.style('Are you sure you want to reset encrypt key pair?'
+                                              ' this operation cannot be rolled back!', fg='red'))
 def reset_encrypt_key_pair():
     """
     Reset the encrypted key pair of workspace for encrypt LLM credentials.
     After the reset, all LLM credentials will become invalid, requiring re-entry.
     Only support SELF_HOSTED mode.
     """
-    if dify_config.EDITION != "SELF_HOSTED":
-        click.echo(click.style("This command is only for SELF_HOSTED installations.", fg="red"))
+    if dify_config.EDITION != 'SELF_HOSTED':
+        click.echo(click.style('Sorry, only support SELF_HOSTED mode.', fg='red'))
         return
 
     tenants = db.session.query(Tenant).all()
     for tenant in tenants:
         if not tenant:
-            click.echo(click.style("No workspaces found. Run /install first.", fg="red"))
+            click.echo(click.style('Sorry, no workspace found. Please enter /install to initialize.', fg='red'))
             return
 
         tenant.encrypt_public_key = generate_key_pair(tenant.id)
 
-        db.session.query(Provider).filter(Provider.provider_type == "custom", Provider.tenant_id == tenant.id).delete()
+        db.session.query(Provider).filter(Provider.provider_type == 'custom', Provider.tenant_id == tenant.id).delete()
         db.session.query(ProviderModel).filter(ProviderModel.tenant_id == tenant.id).delete()
         db.session.commit()
 
-        click.echo(
-            click.style(
-                "Congratulations! The asymmetric key pair of workspace {} has been reset.".format(tenant.id),
-                fg="green",
-            )
-        )
+        click.echo(click.style('Congratulations! '
+                               'the asymmetric key pair of workspace {} has been reset.'.format(tenant.id), fg='green'))
 
 
-@click.command("vdb-migrate", help="Migrate vector db.")
-@click.option("--scope", default="all", prompt=False, help="The scope of vector database to migrate, Default is All.")
+@click.command('vdb-migrate', help='migrate vector db.')
+@click.option('--scope', default='all', prompt=False, help='The scope of vector database to migrate, Default is All.')
 def vdb_migrate(scope: str):
-    if scope in {"knowledge", "all"}:
+    if scope in ['knowledge', 'all']:
         migrate_knowledge_vector_database()
-    if scope in {"annotation", "all"}:
+    if scope in ['annotation', 'all']:
         migrate_annotation_vector_database()
 
 
@@ -150,7 +146,7 @@ def migrate_annotation_vector_database():
     """
     Migrate annotation datas to target vector database .
     """
-    click.echo(click.style("Starting annotation data migration.", fg="green"))
+    click.echo(click.style('Start migrate annotation data.', fg='green'))
     create_count = 0
     skipped_count = 0
     total_count = 0
@@ -158,215 +154,228 @@ def migrate_annotation_vector_database():
     while True:
         try:
             # get apps info
-            apps = (
-                db.session.query(App)
-                .filter(App.status == "normal")
-                .order_by(App.created_at.desc())
-                .paginate(page=page, per_page=50)
-            )
+            apps = db.session.query(App).filter(
+                App.status == 'normal'
+            ).order_by(App.created_at.desc()).paginate(page=page, per_page=50)
         except NotFound:
             break
 
         page += 1
         for app in apps:
             total_count = total_count + 1
-            click.echo(
-                f"Processing the {total_count} app {app.id}. " + f"{create_count} created, {skipped_count} skipped."
-            )
+            click.echo(f'Processing the {total_count} app {app.id}. '
+                       + f'{create_count} created, {skipped_count} skipped.')
             try:
-                click.echo("Creating app annotation index: {}".format(app.id))
-                app_annotation_setting = (
-                    db.session.query(AppAnnotationSetting).filter(AppAnnotationSetting.app_id == app.id).first()
-                )
+                click.echo('Create app annotation index: {}'.format(app.id))
+                app_annotation_setting = db.session.query(AppAnnotationSetting).filter(
+                    AppAnnotationSetting.app_id == app.id
+                ).first()
 
                 if not app_annotation_setting:
                     skipped_count = skipped_count + 1
-                    click.echo("App annotation setting disabled: {}".format(app.id))
+                    click.echo('App annotation setting is disabled: {}'.format(app.id))
                     continue
                 # get dataset_collection_binding info
-                dataset_collection_binding = (
-                    db.session.query(DatasetCollectionBinding)
-                    .filter(DatasetCollectionBinding.id == app_annotation_setting.collection_binding_id)
-                    .first()
-                )
+                dataset_collection_binding = db.session.query(DatasetCollectionBinding).filter(
+                    DatasetCollectionBinding.id == app_annotation_setting.collection_binding_id
+                ).first()
                 if not dataset_collection_binding:
-                    click.echo("App annotation collection binding not found: {}".format(app.id))
+                    click.echo('App annotation collection binding is not exist: {}'.format(app.id))
                     continue
                 annotations = db.session.query(MessageAnnotation).filter(MessageAnnotation.app_id == app.id).all()
                 dataset = Dataset(
                     id=app.id,
                     tenant_id=app.tenant_id,
-                    indexing_technique="high_quality",
+                    indexing_technique='high_quality',
                     embedding_model_provider=dataset_collection_binding.provider_name,
                     embedding_model=dataset_collection_binding.model_name,
-                    collection_binding_id=dataset_collection_binding.id,
+                    collection_binding_id=dataset_collection_binding.id
                 )
                 documents = []
                 if annotations:
                     for annotation in annotations:
                         document = Document(
                             page_content=annotation.question,
-                            metadata={"annotation_id": annotation.id, "app_id": app.id, "doc_id": annotation.id},
+                            metadata={
+                                "annotation_id": annotation.id,
+                                "app_id": app.id,
+                                "doc_id": annotation.id
+                            }
                         )
                         documents.append(document)
 
-                vector = Vector(dataset, attributes=["doc_id", "annotation_id", "app_id"])
-                click.echo(f"Migrating annotations for app: {app.id}.")
+                vector = Vector(dataset, attributes=['doc_id', 'annotation_id', 'app_id'])
+                click.echo(f"Start to migrate annotation, app_id: {app.id}.")
 
                 try:
                     vector.delete()
-                    click.echo(click.style(f"Deleted vector index for app {app.id}.", fg="green"))
+                    click.echo(
+                        click.style(f'Successfully delete vector index for app: {app.id}.',
+                                    fg='green'))
                 except Exception as e:
-                    click.echo(click.style(f"Failed to delete vector index for app {app.id}.", fg="red"))
+                    click.echo(
+                        click.style(f'Failed to delete vector index for app {app.id}.',
+                                    fg='red'))
                     raise e
                 if documents:
                     try:
-                        click.echo(
-                            click.style(
-                                f"Creating vector index with {len(documents)} annotations for app {app.id}.",
-                                fg="green",
-                            )
-                        )
+                        click.echo(click.style(
+                            f'Start to created vector index with {len(documents)} annotations for app {app.id}.',
+                            fg='green'))
                         vector.create(documents)
-                        click.echo(click.style(f"Created vector index for app {app.id}.", fg="green"))
+                        click.echo(
+                            click.style(f'Successfully created vector index for app {app.id}.', fg='green'))
                     except Exception as e:
-                        click.echo(click.style(f"Failed to created vector index for app {app.id}.", fg="red"))
+                        click.echo(click.style(f'Failed to created vector index for app {app.id}.', fg='red'))
                         raise e
-                click.echo(f"Successfully migrated app annotation {app.id}.")
+                click.echo(f'Successfully migrated app annotation {app.id}.')
                 create_count += 1
             except Exception as e:
                 click.echo(
-                    click.style(
-                        "Error creating app annotation index: {} {}".format(e.__class__.__name__, str(e)), fg="red"
-                    )
-                )
+                    click.style('Create app annotation index error: {} {}'.format(e.__class__.__name__, str(e)),
+                                fg='red'))
                 continue
 
     click.echo(
-        click.style(
-            f"Migration complete. Created {create_count} app annotation indexes. Skipped {skipped_count} apps.",
-            fg="green",
-        )
-    )
+        click.style(f'Congratulations! Create {create_count} app annotation indexes, and skipped {skipped_count} apps.',
+                    fg='green'))
 
 
 def migrate_knowledge_vector_database():
     """
     Migrate vector database datas to target vector database .
     """
-    click.echo(click.style("Starting vector database migration.", fg="green"))
+    click.echo(click.style('Start migrate vector db.', fg='green'))
     create_count = 0
     skipped_count = 0
     total_count = 0
     vector_type = dify_config.VECTOR_STORE
-    upper_colletion_vector_types = {
-        VectorType.MILVUS,
-        VectorType.PGVECTOR,
-        VectorType.RELYT,
-        VectorType.WEAVIATE,
-        VectorType.ORACLE,
-        VectorType.ELASTICSEARCH,
-    }
-    lower_colletion_vector_types = {
-        VectorType.ANALYTICDB,
-        VectorType.CHROMA,
-        VectorType.MYSCALE,
-        VectorType.PGVECTO_RS,
-        VectorType.TIDB_VECTOR,
-        VectorType.OPENSEARCH,
-        VectorType.TENCENT,
-        VectorType.BAIDU,
-        VectorType.VIKINGDB,
-        VectorType.UPSTASH,
-    }
     page = 1
     while True:
         try:
-            datasets = (
-                db.session.query(Dataset)
-                .filter(Dataset.indexing_technique == "high_quality")
-                .order_by(Dataset.created_at.desc())
-                .paginate(page=page, per_page=50)
-            )
+            datasets = db.session.query(Dataset).filter(Dataset.indexing_technique == 'high_quality') \
+                .order_by(Dataset.created_at.desc()).paginate(page=page, per_page=50)
         except NotFound:
             break
 
         page += 1
         for dataset in datasets:
             total_count = total_count + 1
-            click.echo(
-                f"Processing the {total_count} dataset {dataset.id}. {create_count} created, {skipped_count} skipped."
-            )
+            click.echo(f'Processing the {total_count} dataset {dataset.id}. '
+                       + f'{create_count} created, {skipped_count} skipped.')
             try:
-                click.echo("Creating dataset vector database index: {}".format(dataset.id))
+                click.echo('Create dataset vdb index: {}'.format(dataset.id))
                 if dataset.index_struct_dict:
-                    if dataset.index_struct_dict["type"] == vector_type:
+                    if dataset.index_struct_dict['type'] == vector_type:
                         skipped_count = skipped_count + 1
                         continue
-                collection_name = ""
-                dataset_id = dataset.id
-                if vector_type in upper_colletion_vector_types:
+                collection_name = ''
+                if vector_type == VectorType.WEAVIATE:
+                    dataset_id = dataset.id
                     collection_name = Dataset.gen_collection_name_by_id(dataset_id)
+                    index_struct_dict = {
+                        "type": VectorType.WEAVIATE,
+                        "vector_store": {"class_prefix": collection_name}
+                    }
+                    dataset.index_struct = json.dumps(index_struct_dict)
                 elif vector_type == VectorType.QDRANT:
                     if dataset.collection_binding_id:
-                        dataset_collection_binding = (
-                            db.session.query(DatasetCollectionBinding)
-                            .filter(DatasetCollectionBinding.id == dataset.collection_binding_id)
-                            .one_or_none()
-                        )
+                        dataset_collection_binding = db.session.query(DatasetCollectionBinding). \
+                            filter(DatasetCollectionBinding.id == dataset.collection_binding_id). \
+                            one_or_none()
                         if dataset_collection_binding:
                             collection_name = dataset_collection_binding.collection_name
                         else:
-                            raise ValueError("Dataset Collection Binding not found")
+                            raise ValueError('Dataset Collection Bindings is not exist!')
                     else:
+                        dataset_id = dataset.id
                         collection_name = Dataset.gen_collection_name_by_id(dataset_id)
+                    index_struct_dict = {
+                        "type": VectorType.QDRANT,
+                        "vector_store": {"class_prefix": collection_name}
+                    }
+                    dataset.index_struct = json.dumps(index_struct_dict)
 
-                elif vector_type in lower_colletion_vector_types:
-                    collection_name = Dataset.gen_collection_name_by_id(dataset_id).lower()
+                elif vector_type == VectorType.MILVUS:
+                    dataset_id = dataset.id
+                    collection_name = Dataset.gen_collection_name_by_id(dataset_id)
+                    index_struct_dict = {
+                        "type": VectorType.MILVUS,
+                        "vector_store": {"class_prefix": collection_name}
+                    }
+                    dataset.index_struct = json.dumps(index_struct_dict)
+                elif vector_type == VectorType.RELYT:
+                    dataset_id = dataset.id
+                    collection_name = Dataset.gen_collection_name_by_id(dataset_id)
+                    index_struct_dict = {
+                        "type": 'relyt',
+                        "vector_store": {"class_prefix": collection_name}
+                    }
+                    dataset.index_struct = json.dumps(index_struct_dict)
+                elif vector_type == VectorType.TENCENT:
+                    dataset_id = dataset.id
+                    collection_name = Dataset.gen_collection_name_by_id(dataset_id)
+                    index_struct_dict = {
+                        "type": VectorType.TENCENT,
+                        "vector_store": {"class_prefix": collection_name}
+                    }
+                    dataset.index_struct = json.dumps(index_struct_dict)
+                elif vector_type == VectorType.PGVECTOR:
+                    dataset_id = dataset.id
+                    collection_name = Dataset.gen_collection_name_by_id(dataset_id)
+                    index_struct_dict = {
+                        "type": VectorType.PGVECTOR,
+                        "vector_store": {"class_prefix": collection_name}
+                    }
+                    dataset.index_struct = json.dumps(index_struct_dict)
+                elif vector_type == VectorType.OPENSEARCH:
+                    dataset_id = dataset.id
+                    collection_name = Dataset.gen_collection_name_by_id(dataset_id)
+                    index_struct_dict = {
+                        "type": VectorType.OPENSEARCH,
+                        "vector_store": {"class_prefix": collection_name}
+                    }
+                    dataset.index_struct = json.dumps(index_struct_dict)
+                elif vector_type == VectorType.ANALYTICDB:
+                    dataset_id = dataset.id
+                    collection_name = Dataset.gen_collection_name_by_id(dataset_id)
+                    index_struct_dict = {
+                        "type": VectorType.ANALYTICDB,
+                        "vector_store": {"class_prefix": collection_name}
+                    }
+                    dataset.index_struct = json.dumps(index_struct_dict)
                 else:
                     raise ValueError(f"Vector store {vector_type} is not supported.")
 
-                index_struct_dict = {"type": vector_type, "vector_store": {"class_prefix": collection_name}}
-                dataset.index_struct = json.dumps(index_struct_dict)
                 vector = Vector(dataset)
-                click.echo(f"Migrating dataset {dataset.id}.")
+                click.echo(f"Start to migrate dataset {dataset.id}.")
 
                 try:
                     vector.delete()
                     click.echo(
-                        click.style(f"Deleted vector index {collection_name} for dataset {dataset.id}.", fg="green")
-                    )
+                        click.style(f'Successfully delete vector index {collection_name} for dataset {dataset.id}.',
+                                    fg='green'))
                 except Exception as e:
                     click.echo(
-                        click.style(
-                            f"Failed to delete vector index {collection_name} for dataset {dataset.id}.", fg="red"
-                        )
-                    )
+                        click.style(f'Failed to delete vector index {collection_name} for dataset {dataset.id}.',
+                                    fg='red'))
                     raise e
 
-                dataset_documents = (
-                    db.session.query(DatasetDocument)
-                    .filter(
-                        DatasetDocument.dataset_id == dataset.id,
-                        DatasetDocument.indexing_status == "completed",
-                        DatasetDocument.enabled == True,
-                        DatasetDocument.archived == False,
-                    )
-                    .all()
-                )
+                dataset_documents = db.session.query(DatasetDocument).filter(
+                    DatasetDocument.dataset_id == dataset.id,
+                    DatasetDocument.indexing_status == 'completed',
+                    DatasetDocument.enabled == True,
+                    DatasetDocument.archived == False,
+                ).all()
 
                 documents = []
                 segments_count = 0
                 for dataset_document in dataset_documents:
-                    segments = (
-                        db.session.query(DocumentSegment)
-                        .filter(
-                            DocumentSegment.document_id == dataset_document.id,
-                            DocumentSegment.status == "completed",
-                            DocumentSegment.enabled == True,
-                        )
-                        .all()
-                    )
+                    segments = db.session.query(DocumentSegment).filter(
+                        DocumentSegment.document_id == dataset_document.id,
+                        DocumentSegment.status == 'completed',
+                        DocumentSegment.enabled == True
+                    ).all()
 
                     for segment in segments:
                         document = Document(
@@ -376,7 +385,7 @@ def migrate_knowledge_vector_database():
                                 "doc_hash": segment.index_node_hash,
                                 "document_id": segment.document_id,
                                 "dataset_id": segment.dataset_id,
-                            },
+                            }
                         )
 
                         documents.append(document)
@@ -384,42 +393,37 @@ def migrate_knowledge_vector_database():
 
                 if documents:
                     try:
-                        click.echo(
-                            click.style(
-                                f"Creating vector index with {len(documents)} documents of {segments_count}"
-                                f" segments for dataset {dataset.id}.",
-                                fg="green",
-                            )
-                        )
+                        click.echo(click.style(
+                            f'Start to created vector index with {len(documents)} documents of {segments_count} segments for dataset {dataset.id}.',
+                            fg='green'))
                         vector.create(documents)
-                        click.echo(click.style(f"Created vector index for dataset {dataset.id}.", fg="green"))
+                        click.echo(
+                            click.style(f'Successfully created vector index for dataset {dataset.id}.', fg='green'))
                     except Exception as e:
-                        click.echo(click.style(f"Failed to created vector index for dataset {dataset.id}.", fg="red"))
+                        click.echo(click.style(f'Failed to created vector index for dataset {dataset.id}.', fg='red'))
                         raise e
                 db.session.add(dataset)
                 db.session.commit()
-                click.echo(f"Successfully migrated dataset {dataset.id}.")
+                click.echo(f'Successfully migrated dataset {dataset.id}.')
                 create_count += 1
             except Exception as e:
                 db.session.rollback()
                 click.echo(
-                    click.style("Error creating dataset index: {} {}".format(e.__class__.__name__, str(e)), fg="red")
-                )
+                    click.style('Create dataset index error: {} {}'.format(e.__class__.__name__, str(e)),
+                                fg='red'))
                 continue
 
     click.echo(
-        click.style(
-            f"Migration complete. Created {create_count} dataset indexes. Skipped {skipped_count} datasets.", fg="green"
-        )
-    )
+        click.style(f'Congratulations! Create {create_count} dataset indexes, and skipped {skipped_count} datasets.',
+                    fg='green'))
 
 
-@click.command("convert-to-agent-apps", help="Convert Agent Assistant to Agent App.")
+@click.command('convert-to-agent-apps', help='Convert Agent Assistant to Agent App.')
 def convert_to_agent_apps():
     """
     Convert Agent Assistant to Agent App.
     """
-    click.echo(click.style("Starting convert to agent apps.", fg="green"))
+    click.echo(click.style('Start convert to agent apps.', fg='green'))
 
     proceeded_app_ids = []
 
@@ -427,14 +431,14 @@ def convert_to_agent_apps():
         # fetch first 1000 apps
         sql_query = """SELECT a.id AS id FROM apps a
             INNER JOIN app_model_configs am ON a.app_model_config_id=am.id
-            WHERE a.mode = 'chat'
-            AND am.agent_mode is not null
+            WHERE a.mode = 'chat' 
+            AND am.agent_mode is not null 
             AND (
-				am.agent_mode like '%"strategy": "function_call"%'
+				am.agent_mode like '%"strategy": "function_call"%' 
                 OR am.agent_mode  like '%"strategy": "react"%'
-			)
+			) 
             AND (
-				am.agent_mode like '{"enabled": true%'
+				am.agent_mode like '{"enabled": true%' 
                 OR am.agent_mode like '{"max_iteration": %'
 			) ORDER BY a.created_at DESC LIMIT 1000
         """
@@ -454,7 +458,7 @@ def convert_to_agent_apps():
                 break
 
         for app in apps:
-            click.echo("Converting app: {}".format(app.id))
+            click.echo('Converting app: {}'.format(app.id))
 
             try:
                 app.mode = AppMode.AGENT_CHAT.value
@@ -466,140 +470,137 @@ def convert_to_agent_apps():
                 )
 
                 db.session.commit()
-                click.echo(click.style("Converted app: {}".format(app.id), fg="green"))
+                click.echo(click.style('Converted app: {}'.format(app.id), fg='green'))
             except Exception as e:
-                click.echo(click.style("Convert app error: {} {}".format(e.__class__.__name__, str(e)), fg="red"))
+                click.echo(
+                    click.style('Convert app error: {} {}'.format(e.__class__.__name__,
+                                                                  str(e)), fg='red'))
 
-    click.echo(click.style("Conversion complete. Converted {} agent apps.".format(len(proceeded_app_ids)), fg="green"))
+    click.echo(click.style('Congratulations! Converted {} agent apps.'.format(len(proceeded_app_ids)), fg='green'))
 
 
-@click.command("add-qdrant-doc-id-index", help="Add Qdrant doc_id index.")
-@click.option("--field", default="metadata.doc_id", prompt=False, help="Index field , default is metadata.doc_id.")
+@click.command('add-qdrant-doc-id-index', help='add qdrant doc_id index.')
+@click.option('--field', default='metadata.doc_id', prompt=False, help='index field , default is metadata.doc_id.')
 def add_qdrant_doc_id_index(field: str):
-    click.echo(click.style("Starting Qdrant doc_id index creation.", fg="green"))
+    click.echo(click.style('Start add qdrant doc_id index.', fg='green'))
     vector_type = dify_config.VECTOR_STORE
     if vector_type != "qdrant":
-        click.echo(click.style("This command only supports Qdrant vector store.", fg="red"))
+        click.echo(click.style('Sorry, only support qdrant vector store.', fg='red'))
         return
     create_count = 0
 
     try:
         bindings = db.session.query(DatasetCollectionBinding).all()
         if not bindings:
-            click.echo(click.style("No dataset collection bindings found.", fg="red"))
+            click.echo(click.style('Sorry, no dataset collection bindings found.', fg='red'))
             return
         import qdrant_client
         from qdrant_client.http.exceptions import UnexpectedResponse
         from qdrant_client.http.models import PayloadSchemaType
 
         from core.rag.datasource.vdb.qdrant.qdrant_vector import QdrantConfig
-
         for binding in bindings:
             if dify_config.QDRANT_URL is None:
-                raise ValueError("Qdrant URL is required.")
+                raise ValueError('Qdrant url is required.')
             qdrant_config = QdrantConfig(
                 endpoint=dify_config.QDRANT_URL,
                 api_key=dify_config.QDRANT_API_KEY,
                 root_path=current_app.root_path,
                 timeout=dify_config.QDRANT_CLIENT_TIMEOUT,
                 grpc_port=dify_config.QDRANT_GRPC_PORT,
-                prefer_grpc=dify_config.QDRANT_GRPC_ENABLED,
+                prefer_grpc=dify_config.QDRANT_GRPC_ENABLED
             )
             try:
                 client = qdrant_client.QdrantClient(**qdrant_config.to_qdrant_params())
                 # create payload index
-                client.create_payload_index(binding.collection_name, field, field_schema=PayloadSchemaType.KEYWORD)
+                client.create_payload_index(binding.collection_name, field,
+                                            field_schema=PayloadSchemaType.KEYWORD)
                 create_count += 1
             except UnexpectedResponse as e:
                 # Collection does not exist, so return
                 if e.status_code == 404:
-                    click.echo(click.style(f"Collection not found: {binding.collection_name}.", fg="red"))
+                    click.echo(click.style(f'Collection not found, collection_name:{binding.collection_name}.', fg='red'))
                     continue
                 # Some other error occurred, so re-raise the exception
                 else:
-                    click.echo(
-                        click.style(
-                            f"Failed to create Qdrant index for collection: {binding.collection_name}.", fg="red"
-                        )
-                    )
+                    click.echo(click.style(f'Failed to create qdrant index, collection_name:{binding.collection_name}.', fg='red'))
 
     except Exception as e:
-        click.echo(click.style("Failed to create Qdrant client.", fg="red"))
+        click.echo(click.style('Failed to create qdrant client.', fg='red'))
 
-    click.echo(click.style(f"Index creation complete. Created {create_count} collection indexes.", fg="green"))
+    click.echo(
+        click.style(f'Congratulations! Create {create_count} collection indexes.',
+                    fg='green'))
 
 
-@click.command("create-tenant", help="Create account and tenant.")
-@click.option("--email", prompt=True, help="Tenant account email.")
-@click.option("--name", prompt=True, help="Workspace name.")
-@click.option("--language", prompt=True, help="Account language, default: en-US.")
-def create_tenant(email: str, language: Optional[str] = None, name: Optional[str] = None):
+@click.command('create-tenant', help='Create account and tenant.')
+@click.option('--email', prompt=True, help='The email address of the tenant account.')
+@click.option('--language', prompt=True, help='Account language, default: en-US.')
+def create_tenant(email: str, language: Optional[str] = None):
     """
     Create tenant account
     """
     if not email:
-        click.echo(click.style("Email is required.", fg="red"))
+        click.echo(click.style('Sorry, email is required.', fg='red'))
         return
 
     # Create account
     email = email.strip()
 
-    if "@" not in email:
-        click.echo(click.style("Invalid email address.", fg="red"))
+    if '@' not in email:
+        click.echo(click.style('Sorry, invalid email address.', fg='red'))
         return
 
-    account_name = email.split("@")[0]
+    account_name = email.split('@')[0]
 
     if language not in languages:
-        language = "en-US"
-
-    name = name.strip()
+        language = 'en-US'
 
     # generate random password
     new_password = secrets.token_urlsafe(16)
 
     # register account
-    account = RegisterService.register(email=email, name=account_name, password=new_password, language=language)
-
-    TenantService.create_owner_tenant_if_not_exist(account, name)
-
-    click.echo(
-        click.style(
-            "Account and tenant created.\nAccount: {}\nPassword: {}".format(email, new_password),
-            fg="green",
-        )
+    account = RegisterService.register(
+        email=email,
+        name=account_name,
+        password=new_password,
+        language=language
     )
 
+    TenantService.create_owner_tenant_if_not_exist(account)
 
-@click.command("upgrade-db", help="Upgrade the database")
+    click.echo(click.style('Congratulations! Account and tenant created.\n'
+                           'Account: {}\nPassword: {}'.format(email, new_password), fg='green'))
+
+
+@click.command('upgrade-db', help='upgrade the database')
 def upgrade_db():
-    click.echo("Preparing database migration...")
-    lock = redis_client.lock(name="db_upgrade_lock", timeout=60)
+    click.echo('Preparing database migration...')
+    lock = redis_client.lock(name='db_upgrade_lock', timeout=60)
     if lock.acquire(blocking=False):
         try:
-            click.echo(click.style("Starting database migration.", fg="green"))
+            click.echo(click.style('Start database migration.', fg='green'))
 
             # run db migration
             import flask_migrate
-
             flask_migrate.upgrade()
 
-            click.echo(click.style("Database migration successful!", fg="green"))
+            click.echo(click.style('Database migration successful!', fg='green'))
 
         except Exception as e:
-            logging.exception(f"Database migration failed: {e}")
+            logging.exception(f'Database migration failed, error: {e}')
         finally:
             lock.release()
     else:
-        click.echo("Database migration skipped")
+        click.echo('Database migration skipped')
 
 
-@click.command("fix-app-site-missing", help="Fix app related site missing issue.")
+@click.command('fix-app-site-missing', help='Fix app related site missing issue.')
 def fix_app_site_missing():
     """
     Fix app related site missing issue.
     """
-    click.echo(click.style("Starting fix for missing app-related sites.", fg="green"))
+    click.echo(click.style('Start fix app related site missing issue.', fg='green'))
 
     failed_app_ids = []
     while True:
@@ -622,22 +623,23 @@ where sites.id is null limit 1000"""
                     if tenant:
                         accounts = tenant.get_accounts()
                         if not accounts:
-                            print("Fix failed for app {}".format(app.id))
+                            print("Fix app {} failed.".format(app.id))
                             continue
 
                         account = accounts[0]
-                        print("Fixing missing site for app {}".format(app.id))
+                        print("Fix app {} related site missing issue.".format(app.id))
                         app_was_created.send(app, account=account)
                 except Exception as e:
                     failed_app_ids.append(app_id)
-                    click.echo(click.style("Failed to fix missing site for app {}".format(app_id), fg="red"))
-                    logging.exception(f"Fix app related site missing issue failed, error: {e}")
+                    click.echo(click.style('Fix app {} related site missing issue failed!'.format(app_id), fg='red'))
+                    logging.exception(f'Fix app related site missing issue failed, error: {e}')
                     continue
 
             if not processed_count:
                 break
 
-    click.echo(click.style("Fix for missing app-related sites completed successfully!", fg="green"))
+
+    click.echo(click.style('Congratulations! Fix app related site missing issue successful!', fg='green'))
 
 
 def register_commands(app):

api/configs/__init__.py

@@ -1,3 +1,3 @@
 from .app_config import DifyConfig
 
-dify_config = DifyConfig()
+dify_config = DifyConfig()

api/configs/app_config.py

@@ -1,3 +1,4 @@
+from pydantic import Field, computed_field
 from pydantic_settings import SettingsConfigDict
 
 from configs.deploy import DeploymentConfig
@@ -11,28 +12,58 @@ from configs.packaging import PackagingInfo
 class DifyConfig(
     # Packaging info
     PackagingInfo,
+
     # Deployment configs
     DeploymentConfig,
+
     # Feature configs
     FeatureConfig,
+
     # Middleware configs
     MiddlewareConfig,
+
     # Extra service configs
     ExtraServiceConfig,
+
     # Enterprise feature configs
     # **Before using, please contact business@dify.ai by email to inquire about licensing matters.**
     EnterpriseFeatureConfig,
 ):
+    DEBUG: bool = Field(default=False, description='whether to enable debug mode.')
+
     model_config = SettingsConfigDict(
         # read from dotenv format config file
-        env_file=".env",
-        env_file_encoding="utf-8",
+        env_file='.env',
+        env_file_encoding='utf-8',
         frozen=True,
+
         # ignore extra attributes
-        extra="ignore",
+        extra='ignore',
     )
 
-    # Before adding any config,
-    # please consider to arrange it in the proper config group of existed or added
-    # for better readability and maintainability.
-    # Thanks for your concentration and consideration.
+    CODE_MAX_NUMBER: int = 9223372036854775807
+    CODE_MIN_NUMBER: int = -9223372036854775808
+    CODE_MAX_STRING_LENGTH: int = 80000
+    CODE_MAX_STRING_ARRAY_LENGTH: int = 30
+    CODE_MAX_OBJECT_ARRAY_LENGTH: int = 30
+    CODE_MAX_NUMBER_ARRAY_LENGTH: int = 1000
+
+    HTTP_REQUEST_MAX_CONNECT_TIMEOUT: int = 300
+    HTTP_REQUEST_MAX_READ_TIMEOUT: int = 600
+    HTTP_REQUEST_MAX_WRITE_TIMEOUT: int = 600
+    HTTP_REQUEST_NODE_MAX_BINARY_SIZE: int = 1024 * 1024 * 10
+
+    @computed_field
+    def HTTP_REQUEST_NODE_READABLE_MAX_BINARY_SIZE(self) -> str:
+        return f'{self.HTTP_REQUEST_NODE_MAX_BINARY_SIZE / 1024 / 1024:.2f}MB'
+
+    HTTP_REQUEST_NODE_MAX_TEXT_SIZE: int = 1024 * 1024
+
+    @computed_field
+    def HTTP_REQUEST_NODE_READABLE_MAX_TEXT_SIZE(self) -> str:
+        return f'{self.HTTP_REQUEST_NODE_MAX_TEXT_SIZE / 1024 / 1024:.2f}MB'
+
+    SSRF_PROXY_HTTP_URL: str | None = None
+    SSRF_PROXY_HTTPS_URL: str | None = None
+
+    MODERATION_BUFFER_SIZE: int = Field(default=300, description='The buffer size for moderation.')

api/configs/deploy/__init__.py

@@ -4,30 +4,24 @@ from pydantic_settings import BaseSettings
 
 class DeploymentConfig(BaseSettings):
     """
-    Configuration settings for application deployment
+    Deployment configs
     """
-
     APPLICATION_NAME: str = Field(
-        description="Name of the application, used for identification and logging purposes",
-        default="langgenius/dify",
-    )
-
-    DEBUG: bool = Field(
-        description="Enable debug mode for additional logging and development features",
-        default=False,
+        description='application name',
+        default='langgenius/dify',
     )
 
     TESTING: bool = Field(
-        description="Enable testing mode for running automated tests",
+        description='',
         default=False,
     )
 
     EDITION: str = Field(
-        description="Deployment edition of the application (e.g., 'SELF_HOSTED', 'CLOUD')",
-        default="SELF_HOSTED",
+        description='deployment edition',
+        default='SELF_HOSTED',
     )
 
     DEPLOY_ENV: str = Field(
-        description="Deployment environment (e.g., 'PRODUCTION', 'DEVELOPMENT'), default to PRODUCTION",
-        default="PRODUCTION",
+        description='deployment environment, default to PRODUCTION.',
+        default='PRODUCTION',
     )

api/configs/enterprise/__init__.py

@@ -4,17 +4,16 @@ from pydantic_settings import BaseSettings
 
 class EnterpriseFeatureConfig(BaseSettings):
     """
-    Configuration for enterprise-level features.
+    Enterprise feature configs.
     **Before using, please contact business@dify.ai by email to inquire about licensing matters.**
     """
-
     ENTERPRISE_ENABLED: bool = Field(
-        description="Enable or disable enterprise-level features."
-        "Before using, please contact business@dify.ai by email to inquire about licensing matters.",
+        description='whether to enable enterprise features.'
+                    'Before using, please contact business@dify.ai by email to inquire about licensing matters.',
         default=False,
     )
 
     CAN_REPLACE_LOGO: bool = Field(
-        description="Allow customization of the enterprise logo.",
+        description='whether to allow replacing enterprise logo.',
         default=False,
     )

api/configs/extra/notion_config.py

@@ -6,31 +6,29 @@ from pydantic_settings import BaseSettings
 
 class NotionConfig(BaseSettings):
     """
-    Configuration settings for Notion integration
+    Notion integration configs
     """
-
     NOTION_CLIENT_ID: Optional[str] = Field(
-        description="Client ID for Notion API authentication. Required for OAuth 2.0 flow.",
+        description='Notion client ID',
         default=None,
     )
 
     NOTION_CLIENT_SECRET: Optional[str] = Field(
-        description="Client secret for Notion API authentication. Required for OAuth 2.0 flow.",
+        description='Notion client secret key',
         default=None,
     )
 
     NOTION_INTEGRATION_TYPE: Optional[str] = Field(
-        description="Type of Notion integration."
-        " Set to 'internal' for internal integrations, or None for public integrations.",
+        description='Notion integration type, default to None, available values: internal.',
         default=None,
     )
 
     NOTION_INTERNAL_SECRET: Optional[str] = Field(
-        description="Secret key for internal Notion integrations. Required when NOTION_INTEGRATION_TYPE is 'internal'.",
+        description='Notion internal secret key',
         default=None,
     )
 
     NOTION_INTEGRATION_TOKEN: Optional[str] = Field(
-        description="Integration token for Notion API access. Used for direct API calls without OAuth flow.",
+        description='Notion integration token',
         default=None,
     )

api/configs/extra/sentry_config.py

@@ -6,23 +6,19 @@ from pydantic_settings import BaseSettings
 
 class SentryConfig(BaseSettings):
     """
-    Configuration settings for Sentry error tracking and performance monitoring
+    Sentry configs
     """
-
     SENTRY_DSN: Optional[str] = Field(
-        description="Sentry Data Source Name (DSN)."
-        " This is the unique identifier of your Sentry project, used to send events to the correct project.",
+        description='Sentry DSN',
         default=None,
     )
 
     SENTRY_TRACES_SAMPLE_RATE: NonNegativeFloat = Field(
-        description="Sample rate for Sentry performance monitoring traces."
-        " Value between 0.0 and 1.0, where 1.0 means 100% of traces are sent to Sentry.",
+        description='Sentry trace sample rate',
         default=1.0,
     )
 
     SENTRY_PROFILES_SAMPLE_RATE: NonNegativeFloat = Field(
-        description="Sample rate for Sentry profiling."
-        " Value between 0.0 and 1.0, where 1.0 means 100% of profiles are sent to Sentry.",
+        description='Sentry profiles sample rate',
         default=1.0,
     )

api/configs/feature/__init__.py

@@ -1,15 +1,6 @@
-from typing import Annotated, Literal, Optional
+from typing import Optional
 
-from pydantic import (
-    AliasChoices,
-    Field,
-    HttpUrl,
-    NegativeInt,
-    NonNegativeInt,
-    PositiveFloat,
-    PositiveInt,
-    computed_field,
-)
+from pydantic import AliasChoices, Field, NonNegativeInt, PositiveInt, computed_field
 from pydantic_settings import BaseSettings
 
 from configs.feature.hosted_service import HostedServiceConfig
@@ -17,684 +8,443 @@ from configs.feature.hosted_service import HostedServiceConfig
 
 class SecurityConfig(BaseSettings):
     """
-    Security-related configurations for the application
+    Secret Key configs
     """
-
-    SECRET_KEY: str = Field(
-        description="Secret key for secure session cookie signing."
-        "Make sure you are changing this key for your deployment with a strong key."
-        "Generate a strong key using `openssl rand -base64 42` or set via the `SECRET_KEY` environment variable.",
-        default="",
-    )
-
-    RESET_PASSWORD_TOKEN_EXPIRY_MINUTES: PositiveInt = Field(
-        description="Duration in minutes for which a password reset token remains valid",
-        default=5,
-    )
-
-    LOGIN_DISABLED: bool = Field(
-        description="Whether to disable login checks",
-        default=False,
-    )
-
-    ADMIN_API_KEY_ENABLE: bool = Field(
-        description="Whether to enable admin api key for authentication",
-        default=False,
-    )
-
-    ADMIN_API_KEY: Optional[str] = Field(
-        description="admin api key for authentication",
+    SECRET_KEY: Optional[str] = Field(
+        description='Your App secret key will be used for securely signing the session cookie'
+                    'Make sure you are changing this key for your deployment with a strong key.'
+                    'You can generate a strong key using `openssl rand -base64 42`.'
+                    'Alternatively you can set it with `SECRET_KEY` environment variable.',
         default=None,
     )
 
+    RESET_PASSWORD_TOKEN_EXPIRY_HOURS: PositiveInt = Field(
+        description='Expiry time in hours for reset token',
+        default=24,
+    )
+
 
 class AppExecutionConfig(BaseSettings):
     """
-    Configuration parameters for application execution
+    App Execution configs
     """
-
     APP_MAX_EXECUTION_TIME: PositiveInt = Field(
-        description="Maximum allowed execution time for the application in seconds",
+        description='execution timeout in seconds for app execution',
         default=1200,
     )
     APP_MAX_ACTIVE_REQUESTS: NonNegativeInt = Field(
-        description="Maximum number of concurrent active requests per app (0 for unlimited)",
+        description='max active request per app, 0 means unlimited',
         default=0,
     )
 
 
 class CodeExecutionSandboxConfig(BaseSettings):
     """
-    Configuration for the code execution sandbox environment
+    Code Execution Sandbox configs
     """
-
-    CODE_EXECUTION_ENDPOINT: HttpUrl = Field(
-        description="URL endpoint for the code execution service",
-        default="http://sandbox:8194",
+    CODE_EXECUTION_ENDPOINT: str = Field(
+        description='endpoint URL of code execution servcie',
+        default='http://sandbox:8194',
     )
 
     CODE_EXECUTION_API_KEY: str = Field(
-        description="API key for accessing the code execution service",
-        default="dify-sandbox",
-    )
-
-    CODE_EXECUTION_CONNECT_TIMEOUT: Optional[float] = Field(
-        description="Connection timeout in seconds for code execution requests",
-        default=10.0,
-    )
-
-    CODE_EXECUTION_READ_TIMEOUT: Optional[float] = Field(
-        description="Read timeout in seconds for code execution requests",
-        default=60.0,
-    )
-
-    CODE_EXECUTION_WRITE_TIMEOUT: Optional[float] = Field(
-        description="Write timeout in seconds for code execution request",
-        default=10.0,
-    )
-
-    CODE_MAX_NUMBER: PositiveInt = Field(
-        description="Maximum allowed numeric value in code execution",
-        default=9223372036854775807,
-    )
-
-    CODE_MIN_NUMBER: NegativeInt = Field(
-        description="Minimum allowed numeric value in code execution",
-        default=-9223372036854775807,
-    )
-
-    CODE_MAX_DEPTH: PositiveInt = Field(
-        description="Maximum allowed depth for nested structures in code execution",
-        default=5,
-    )
-
-    CODE_MAX_PRECISION: PositiveInt = Field(
-        description="mMaximum number of decimal places for floating-point numbers in code execution",
-        default=20,
-    )
-
-    CODE_MAX_STRING_LENGTH: PositiveInt = Field(
-        description="Maximum allowed length for strings in code execution",
-        default=80000,
-    )
-
-    CODE_MAX_STRING_ARRAY_LENGTH: PositiveInt = Field(
-        description="Maximum allowed length for string arrays in code execution",
-        default=30,
-    )
-
-    CODE_MAX_OBJECT_ARRAY_LENGTH: PositiveInt = Field(
-        description="Maximum allowed length for object arrays in code execution",
-        default=30,
-    )
-
-    CODE_MAX_NUMBER_ARRAY_LENGTH: PositiveInt = Field(
-        description="Maximum allowed length for numeric arrays in code execution",
-        default=1000,
+        description='API key for code execution service',
+        default='dify-sandbox',
     )
 
 
 class EndpointConfig(BaseSettings):
     """
-    Configuration for various application endpoints and URLs
+    Module URL configs
     """
-
     CONSOLE_API_URL: str = Field(
-        description="Base URL for the console API,"
-        "used for login authentication callback or notion integration callbacks",
-        default="",
+        description='The backend URL prefix of the console API.'
+                    'used to concatenate the login authorization callback or notion integration callback.',
+        default='',
     )
 
     CONSOLE_WEB_URL: str = Field(
-        description="Base URL for the console web interface," "used for frontend references and CORS configuration",
-        default="",
+        description='The front-end URL prefix of the console web.'
+                    'used to concatenate some front-end addresses and for CORS configuration use.',
+        default='',
     )
 
     SERVICE_API_URL: str = Field(
-        description="Base URL for the service API, displayed to users for API access",
-        default="",
+        description='Service API Url prefix.'
+                    'used to display Service API Base Url to the front-end.',
+        default='',
     )
 
     APP_WEB_URL: str = Field(
-        description="Base URL for the web application, used for frontend references",
-        default="",
+        description='WebApp Url prefix.'
+                    'used to display WebAPP API Base Url to the front-end.',
+        default='',
     )
 
 
 class FileAccessConfig(BaseSettings):
     """
-    Configuration for file access and handling
+    File Access configs
     """
-
     FILES_URL: str = Field(
-        description="Base URL for file preview or download,"
-        " used for frontend display and multi-model inputs"
-        "Url is signed and has expiration time.",
-        validation_alias=AliasChoices("FILES_URL", "CONSOLE_API_URL"),
+        description='File preview or download Url prefix.'
+                    ' used to display File preview or download Url to the front-end or as Multi-model inputs;'
+                    'Url is signed and has expiration time.',
+        validation_alias=AliasChoices('FILES_URL', 'CONSOLE_API_URL'),
         alias_priority=1,
-        default="",
+        default='',
     )
 
     FILES_ACCESS_TIMEOUT: int = Field(
-        description="Expiration time in seconds for file access URLs",
+        description='timeout in seconds for file accessing',
         default=300,
     )
 
 
 class FileUploadConfig(BaseSettings):
     """
-    Configuration for file upload limitations
+    File Uploading configs
     """
-
     UPLOAD_FILE_SIZE_LIMIT: NonNegativeInt = Field(
-        description="Maximum allowed file size for uploads in megabytes",
+        description='size limit in Megabytes for uploading files',
         default=15,
     )
 
     UPLOAD_FILE_BATCH_LIMIT: NonNegativeInt = Field(
-        description="Maximum number of files allowed in a single upload batch",
+        description='batch size limit for uploading files',
         default=5,
     )
 
     UPLOAD_IMAGE_FILE_SIZE_LIMIT: NonNegativeInt = Field(
-        description="Maximum allowed image file size for uploads in megabytes",
+        description='image file size limit in Megabytes for uploading files',
         default=10,
     )
 
-    UPLOAD_VIDEO_FILE_SIZE_LIMIT: NonNegativeInt = Field(
-        description="video file size limit in Megabytes for uploading files",
-        default=100,
-    )
-
-    UPLOAD_AUDIO_FILE_SIZE_LIMIT: NonNegativeInt = Field(
-        description="audio file size limit in Megabytes for uploading files",
-        default=50,
-    )
-
     BATCH_UPLOAD_LIMIT: NonNegativeInt = Field(
-        description="Maximum number of files allowed in a batch upload operation",
+        description='',  # todo: to be clarified
         default=20,
     )
 
 
 class HttpConfig(BaseSettings):
     """
-    HTTP-related configurations for the application
+    HTTP configs
     """
-
     API_COMPRESSION_ENABLED: bool = Field(
-        description="Enable or disable gzip compression for HTTP responses",
+        description='whether to enable HTTP response compression of gzip',
         default=False,
     )
 
     inner_CONSOLE_CORS_ALLOW_ORIGINS: str = Field(
-        description="Comma-separated list of allowed origins for CORS in the console",
-        validation_alias=AliasChoices("CONSOLE_CORS_ALLOW_ORIGINS", "CONSOLE_WEB_URL"),
-        default="",
+        description='',
+        validation_alias=AliasChoices('CONSOLE_CORS_ALLOW_ORIGINS', 'CONSOLE_WEB_URL'),
+        default='',
     )
 
     @computed_field
     @property
     def CONSOLE_CORS_ALLOW_ORIGINS(self) -> list[str]:
-        return self.inner_CONSOLE_CORS_ALLOW_ORIGINS.split(",")
+        return self.inner_CONSOLE_CORS_ALLOW_ORIGINS.split(',')
 
     inner_WEB_API_CORS_ALLOW_ORIGINS: str = Field(
-        description="",
-        validation_alias=AliasChoices("WEB_API_CORS_ALLOW_ORIGINS"),
-        default="*",
+        description='',
+        validation_alias=AliasChoices('WEB_API_CORS_ALLOW_ORIGINS'),
+        default='*',
     )
 
     @computed_field
     @property
     def WEB_API_CORS_ALLOW_ORIGINS(self) -> list[str]:
-        return self.inner_WEB_API_CORS_ALLOW_ORIGINS.split(",")
-
-    HTTP_REQUEST_MAX_CONNECT_TIMEOUT: Annotated[
-        PositiveInt, Field(ge=10, description="Maximum connection timeout in seconds for HTTP requests")
-    ] = 10
-
-    HTTP_REQUEST_MAX_READ_TIMEOUT: Annotated[
-        PositiveInt, Field(ge=60, description="Maximum read timeout in seconds for HTTP requests")
-    ] = 60
-
-    HTTP_REQUEST_MAX_WRITE_TIMEOUT: Annotated[
-        PositiveInt, Field(ge=10, description="Maximum write timeout in seconds for HTTP requests")
-    ] = 20
-
-    HTTP_REQUEST_NODE_MAX_BINARY_SIZE: PositiveInt = Field(
-        description="Maximum allowed size in bytes for binary data in HTTP requests",
-        default=10 * 1024 * 1024,
-    )
-
-    HTTP_REQUEST_NODE_MAX_TEXT_SIZE: PositiveInt = Field(
-        description="Maximum allowed size in bytes for text data in HTTP requests",
-        default=1 * 1024 * 1024,
-    )
-
-    SSRF_PROXY_HTTP_URL: Optional[str] = Field(
-        description="Proxy URL for HTTP requests to prevent Server-Side Request Forgery (SSRF)",
-        default=None,
-    )
-
-    SSRF_PROXY_HTTPS_URL: Optional[str] = Field(
-        description="Proxy URL for HTTPS requests to prevent Server-Side Request Forgery (SSRF)",
-        default=None,
-    )
-
-    RESPECT_XFORWARD_HEADERS_ENABLED: bool = Field(
-        description="Enable or disable the X-Forwarded-For Proxy Fix middleware from Werkzeug"
-        " to respect X-* headers to redirect clients",
-        default=False,
-    )
+        return self.inner_WEB_API_CORS_ALLOW_ORIGINS.split(',')
 
 
 class InnerAPIConfig(BaseSettings):
     """
-    Configuration for internal API functionality
+    Inner API configs
     """
-
     INNER_API: bool = Field(
-        description="Enable or disable the internal API",
+        description='whether to enable the inner API',
         default=False,
     )
 
     INNER_API_KEY: Optional[str] = Field(
-        description="API key for accessing the internal API",
+        description='The inner API key is used to authenticate the inner API',
         default=None,
     )
 
 
 class LoggingConfig(BaseSettings):
     """
-    Configuration for application logging
+    Logging configs
     """
 
     LOG_LEVEL: str = Field(
-        description="Logging level, default to INFO. Set to ERROR for production environments.",
-        default="INFO",
+        description='Log output level, default to INFO.'
+                    'It is recommended to set it to ERROR for production.',
+        default='INFO',
     )
 
     LOG_FILE: Optional[str] = Field(
-        description="File path for log output.",
+        description='logging output file path',
         default=None,
     )
 
-    LOG_FILE_MAX_SIZE: PositiveInt = Field(
-        description="Maximum file size for file rotation retention, the unit is megabytes (MB)",
-        default=20,
-    )
-
-    LOG_FILE_BACKUP_COUNT: PositiveInt = Field(
-        description="Maximum file backup count file rotation retention",
-        default=5,
-    )
-
     LOG_FORMAT: str = Field(
-        description="Format string for log messages",
-        default="%(asctime)s.%(msecs)03d %(levelname)s [%(threadName)s] [%(filename)s:%(lineno)d] - %(message)s",
+        description='log format',
+        default='%(asctime)s.%(msecs)03d %(levelname)s [%(threadName)s] [%(filename)s:%(lineno)d] - %(message)s',
     )
 
     LOG_DATEFORMAT: Optional[str] = Field(
-        description="Date format string for log timestamps",
+        description='log date format',
         default=None,
     )
 
     LOG_TZ: Optional[str] = Field(
-        description="Timezone for log timestamps (e.g., 'America/New_York')",
+        description='specify log timezone, eg: America/New_York',
         default=None,
     )
 
 
 class ModelLoadBalanceConfig(BaseSettings):
     """
-    Configuration for model load balancing
+    Model load balance configs
     """
-
     MODEL_LB_ENABLED: bool = Field(
-        description="Enable or disable load balancing for models",
+        description='whether to enable model load balancing',
         default=False,
     )
 
 
 class BillingConfig(BaseSettings):
     """
-    Configuration for platform billing features
+    Platform Billing Configurations
     """
-
     BILLING_ENABLED: bool = Field(
-        description="Enable or disable billing functionality",
+        description='whether to enable billing',
         default=False,
     )
 
 
 class UpdateConfig(BaseSettings):
     """
-    Configuration for application update checks
+    Update configs
     """
-
     CHECK_UPDATE_URL: str = Field(
-        description="URL to check for application updates",
-        default="https://updates.dify.ai",
+        description='url for checking updates',
+        default='https://updates.dify.ai',
     )
 
 
 class WorkflowConfig(BaseSettings):
     """
-    Configuration for workflow execution
+    Workflow feature configs
     """
 
     WORKFLOW_MAX_EXECUTION_STEPS: PositiveInt = Field(
-        description="Maximum number of steps allowed in a single workflow execution",
+        description='max execution steps in single workflow execution',
         default=500,
     )
 
     WORKFLOW_MAX_EXECUTION_TIME: PositiveInt = Field(
-        description="Maximum execution time in seconds for a single workflow",
+        description='max execution time in seconds in single workflow execution',
         default=1200,
     )
 
     WORKFLOW_CALL_MAX_DEPTH: PositiveInt = Field(
-        description="Maximum allowed depth for nested workflow calls",
+        description='max depth of calling in single workflow execution',
         default=5,
     )
 
-    MAX_VARIABLE_SIZE: PositiveInt = Field(
-        description="Maximum size in bytes for a single variable in workflows. Default to 200 KB.",
-        default=200 * 1024,
-    )
 
-
-class AuthConfig(BaseSettings):
+class OAuthConfig(BaseSettings):
     """
-    Configuration for authentication and OAuth
+    oauth configs
     """
-
     OAUTH_REDIRECT_PATH: str = Field(
-        description="Redirect path for OAuth authentication callbacks",
-        default="/console/api/oauth/authorize",
+        description='redirect path for OAuth',
+        default='/console/api/oauth/authorize',
     )
 
     GITHUB_CLIENT_ID: Optional[str] = Field(
-        description="GitHub OAuth client ID",
+        description='GitHub client id for OAuth',
         default=None,
     )
 
     GITHUB_CLIENT_SECRET: Optional[str] = Field(
-        description="GitHub OAuth client secret",
+        description='GitHub client secret key for OAuth',
         default=None,
     )
 
     GOOGLE_CLIENT_ID: Optional[str] = Field(
-        description="Google OAuth client ID",
+        description='Google client id for OAuth',
         default=None,
     )
 
     GOOGLE_CLIENT_SECRET: Optional[str] = Field(
-        description="Google OAuth client secret",
+        description='Google client secret key for OAuth',
         default=None,
     )
 
-    ACCESS_TOKEN_EXPIRE_MINUTES: PositiveInt = Field(
-        description="Expiration time for access tokens in minutes",
-        default=60,
-    )
-
 
 class ModerationConfig(BaseSettings):
     """
-    Configuration for content moderation
+    Moderation in app configs.
     """
 
-    MODERATION_BUFFER_SIZE: PositiveInt = Field(
-        description="Size of the buffer for content moderation processing",
+    # todo: to be clarified in usage and unit
+    OUTPUT_MODERATION_BUFFER_SIZE: PositiveInt = Field(
+        description='buffer size for moderation',
         default=300,
     )
 
 
 class ToolConfig(BaseSettings):
     """
-    Configuration for tool management
+    Tool configs
     """
 
     TOOL_ICON_CACHE_MAX_AGE: PositiveInt = Field(
-        description="Maximum age in seconds for caching tool icons",
+        description='max age in seconds for tool icon caching',
         default=3600,
     )
 
 
 class MailConfig(BaseSettings):
     """
-    Configuration for email services
+    Mail Configurations
     """
 
     MAIL_TYPE: Optional[str] = Field(
-        description="Email service provider type ('smtp' or 'resend'), default to None.",
+        description='Mail provider type name, default to None, availabile values are `smtp` and `resend`.',
         default=None,
     )
 
     MAIL_DEFAULT_SEND_FROM: Optional[str] = Field(
-        description="Default email address to use as the sender",
+        description='default email address for sending from ',
         default=None,
     )
 
     RESEND_API_KEY: Optional[str] = Field(
-        description="API key for Resend email service",
+        description='API key for Resend',
         default=None,
     )
 
     RESEND_API_URL: Optional[str] = Field(
-        description="API URL for Resend email service",
+        description='API URL for Resend',
         default=None,
     )
 
     SMTP_SERVER: Optional[str] = Field(
-        description="SMTP server hostname",
+        description='smtp server host',
         default=None,
     )
 
     SMTP_PORT: Optional[int] = Field(
-        description="SMTP server port number",
+        description='smtp server port',
         default=465,
     )
 
     SMTP_USERNAME: Optional[str] = Field(
-        description="Username for SMTP authentication",
+        description='smtp server username',
         default=None,
     )
 
     SMTP_PASSWORD: Optional[str] = Field(
-        description="Password for SMTP authentication",
+        description='smtp server password',
         default=None,
     )
 
     SMTP_USE_TLS: bool = Field(
-        description="Enable TLS encryption for SMTP connections",
+        description='whether to use TLS connection to smtp server',
         default=False,
     )
 
     SMTP_OPPORTUNISTIC_TLS: bool = Field(
-        description="Enable opportunistic TLS for SMTP connections",
+        description='whether to use opportunistic TLS connection to smtp server',
         default=False,
     )
 
-    EMAIL_SEND_IP_LIMIT_PER_MINUTE: PositiveInt = Field(
-        description="Maximum number of emails allowed to be sent from the same IP address in a minute",
-        default=50,
-    )
-
 
 class RagEtlConfig(BaseSettings):
     """
-    Configuration for RAG ETL processes
+    RAG ETL Configurations.
     """
 
-    # TODO: This config is not only for rag etl, it is also for file upload, we should move it to file upload config
     ETL_TYPE: str = Field(
-        description="RAG ETL type ('dify' or 'Unstructured'), default to 'dify'",
-        default="dify",
+        description='RAG ETL type name, default to `dify`, available values are `dify` and `Unstructured`. ',
+        default='dify',
     )
 
     KEYWORD_DATA_SOURCE_TYPE: str = Field(
-        description="Data source type for keyword extraction"
-        " ('database' or other supported types), default to 'database'",
-        default="database",
+        description='source type for keyword data, default to `database`, available values are `database` .',
+        default='database',
     )
 
     UNSTRUCTURED_API_URL: Optional[str] = Field(
-        description="API URL for Unstructured.io service",
+        description='API URL for Unstructured',
         default=None,
     )
 
     UNSTRUCTURED_API_KEY: Optional[str] = Field(
-        description="API key for Unstructured.io service",
+        description='API key for Unstructured',
         default=None,
     )
 
 
 class DataSetConfig(BaseSettings):
     """
-    Configuration for dataset management
+    Dataset configs
     """
 
-    PLAN_SANDBOX_CLEAN_DAY_SETTING: PositiveInt = Field(
-        description="Interval in days for dataset cleanup operations - plan: sandbox",
+    CLEAN_DAY_SETTING: PositiveInt = Field(
+        description='interval in days for cleaning up dataset',
         default=30,
     )
 
-    PLAN_PRO_CLEAN_DAY_SETTING: PositiveInt = Field(
-        description="Interval in days for dataset cleanup operations - plan: pro and team",
-        default=7,
-    )
-
     DATASET_OPERATOR_ENABLED: bool = Field(
-        description="Enable or disable dataset operator functionality",
+        description='whether to enable dataset operator',
         default=False,
     )
 
-
 class WorkspaceConfig(BaseSettings):
     """
-    Configuration for workspace management
+    Workspace configs
     """
 
     INVITE_EXPIRY_HOURS: PositiveInt = Field(
-        description="Expiration time in hours for workspace invitation links",
+        description='workspaces invitation expiration in hours',
         default=72,
     )
 
 
 class IndexingConfig(BaseSettings):
     """
-    Configuration for indexing operations
+    Indexing configs.
     """
 
     INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: PositiveInt = Field(
-        description="Maximum token length for text segmentation during indexing",
+        description='max segmentation token length for indexing',
         default=1000,
     )
 
 
 class ImageFormatConfig(BaseSettings):
-    MULTIMODAL_SEND_IMAGE_FORMAT: Literal["base64", "url"] = Field(
-        description="Format for sending images in multimodal contexts ('base64' or 'url'), default is base64",
-        default="base64",
+    MULTIMODAL_SEND_IMAGE_FORMAT: str = Field(
+        description='multi model send image format, support base64, url, default is base64',
+        default='base64',
     )
 
 
 class CeleryBeatConfig(BaseSettings):
     CELERY_BEAT_SCHEDULER_TIME: int = Field(
-        description="Interval in days for Celery Beat scheduler execution, default to 1 day",
+        description='the time of the celery scheduler, default to 1 day',
         default=1,
     )
 
 
-class PositionConfig(BaseSettings):
-    POSITION_PROVIDER_PINS: str = Field(
-        description="Comma-separated list of pinned model providers",
-        default="",
-    )
-
-    POSITION_PROVIDER_INCLUDES: str = Field(
-        description="Comma-separated list of included model providers",
-        default="",
-    )
-
-    POSITION_PROVIDER_EXCLUDES: str = Field(
-        description="Comma-separated list of excluded model providers",
-        default="",
-    )
-
-    POSITION_TOOL_PINS: str = Field(
-        description="Comma-separated list of pinned tools",
-        default="",
-    )
-
-    POSITION_TOOL_INCLUDES: str = Field(
-        description="Comma-separated list of included tools",
-        default="",
-    )
-
-    POSITION_TOOL_EXCLUDES: str = Field(
-        description="Comma-separated list of excluded tools",
-        default="",
-    )
-
-    @computed_field
-    def POSITION_PROVIDER_PINS_LIST(self) -> list[str]:
-        return [item.strip() for item in self.POSITION_PROVIDER_PINS.split(",") if item.strip() != ""]
-
-    @computed_field
-    def POSITION_PROVIDER_INCLUDES_SET(self) -> set[str]:
-        return {item.strip() for item in self.POSITION_PROVIDER_INCLUDES.split(",") if item.strip() != ""}
-
-    @computed_field
-    def POSITION_PROVIDER_EXCLUDES_SET(self) -> set[str]:
-        return {item.strip() for item in self.POSITION_PROVIDER_EXCLUDES.split(",") if item.strip() != ""}
-
-    @computed_field
-    def POSITION_TOOL_PINS_LIST(self) -> list[str]:
-        return [item.strip() for item in self.POSITION_TOOL_PINS.split(",") if item.strip() != ""]
-
-    @computed_field
-    def POSITION_TOOL_INCLUDES_SET(self) -> set[str]:
-        return {item.strip() for item in self.POSITION_TOOL_INCLUDES.split(",") if item.strip() != ""}
-
-    @computed_field
-    def POSITION_TOOL_EXCLUDES_SET(self) -> set[str]:
-        return {item.strip() for item in self.POSITION_TOOL_EXCLUDES.split(",") if item.strip() != ""}
-
-
-class LoginConfig(BaseSettings):
-    ENABLE_EMAIL_CODE_LOGIN: bool = Field(
-        description="whether to enable email code login",
-        default=False,
-    )
-    ENABLE_EMAIL_PASSWORD_LOGIN: bool = Field(
-        description="whether to enable email password login",
-        default=True,
-    )
-    ENABLE_SOCIAL_OAUTH_LOGIN: bool = Field(
-        description="whether to enable github/google oauth login",
-        default=False,
-    )
-    EMAIL_CODE_LOGIN_TOKEN_EXPIRY_MINUTES: PositiveInt = Field(
-        description="expiry time in minutes for email code login token",
-        default=5,
-    )
-    ALLOW_REGISTER: bool = Field(
-        description="whether to enable register",
-        default=False,
-    )
-    ALLOW_CREATE_WORKSPACE: bool = Field(
-        description="whether to enable create workspace",
-        default=False,
-    )
-
-
 class FeatureConfig(
     # place the configs in alphabet order
     AppExecutionConfig,
-    AuthConfig,  # Changed from OAuthConfig to AuthConfig
     BillingConfig,
     CodeExecutionSandboxConfig,
     DataSetConfig,
@@ -709,14 +459,14 @@ class FeatureConfig(
     MailConfig,
     ModelLoadBalanceConfig,
     ModerationConfig,
-    PositionConfig,
+    OAuthConfig,
     RagEtlConfig,
     SecurityConfig,
     ToolConfig,
     UpdateConfig,
     WorkflowConfig,
     WorkspaceConfig,
-    LoginConfig,
+
     # hosted services config
     HostedServiceConfig,
     CeleryBeatConfig,

api/configs/feature/hosted_service/__init__.py

@@ -6,188 +6,190 @@ from pydantic_settings import BaseSettings
 
 class HostedOpenAiConfig(BaseSettings):
     """
-    Configuration for hosted OpenAI service
+    Hosted OpenAI service config
     """
 
     HOSTED_OPENAI_API_KEY: Optional[str] = Field(
-        description="API key for hosted OpenAI service",
+        description='',
         default=None,
     )
 
     HOSTED_OPENAI_API_BASE: Optional[str] = Field(
-        description="Base URL for hosted OpenAI API",
+        description='',
         default=None,
     )
 
     HOSTED_OPENAI_API_ORGANIZATION: Optional[str] = Field(
-        description="Organization ID for hosted OpenAI service",
+        description='',
         default=None,
     )
 
     HOSTED_OPENAI_TRIAL_ENABLED: bool = Field(
-        description="Enable trial access to hosted OpenAI service",
+        description='',
         default=False,
     )
 
     HOSTED_OPENAI_TRIAL_MODELS: str = Field(
-        description="Comma-separated list of available models for trial access",
-        default="gpt-3.5-turbo,"
-        "gpt-3.5-turbo-1106,"
-        "gpt-3.5-turbo-instruct,"
-        "gpt-3.5-turbo-16k,"
-        "gpt-3.5-turbo-16k-0613,"
-        "gpt-3.5-turbo-0613,"
-        "gpt-3.5-turbo-0125,"
-        "text-davinci-003",
+        description='',
+        default='gpt-3.5-turbo,'
+                'gpt-3.5-turbo-1106,'
+                'gpt-3.5-turbo-instruct,'
+                'gpt-3.5-turbo-16k,'
+                'gpt-3.5-turbo-16k-0613,'
+                'gpt-3.5-turbo-0613,'
+                'gpt-3.5-turbo-0125,'
+                'text-davinci-003',
     )
 
     HOSTED_OPENAI_QUOTA_LIMIT: NonNegativeInt = Field(
-        description="Quota limit for hosted OpenAI service usage",
+        description='',
         default=200,
     )
 
     HOSTED_OPENAI_PAID_ENABLED: bool = Field(
-        description="Enable paid access to hosted OpenAI service",
+        description='',
         default=False,
     )
 
     HOSTED_OPENAI_PAID_MODELS: str = Field(
-        description="Comma-separated list of available models for paid access",
-        default="gpt-4,"
-        "gpt-4-turbo-preview,"
-        "gpt-4-turbo-2024-04-09,"
-        "gpt-4-1106-preview,"
-        "gpt-4-0125-preview,"
-        "gpt-3.5-turbo,"
-        "gpt-3.5-turbo-16k,"
-        "gpt-3.5-turbo-16k-0613,"
-        "gpt-3.5-turbo-1106,"
-        "gpt-3.5-turbo-0613,"
-        "gpt-3.5-turbo-0125,"
-        "gpt-3.5-turbo-instruct,"
-        "text-davinci-003",
+        description='',
+        default='gpt-4,'
+                'gpt-4-turbo-preview,'
+                'gpt-4-turbo-2024-04-09,'
+                'gpt-4-1106-preview,'
+                'gpt-4-0125-preview,'
+                'gpt-3.5-turbo,'
+                'gpt-3.5-turbo-16k,'
+                'gpt-3.5-turbo-16k-0613,'
+                'gpt-3.5-turbo-1106,'
+                'gpt-3.5-turbo-0613,'
+                'gpt-3.5-turbo-0125,'
+                'gpt-3.5-turbo-instruct,'
+                'text-davinci-003',
     )
 
 
 class HostedAzureOpenAiConfig(BaseSettings):
     """
-    Configuration for hosted Azure OpenAI service
+    Hosted OpenAI service config
     """
 
     HOSTED_AZURE_OPENAI_ENABLED: bool = Field(
-        description="Enable hosted Azure OpenAI service",
+        description='',
         default=False,
     )
 
     HOSTED_AZURE_OPENAI_API_KEY: Optional[str] = Field(
-        description="API key for hosted Azure OpenAI service",
+        description='',
         default=None,
     )
 
     HOSTED_AZURE_OPENAI_API_BASE: Optional[str] = Field(
-        description="Base URL for hosted Azure OpenAI API",
+        description='',
         default=None,
     )
 
     HOSTED_AZURE_OPENAI_QUOTA_LIMIT: NonNegativeInt = Field(
-        description="Quota limit for hosted Azure OpenAI service usage",
+        description='',
         default=200,
     )
 
 
 class HostedAnthropicConfig(BaseSettings):
     """
-    Configuration for hosted Anthropic service
+    Hosted Azure OpenAI service config
     """
 
     HOSTED_ANTHROPIC_API_BASE: Optional[str] = Field(
-        description="Base URL for hosted Anthropic API",
+        description='',
         default=None,
     )
 
     HOSTED_ANTHROPIC_API_KEY: Optional[str] = Field(
-        description="API key for hosted Anthropic service",
+        description='',
         default=None,
     )
 
     HOSTED_ANTHROPIC_TRIAL_ENABLED: bool = Field(
-        description="Enable trial access to hosted Anthropic service",
+        description='',
         default=False,
     )
 
     HOSTED_ANTHROPIC_QUOTA_LIMIT: NonNegativeInt = Field(
-        description="Quota limit for hosted Anthropic service usage",
+        description='',
         default=600000,
     )
 
     HOSTED_ANTHROPIC_PAID_ENABLED: bool = Field(
-        description="Enable paid access to hosted Anthropic service",
+        description='',
         default=False,
     )
 
 
 class HostedMinmaxConfig(BaseSettings):
     """
-    Configuration for hosted Minmax service
+    Hosted Minmax service config
     """
 
     HOSTED_MINIMAX_ENABLED: bool = Field(
-        description="Enable hosted Minmax service",
+        description='',
         default=False,
     )
 
 
 class HostedSparkConfig(BaseSettings):
     """
-    Configuration for hosted Spark service
+    Hosted Spark service config
     """
 
     HOSTED_SPARK_ENABLED: bool = Field(
-        description="Enable hosted Spark service",
+        description='',
         default=False,
     )
 
 
 class HostedZhipuAIConfig(BaseSettings):
     """
-    Configuration for hosted ZhipuAI service
+    Hosted Minmax service config
     """
 
     HOSTED_ZHIPUAI_ENABLED: bool = Field(
-        description="Enable hosted ZhipuAI service",
+        description='',
         default=False,
     )
 
 
 class HostedModerationConfig(BaseSettings):
     """
-    Configuration for hosted Moderation service
+    Hosted Moderation service config
     """
 
     HOSTED_MODERATION_ENABLED: bool = Field(
-        description="Enable hosted Moderation service",
+        description='',
         default=False,
     )
 
     HOSTED_MODERATION_PROVIDERS: str = Field(
-        description="Comma-separated list of moderation providers",
-        default="",
+        description='',
+        default='',
     )
 
 
 class HostedFetchAppTemplateConfig(BaseSettings):
     """
-    Configuration for fetching app templates
+    Hosted Moderation service config
     """
 
     HOSTED_FETCH_APP_TEMPLATES_MODE: str = Field(
-        description="Mode for fetching app templates: remote, db, or builtin" " default to remote,",
-        default="remote",
+        description='the mode for fetching app templates,'
+                    ' default to remote,'
+                    ' available values: remote, db, builtin',
+        default='remote',
     )
 
     HOSTED_FETCH_APP_TEMPLATES_REMOTE_DOMAIN: str = Field(
-        description="Domain for fetching remote app templates",
-        default="https://tmpl.dify.ai",
+        description='the domain for fetching remote app templates',
+        default='https://tmpl.dify.ai',
     )
 
 
@@ -200,6 +202,7 @@ class HostedServiceConfig(
     HostedOpenAiConfig,
     HostedSparkConfig,
     HostedZhipuAIConfig,
+
     # moderation
     HostedModerationConfig,
 ):

api/configs/middleware/__init__.py

@@ -1,23 +1,18 @@
 from typing import Any, Optional
 from urllib.parse import quote_plus
 
-from pydantic import Field, NonNegativeInt, PositiveFloat, PositiveInt, computed_field
+from pydantic import Field, NonNegativeInt, PositiveInt, computed_field
 from pydantic_settings import BaseSettings
 
 from configs.middleware.cache.redis_config import RedisConfig
 from configs.middleware.storage.aliyun_oss_storage_config import AliyunOSSStorageConfig
 from configs.middleware.storage.amazon_s3_storage_config import S3StorageConfig
 from configs.middleware.storage.azure_blob_storage_config import AzureBlobStorageConfig
-from configs.middleware.storage.baidu_obs_storage_config import BaiduOBSStorageConfig
 from configs.middleware.storage.google_cloud_storage_config import GoogleCloudStorageConfig
-from configs.middleware.storage.huawei_obs_storage_config import HuaweiCloudOBSStorageConfig
 from configs.middleware.storage.oci_storage_config import OCIStorageConfig
-from configs.middleware.storage.supabase_storage_config import SupabaseStorageConfig
 from configs.middleware.storage.tencent_cos_storage_config import TencentCloudCOSStorageConfig
-from configs.middleware.storage.volcengine_tos_storage_config import VolcengineTOSStorageConfig
 from configs.middleware.vdb.analyticdb_config import AnalyticdbConfig
 from configs.middleware.vdb.chroma_config import ChromaConfig
-from configs.middleware.vdb.elasticsearch_config import ElasticsearchConfig
 from configs.middleware.vdb.milvus_config import MilvusConfig
 from configs.middleware.vdb.myscale_config import MyScaleConfig
 from configs.middleware.vdb.opensearch_config import OpenSearchConfig
@@ -28,117 +23,113 @@ from configs.middleware.vdb.qdrant_config import QdrantConfig
 from configs.middleware.vdb.relyt_config import RelytConfig
 from configs.middleware.vdb.tencent_vector_config import TencentVectorDBConfig
 from configs.middleware.vdb.tidb_vector_config import TiDBVectorConfig
-from configs.middleware.vdb.upstash_config import UpstashConfig
-from configs.middleware.vdb.vikingdb_config import VikingDBConfig
 from configs.middleware.vdb.weaviate_config import WeaviateConfig
 
 
 class StorageConfig(BaseSettings):
     STORAGE_TYPE: str = Field(
-        description="Type of storage to use."
-        " Options: 'local', 's3', 'aliyun-oss', 'azure-blob', 'baidu-obs', 'google-storage', 'huawei-obs', "
-        "'oci-storage', 'tencent-cos', 'volcengine-tos', 'supabase'. Default is 'local'.",
-        default="local",
+        description='storage type,'
+                    ' default to `local`,'
+                    ' available values are `local`, `s3`, `azure-blob`, `aliyun-oss`, `google-storage`.',
+        default='local',
     )
 
     STORAGE_LOCAL_PATH: str = Field(
-        description="Path for local storage when STORAGE_TYPE is set to 'local'.",
-        default="storage",
+        description='local storage path',
+        default='storage',
     )
 
 
 class VectorStoreConfig(BaseSettings):
     VECTOR_STORE: Optional[str] = Field(
-        description="Type of vector store to use for efficient similarity search."
-        " Set to None if not using a vector store.",
+        description='vector store type',
         default=None,
     )
 
 
 class KeywordStoreConfig(BaseSettings):
     KEYWORD_STORE: str = Field(
-        description="Method for keyword extraction and storage."
-        " Default is 'jieba', a Chinese text segmentation library.",
-        default="jieba",
+        description='keyword store type',
+        default='jieba',
     )
 
 
 class DatabaseConfig:
     DB_HOST: str = Field(
-        description="Hostname or IP address of the database server.",
-        default="localhost",
+        description='db host',
+        default='localhost',
     )
 
     DB_PORT: PositiveInt = Field(
-        description="Port number for database connection.",
+        description='db port',
         default=5432,
     )
 
     DB_USERNAME: str = Field(
-        description="Username for database authentication.",
-        default="postgres",
+        description='db username',
+        default='postgres',
     )
 
     DB_PASSWORD: str = Field(
-        description="Password for database authentication.",
-        default="",
+        description='db password',
+        default='',
     )
 
     DB_DATABASE: str = Field(
-        description="Name of the database to connect to.",
-        default="dify",
+        description='db database',
+        default='dify',
     )
 
     DB_CHARSET: str = Field(
-        description="Character set for database connection.",
-        default="",
+        description='db charset',
+        default='',
     )
 
     DB_EXTRAS: str = Field(
-        description="Additional database connection parameters. Example: 'keepalives_idle=60&keepalives=1'",
-        default="",
+        description='db extras options. Example: keepalives_idle=60&keepalives=1',
+        default='',
     )
 
     SQLALCHEMY_DATABASE_URI_SCHEME: str = Field(
-        description="Database URI scheme for SQLAlchemy connection.",
-        default="postgresql",
+        description='db uri scheme',
+        default='postgresql',
     )
 
     @computed_field
     @property
     def SQLALCHEMY_DATABASE_URI(self) -> str:
         db_extras = (
-            f"{self.DB_EXTRAS}&client_encoding={self.DB_CHARSET}" if self.DB_CHARSET else self.DB_EXTRAS
+            f"{self.DB_EXTRAS}&client_encoding={self.DB_CHARSET}"
+            if self.DB_CHARSET
+            else self.DB_EXTRAS
         ).strip("&")
         db_extras = f"?{db_extras}" if db_extras else ""
-        return (
-            f"{self.SQLALCHEMY_DATABASE_URI_SCHEME}://"
-            f"{quote_plus(self.DB_USERNAME)}:{quote_plus(self.DB_PASSWORD)}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_DATABASE}"
-            f"{db_extras}"
-        )
+        return (f"{self.SQLALCHEMY_DATABASE_URI_SCHEME}://"
+                f"{quote_plus(self.DB_USERNAME)}:{quote_plus(self.DB_PASSWORD)}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_DATABASE}" 
+                f"{db_extras}")
 
     SQLALCHEMY_POOL_SIZE: NonNegativeInt = Field(
-        description="Maximum number of database connections in the pool.",
+        description='pool size of SqlAlchemy',
         default=30,
     )
 
     SQLALCHEMY_MAX_OVERFLOW: NonNegativeInt = Field(
-        description="Maximum number of connections that can be created beyond the pool_size.",
+        description='max overflows for SqlAlchemy',
         default=10,
     )
 
     SQLALCHEMY_POOL_RECYCLE: NonNegativeInt = Field(
-        description="Number of seconds after which a connection is automatically recycled.",
+        description='SqlAlchemy pool recycle',
         default=3600,
     )
 
     SQLALCHEMY_POOL_PRE_PING: bool = Field(
-        description="If True, enables connection pool pre-ping feature to check connections.",
+        description='whether to enable pool pre-ping in SqlAlchemy',
         default=False,
     )
 
     SQLALCHEMY_ECHO: bool | str = Field(
-        description="If True, SQLAlchemy will log all SQL statements.",
+        description='whether to enable SqlAlchemy echo',
         default=False,
     )
 
@@ -146,69 +137,35 @@ class DatabaseConfig:
     @property
     def SQLALCHEMY_ENGINE_OPTIONS(self) -> dict[str, Any]:
         return {
-            "pool_size": self.SQLALCHEMY_POOL_SIZE,
-            "max_overflow": self.SQLALCHEMY_MAX_OVERFLOW,
-            "pool_recycle": self.SQLALCHEMY_POOL_RECYCLE,
-            "pool_pre_ping": self.SQLALCHEMY_POOL_PRE_PING,
-            "connect_args": {"options": "-c timezone=UTC"},
+            'pool_size': self.SQLALCHEMY_POOL_SIZE,
+            'max_overflow': self.SQLALCHEMY_MAX_OVERFLOW,
+            'pool_recycle': self.SQLALCHEMY_POOL_RECYCLE,
+            'pool_pre_ping': self.SQLALCHEMY_POOL_PRE_PING,
+            'connect_args': {'options': '-c timezone=UTC'},
         }
 
 
 class CeleryConfig(DatabaseConfig):
     CELERY_BACKEND: str = Field(
-        description="Backend for Celery task results. Options: 'database', 'redis'.",
-        default="database",
+        description='Celery backend, available values are `database`, `redis`',
+        default='database',
     )
 
     CELERY_BROKER_URL: Optional[str] = Field(
-        description="URL of the message broker for Celery tasks.",
+        description='CELERY_BROKER_URL',
         default=None,
     )
 
-    CELERY_USE_SENTINEL: Optional[bool] = Field(
-        description="Whether to use Redis Sentinel for high availability.",
-        default=False,
-    )
-
-    CELERY_SENTINEL_MASTER_NAME: Optional[str] = Field(
-        description="Name of the Redis Sentinel master.",
-        default=None,
-    )
-
-    CELERY_SENTINEL_SOCKET_TIMEOUT: Optional[PositiveFloat] = Field(
-        description="Timeout for Redis Sentinel socket operations in seconds.",
-        default=0.1,
-    )
-
     @computed_field
     @property
     def CELERY_RESULT_BACKEND(self) -> str | None:
-        return (
-            "db+{}".format(self.SQLALCHEMY_DATABASE_URI)
-            if self.CELERY_BACKEND == "database"
-            else self.CELERY_BROKER_URL
-        )
+        return 'db+{}'.format(self.SQLALCHEMY_DATABASE_URI) \
+            if self.CELERY_BACKEND == 'database' else self.CELERY_BROKER_URL
 
     @computed_field
     @property
     def BROKER_USE_SSL(self) -> bool:
-        return self.CELERY_BROKER_URL.startswith("rediss://") if self.CELERY_BROKER_URL else False
-
-
-class InternalTestConfig(BaseSettings):
-    """
-    Configuration settings for Internal Test
-    """
-
-    AWS_SECRET_ACCESS_KEY: Optional[str] = Field(
-        description="Internal test AWS secret access key",
-        default=None,
-    )
-
-    AWS_ACCESS_KEY_ID: Optional[str] = Field(
-        description="Internal test AWS access key ID",
-        default=None,
-    )
+        return self.CELERY_BROKER_URL.startswith('rediss://') if self.CELERY_BROKER_URL else False
 
 
 class MiddlewareConfig(
@@ -217,18 +174,16 @@ class MiddlewareConfig(
     DatabaseConfig,
     KeywordStoreConfig,
     RedisConfig,
+
     # configs of storage and storage providers
     StorageConfig,
     AliyunOSSStorageConfig,
     AzureBlobStorageConfig,
-    BaiduOBSStorageConfig,
     GoogleCloudStorageConfig,
-    HuaweiCloudOBSStorageConfig,
-    OCIStorageConfig,
-    S3StorageConfig,
-    SupabaseStorageConfig,
     TencentCloudCOSStorageConfig,
-    VolcengineTOSStorageConfig,
+    S3StorageConfig,
+    OCIStorageConfig,
+
     # configs of vdb and vdb providers
     VectorStoreConfig,
     AnalyticdbConfig,
@@ -244,9 +199,5 @@ class MiddlewareConfig(
     TencentVectorDBConfig,
     TiDBVectorConfig,
     WeaviateConfig,
-    ElasticsearchConfig,
-    InternalTestConfig,
-    VikingDBConfig,
-    UpstashConfig,
 ):
     pass

api/configs/middleware/cache/redis_config.py

@@ -1,70 +1,39 @@
 from typing import Optional
 
-from pydantic import Field, NonNegativeInt, PositiveFloat, PositiveInt
+from pydantic import Field, NonNegativeInt, PositiveInt
 from pydantic_settings import BaseSettings
 
 
 class RedisConfig(BaseSettings):
     """
-    Configuration settings for Redis connection
+    Redis configs
     """
-
     REDIS_HOST: str = Field(
-        description="Hostname or IP address of the Redis server",
-        default="localhost",
+        description='Redis host',
+        default='localhost',
     )
 
     REDIS_PORT: PositiveInt = Field(
-        description="Port number on which the Redis server is listening",
+        description='Redis port',
         default=6379,
     )
 
     REDIS_USERNAME: Optional[str] = Field(
-        description="Username for Redis authentication (if required)",
+        description='Redis username',
         default=None,
     )
 
     REDIS_PASSWORD: Optional[str] = Field(
-        description="Password for Redis authentication (if required)",
+        description='Redis password',
         default=None,
     )
 
     REDIS_DB: NonNegativeInt = Field(
-        description="Redis database number to use (0-15)",
+        description='Redis database id, default to 0',
         default=0,
     )
 
     REDIS_USE_SSL: bool = Field(
-        description="Enable SSL/TLS for the Redis connection",
+        description='whether to use SSL for Redis connection',
         default=False,
     )
-
-    REDIS_USE_SENTINEL: Optional[bool] = Field(
-        description="Enable Redis Sentinel mode for high availability",
-        default=False,
-    )
-
-    REDIS_SENTINELS: Optional[str] = Field(
-        description="Comma-separated list of Redis Sentinel nodes (host:port)",
-        default=None,
-    )
-
-    REDIS_SENTINEL_SERVICE_NAME: Optional[str] = Field(
-        description="Name of the Redis Sentinel service to monitor",
-        default=None,
-    )
-
-    REDIS_SENTINEL_USERNAME: Optional[str] = Field(
-        description="Username for Redis Sentinel authentication (if required)",
-        default=None,
-    )
-
-    REDIS_SENTINEL_PASSWORD: Optional[str] = Field(
-        description="Password for Redis Sentinel authentication (if required)",
-        default=None,
-    )
-
-    REDIS_SENTINEL_SOCKET_TIMEOUT: Optional[PositiveFloat] = Field(
-        description="Socket timeout in seconds for Redis Sentinel connections",
-        default=0.1,
-    )

api/configs/middleware/storage/aliyun_oss_storage_config.py

@@ -6,40 +6,35 @@ from pydantic_settings import BaseSettings
 
 class AliyunOSSStorageConfig(BaseSettings):
     """
-    Configuration settings for Aliyun Object Storage Service (OSS)
+    Aliyun storage configs
     """
 
     ALIYUN_OSS_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the Aliyun OSS bucket to store and retrieve objects",
+        description='Aliyun OSS bucket name',
         default=None,
     )
 
     ALIYUN_OSS_ACCESS_KEY: Optional[str] = Field(
-        description="Access key ID for authenticating with Aliyun OSS",
+        description='Aliyun OSS access key',
         default=None,
     )
 
     ALIYUN_OSS_SECRET_KEY: Optional[str] = Field(
-        description="Secret access key for authenticating with Aliyun OSS",
+        description='Aliyun OSS secret key',
         default=None,
     )
 
     ALIYUN_OSS_ENDPOINT: Optional[str] = Field(
-        description="URL of the Aliyun OSS endpoint for your chosen region",
+        description='Aliyun OSS endpoint URL',
         default=None,
     )
 
     ALIYUN_OSS_REGION: Optional[str] = Field(
-        description="Aliyun OSS region where your bucket is located (e.g., 'oss-cn-hangzhou')",
+        description='Aliyun OSS region',
         default=None,
     )
 
     ALIYUN_OSS_AUTH_VERSION: Optional[str] = Field(
-        description="Version of the authentication protocol to use with Aliyun OSS (e.g., 'v4')",
-        default=None,
-    )
-
-    ALIYUN_OSS_PATH: Optional[str] = Field(
-        description="Base path within the bucket to store objects (e.g., 'my-app-data/')",
+        description='Aliyun OSS authentication version',
         default=None,
     )

api/configs/middleware/storage/amazon_s3_storage_config.py

@@ -6,40 +6,40 @@ from pydantic_settings import BaseSettings
 
 class S3StorageConfig(BaseSettings):
     """
-    Configuration settings for S3-compatible object storage
+    S3 storage configs
     """
 
     S3_ENDPOINT: Optional[str] = Field(
-        description="URL of the S3-compatible storage endpoint (e.g., 'https://s3.amazonaws.com')",
+        description='S3 storage endpoint',
         default=None,
     )
 
     S3_REGION: Optional[str] = Field(
-        description="Region where the S3 bucket is located (e.g., 'us-east-1')",
+        description='S3 storage region',
         default=None,
     )
 
     S3_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the S3 bucket to store and retrieve objects",
+        description='S3 storage bucket name',
         default=None,
     )
 
     S3_ACCESS_KEY: Optional[str] = Field(
-        description="Access key ID for authenticating with the S3 service",
+        description='S3 storage access key',
         default=None,
     )
 
     S3_SECRET_KEY: Optional[str] = Field(
-        description="Secret access key for authenticating with the S3 service",
+        description='S3 storage secret key',
         default=None,
     )
 
     S3_ADDRESS_STYLE: str = Field(
-        description="S3 addressing style: 'auto', 'path', or 'virtual'",
-        default="auto",
+        description='S3 storage address style',
+        default='auto',
     )
 
     S3_USE_AWS_MANAGED_IAM: bool = Field(
-        description="Use AWS managed IAM roles for authentication instead of access/secret keys",
+        description='whether to use aws managed IAM for S3',
         default=False,
     )

api/configs/middleware/storage/azure_blob_storage_config.py

@@ -6,25 +6,25 @@ from pydantic_settings import BaseSettings
 
 class AzureBlobStorageConfig(BaseSettings):
     """
-    Configuration settings for Azure Blob Storage
+    Azure Blob storage configs
     """
 
     AZURE_BLOB_ACCOUNT_NAME: Optional[str] = Field(
-        description="Name of the Azure Storage account (e.g., 'mystorageaccount')",
+        description='Azure Blob account name',
         default=None,
     )
 
     AZURE_BLOB_ACCOUNT_KEY: Optional[str] = Field(
-        description="Access key for authenticating with the Azure Storage account",
+        description='Azure Blob account key',
         default=None,
     )
 
     AZURE_BLOB_CONTAINER_NAME: Optional[str] = Field(
-        description="Name of the Azure Blob container to store and retrieve objects",
+        description='Azure Blob container name',
         default=None,
     )
 
     AZURE_BLOB_ACCOUNT_URL: Optional[str] = Field(
-        description="URL of the Azure Blob storage endpoint (e.g., 'https://mystorageaccount.blob.core.windows.net')",
+        description='Azure Blob account URL',
         default=None,
     )

api/configs/middleware/storage/baidu_obs_storage_config.py

@@ -1,29 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-
-class BaiduOBSStorageConfig(BaseModel):
-    """
-    Configuration settings for Baidu Object Storage Service (OBS)
-    """
-
-    BAIDU_OBS_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the Baidu OBS bucket to store and retrieve objects (e.g., 'my-obs-bucket')",
-        default=None,
-    )
-
-    BAIDU_OBS_ACCESS_KEY: Optional[str] = Field(
-        description="Access Key ID for authenticating with Baidu OBS",
-        default=None,
-    )
-
-    BAIDU_OBS_SECRET_KEY: Optional[str] = Field(
-        description="Secret Access Key for authenticating with Baidu OBS",
-        default=None,
-    )
-
-    BAIDU_OBS_ENDPOINT: Optional[str] = Field(
-        description="URL of the Baidu OSS endpoint for your chosen region (e.g., 'https://.bj.bcebos.com')",
-        default=None,
-    )

api/configs/middleware/storage/google_cloud_storage_config.py

@@ -6,15 +6,15 @@ from pydantic_settings import BaseSettings
 
 class GoogleCloudStorageConfig(BaseSettings):
     """
-    Configuration settings for Google Cloud Storage
+    Google Cloud storage configs
     """
 
     GOOGLE_STORAGE_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the Google Cloud Storage bucket to store and retrieve objects (e.g., 'my-gcs-bucket')",
+        description='Google Cloud storage bucket name',
         default=None,
     )
 
     GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64: Optional[str] = Field(
-        description="Base64-encoded JSON key file for Google Cloud service account authentication",
+        description='Google Cloud storage service account json base64',
         default=None,
     )

api/configs/middleware/storage/huawei_obs_storage_config.py

@@ -1,29 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-
-class HuaweiCloudOBSStorageConfig(BaseModel):
-    """
-    Configuration settings for Huawei Cloud Object Storage Service (OBS)
-    """
-
-    HUAWEI_OBS_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the Huawei Cloud OBS bucket to store and retrieve objects (e.g., 'my-obs-bucket')",
-        default=None,
-    )
-
-    HUAWEI_OBS_ACCESS_KEY: Optional[str] = Field(
-        description="Access Key ID for authenticating with Huawei Cloud OBS",
-        default=None,
-    )
-
-    HUAWEI_OBS_SECRET_KEY: Optional[str] = Field(
-        description="Secret Access Key for authenticating with Huawei Cloud OBS",
-        default=None,
-    )
-
-    HUAWEI_OBS_SERVER: Optional[str] = Field(
-        description="Endpoint URL for Huawei Cloud OBS (e.g., 'https://obs.cn-north-4.myhuaweicloud.com')",
-        default=None,
-    )

api/configs/middleware/storage/oci_storage_config.py

@@ -6,30 +6,31 @@ from pydantic_settings import BaseSettings
 
 class OCIStorageConfig(BaseSettings):
     """
-    Configuration settings for Oracle Cloud Infrastructure (OCI) Object Storage
+    OCI storage configs
     """
 
     OCI_ENDPOINT: Optional[str] = Field(
-        description="URL of the OCI Object Storage endpoint (e.g., 'https://objectstorage.us-phoenix-1.oraclecloud.com')",
+        description='OCI storage endpoint',
         default=None,
     )
 
     OCI_REGION: Optional[str] = Field(
-        description="OCI region where the bucket is located (e.g., 'us-phoenix-1')",
+        description='OCI storage region',
         default=None,
     )
 
     OCI_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the OCI Object Storage bucket to store and retrieve objects (e.g., 'my-oci-bucket')",
+        description='OCI storage bucket name',
         default=None,
     )
 
     OCI_ACCESS_KEY: Optional[str] = Field(
-        description="Access key (also known as API key) for authenticating with OCI Object Storage",
+        description='OCI storage access key',
         default=None,
     )
 
     OCI_SECRET_KEY: Optional[str] = Field(
-        description="Secret key associated with the access key for authenticating with OCI Object Storage",
+        description='OCI storage secret key',
         default=None,
     )
+

api/configs/middleware/storage/supabase_storage_config.py

@@ -1,24 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-
-class SupabaseStorageConfig(BaseModel):
-    """
-    Configuration settings for Supabase Object Storage Service
-    """
-
-    SUPABASE_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the Supabase bucket to store and retrieve objects (e.g., 'dify-bucket')",
-        default=None,
-    )
-
-    SUPABASE_API_KEY: Optional[str] = Field(
-        description="API KEY for authenticating with Supabase",
-        default=None,
-    )
-
-    SUPABASE_URL: Optional[str] = Field(
-        description="URL of the Supabase",
-        default=None,
-    )

api/configs/middleware/storage/tencent_cos_storage_config.py

@@ -6,30 +6,30 @@ from pydantic_settings import BaseSettings
 
 class TencentCloudCOSStorageConfig(BaseSettings):
     """
-    Configuration settings for Tencent Cloud Object Storage (COS)
+    Tencent Cloud COS storage configs
     """
 
     TENCENT_COS_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the Tencent Cloud COS bucket to store and retrieve objects",
+        description='Tencent Cloud COS bucket name',
         default=None,
     )
 
     TENCENT_COS_REGION: Optional[str] = Field(
-        description="Tencent Cloud region where the COS bucket is located (e.g., 'ap-guangzhou')",
+        description='Tencent Cloud COS region',
         default=None,
     )
 
     TENCENT_COS_SECRET_ID: Optional[str] = Field(
-        description="SecretId for authenticating with Tencent Cloud COS (part of API credentials)",
+        description='Tencent Cloud COS secret id',
         default=None,
     )
 
     TENCENT_COS_SECRET_KEY: Optional[str] = Field(
-        description="SecretKey for authenticating with Tencent Cloud COS (part of API credentials)",
+        description='Tencent Cloud COS secret key',
         default=None,
     )
 
     TENCENT_COS_SCHEME: Optional[str] = Field(
-        description="Protocol scheme for COS requests: 'https' (recommended) or 'http'",
+        description='Tencent Cloud COS scheme',
         default=None,
     )

api/configs/middleware/storage/volcengine_tos_storage_config.py

@@ -1,34 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-
-class VolcengineTOSStorageConfig(BaseModel):
-    """
-    Configuration settings for Volcengine Tinder Object Storage (TOS)
-    """
-
-    VOLCENGINE_TOS_BUCKET_NAME: Optional[str] = Field(
-        description="Name of the Volcengine TOS bucket to store and retrieve objects (e.g., 'my-tos-bucket')",
-        default=None,
-    )
-
-    VOLCENGINE_TOS_ACCESS_KEY: Optional[str] = Field(
-        description="Access Key ID for authenticating with Volcengine TOS",
-        default=None,
-    )
-
-    VOLCENGINE_TOS_SECRET_KEY: Optional[str] = Field(
-        description="Secret Access Key for authenticating with Volcengine TOS",
-        default=None,
-    )
-
-    VOLCENGINE_TOS_ENDPOINT: Optional[str] = Field(
-        description="URL of the Volcengine TOS endpoint (e.g., 'https://tos-cn-beijing.volces.com')",
-        default=None,
-    )
-
-    VOLCENGINE_TOS_REGION: Optional[str] = Field(
-        description="Volcengine region where the TOS bucket is located (e.g., 'cn-beijing')",
-        default=None,
-    )

api/configs/middleware/vdb/analyticdb_config.py

@@ -5,38 +5,40 @@ from pydantic import BaseModel, Field
 
 class AnalyticdbConfig(BaseModel):
     """
-    Configuration for connecting to Alibaba Cloud AnalyticDB for PostgreSQL.
+    Configuration for connecting to AnalyticDB.
     Refer to the following documentation for details on obtaining credentials:
     https://www.alibabacloud.com/help/en/analyticdb-for-postgresql/getting-started/create-an-instance-instances-with-vector-engine-optimization-enabled
     """
 
-    ANALYTICDB_KEY_ID: Optional[str] = Field(
-        default=None, description="The Access Key ID provided by Alibaba Cloud for API authentication."
-    )
-    ANALYTICDB_KEY_SECRET: Optional[str] = Field(
-        default=None, description="The Secret Access Key corresponding to the Access Key ID for secure API access."
-    )
-    ANALYTICDB_REGION_ID: Optional[str] = Field(
+    ANALYTICDB_KEY_ID : Optional[str] = Field(
         default=None,
-        description="The region where the AnalyticDB instance is deployed (e.g., 'cn-hangzhou', 'ap-southeast-1').",
+        description="The Access Key ID provided by Alibaba Cloud for authentication."
     )
-    ANALYTICDB_INSTANCE_ID: Optional[str] = Field(
+    ANALYTICDB_KEY_SECRET : Optional[str] = Field(
         default=None,
-        description="The unique identifier of the AnalyticDB instance you want to connect to.",
+        description="The Secret Access Key corresponding to the Access Key ID for secure access."
     )
-    ANALYTICDB_ACCOUNT: Optional[str] = Field(
+    ANALYTICDB_REGION_ID : Optional[str] = Field(
         default=None,
-        description="The account name used to log in to the AnalyticDB instance"
-        " (usually the initial account created with the instance).",
+        description="The region where the AnalyticDB instance is deployed (e.g., 'cn-hangzhou')."
     )
-    ANALYTICDB_PASSWORD: Optional[str] = Field(
-        default=None, description="The password associated with the AnalyticDB account for database authentication."
-    )
-    ANALYTICDB_NAMESPACE: Optional[str] = Field(
-        default=None, description="The namespace within AnalyticDB for schema isolation (if using namespace feature)."
-    )
-    ANALYTICDB_NAMESPACE_PASSWORD: Optional[str] = Field(
+    ANALYTICDB_INSTANCE_ID : Optional[str] = Field(
         default=None,
-        description="The password for accessing the specified namespace within the AnalyticDB instance"
-        " (if namespace feature is enabled).",
+        description="The unique identifier of the AnalyticDB instance you want to connect to (e.g., 'gp-ab123456').."
+    )
+    ANALYTICDB_ACCOUNT : Optional[str] = Field(
+        default=None,
+        description="The account name used to log in to the AnalyticDB instance."
+    )
+    ANALYTICDB_PASSWORD : Optional[str] = Field(
+        default=None,
+        description="The password associated with the AnalyticDB account for authentication."
+    )
+    ANALYTICDB_NAMESPACE : Optional[str] = Field(
+        default=None,
+        description="The namespace within AnalyticDB for schema isolation."
+    )
+    ANALYTICDB_NAMESPACE_PASSWORD : Optional[str] = Field(
+        default=None,
+        description="The password for accessing the specified namespace within the AnalyticDB instance."
     )

api/configs/middleware/vdb/baidu_vector_config.py

@@ -1,45 +0,0 @@
-from typing import Optional
-
-from pydantic import Field, NonNegativeInt, PositiveInt
-from pydantic_settings import BaseSettings
-
-
-class BaiduVectorDBConfig(BaseSettings):
-    """
-    Configuration settings for Baidu Vector Database
-    """
-
-    BAIDU_VECTOR_DB_ENDPOINT: Optional[str] = Field(
-        description="URL of the Baidu Vector Database service (e.g., 'http://vdb.bj.baidubce.com')",
-        default=None,
-    )
-
-    BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS: PositiveInt = Field(
-        description="Timeout in milliseconds for Baidu Vector Database operations (default is 30000 milliseconds)",
-        default=30000,
-    )
-
-    BAIDU_VECTOR_DB_ACCOUNT: Optional[str] = Field(
-        description="Account for authenticating with the Baidu Vector Database",
-        default=None,
-    )
-
-    BAIDU_VECTOR_DB_API_KEY: Optional[str] = Field(
-        description="API key for authenticating with the Baidu Vector Database service",
-        default=None,
-    )
-
-    BAIDU_VECTOR_DB_DATABASE: Optional[str] = Field(
-        description="Name of the specific Baidu Vector Database to connect to",
-        default=None,
-    )
-
-    BAIDU_VECTOR_DB_SHARD: PositiveInt = Field(
-        description="Number of shards for the Baidu Vector Database (default is 1)",
-        default=1,
-    )
-
-    BAIDU_VECTOR_DB_REPLICAS: NonNegativeInt = Field(
-        description="Number of replicas for the Baidu Vector Database (default is 3)",
-        default=3,
-    )

api/configs/middleware/vdb/chroma_config.py

@@ -6,35 +6,35 @@ from pydantic_settings import BaseSettings
 
 class ChromaConfig(BaseSettings):
     """
-    Configuration settings for Chroma vector database
+    Chroma configs
     """
 
     CHROMA_HOST: Optional[str] = Field(
-        description="Hostname or IP address of the Chroma server (e.g., 'localhost' or '192.168.1.100')",
+        description='Chroma host',
         default=None,
     )
 
     CHROMA_PORT: PositiveInt = Field(
-        description="Port number on which the Chroma server is listening (default is 8000)",
+        description='Chroma port',
         default=8000,
     )
 
     CHROMA_TENANT: Optional[str] = Field(
-        description="Tenant identifier for multi-tenancy support in Chroma",
+        description='Chroma database',
         default=None,
     )
 
     CHROMA_DATABASE: Optional[str] = Field(
-        description="Name of the Chroma database to connect to",
+        description='Chroma database',
         default=None,
     )
 
     CHROMA_AUTH_PROVIDER: Optional[str] = Field(
-        description="Authentication provider for Chroma (e.g., 'basic', 'token', or a custom provider)",
+        description='Chroma authentication provider',
         default=None,
     )
 
     CHROMA_AUTH_CREDENTIALS: Optional[str] = Field(
-        description="Authentication credentials for Chroma (format depends on the auth provider)",
+        description='Chroma authentication credentials',
         default=None,
     )

api/configs/middleware/vdb/elasticsearch_config.py

@@ -1,30 +0,0 @@
-from typing import Optional
-
-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
-
-
-class ElasticsearchConfig(BaseSettings):
-    """
-    Configuration settings for Elasticsearch
-    """
-
-    ELASTICSEARCH_HOST: Optional[str] = Field(
-        description="Hostname or IP address of the Elasticsearch server (e.g., 'localhost' or '192.168.1.100')",
-        default="127.0.0.1",
-    )
-
-    ELASTICSEARCH_PORT: PositiveInt = Field(
-        description="Port number on which the Elasticsearch server is listening (default is 9200)",
-        default=9200,
-    )
-
-    ELASTICSEARCH_USERNAME: Optional[str] = Field(
-        description="Username for authenticating with Elasticsearch (default is 'elastic')",
-        default="elastic",
-    )
-
-    ELASTICSEARCH_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with Elasticsearch (default is 'elastic')",
-        default="elastic",
-    )

api/configs/middleware/vdb/milvus_config.py

@@ -1,35 +1,40 @@
 from typing import Optional
 
-from pydantic import Field
+from pydantic import Field, PositiveInt
 from pydantic_settings import BaseSettings
 
 
 class MilvusConfig(BaseSettings):
     """
-    Configuration settings for Milvus vector database
+    Milvus configs
     """
 
-    MILVUS_URI: Optional[str] = Field(
-        description="URI for connecting to the Milvus server (e.g., 'http://localhost:19530' or 'https://milvus-instance.example.com:19530')",
-        default="http://127.0.0.1:19530",
-    )
-
-    MILVUS_TOKEN: Optional[str] = Field(
-        description="Authentication token for Milvus, if token-based authentication is enabled",
+    MILVUS_HOST: Optional[str] = Field(
+        description='Milvus host',
         default=None,
     )
 
+    MILVUS_PORT: PositiveInt = Field(
+        description='Milvus RestFul API port',
+        default=9091,
+    )
+
     MILVUS_USER: Optional[str] = Field(
-        description="Username for authenticating with Milvus, if username/password authentication is enabled",
+        description='Milvus user',
         default=None,
     )
 
     MILVUS_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with Milvus, if username/password authentication is enabled",
+        description='Milvus password',
         default=None,
     )
 
-    MILVUS_DATABASE: str = Field(
-        description="Name of the Milvus database to connect to (default is 'default')",
-        default="default",
+    MILVUS_SECURE: bool = Field(
+        description='whether to use SSL connection for Milvus',
+        default=False,
+    )
+
+    MILVUS_DATABASE: str = Field(
+        description='Milvus database, default to `default`',
+        default='default',
     )

api/configs/middleware/vdb/myscale_config.py

@@ -1,37 +1,38 @@
+
 from pydantic import BaseModel, Field, PositiveInt
 
 
 class MyScaleConfig(BaseModel):
     """
-    Configuration settings for MyScale vector database
+    MyScale configs
     """
 
     MYSCALE_HOST: str = Field(
-        description="Hostname or IP address of the MyScale server (e.g., 'localhost' or 'myscale.example.com')",
-        default="localhost",
+        description='MyScale host',
+        default='localhost',
     )
 
     MYSCALE_PORT: PositiveInt = Field(
-        description="Port number on which the MyScale server is listening (default is 8123)",
+        description='MyScale port',
         default=8123,
     )
 
     MYSCALE_USER: str = Field(
-        description="Username for authenticating with MyScale (default is 'default')",
-        default="default",
+        description='MyScale user',
+        default='default',
     )
 
     MYSCALE_PASSWORD: str = Field(
-        description="Password for authenticating with MyScale (default is an empty string)",
-        default="",
+        description='MyScale password',
+        default='',
     )
 
     MYSCALE_DATABASE: str = Field(
-        description="Name of the MyScale database to connect to (default is 'default')",
-        default="default",
+        description='MyScale database name',
+        default='default',
     )
 
     MYSCALE_FTS_PARAMS: str = Field(
-        description="Additional parameters for MyScale Full Text Search index)",
-        default="",
+        description='MyScale fts index parameters',
+        default='',
     )

api/configs/middleware/vdb/opensearch_config.py

@@ -6,30 +6,30 @@ from pydantic_settings import BaseSettings
 
 class OpenSearchConfig(BaseSettings):
     """
-    Configuration settings for OpenSearch
+    OpenSearch configs
     """
 
     OPENSEARCH_HOST: Optional[str] = Field(
-        description="Hostname or IP address of the OpenSearch server (e.g., 'localhost' or 'opensearch.example.com')",
+        description='OpenSearch host',
         default=None,
     )
 
     OPENSEARCH_PORT: PositiveInt = Field(
-        description="Port number on which the OpenSearch server is listening (default is 9200)",
+        description='OpenSearch port',
         default=9200,
     )
 
     OPENSEARCH_USER: Optional[str] = Field(
-        description="Username for authenticating with OpenSearch",
+        description='OpenSearch user',
         default=None,
     )
 
     OPENSEARCH_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with OpenSearch",
+        description='OpenSearch password',
         default=None,
     )
 
     OPENSEARCH_SECURE: bool = Field(
-        description="Whether to use SSL/TLS encrypted connection for OpenSearch (True for HTTPS, False for HTTP)",
+        description='whether to use SSL connection for OpenSearch',
         default=False,
     )

api/configs/middleware/vdb/oracle_config.py

@@ -6,30 +6,30 @@ from pydantic_settings import BaseSettings
 
 class OracleConfig(BaseSettings):
     """
-    Configuration settings for Oracle database
+    ORACLE configs
     """
 
     ORACLE_HOST: Optional[str] = Field(
-        description="Hostname or IP address of the Oracle database server (e.g., 'localhost' or 'oracle.example.com')",
+        description='ORACLE host',
         default=None,
     )
 
-    ORACLE_PORT: PositiveInt = Field(
-        description="Port number on which the Oracle database server is listening (default is 1521)",
+    ORACLE_PORT: Optional[PositiveInt] = Field(
+        description='ORACLE port',
         default=1521,
     )
 
     ORACLE_USER: Optional[str] = Field(
-        description="Username for authenticating with the Oracle database",
+        description='ORACLE user',
         default=None,
     )
 
     ORACLE_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with the Oracle database",
+        description='ORACLE password',
         default=None,
     )
 
     ORACLE_DATABASE: Optional[str] = Field(
-        description="Name of the Oracle database or service to connect to (e.g., 'ORCL' or 'pdborcl')",
+        description='ORACLE database',
         default=None,
     )

api/configs/middleware/vdb/pgvector_config.py

@@ -6,40 +6,30 @@ from pydantic_settings import BaseSettings
 
 class PGVectorConfig(BaseSettings):
     """
-    Configuration settings for PGVector (PostgreSQL with vector extension)
+    PGVector configs
     """
 
     PGVECTOR_HOST: Optional[str] = Field(
-        description="Hostname or IP address of the PostgreSQL server with PGVector extension (e.g., 'localhost')",
+        description='PGVector host',
         default=None,
     )
 
-    PGVECTOR_PORT: PositiveInt = Field(
-        description="Port number on which the PostgreSQL server is listening (default is 5433)",
+    PGVECTOR_PORT: Optional[PositiveInt] = Field(
+        description='PGVector port',
         default=5433,
     )
 
     PGVECTOR_USER: Optional[str] = Field(
-        description="Username for authenticating with the PostgreSQL database",
+        description='PGVector user',
         default=None,
     )
 
     PGVECTOR_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with the PostgreSQL database",
+        description='PGVector password',
         default=None,
     )
 
     PGVECTOR_DATABASE: Optional[str] = Field(
-        description="Name of the PostgreSQL database to connect to",
+        description='PGVector database',
         default=None,
     )
-
-    PGVECTOR_MIN_CONNECTION: PositiveInt = Field(
-        description="Min connection of the PostgreSQL database",
-        default=1,
-    )
-
-    PGVECTOR_MAX_CONNECTION: PositiveInt = Field(
-        description="Max connection of the PostgreSQL database",
-        default=5,
-    )

api/configs/middleware/vdb/pgvectors_config.py

@@ -6,30 +6,30 @@ from pydantic_settings import BaseSettings
 
 class PGVectoRSConfig(BaseSettings):
     """
-    Configuration settings for PGVecto.RS (Rust-based vector extension for PostgreSQL)
+    PGVectoRS configs
     """
 
     PGVECTO_RS_HOST: Optional[str] = Field(
-        description="Hostname or IP address of the PostgreSQL server with PGVecto.RS extension (e.g., 'localhost')",
+        description='PGVectoRS host',
         default=None,
     )
 
-    PGVECTO_RS_PORT: PositiveInt = Field(
-        description="Port number on which the PostgreSQL server with PGVecto.RS is listening (default is 5431)",
+    PGVECTO_RS_PORT: Optional[PositiveInt] = Field(
+        description='PGVectoRS port',
         default=5431,
     )
 
     PGVECTO_RS_USER: Optional[str] = Field(
-        description="Username for authenticating with the PostgreSQL database using PGVecto.RS",
+        description='PGVectoRS user',
         default=None,
     )
 
     PGVECTO_RS_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with the PostgreSQL database using PGVecto.RS",
+        description='PGVectoRS password',
         default=None,
     )
 
     PGVECTO_RS_DATABASE: Optional[str] = Field(
-        description="Name of the PostgreSQL database with PGVecto.RS extension to connect to",
+        description='PGVectoRS database',
         default=None,
     )

api/configs/middleware/vdb/qdrant_config.py

@@ -6,30 +6,30 @@ from pydantic_settings import BaseSettings
 
 class QdrantConfig(BaseSettings):
     """
-    Configuration settings for Qdrant vector database
+    Qdrant configs
     """
 
     QDRANT_URL: Optional[str] = Field(
-        description="URL of the Qdrant server (e.g., 'http://localhost:6333' or 'https://qdrant.example.com')",
+        description='Qdrant url',
         default=None,
     )
 
     QDRANT_API_KEY: Optional[str] = Field(
-        description="API key for authenticating with the Qdrant server",
+        description='Qdrant api key',
         default=None,
     )
 
     QDRANT_CLIENT_TIMEOUT: NonNegativeInt = Field(
-        description="Timeout in seconds for Qdrant client operations (default is 20 seconds)",
+        description='Qdrant client timeout in seconds',
         default=20,
     )
 
     QDRANT_GRPC_ENABLED: bool = Field(
-        description="Whether to enable gRPC support for Qdrant connection (True for gRPC, False for HTTP)",
+        description='whether enable grpc support for Qdrant connection',
         default=False,
     )
 
     QDRANT_GRPC_PORT: PositiveInt = Field(
-        description="Port number for gRPC connection to Qdrant server (default is 6334)",
+        description='Qdrant grpc port',
         default=6334,
     )

api/configs/middleware/vdb/relyt_config.py

@@ -6,30 +6,30 @@ from pydantic_settings import BaseSettings
 
 class RelytConfig(BaseSettings):
     """
-    Configuration settings for Relyt database
+    Relyt configs
     """
 
     RELYT_HOST: Optional[str] = Field(
-        description="Hostname or IP address of the Relyt server (e.g., 'localhost' or 'relyt.example.com')",
+        description='Relyt host',
         default=None,
     )
 
     RELYT_PORT: PositiveInt = Field(
-        description="Port number on which the Relyt server is listening (default is 9200)",
+        description='Relyt port',
         default=9200,
     )
 
     RELYT_USER: Optional[str] = Field(
-        description="Username for authenticating with the Relyt database",
+        description='Relyt user',
         default=None,
     )
 
     RELYT_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with the Relyt database",
+        description='Relyt password',
         default=None,
     )
 
     RELYT_DATABASE: Optional[str] = Field(
-        description="Name of the Relyt database to connect to (default is 'default')",
-        default="default",
+        description='Relyt database',
+        default='default',
     )

api/configs/middleware/vdb/tencent_vector_config.py

@@ -6,45 +6,45 @@ from pydantic_settings import BaseSettings
 
 class TencentVectorDBConfig(BaseSettings):
     """
-    Configuration settings for Tencent Vector Database
+    Tencent Vector configs
     """
 
     TENCENT_VECTOR_DB_URL: Optional[str] = Field(
-        description="URL of the Tencent Vector Database service (e.g., 'https://vectordb.tencentcloudapi.com')",
+        description='Tencent Vector URL',
         default=None,
     )
 
     TENCENT_VECTOR_DB_API_KEY: Optional[str] = Field(
-        description="API key for authenticating with the Tencent Vector Database service",
+        description='Tencent Vector API key',
         default=None,
     )
 
     TENCENT_VECTOR_DB_TIMEOUT: PositiveInt = Field(
-        description="Timeout in seconds for Tencent Vector Database operations (default is 30 seconds)",
+        description='Tencent Vector timeout in seconds',
         default=30,
     )
 
     TENCENT_VECTOR_DB_USERNAME: Optional[str] = Field(
-        description="Username for authenticating with the Tencent Vector Database (if required)",
+        description='Tencent Vector username',
         default=None,
     )
 
     TENCENT_VECTOR_DB_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with the Tencent Vector Database (if required)",
+        description='Tencent Vector password',
         default=None,
     )
 
     TENCENT_VECTOR_DB_SHARD: PositiveInt = Field(
-        description="Number of shards for the Tencent Vector Database (default is 1)",
+        description='Tencent Vector sharding number',
         default=1,
     )
 
     TENCENT_VECTOR_DB_REPLICAS: NonNegativeInt = Field(
-        description="Number of replicas for the Tencent Vector Database (default is 2)",
+        description='Tencent Vector replicas',
         default=2,
     )
 
     TENCENT_VECTOR_DB_DATABASE: Optional[str] = Field(
-        description="Name of the specific Tencent Vector Database to connect to",
+        description='Tencent Vector Database',
         default=None,
     )

api/configs/middleware/vdb/tidb_vector_config.py

@@ -6,30 +6,30 @@ from pydantic_settings import BaseSettings
 
 class TiDBVectorConfig(BaseSettings):
     """
-    Configuration settings for TiDB Vector database
+    TiDB Vector configs
     """
 
     TIDB_VECTOR_HOST: Optional[str] = Field(
-        description="Hostname or IP address of the TiDB Vector server (e.g., 'localhost' or 'tidb.example.com')",
+        description='TiDB Vector host',
         default=None,
     )
 
     TIDB_VECTOR_PORT: Optional[PositiveInt] = Field(
-        description="Port number on which the TiDB Vector server is listening (default is 4000)",
+        description='TiDB Vector port',
         default=4000,
     )
 
     TIDB_VECTOR_USER: Optional[str] = Field(
-        description="Username for authenticating with the TiDB Vector database",
+        description='TiDB Vector user',
         default=None,
     )
 
     TIDB_VECTOR_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with the TiDB Vector database",
+        description='TiDB Vector password',
         default=None,
     )
 
     TIDB_VECTOR_DATABASE: Optional[str] = Field(
-        description="Name of the TiDB Vector database to connect to",
+        description='TiDB Vector database',
         default=None,
     )

api/configs/middleware/vdb/upstash_config.py

@@ -1,20 +0,0 @@
-from typing import Optional
-
-from pydantic import Field
-from pydantic_settings import BaseSettings
-
-
-class UpstashConfig(BaseSettings):
-    """
-    Configuration settings for Upstash vector database
-    """
-
-    UPSTASH_VECTOR_URL: Optional[str] = Field(
-        description="URL of the upstash server (e.g., 'https://vector.upstash.io')",
-        default=None,
-    )
-
-    UPSTASH_VECTOR_TOKEN: Optional[str] = Field(
-        description="Token for authenticating with the upstash server",
-        default=None,
-    )

api/configs/middleware/vdb/vikingdb_config.py

@@ -1,49 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-
-class VikingDBConfig(BaseModel):
-    """
-    Configuration for connecting to Volcengine VikingDB.
-    Refer to the following documentation for details on obtaining credentials:
-    https://www.volcengine.com/docs/6291/65568
-    """
-
-    VIKINGDB_ACCESS_KEY: Optional[str] = Field(
-        description="The Access Key provided by Volcengine VikingDB for API authentication."
-        "Refer to the following documentation for details on obtaining credentials:"
-        "https://www.volcengine.com/docs/6291/65568",
-        default=None,
-    )
-
-    VIKINGDB_SECRET_KEY: Optional[str] = Field(
-        description="The Secret Key provided by Volcengine VikingDB for API authentication.",
-        default=None,
-    )
-
-    VIKINGDB_REGION: str = Field(
-        description="The region of the Volcengine VikingDB service.(e.g., 'cn-shanghai', 'cn-beijing').",
-        default="cn-shanghai",
-    )
-
-    VIKINGDB_HOST: str = Field(
-        description="The host of the Volcengine VikingDB service.(e.g., 'api-vikingdb.volces.com', \
-            'api-vikingdb.mlp.cn-shanghai.volces.com')",
-        default="api-vikingdb.mlp.cn-shanghai.volces.com",
-    )
-
-    VIKINGDB_SCHEME: str = Field(
-        description="The scheme of the Volcengine VikingDB service.(e.g., 'http', 'https').",
-        default="http",
-    )
-
-    VIKINGDB_CONNECTION_TIMEOUT: int = Field(
-        description="The connection timeout of the Volcengine VikingDB service.",
-        default=30,
-    )
-
-    VIKINGDB_SOCKET_TIMEOUT: int = Field(
-        description="The socket timeout of the Volcengine VikingDB service.",
-        default=30,
-    )

api/configs/middleware/vdb/weaviate_config.py

@@ -6,25 +6,25 @@ from pydantic_settings import BaseSettings
 
 class WeaviateConfig(BaseSettings):
     """
-    Configuration settings for Weaviate vector database
+    Weaviate configs
     """
 
     WEAVIATE_ENDPOINT: Optional[str] = Field(
-        description="URL of the Weaviate server (e.g., 'http://localhost:8080' or 'https://weaviate.example.com')",
+        description='Weaviate endpoint URL',
         default=None,
     )
 
     WEAVIATE_API_KEY: Optional[str] = Field(
-        description="API key for authenticating with the Weaviate server",
+        description='Weaviate API key',
         default=None,
     )
 
     WEAVIATE_GRPC_ENABLED: bool = Field(
-        description="Whether to enable gRPC for Weaviate connection (True for gRPC, False for HTTP)",
+        description='whether to enable gRPC for Weaviate connection',
         default=True,
     )
 
     WEAVIATE_BATCH_SIZE: PositiveInt = Field(
-        description="Number of objects to be processed in a single batch operation (default is 100)",
+        description='Weaviate batch size',
         default=100,
     )

api/configs/packaging/__init__.py

@@ -8,11 +8,11 @@ class PackagingInfo(BaseSettings):
     """
 
     CURRENT_VERSION: str = Field(
-        description="Dify version",
-        default="0.10.1",
+        description='Dify version',
+        default='0.6.16',
     )
 
     COMMIT_SHA: str = Field(
         description="SHA-1 checksum of the git commit used to build the app",
-        default="",
+        default='',
     )

api/constants/__init__.py

@@ -1,24 +1 @@
-from configs import dify_config
-
-HIDDEN_VALUE = "[__HIDDEN__]"
-UUID_NIL = "00000000-0000-0000-0000-000000000000"
-
-IMAGE_EXTENSIONS = ["jpg", "jpeg", "png", "webp", "gif", "svg"]
-IMAGE_EXTENSIONS.extend([ext.upper() for ext in IMAGE_EXTENSIONS])
-
-VIDEO_EXTENSIONS = ["mp4", "mov", "mpeg", "mpga"]
-VIDEO_EXTENSIONS.extend([ext.upper() for ext in VIDEO_EXTENSIONS])
-
-AUDIO_EXTENSIONS = ["mp3", "m4a", "wav", "webm", "amr"]
-AUDIO_EXTENSIONS.extend([ext.upper() for ext in AUDIO_EXTENSIONS])
-
-
-if dify_config.ETL_TYPE == "Unstructured":
-    DOCUMENT_EXTENSIONS = ["txt", "markdown", "md", "pdf", "html", "htm", "xlsx", "xls"]
-    DOCUMENT_EXTENSIONS.extend(("docx", "csv", "eml", "msg", "pptx", "xml", "epub"))
-    if dify_config.UNSTRUCTURED_API_URL:
-        DOCUMENT_EXTENSIONS.append("ppt")
-    DOCUMENT_EXTENSIONS.extend([ext.upper() for ext in DOCUMENT_EXTENSIONS])
-else:
-    DOCUMENT_EXTENSIONS = ["txt", "markdown", "md", "pdf", "html", "htm", "xlsx", "xls", "docx", "csv"]
-    DOCUMENT_EXTENSIONS.extend([ext.upper() for ext in DOCUMENT_EXTENSIONS])
+HIDDEN_VALUE = '[__HIDDEN__]'

api/constants/languages.py

@@ -1,22 +1,22 @@
 language_timezone_mapping = {
-    "en-US": "America/New_York",
-    "zh-Hans": "Asia/Shanghai",
-    "zh-Hant": "Asia/Taipei",
-    "pt-BR": "America/Sao_Paulo",
-    "es-ES": "Europe/Madrid",
-    "fr-FR": "Europe/Paris",
-    "de-DE": "Europe/Berlin",
-    "ja-JP": "Asia/Tokyo",
-    "ko-KR": "Asia/Seoul",
-    "ru-RU": "Europe/Moscow",
-    "it-IT": "Europe/Rome",
-    "uk-UA": "Europe/Kyiv",
-    "vi-VN": "Asia/Ho_Chi_Minh",
-    "ro-RO": "Europe/Bucharest",
-    "pl-PL": "Europe/Warsaw",
-    "hi-IN": "Asia/Kolkata",
-    "tr-TR": "Europe/Istanbul",
-    "fa-IR": "Asia/Tehran",
+    'en-US': 'America/New_York',
+    'zh-Hans': 'Asia/Shanghai',
+    'zh-Hant': 'Asia/Taipei',
+    'pt-BR': 'America/Sao_Paulo',
+    'es-ES': 'Europe/Madrid',
+    'fr-FR': 'Europe/Paris',
+    'de-DE': 'Europe/Berlin',
+    'ja-JP': 'Asia/Tokyo',
+    'ko-KR': 'Asia/Seoul',
+    'ru-RU': 'Europe/Moscow',
+    'it-IT': 'Europe/Rome',
+    'uk-UA': 'Europe/Kyiv',
+    'vi-VN': 'Asia/Ho_Chi_Minh',
+    'ro-RO': 'Europe/Bucharest',
+    'pl-PL': 'Europe/Warsaw',
+    'hi-IN': 'Asia/Kolkata',
+    'tr-TR': 'Europe/Istanbul',
+    'fa-IR': 'Asia/Tehran',
 }
 
 languages = list(language_timezone_mapping.keys())
@@ -26,5 +26,6 @@ def supported_language(lang):
     if lang in languages:
         return lang
 
-    error = "{lang} is not a valid language.".format(lang=lang)
+    error = ('{lang} is not a valid language.'
+             .format(lang=lang))
     raise ValueError(error)

api/constants/model_template.py

@@ -5,79 +5,82 @@ from models.model import AppMode
 default_app_templates = {
     # workflow default mode
     AppMode.WORKFLOW: {
-        "app": {
-            "mode": AppMode.WORKFLOW.value,
-            "enable_site": True,
-            "enable_api": True,
+        'app': {
+            'mode': AppMode.WORKFLOW.value,
+            'enable_site': True,
+            'enable_api': True
         }
     },
+
     # completion default mode
     AppMode.COMPLETION: {
-        "app": {
-            "mode": AppMode.COMPLETION.value,
-            "enable_site": True,
-            "enable_api": True,
+        'app': {
+            'mode': AppMode.COMPLETION.value,
+            'enable_site': True,
+            'enable_api': True
         },
-        "model_config": {
-            "model": {
+        'model_config': {
+            'model': {
                 "provider": "openai",
                 "name": "gpt-4o",
                 "mode": "chat",
-                "completion_params": {},
+                "completion_params": {}
             },
-            "user_input_form": json.dumps(
-                [
-                    {
-                        "paragraph": {
-                            "label": "Query",
-                            "variable": "query",
-                            "required": True,
-                            "default": "",
-                        },
-                    },
-                ]
-            ),
-            "pre_prompt": "{{query}}",
+            'user_input_form': json.dumps([
+                {
+                    "paragraph": {
+                        "label": "Query",
+                        "variable": "query",
+                        "required": True,
+                        "default": ""
+                    }
+                }
+            ]),
+            'pre_prompt': '{{query}}'
         },
+
     },
+
     # chat default mode
     AppMode.CHAT: {
-        "app": {
-            "mode": AppMode.CHAT.value,
-            "enable_site": True,
-            "enable_api": True,
+        'app': {
+            'mode': AppMode.CHAT.value,
+            'enable_site': True,
+            'enable_api': True
         },
-        "model_config": {
-            "model": {
+        'model_config': {
+            'model': {
                 "provider": "openai",
                 "name": "gpt-4o",
                 "mode": "chat",
-                "completion_params": {},
-            },
-        },
+                "completion_params": {}
+            }
+        }
     },
+
     # advanced-chat default mode
     AppMode.ADVANCED_CHAT: {
-        "app": {
-            "mode": AppMode.ADVANCED_CHAT.value,
-            "enable_site": True,
-            "enable_api": True,
-        },
+        'app': {
+            'mode': AppMode.ADVANCED_CHAT.value,
+            'enable_site': True,
+            'enable_api': True
+        }
     },
+
     # agent-chat default mode
     AppMode.AGENT_CHAT: {
-        "app": {
-            "mode": AppMode.AGENT_CHAT.value,
-            "enable_site": True,
-            "enable_api": True,
+        'app': {
+            'mode': AppMode.AGENT_CHAT.value,
+            'enable_site': True,
+            'enable_api': True
         },
-        "model_config": {
-            "model": {
+        'model_config': {
+            'model': {
                 "provider": "openai",
                 "name": "gpt-4o",
                 "mode": "chat",
-                "completion_params": {},
-            },
-        },
-    },
+                "completion_params": {}
+            }
+        }
+    }
 }

api/contexts/__init__.py

@@ -1,9 +1,3 @@
 from contextvars import ContextVar
-from typing import TYPE_CHECKING
 
-if TYPE_CHECKING:
-    from core.workflow.entities.variable_pool import VariablePool
-
-tenant_id: ContextVar[str] = ContextVar("tenant_id")
-
-workflow_variable_pool: ContextVar["VariablePool"] = ContextVar("workflow_variable_pool")
+tenant_id: ContextVar[str] = ContextVar('tenant_id')

api/controllers/__init__.py

@@ -1 +1,3 @@
 
+
+

api/controllers/console/__init__.py

@@ -2,7 +2,7 @@ from flask import Blueprint
 
 from libs.external_api import ExternalApi
 
-bp = Blueprint("console", __name__, url_prefix="/console/api")
+bp = Blueprint('console', __name__, url_prefix='/console/api')
 api = ExternalApi(bp)
 
 # Import other controllers
@@ -17,7 +17,6 @@ from .app import (
     audio,
     completion,
     conversation,
-    conversation_variables,
     generator,
     message,
     model_config,
@@ -37,16 +36,7 @@ from .auth import activate, data_source_bearer_auth, data_source_oauth, forgot_p
 from .billing import billing
 
 # Import datasets controllers
-from .datasets import (
-    data_source,
-    datasets,
-    datasets_document,
-    datasets_segments,
-    external,
-    file,
-    hit_testing,
-    website,
-)
+from .datasets import data_source, datasets, datasets_document, datasets_segments, file, hit_testing, website
 
 # Import explore controllers
 from .explore import (

api/controllers/console/admin.py

@@ -1,10 +1,10 @@
+import os
 from functools import wraps
 
 from flask import request
 from flask_restful import Resource, reqparse
 from werkzeug.exceptions import NotFound, Unauthorized
 
-from configs import dify_config
 from constants.languages import supported_language
 from controllers.console import api
 from controllers.console.wraps import only_edition_cloud
@@ -15,24 +15,24 @@ from models.model import App, InstalledApp, RecommendedApp
 def admin_required(view):
     @wraps(view)
     def decorated(*args, **kwargs):
-        if not dify_config.ADMIN_API_KEY:
-            raise Unauthorized("API key is invalid.")
+        if not os.getenv('ADMIN_API_KEY'):
+            raise Unauthorized('API key is invalid.')
 
-        auth_header = request.headers.get("Authorization")
+        auth_header = request.headers.get('Authorization')
         if auth_header is None:
-            raise Unauthorized("Authorization header is missing.")
+            raise Unauthorized('Authorization header is missing.')
 
-        if " " not in auth_header:
-            raise Unauthorized("Invalid Authorization header format. Expected 'Bearer <api-key>' format.")
+        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_scheme != 'bearer':
+            raise Unauthorized('Invalid Authorization header format. Expected \'Bearer <api-key>\' format.')
 
-        if dify_config.ADMIN_API_KEY != auth_token:
-            raise Unauthorized("API key is invalid.")
+        if os.getenv('ADMIN_API_KEY') != auth_token:
+            raise Unauthorized('API key is invalid.')
 
         return view(*args, **kwargs)
 
@@ -44,33 +44,37 @@ class InsertExploreAppListApi(Resource):
     @admin_required
     def post(self):
         parser = reqparse.RequestParser()
-        parser.add_argument("app_id", type=str, required=True, nullable=False, location="json")
-        parser.add_argument("desc", type=str, location="json")
-        parser.add_argument("copyright", type=str, location="json")
-        parser.add_argument("privacy_policy", type=str, location="json")
-        parser.add_argument("custom_disclaimer", type=str, location="json")
-        parser.add_argument("language", type=supported_language, required=True, nullable=False, location="json")
-        parser.add_argument("category", type=str, required=True, nullable=False, location="json")
-        parser.add_argument("position", type=int, required=True, nullable=False, location="json")
+        parser.add_argument('app_id', type=str, required=True, nullable=False, location='json')
+        parser.add_argument('desc', type=str, location='json')
+        parser.add_argument('copyright', type=str, location='json')
+        parser.add_argument('privacy_policy', type=str, location='json')
+        parser.add_argument('custom_disclaimer', type=str, location='json')
+        parser.add_argument('language', type=supported_language, required=True, nullable=False, location='json')
+        parser.add_argument('category', type=str, required=True, nullable=False, location='json')
+        parser.add_argument('position', type=int, required=True, nullable=False, location='json')
         args = parser.parse_args()
 
-        app = App.query.filter(App.id == args["app_id"]).first()
+        app = App.query.filter(App.id == args['app_id']).first()
         if not app:
             raise NotFound(f'App \'{args["app_id"]}\' is not found')
 
         site = app.site
         if not site:
-            desc = args["desc"] or ""
-            copy_right = args["copyright"] or ""
-            privacy_policy = args["privacy_policy"] or ""
-            custom_disclaimer = args["custom_disclaimer"] or ""
+            desc = args['desc'] if args['desc'] else ''
+            copy_right = args['copyright'] if args['copyright'] else ''
+            privacy_policy = args['privacy_policy'] if args['privacy_policy'] else ''
+            custom_disclaimer = args['custom_disclaimer'] if args['custom_disclaimer'] else ''
         else:
-            desc = site.description or args["desc"] or ""
-            copy_right = site.copyright or args["copyright"] or ""
-            privacy_policy = site.privacy_policy or args["privacy_policy"] or ""
-            custom_disclaimer = site.custom_disclaimer or args["custom_disclaimer"] or ""
+            desc = site.description if site.description else \
+                args['desc'] if args['desc'] else ''
+            copy_right = site.copyright if site.copyright else \
+                args['copyright'] if args['copyright'] else ''
+            privacy_policy = site.privacy_policy if site.privacy_policy else \
+                args['privacy_policy'] if args['privacy_policy']  else ''
+            custom_disclaimer = site.custom_disclaimer if site.custom_disclaimer else \
+                args['custom_disclaimer'] if args['custom_disclaimer'] else ''
 
-        recommended_app = RecommendedApp.query.filter(RecommendedApp.app_id == args["app_id"]).first()
+        recommended_app = RecommendedApp.query.filter(RecommendedApp.app_id == args['app_id']).first()
 
         if not recommended_app:
             recommended_app = RecommendedApp(
@@ -79,9 +83,9 @@ class InsertExploreAppListApi(Resource):
                 copyright=copy_right,
                 privacy_policy=privacy_policy,
                 custom_disclaimer=custom_disclaimer,
-                language=args["language"],
-                category=args["category"],
-                position=args["position"],
+                language=args['language'],
+                category=args['category'],
+                position=args['position']
             )
 
             db.session.add(recommended_app)
@@ -89,21 +93,21 @@ class InsertExploreAppListApi(Resource):
             app.is_public = True
             db.session.commit()
 
-            return {"result": "success"}, 201
+            return {'result': 'success'}, 201
         else:
             recommended_app.description = desc
             recommended_app.copyright = copy_right
             recommended_app.privacy_policy = privacy_policy
             recommended_app.custom_disclaimer = custom_disclaimer
-            recommended_app.language = args["language"]
-            recommended_app.category = args["category"]
-            recommended_app.position = args["position"]
+            recommended_app.language = args['language']
+            recommended_app.category = args['category']
+            recommended_app.position = args['position']
 
             app.is_public = True
 
             db.session.commit()
 
-            return {"result": "success"}, 200
+            return {'result': 'success'}, 200
 
 
 class InsertExploreAppApi(Resource):
@@ -112,14 +116,15 @@ class InsertExploreAppApi(Resource):
     def delete(self, app_id):
         recommended_app = RecommendedApp.query.filter(RecommendedApp.app_id == str(app_id)).first()
         if not recommended_app:
-            return {"result": "success"}, 204
+            return {'result': 'success'}, 204
 
         app = App.query.filter(App.id == recommended_app.app_id).first()
         if app:
             app.is_public = False
 
         installed_apps = InstalledApp.query.filter(
-            InstalledApp.app_id == recommended_app.app_id, InstalledApp.tenant_id != InstalledApp.app_owner_tenant_id
+            InstalledApp.app_id == recommended_app.app_id,
+            InstalledApp.tenant_id != InstalledApp.app_owner_tenant_id
         ).all()
 
         for installed_app in installed_apps:
@@ -128,8 +133,8 @@ class InsertExploreAppApi(Resource):
         db.session.delete(recommended_app)
         db.session.commit()
 
-        return {"result": "success"}, 204
+        return {'result': 'success'}, 204
 
 
-api.add_resource(InsertExploreAppListApi, "/admin/insert-explore-apps")
-api.add_resource(InsertExploreAppApi, "/admin/insert-explore-apps/<uuid:app_id>")
+api.add_resource(InsertExploreAppListApi, '/admin/insert-explore-apps')
+api.add_resource(InsertExploreAppApi, '/admin/insert-explore-apps/<uuid:app_id>')

api/controllers/console/apikey.py

@@ -14,21 +14,26 @@ from .setup import setup_required
 from .wraps import account_initialization_required
 
 api_key_fields = {
-    "id": fields.String,
-    "type": fields.String,
-    "token": fields.String,
-    "last_used_at": TimestampField,
-    "created_at": TimestampField,
+    'id': fields.String,
+    'type': fields.String,
+    'token': fields.String,
+    'last_used_at': TimestampField,
+    'created_at': TimestampField
 }
 
-api_key_list = {"data": fields.List(fields.Nested(api_key_fields), attribute="items")}
+api_key_list = {
+    'data': fields.List(fields.Nested(api_key_fields), attribute="items")
+}
 
 
 def _get_resource(resource_id, tenant_id, resource_model):
-    resource = resource_model.query.filter_by(id=resource_id, tenant_id=tenant_id).first()
+    resource = resource_model.query.filter_by(
+        id=resource_id, tenant_id=tenant_id
+    ).first()
 
     if resource is None:
-        flask_restful.abort(404, message=f"{resource_model.__name__} not found.")
+        flask_restful.abort(
+            404, message=f"{resource_model.__name__} not found.")
 
     return resource
 
@@ -45,32 +50,30 @@ class BaseApiKeyListResource(Resource):
     @marshal_with(api_key_list)
     def get(self, resource_id):
         resource_id = str(resource_id)
-        _get_resource(resource_id, current_user.current_tenant_id, self.resource_model)
-        keys = (
-            db.session.query(ApiToken)
-            .filter(ApiToken.type == self.resource_type, getattr(ApiToken, self.resource_id_field) == resource_id)
-            .all()
-        )
+        _get_resource(resource_id, current_user.current_tenant_id,
+                      self.resource_model)
+        keys = db.session.query(ApiToken). \
+            filter(ApiToken.type == self.resource_type, getattr(ApiToken, self.resource_id_field) == resource_id). \
+            all()
         return {"items": keys}
 
     @marshal_with(api_key_fields)
     def post(self, resource_id):
         resource_id = str(resource_id)
-        _get_resource(resource_id, current_user.current_tenant_id, self.resource_model)
-        if not current_user.is_editor:
+        _get_resource(resource_id, current_user.current_tenant_id,
+                      self.resource_model)
+        if not current_user.is_admin_or_owner:
             raise Forbidden()
 
-        current_key_count = (
-            db.session.query(ApiToken)
-            .filter(ApiToken.type == self.resource_type, getattr(ApiToken, self.resource_id_field) == resource_id)
-            .count()
-        )
+        current_key_count = db.session.query(ApiToken). \
+            filter(ApiToken.type == self.resource_type, getattr(ApiToken, self.resource_id_field) == resource_id). \
+            count()
 
         if current_key_count >= self.max_keys:
             flask_restful.abort(
                 400,
                 message=f"Cannot create more than {self.max_keys} API keys for this resource type.",
-                code="max_keys_exceeded",
+                code='max_keys_exceeded'
             )
 
         key = ApiToken.generate_api_key(self.token_prefix, 24)
@@ -94,78 +97,79 @@ class BaseApiKeyResource(Resource):
     def delete(self, resource_id, api_key_id):
         resource_id = str(resource_id)
         api_key_id = str(api_key_id)
-        _get_resource(resource_id, current_user.current_tenant_id, self.resource_model)
+        _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()
 
-        key = (
-            db.session.query(ApiToken)
-            .filter(
-                getattr(ApiToken, self.resource_id_field) == resource_id,
-                ApiToken.type == self.resource_type,
-                ApiToken.id == api_key_id,
-            )
-            .first()
-        )
+        key = db.session.query(ApiToken). \
+            filter(getattr(ApiToken, self.resource_id_field) == resource_id, ApiToken.type == self.resource_type, ApiToken.id == api_key_id). \
+            first()
 
         if key is None:
-            flask_restful.abort(404, message="API key not found")
+            flask_restful.abort(404, message='API key not found')
 
         db.session.query(ApiToken).filter(ApiToken.id == api_key_id).delete()
         db.session.commit()
 
-        return {"result": "success"}, 204
+        return {'result': 'success'}, 204
 
 
 class AppApiKeyListResource(BaseApiKeyListResource):
+
     def after_request(self, resp):
-        resp.headers["Access-Control-Allow-Origin"] = "*"
-        resp.headers["Access-Control-Allow-Credentials"] = "true"
+        resp.headers['Access-Control-Allow-Origin'] = '*'
+        resp.headers['Access-Control-Allow-Credentials'] = 'true'
         return resp
 
-    resource_type = "app"
+    resource_type = 'app'
     resource_model = App
-    resource_id_field = "app_id"
-    token_prefix = "app-"
+    resource_id_field = 'app_id'
+    token_prefix = 'app-'
 
 
 class AppApiKeyResource(BaseApiKeyResource):
+
     def after_request(self, resp):
-        resp.headers["Access-Control-Allow-Origin"] = "*"
-        resp.headers["Access-Control-Allow-Credentials"] = "true"
+        resp.headers['Access-Control-Allow-Origin'] = '*'
+        resp.headers['Access-Control-Allow-Credentials'] = 'true'
         return resp
 
-    resource_type = "app"
+    resource_type = 'app'
     resource_model = App
-    resource_id_field = "app_id"
+    resource_id_field = 'app_id'
 
 
 class DatasetApiKeyListResource(BaseApiKeyListResource):
+
     def after_request(self, resp):
-        resp.headers["Access-Control-Allow-Origin"] = "*"
-        resp.headers["Access-Control-Allow-Credentials"] = "true"
+        resp.headers['Access-Control-Allow-Origin'] = '*'
+        resp.headers['Access-Control-Allow-Credentials'] = 'true'
         return resp
 
-    resource_type = "dataset"
+    resource_type = 'dataset'
     resource_model = Dataset
-    resource_id_field = "dataset_id"
-    token_prefix = "ds-"
+    resource_id_field = 'dataset_id'
+    token_prefix = 'ds-'
 
 
 class DatasetApiKeyResource(BaseApiKeyResource):
+
     def after_request(self, resp):
-        resp.headers["Access-Control-Allow-Origin"] = "*"
-        resp.headers["Access-Control-Allow-Credentials"] = "true"
+        resp.headers['Access-Control-Allow-Origin'] = '*'
+        resp.headers['Access-Control-Allow-Credentials'] = 'true'
         return resp
-
-    resource_type = "dataset"
+    resource_type = 'dataset'
     resource_model = Dataset
-    resource_id_field = "dataset_id"
+    resource_id_field = 'dataset_id'
 
 
-api.add_resource(AppApiKeyListResource, "/apps/<uuid:resource_id>/api-keys")
-api.add_resource(AppApiKeyResource, "/apps/<uuid:resource_id>/api-keys/<uuid:api_key_id>")
-api.add_resource(DatasetApiKeyListResource, "/datasets/<uuid:resource_id>/api-keys")
-api.add_resource(DatasetApiKeyResource, "/datasets/<uuid:resource_id>/api-keys/<uuid:api_key_id>")
+api.add_resource(AppApiKeyListResource, '/apps/<uuid:resource_id>/api-keys')
+api.add_resource(AppApiKeyResource,
+                 '/apps/<uuid:resource_id>/api-keys/<uuid:api_key_id>')
+api.add_resource(DatasetApiKeyListResource,
+                 '/datasets/<uuid:resource_id>/api-keys')
+api.add_resource(DatasetApiKeyResource,
+                 '/datasets/<uuid:resource_id>/api-keys/<uuid:api_key_id>')

api/controllers/console/app/advanced_prompt_template.py

@@ -8,18 +8,19 @@ from services.advanced_prompt_template_service import AdvancedPromptTemplateServ
 
 
 class AdvancedPromptTemplateList(Resource):
+    
     @setup_required
     @login_required
     @account_initialization_required
     def get(self):
+         
         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")
+        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)
 
-
-api.add_resource(AdvancedPromptTemplateList, "/app/prompt-templates")
+api.add_resource(AdvancedPromptTemplateList, '/app/prompt-templates')

api/controllers/console/app/agent.py

@@ -18,12 +18,15 @@ class AgentLogApi(Resource):
     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")
+        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"])
-
-
-api.add_resource(AgentLogApi, "/apps/<uuid:app_id>/agent/logs")
+        return AgentService.get_agent_logs(
+            app_model,
+            args['conversation_id'],
+            args['message_id']
+        )
+    
+api.add_resource(AgentLogApi, '/apps/<uuid:app_id>/agent/logs')

api/controllers/console/app/annotation.py

@@ -21,23 +21,23 @@ class AnnotationReplyActionApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @cloud_edition_billing_resource_check("annotation")
+    @cloud_edition_billing_resource_check('annotation')
     def post(self, app_id, action):
         if not current_user.is_editor:
             raise Forbidden()
 
         app_id = str(app_id)
         parser = reqparse.RequestParser()
-        parser.add_argument("score_threshold", required=True, type=float, location="json")
-        parser.add_argument("embedding_provider_name", required=True, type=str, location="json")
-        parser.add_argument("embedding_model_name", required=True, type=str, location="json")
+        parser.add_argument('score_threshold', required=True, type=float, location='json')
+        parser.add_argument('embedding_provider_name', required=True, type=str, location='json')
+        parser.add_argument('embedding_model_name', required=True, type=str, location='json')
         args = parser.parse_args()
-        if action == "enable":
+        if action == 'enable':
             result = AppAnnotationService.enable_app_annotation(args, app_id)
-        elif action == "disable":
+        elif action == 'disable':
             result = AppAnnotationService.disable_app_annotation(app_id)
         else:
-            raise ValueError("Unsupported annotation reply action")
+            raise ValueError('Unsupported annotation reply action')
         return result, 200
 
 
@@ -66,7 +66,7 @@ class AppAnnotationSettingUpdateApi(Resource):
         annotation_setting_id = str(annotation_setting_id)
 
         parser = reqparse.RequestParser()
-        parser.add_argument("score_threshold", required=True, type=float, location="json")
+        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)
@@ -77,24 +77,28 @@ class AnnotationReplyActionStatusApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @cloud_edition_billing_resource_check("annotation")
+    @cloud_edition_billing_resource_check('annotation')
     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 = "{}_app_annotation_job_{}".format(action, str(job_id))
+        app_annotation_job_key = '{}_app_annotation_job_{}'.format(action, str(job_id))
         cache_result = redis_client.get(app_annotation_job_key)
         if cache_result is None:
             raise ValueError("The job is not exist.")
 
         job_status = cache_result.decode()
-        error_msg = ""
-        if job_status == "error":
-            app_annotation_error_key = "{}_app_annotation_error_{}".format(action, str(job_id))
+        error_msg = ''
+        if job_status == 'error':
+            app_annotation_error_key = '{}_app_annotation_error_{}'.format(action, str(job_id))
             error_msg = redis_client.get(app_annotation_error_key).decode()
 
-        return {"job_id": job_id, "job_status": job_status, "error_msg": error_msg}, 200
+        return {
+            'job_id': job_id,
+            'job_status': job_status,
+            'error_msg': error_msg
+        }, 200
 
 
 class AnnotationListApi(Resource):
@@ -105,18 +109,18 @@ class AnnotationListApi(Resource):
         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=None, type=str)
+        page = request.args.get('page', default=1, type=int)
+        limit = request.args.get('limit', default=20, type=int)
+        keyword = request.args.get('keyword', default=None, type=str)
 
         app_id = str(app_id)
         annotation_list, total = AppAnnotationService.get_annotation_list_by_app_id(app_id, page, limit, keyword)
         response = {
-            "data": marshal(annotation_list, annotation_fields),
-            "has_more": len(annotation_list) == limit,
-            "limit": limit,
-            "total": total,
-            "page": page,
+            'data': marshal(annotation_list, annotation_fields),
+            'has_more': len(annotation_list) == limit,
+            'limit': limit,
+            'total': total,
+            'page': page
         }
         return response, 200
 
@@ -131,7 +135,9 @@ class AnnotationExportApi(Resource):
 
         app_id = str(app_id)
         annotation_list = AppAnnotationService.export_annotation_list_by_app_id(app_id)
-        response = {"data": marshal(annotation_list, annotation_fields)}
+        response = {
+            'data': marshal(annotation_list, annotation_fields)
+        }
         return response, 200
 
 
@@ -139,7 +145,7 @@ class AnnotationCreateApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @cloud_edition_billing_resource_check("annotation")
+    @cloud_edition_billing_resource_check('annotation')
     @marshal_with(annotation_fields)
     def post(self, app_id):
         if not current_user.is_editor:
@@ -147,8 +153,8 @@ class AnnotationCreateApi(Resource):
 
         app_id = str(app_id)
         parser = reqparse.RequestParser()
-        parser.add_argument("question", required=True, type=str, location="json")
-        parser.add_argument("answer", required=True, type=str, location="json")
+        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.insert_app_annotation_directly(args, app_id)
         return annotation
@@ -158,7 +164,7 @@ class AnnotationUpdateDeleteApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @cloud_edition_billing_resource_check("annotation")
+    @cloud_edition_billing_resource_check('annotation')
     @marshal_with(annotation_fields)
     def post(self, app_id, annotation_id):
         if not current_user.is_editor:
@@ -167,8 +173,8 @@ class AnnotationUpdateDeleteApi(Resource):
         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")
+        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
@@ -183,29 +189,29 @@ class AnnotationUpdateDeleteApi(Resource):
         app_id = str(app_id)
         annotation_id = str(annotation_id)
         AppAnnotationService.delete_app_annotation(app_id, annotation_id)
-        return {"result": "success"}, 200
+        return {'result': 'success'}, 200
 
 
 class AnnotationBatchImportApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @cloud_edition_billing_resource_check("annotation")
+    @cloud_edition_billing_resource_check('annotation')
     def post(self, app_id):
         if not current_user.is_editor:
             raise Forbidden()
 
         app_id = str(app_id)
         # get file from request
-        file = request.files["file"]
+        file = request.files['file']
         # check file
-        if "file" not in request.files:
+        if 'file' not in request.files:
             raise NoFileUploadedError()
 
         if len(request.files) > 1:
             raise TooManyFilesError()
         # check file type
-        if not file.filename.endswith(".csv"):
+        if not file.filename.endswith('.csv'):
             raise ValueError("Invalid file type. Only CSV files are allowed")
         return AppAnnotationService.batch_import_app_annotations(app_id, file)
 
@@ -214,23 +220,27 @@ class AnnotationBatchImportStatusApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @cloud_edition_billing_resource_check("annotation")
+    @cloud_edition_billing_resource_check('annotation')
     def get(self, app_id, job_id):
         if not current_user.is_editor:
             raise Forbidden()
 
         job_id = str(job_id)
-        indexing_cache_key = "app_annotation_batch_import_{}".format(str(job_id))
+        indexing_cache_key = 'app_annotation_batch_import_{}'.format(str(job_id))
         cache_result = redis_client.get(indexing_cache_key)
         if cache_result is None:
             raise ValueError("The job is not exist.")
         job_status = cache_result.decode()
-        error_msg = ""
-        if job_status == "error":
-            indexing_error_msg_key = "app_annotation_batch_import_error_msg_{}".format(str(job_id))
+        error_msg = ''
+        if job_status == 'error':
+            indexing_error_msg_key = 'app_annotation_batch_import_error_msg_{}'.format(str(job_id))
             error_msg = redis_client.get(indexing_error_msg_key).decode()
 
-        return {"job_id": job_id, "job_status": job_status, "error_msg": error_msg}, 200
+        return {
+            'job_id': job_id,
+            'job_status': job_status,
+            'error_msg': error_msg
+        }, 200
 
 
 class AnnotationHitHistoryListApi(Resource):
@@ -241,32 +251,30 @@ class AnnotationHitHistoryListApi(Resource):
         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)
+        page = request.args.get('page', default=1, type=int)
+        limit = request.args.get('limit', default=20, type=int)
         app_id = str(app_id)
         annotation_id = str(annotation_id)
-        annotation_hit_history_list, total = AppAnnotationService.get_annotation_hit_histories(
-            app_id, annotation_id, page, limit
-        )
+        annotation_hit_history_list, total = AppAnnotationService.get_annotation_hit_histories(app_id, annotation_id,
+                                                                                               page, limit)
         response = {
-            "data": marshal(annotation_hit_history_list, annotation_hit_history_fields),
-            "has_more": len(annotation_hit_history_list) == limit,
-            "limit": limit,
-            "total": total,
-            "page": page,
+            'data': marshal(annotation_hit_history_list, annotation_hit_history_fields),
+            'has_more': len(annotation_hit_history_list) == limit,
+            'limit': limit,
+            'total': total,
+            'page': page
         }
         return response
 
 
-api.add_resource(AnnotationReplyActionApi, "/apps/<uuid:app_id>/annotation-reply/<string:action>")
-api.add_resource(
-    AnnotationReplyActionStatusApi, "/apps/<uuid:app_id>/annotation-reply/<string:action>/status/<uuid:job_id>"
-)
-api.add_resource(AnnotationListApi, "/apps/<uuid:app_id>/annotations")
-api.add_resource(AnnotationExportApi, "/apps/<uuid:app_id>/annotations/export")
-api.add_resource(AnnotationUpdateDeleteApi, "/apps/<uuid:app_id>/annotations/<uuid:annotation_id>")
-api.add_resource(AnnotationBatchImportApi, "/apps/<uuid:app_id>/annotations/batch-import")
-api.add_resource(AnnotationBatchImportStatusApi, "/apps/<uuid:app_id>/annotations/batch-import-status/<uuid:job_id>")
-api.add_resource(AnnotationHitHistoryListApi, "/apps/<uuid:app_id>/annotations/<uuid:annotation_id>/hit-histories")
-api.add_resource(AppAnnotationSettingDetailApi, "/apps/<uuid:app_id>/annotation-setting")
-api.add_resource(AppAnnotationSettingUpdateApi, "/apps/<uuid:app_id>/annotation-settings/<uuid:annotation_setting_id>")
+api.add_resource(AnnotationReplyActionApi, '/apps/<uuid:app_id>/annotation-reply/<string:action>')
+api.add_resource(AnnotationReplyActionStatusApi,
+                 '/apps/<uuid:app_id>/annotation-reply/<string:action>/status/<uuid:job_id>')
+api.add_resource(AnnotationListApi, '/apps/<uuid:app_id>/annotations')
+api.add_resource(AnnotationExportApi, '/apps/<uuid:app_id>/annotations/export')
+api.add_resource(AnnotationUpdateDeleteApi, '/apps/<uuid:app_id>/annotations/<uuid:annotation_id>')
+api.add_resource(AnnotationBatchImportApi, '/apps/<uuid:app_id>/annotations/batch-import')
+api.add_resource(AnnotationBatchImportStatusApi, '/apps/<uuid:app_id>/annotations/batch-import-status/<uuid:job_id>')
+api.add_resource(AnnotationHitHistoryListApi, '/apps/<uuid:app_id>/annotations/<uuid:annotation_id>/hit-histories')
+api.add_resource(AppAnnotationSettingDetailApi, '/apps/<uuid:app_id>/annotation-setting')
+api.add_resource(AppAnnotationSettingUpdateApi, '/apps/<uuid:app_id>/annotation-settings/<uuid:annotation_setting_id>')

api/controllers/console/app/app.py

@@ -18,35 +18,27 @@ from libs.login import login_required
 from services.app_dsl_service import AppDslService
 from services.app_service import AppService
 
-ALLOW_CREATE_APP_MODES = ["chat", "agent-chat", "advanced-chat", "workflow", "completion"]
+ALLOW_CREATE_APP_MODES = ['chat', 'agent-chat', 'advanced-chat', 'workflow', 'completion']
 
 
 class AppListApi(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
     def get(self):
         """Get app list"""
-
         def uuid_list(value):
             try:
-                return [str(uuid.UUID(v)) for v in value.split(",")]
+                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=["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('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=['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)
 
         args = parser.parse_args()
 
@@ -54,7 +46,7 @@ class AppListApi(Resource):
         app_service = AppService()
         app_pagination = app_service.get_paginate_apps(current_user.current_tenant_id, args)
         if not app_pagination:
-            return {"data": [], "total": 0, "page": 1, "limit": 20, "has_more": False}
+            return {'data': [], 'total': 0, 'page': 1, 'limit': 20, 'has_more': False}
 
         return marshal(app_pagination, app_pagination_fields)
 
@@ -62,23 +54,22 @@ class AppListApi(Resource):
     @login_required
     @account_initialization_required
     @marshal_with(app_detail_fields)
-    @cloud_edition_billing_resource_check("apps")
+    @cloud_edition_billing_resource_check('apps')
     def post(self):
         """Create app"""
         parser = reqparse.RequestParser()
-        parser.add_argument("name", type=str, required=True, location="json")
-        parser.add_argument("description", type=str, 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")
+        parser.add_argument('name', type=str, required=True, location='json')
+        parser.add_argument('description', type=str, location='json')
+        parser.add_argument('mode', type=str, choices=ALLOW_CREATE_APP_MODES, 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:
+        if 'mode' not in args or args['mode'] is None:
             raise BadRequest("mode is required")
 
         app_service = AppService()
@@ -92,7 +83,7 @@ class AppImportApi(Resource):
     @login_required
     @account_initialization_required
     @marshal_with(app_detail_fields_with_site)
-    @cloud_edition_billing_resource_check("apps")
+    @cloud_edition_billing_resource_check('apps')
     def post(self):
         """Import app"""
         # The role of the current user in the ta table must be admin, owner, or editor
@@ -100,16 +91,18 @@ class AppImportApi(Resource):
             raise Forbidden()
 
         parser = reqparse.RequestParser()
-        parser.add_argument("data", type=str, required=True, nullable=False, 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('data', type=str, required=True, nullable=False, location='json')
+        parser.add_argument('name', type=str, location='json')
+        parser.add_argument('description', 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()
 
         app = AppDslService.import_and_create_new_app(
-            tenant_id=current_user.current_tenant_id, data=args["data"], args=args, account=current_user
+            tenant_id=current_user.current_tenant_id,
+            data=args['data'],
+            args=args,
+            account=current_user
         )
 
         return app, 201
@@ -120,7 +113,7 @@ class AppImportFromUrlApi(Resource):
     @login_required
     @account_initialization_required
     @marshal_with(app_detail_fields_with_site)
-    @cloud_edition_billing_resource_check("apps")
+    @cloud_edition_billing_resource_check('apps')
     def post(self):
         """Import app from url"""
         # The role of the current user in the ta table must be admin, owner, or editor
@@ -128,21 +121,25 @@ class AppImportFromUrlApi(Resource):
             raise Forbidden()
 
         parser = reqparse.RequestParser()
-        parser.add_argument("url", type=str, required=True, nullable=False, location="json")
-        parser.add_argument("name", type=str, location="json")
-        parser.add_argument("description", type=str, location="json")
-        parser.add_argument("icon", type=str, location="json")
-        parser.add_argument("icon_background", type=str, location="json")
+        parser.add_argument('url', type=str, required=True, nullable=False, location='json')
+        parser.add_argument('name', type=str, location='json')
+        parser.add_argument('description', 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()
 
         app = AppDslService.import_and_create_new_app_from_url(
-            tenant_id=current_user.current_tenant_id, url=args["url"], args=args, account=current_user
+            tenant_id=current_user.current_tenant_id,
+            url=args['url'],
+            args=args,
+            account=current_user
         )
 
         return app, 201
 
 
 class AppApi(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
@@ -166,15 +163,13 @@ class AppApi(Resource):
         # 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=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("max_active_requests", type=int, location="json")
-        parser.add_argument("use_icon_as_answer_icon", type=bool, location="json")
+        parser.add_argument('name', type=str, required=True, nullable=False, location='json')
+        parser.add_argument('description', type=str, location='json')
+        parser.add_argument('icon', type=str, location='json')
+        parser.add_argument('icon_background', type=str, location='json')
+        parser.add_argument('max_active_requests', type=int, location='json')
         args = parser.parse_args()
 
         app_service = AppService()
@@ -195,7 +190,7 @@ class AppApi(Resource):
         app_service = AppService()
         app_service.delete_app(app_model)
 
-        return {"result": "success"}, 204
+        return {'result': 'success'}, 204
 
 
 class AppCopyApi(Resource):
@@ -211,16 +206,18 @@ class AppCopyApi(Resource):
             raise Forbidden()
 
         parser = reqparse.RequestParser()
-        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('name', type=str, location='json')
+        parser.add_argument('description', 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()
 
         data = AppDslService.export_dsl(app_model=app_model, include_secret=True)
         app = AppDslService.import_and_create_new_app(
-            tenant_id=current_user.current_tenant_id, data=data, args=args, account=current_user
+            tenant_id=current_user.current_tenant_id,
+            data=data,
+            args=args,
+            account=current_user
         )
 
         return app, 201
@@ -239,10 +236,12 @@ class AppExportApi(Resource):
 
         # Add include_secret params
         parser = reqparse.RequestParser()
-        parser.add_argument("include_secret", type=inputs.boolean, default=False, location="args")
+        parser.add_argument('include_secret', type=inputs.boolean, default=False, location='args')
         args = parser.parse_args()
 
-        return {"data": AppDslService.export_dsl(app_model=app_model, include_secret=args["include_secret"])}
+        return {
+            "data": AppDslService.export_dsl(app_model=app_model, include_secret=args['include_secret'])
+        }
 
 
 class AppNameApi(Resource):
@@ -255,13 +254,13 @@ class AppNameApi(Resource):
         # 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")
+        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.get("name"))
+        app_model = app_service.update_app_name(app_model, args.get('name'))
 
         return app_model
 
@@ -276,14 +275,14 @@ class AppIconApi(Resource):
         # 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")
+        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.get("icon"), args.get("icon_background"))
+        app_model = app_service.update_app_icon(app_model, args.get('icon'), args.get('icon_background'))
 
         return app_model
 
@@ -298,13 +297,13 @@ class AppSiteStatus(Resource):
         # 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")
+        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.get("enable_site"))
+        app_model = app_service.update_app_site_status(app_model, args.get('enable_site'))
 
         return app_model
 
@@ -319,13 +318,13 @@ class AppApiStatus(Resource):
         # 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")
+        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.get("enable_api"))
+        app_model = app_service.update_app_api_status(app_model, args.get('enable_api'))
 
         return app_model
 
@@ -336,7 +335,9 @@ class AppTraceApi(Resource):
     @account_initialization_required
     def get(self, app_id):
         """Get app trace"""
-        app_trace_config = OpsTraceManager.get_app_tracing_config(app_id=app_id)
+        app_trace_config = OpsTraceManager.get_app_tracing_config(
+            app_id=app_id
+        )
 
         return app_trace_config
 
@@ -348,27 +349,27 @@ class AppTraceApi(Resource):
         if not current_user.is_admin_or_owner:
             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")
+        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"],
-            tracing_provider=args["tracing_provider"],
+            enabled=args['enabled'],
+            tracing_provider=args['tracing_provider'],
         )
 
         return {"result": "success"}
 
 
-api.add_resource(AppListApi, "/apps")
-api.add_resource(AppImportApi, "/apps/import")
-api.add_resource(AppImportFromUrlApi, "/apps/import/url")
-api.add_resource(AppApi, "/apps/<uuid:app_id>")
-api.add_resource(AppCopyApi, "/apps/<uuid:app_id>/copy")
-api.add_resource(AppExportApi, "/apps/<uuid:app_id>/export")
-api.add_resource(AppNameApi, "/apps/<uuid:app_id>/name")
-api.add_resource(AppIconApi, "/apps/<uuid:app_id>/icon")
-api.add_resource(AppSiteStatus, "/apps/<uuid:app_id>/site-enable")
-api.add_resource(AppApiStatus, "/apps/<uuid:app_id>/api-enable")
-api.add_resource(AppTraceApi, "/apps/<uuid:app_id>/trace")
+api.add_resource(AppListApi, '/apps')
+api.add_resource(AppImportApi, '/apps/import')
+api.add_resource(AppImportFromUrlApi, '/apps/import/url')
+api.add_resource(AppApi, '/apps/<uuid:app_id>')
+api.add_resource(AppCopyApi, '/apps/<uuid:app_id>/copy')
+api.add_resource(AppExportApi, '/apps/<uuid:app_id>/export')
+api.add_resource(AppNameApi, '/apps/<uuid:app_id>/name')
+api.add_resource(AppIconApi, '/apps/<uuid:app_id>/icon')
+api.add_resource(AppSiteStatus, '/apps/<uuid:app_id>/site-enable')
+api.add_resource(AppApiStatus, '/apps/<uuid:app_id>/api-enable')
+api.add_resource(AppTraceApi, '/apps/<uuid:app_id>/trace')

api/controllers/console/app/audio.py

@@ -39,7 +39,7 @@ class ChatMessageAudioApi(Resource):
     @account_initialization_required
     @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
     def post(self, app_model):
-        file = request.files["file"]
+        file = request.files['file']
 
         try:
             response = AudioService.transcript_asr(
@@ -85,27 +85,31 @@ class ChatMessageTextApi(Resource):
 
         try:
             parser = reqparse.RequestParser()
-            parser.add_argument("message_id", type=str, location="json")
-            parser.add_argument("text", type=str, location="json")
-            parser.add_argument("voice", type=str, location="json")
-            parser.add_argument("streaming", type=bool, location="json")
+            parser.add_argument('message_id', type=str, location='json')
+            parser.add_argument('text', type=str, location='json')
+            parser.add_argument('voice', type=str, location='json')
+            parser.add_argument('streaming', type=bool, location='json')
             args = parser.parse_args()
 
-            message_id = args.get("message_id", None)
-            text = args.get("text", None)
-            if (
-                app_model.mode in {AppMode.ADVANCED_CHAT.value, AppMode.WORKFLOW.value}
-                and app_model.workflow
-                and app_model.workflow.features_dict
-            ):
-                text_to_speech = app_model.workflow.features_dict.get("text_to_speech")
-                voice = args.get("voice") or text_to_speech.get("voice")
+            message_id = args.get('message_id', None)
+            text = args.get('text', None)
+            if (app_model.mode in [AppMode.ADVANCED_CHAT.value, AppMode.WORKFLOW.value]
+                    and app_model.workflow
+                    and app_model.workflow.features_dict):
+                text_to_speech = app_model.workflow.features_dict.get('text_to_speech')
+                voice = args.get('voice') if args.get('voice') else text_to_speech.get('voice')
             else:
                 try:
-                    voice = args.get("voice") or app_model.app_model_config.text_to_speech_dict.get("voice")
+                    voice = args.get('voice') if args.get('voice') else app_model.app_model_config.text_to_speech_dict.get(
+                        'voice')
                 except Exception:
                     voice = None
-            response = AudioService.transcript_tts(app_model=app_model, text=text, message_id=message_id, voice=voice)
+            response = AudioService.transcript_tts(
+                app_model=app_model,
+                text=text,
+                message_id=message_id,
+                voice=voice
+            )
             return response
         except services.errors.app_model_config.AppModelConfigBrokenError:
             logging.exception("App model config broken.")
@@ -141,12 +145,12 @@ class TextModesApi(Resource):
     def get(self, app_model):
         try:
             parser = reqparse.RequestParser()
-            parser.add_argument("language", type=str, required=True, location="args")
+            parser.add_argument('language', type=str, required=True, location='args')
             args = parser.parse_args()
 
             response = AudioService.transcript_tts_voices(
                 tenant_id=app_model.tenant_id,
-                language=args["language"],
+                language=args['language'],
             )
 
             return response
@@ -175,6 +179,6 @@ class TextModesApi(Resource):
             raise InternalServerError()
 
 
-api.add_resource(ChatMessageAudioApi, "/apps/<uuid:app_id>/audio-to-text")
-api.add_resource(ChatMessageTextApi, "/apps/<uuid:app_id>/text-to-audio")
-api.add_resource(TextModesApi, "/apps/<uuid:app_id>/text-to-audio/voices")
+api.add_resource(ChatMessageAudioApi, '/apps/<uuid:app_id>/audio-to-text')
+api.add_resource(ChatMessageTextApi, '/apps/<uuid:app_id>/text-to-audio')
+api.add_resource(TextModesApi, '/apps/<uuid:app_id>/text-to-audio/voices')

api/controllers/console/app/completion.py

@@ -17,7 +17,6 @@ from controllers.console.app.error import (
 from controllers.console.app.wraps import get_app_model
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_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 (
@@ -32,33 +31,37 @@ from libs.helper import uuid_value
 from libs.login import login_required
 from models.model import AppMode
 from services.app_generate_service import AppGenerateService
-from services.errors.llm import InvokeRateLimitError
 
 
 # define completion message api for user
 class CompletionMessageApi(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=AppMode.COMPLETION)
     def post(self, app_model):
         parser = reqparse.RequestParser()
-        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")
+        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["response_mode"] != "blocking"
-        args["auto_generate_name"] = False
+        streaming = args['response_mode'] != 'blocking'
+        args['auto_generate_name'] = False
 
         account = flask_login.current_user
 
         try:
             response = AppGenerateService.generate(
-                app_model=app_model, user=account, args=args, invoke_from=InvokeFrom.DEBUGGER, streaming=streaming
+                app_model=app_model,
+                user=account,
+                args=args,
+                invoke_from=InvokeFrom.DEBUGGER,
+                streaming=streaming
             )
 
             return helper.compact_generate_response(response)
@@ -94,7 +97,7 @@ class CompletionMessageStopApi(Resource):
 
         AppQueueManager.set_stop_flag(task_id, InvokeFrom.DEBUGGER, account.id)
 
-        return {"result": "success"}, 200
+        return {'result': 'success'}, 200
 
 
 class ChatMessageApi(Resource):
@@ -104,24 +107,27 @@ class ChatMessageApi(Resource):
     @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT])
     def post(self, app_model):
         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")
+        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('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
+        streaming = args['response_mode'] != 'blocking'
+        args['auto_generate_name'] = False
 
         account = flask_login.current_user
 
         try:
             response = AppGenerateService.generate(
-                app_model=app_model, user=account, args=args, invoke_from=InvokeFrom.DEBUGGER, streaming=streaming
+                app_model=app_model,
+                user=account,
+                args=args,
+                invoke_from=InvokeFrom.DEBUGGER,
+                streaming=streaming
             )
 
             return helper.compact_generate_response(response)
@@ -138,8 +144,6 @@ class ChatMessageApi(Resource):
             raise ProviderQuotaExceededError()
         except ModelCurrentlyNotSupportError:
             raise ProviderModelCurrentlyNotSupportError()
-        except InvokeRateLimitError as ex:
-            raise InvokeRateLimitHttpError(ex.description)
         except InvokeError as e:
             raise CompletionRequestError(e.description)
         except (ValueError, AppInvokeQuotaExceededError) as e:
@@ -159,10 +163,10 @@ class ChatMessageStopApi(Resource):
 
         AppQueueManager.set_stop_flag(task_id, InvokeFrom.DEBUGGER, account.id)
 
-        return {"result": "success"}, 200
+        return {'result': 'success'}, 200
 
 
-api.add_resource(CompletionMessageApi, "/apps/<uuid:app_id>/completion-messages")
-api.add_resource(CompletionMessageStopApi, "/apps/<uuid:app_id>/completion-messages/<string:task_id>/stop")
-api.add_resource(ChatMessageApi, "/apps/<uuid:app_id>/chat-messages")
-api.add_resource(ChatMessageStopApi, "/apps/<uuid:app_id>/chat-messages/<string:task_id>/stop")
+api.add_resource(CompletionMessageApi, '/apps/<uuid:app_id>/completion-messages')
+api.add_resource(CompletionMessageStopApi, '/apps/<uuid:app_id>/completion-messages/<string:task_id>/stop')
+api.add_resource(ChatMessageApi, '/apps/<uuid:app_id>/chat-messages')
+api.add_resource(ChatMessageStopApi, '/apps/<uuid:app_id>/chat-messages/<string:task_id>/stop')

api/controllers/console/app/conversation.py

@@ -20,39 +20,40 @@ from fields.conversation_fields import (
     conversation_pagination_fields,
     conversation_with_summary_pagination_fields,
 )
-from libs.helper import DatetimeString
+from libs.helper import datetime_string
 from libs.login import login_required
-from models import Conversation, EndUser, Message, MessageAnnotation
-from models.model import AppMode
+from models.model import AppMode, Conversation, EndUser, Message, MessageAnnotation
 
 
 class CompletionConversationApi(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=AppMode.COMPLETION)
     @marshal_with(conversation_pagination_fields)
     def get(self, app_model):
-        if not current_user.is_editor:
+        if not current_user.is_admin_or_owner:
             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")
+        parser.add_argument('keyword', type=str, location='args')
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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 = db.select(Conversation).where(Conversation.app_id == app_model.id, Conversation.mode == "completion")
+        query = db.select(Conversation).where(Conversation.app_id == app_model.id, Conversation.mode == 'completion')
 
-        if args["keyword"]:
-            query = query.join(Message, Message.conversation_id == Conversation.id).filter(
+        if args['keyword']:
+            query = query.join(
+                Message, Message.conversation_id == Conversation.id
+            ).filter(
                 or_(
-                    Message.query.ilike("%{}%".format(args["keyword"])),
-                    Message.answer.ilike("%{}%".format(args["keyword"])),
+                    Message.query.ilike('%{}%'.format(args['keyword'])),
+                    Message.answer.ilike('%{}%'.format(args['keyword']))
                 )
             )
 
@@ -60,8 +61,8 @@ class CompletionConversationApi(Resource):
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
@@ -69,8 +70,8 @@ class CompletionConversationApi(Resource):
 
             query = query.where(Conversation.created_at >= start_datetime_utc)
 
-        if args["end"]:
-            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
+        if args['end']:
+            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)
@@ -78,32 +79,36 @@ class CompletionConversationApi(Resource):
 
             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(
                 MessageAnnotation, MessageAnnotation.conversation_id == Conversation.id
             )
-        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)
-            )
+        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)
 
         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
 
 
 class CompletionConversationDetailApi(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=AppMode.COMPLETION)
     @marshal_with(conversation_message_detail_fields)
     def get(self, app_model, conversation_id):
-        if not current_user.is_editor:
+        if not current_user.is_admin_or_owner:
             raise Forbidden()
         conversation_id = str(conversation_id)
 
@@ -114,15 +119,12 @@ class CompletionConversationDetailApi(Resource):
     @account_initialization_required
     @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
     def delete(self, app_model, conversation_id):
-        if not current_user.is_editor:
+        if not current_user.is_admin_or_owner:
             raise Forbidden()
         conversation_id = str(conversation_id)
 
-        conversation = (
-            db.session.query(Conversation)
-            .filter(Conversation.id == conversation_id, Conversation.app_id == app_model.id)
-            .first()
-        )
+        conversation = db.session.query(Conversation) \
+            .filter(Conversation.id == conversation_id, Conversation.app_id == app_model.id).first()
 
         if not conversation:
             raise NotFound("Conversation Not Exists.")
@@ -130,10 +132,11 @@ class CompletionConversationDetailApi(Resource):
         conversation.is_deleted = True
         db.session.commit()
 
-        return {"result": "success"}, 204
+        return {'result': 'success'}, 204
 
 
 class ChatConversationApi(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
@@ -143,28 +146,20 @@ class ChatConversationApi(Resource):
         if not current_user.is_editor:
             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",
-        )
+        parser.add_argument('keyword', type=str, location='args')
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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')
         args = parser.parse_args()
 
         subquery = (
             db.session.query(
-                Conversation.id.label("conversation_id"), EndUser.session_id.label("from_end_user_session_id")
+                Conversation.id.label('conversation_id'),
+                EndUser.session_id.label('from_end_user_session_id')
             )
             .outerjoin(EndUser, Conversation.from_end_user_id == EndUser.id)
             .subquery()
@@ -172,96 +167,78 @@ class ChatConversationApi(Resource):
 
         query = db.select(Conversation).where(Conversation.app_id == app_model.id)
 
-        if args["keyword"]:
-            keyword_filter = "%{}%".format(args["keyword"])
-            query = (
-                query.join(
-                    Message,
-                    Message.conversation_id == Conversation.id,
-                )
-                .join(subquery, subquery.c.conversation_id == Conversation.id)
-                .filter(
-                    or_(
-                        Message.query.ilike(keyword_filter),
-                        Message.answer.ilike(keyword_filter),
-                        Conversation.name.ilike(keyword_filter),
-                        Conversation.introduction.ilike(keyword_filter),
-                        subquery.c.from_end_user_session_id.ilike(keyword_filter),
-                    ),
-                )
-                .group_by(Conversation.id)
+        if args['keyword']:
+            keyword_filter = '%{}%'.format(args['keyword'])
+            query = query.join(
+                Message, Message.conversation_id == Conversation.id,
+            ).join(
+                subquery, subquery.c.conversation_id == Conversation.id
+            ).filter(
+                or_(
+                    Message.query.ilike(keyword_filter),
+                    Message.answer.ilike(keyword_filter),
+                    Conversation.name.ilike(keyword_filter),
+                    Conversation.introduction.ilike(keyword_filter),
+                    subquery.c.from_end_user_session_id.ilike(keyword_filter)
+                ),
             )
 
         account = current_user
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            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)
+            query = query.where(Conversation.created_at >= start_datetime_utc)
 
-        if args["end"]:
-            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
+        if args['end']:
+            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)
 
-            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)
+            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(
                 MessageAnnotation, MessageAnnotation.conversation_id == Conversation.id
             )
-        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)
-            )
+        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))
                 .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.value:
             query = query.where(Conversation.invoke_from != InvokeFrom.DEBUGGER.value)
 
-        match args["sort_by"]:
-            case "created_at":
-                query = query.order_by(Conversation.created_at.asc())
-            case "-created_at":
-                query = query.order_by(Conversation.created_at.desc())
-            case "updated_at":
-                query = query.order_by(Conversation.updated_at.asc())
-            case "-updated_at":
-                query = query.order_by(Conversation.updated_at.desc())
-            case _:
-                query = query.order_by(Conversation.created_at.desc())
+        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
 
 
 class ChatConversationDetailApi(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
@@ -279,15 +256,12 @@ class ChatConversationDetailApi(Resource):
     @get_app_model(mode=[AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT])
     @account_initialization_required
     def delete(self, app_model, conversation_id):
-        if not current_user.is_editor:
+        if not current_user.is_admin_or_owner:
             raise Forbidden()
         conversation_id = str(conversation_id)
 
-        conversation = (
-            db.session.query(Conversation)
-            .filter(Conversation.id == conversation_id, Conversation.app_id == app_model.id)
-            .first()
-        )
+        conversation = db.session.query(Conversation) \
+            .filter(Conversation.id == conversation_id, Conversation.app_id == app_model.id).first()
 
         if not conversation:
             raise NotFound("Conversation Not Exists.")
@@ -295,21 +269,18 @@ class ChatConversationDetailApi(Resource):
         conversation.is_deleted = True
         db.session.commit()
 
-        return {"result": "success"}, 204
+        return {'result': 'success'}, 204
 
 
-api.add_resource(CompletionConversationApi, "/apps/<uuid:app_id>/completion-conversations")
-api.add_resource(CompletionConversationDetailApi, "/apps/<uuid:app_id>/completion-conversations/<uuid:conversation_id>")
-api.add_resource(ChatConversationApi, "/apps/<uuid:app_id>/chat-conversations")
-api.add_resource(ChatConversationDetailApi, "/apps/<uuid:app_id>/chat-conversations/<uuid:conversation_id>")
+api.add_resource(CompletionConversationApi, '/apps/<uuid:app_id>/completion-conversations')
+api.add_resource(CompletionConversationDetailApi, '/apps/<uuid:app_id>/completion-conversations/<uuid:conversation_id>')
+api.add_resource(ChatConversationApi, '/apps/<uuid:app_id>/chat-conversations')
+api.add_resource(ChatConversationDetailApi, '/apps/<uuid:app_id>/chat-conversations/<uuid:conversation_id>')
 
 
 def _get_conversation(app_model, conversation_id):
-    conversation = (
-        db.session.query(Conversation)
-        .filter(Conversation.id == conversation_id, Conversation.app_id == app_model.id)
-        .first()
-    )
+    conversation = db.session.query(Conversation) \
+        .filter(Conversation.id == conversation_id, Conversation.app_id == app_model.id).first()
 
     if not conversation:
         raise NotFound("Conversation Not Exists.")

api/controllers/console/app/conversation_variables.py

@@ -1,61 +0,0 @@
-from flask_restful import Resource, marshal_with, reqparse
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-
-from controllers.console import api
-from controllers.console.app.wraps import get_app_model
-from controllers.console.setup import setup_required
-from controllers.console.wraps import account_initialization_required
-from extensions.ext_database import db
-from fields.conversation_variable_fields import paginated_conversation_variable_fields
-from libs.login import login_required
-from models import ConversationVariable
-from models.model import AppMode
-
-
-class ConversationVariablesApi(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @get_app_model(mode=AppMode.ADVANCED_CHAT)
-    @marshal_with(paginated_conversation_variable_fields)
-    def get(self, app_model):
-        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)
-        )
-        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
-        page_size = 100
-        stmt = stmt.limit(page_size).offset((page - 1) * page_size)
-
-        with Session(db.engine) as session:
-            rows = session.scalars(stmt).all()
-
-        return {
-            "page": page,
-            "limit": page_size,
-            "total": len(rows),
-            "has_more": False,
-            "data": [
-                {
-                    "created_at": row.created_at,
-                    "updated_at": row.updated_at,
-                    **row.to_variable().model_dump(),
-                }
-                for row in rows
-            ],
-        }
-
-
-api.add_resource(ConversationVariablesApi, "/apps/<uuid:app_id>/conversation-variables")

api/controllers/console/app/error.py

@@ -2,128 +2,116 @@ from libs.exception import BaseHTTPException
 
 
 class AppNotFoundError(BaseHTTPException):
-    error_code = "app_not_found"
+    error_code = 'app_not_found'
     description = "App not found."
     code = 404
 
 
 class ProviderNotInitializeError(BaseHTTPException):
-    error_code = "provider_not_initialize"
-    description = (
-        "No valid model provider credentials found. "
-        "Please go to Settings -> Model Provider to complete your provider credentials."
-    )
+    error_code = 'provider_not_initialize'
+    description = "No valid model provider credentials found. " \
+                  "Please go to Settings -> Model Provider to complete your provider credentials."
     code = 400
 
 
 class ProviderQuotaExceededError(BaseHTTPException):
-    error_code = "provider_quota_exceeded"
-    description = (
-        "Your quota for Dify Hosted Model Provider has been exhausted. "
-        "Please go to Settings -> Model Provider to complete your own provider credentials."
-    )
+    error_code = 'provider_quota_exceeded'
+    description = "Your quota for Dify Hosted Model Provider has been exhausted. " \
+                  "Please go to Settings -> Model Provider to complete your own provider credentials."
     code = 400
 
 
 class ProviderModelCurrentlyNotSupportError(BaseHTTPException):
-    error_code = "model_currently_not_support"
+    error_code = 'model_currently_not_support'
     description = "Dify Hosted OpenAI trial currently not support the GPT-4 model."
     code = 400
 
 
 class ConversationCompletedError(BaseHTTPException):
-    error_code = "conversation_completed"
+    error_code = 'conversation_completed'
     description = "The conversation has ended. Please start a new conversation."
     code = 400
 
 
 class AppUnavailableError(BaseHTTPException):
-    error_code = "app_unavailable"
+    error_code = 'app_unavailable'
     description = "App unavailable, please check your app configurations."
     code = 400
 
 
 class CompletionRequestError(BaseHTTPException):
-    error_code = "completion_request_error"
+    error_code = 'completion_request_error'
     description = "Completion request failed."
     code = 400
 
 
 class AppMoreLikeThisDisabledError(BaseHTTPException):
-    error_code = "app_more_like_this_disabled"
+    error_code = 'app_more_like_this_disabled'
     description = "The 'More like this' feature is disabled. Please refresh your page."
     code = 403
 
 
 class NoAudioUploadedError(BaseHTTPException):
-    error_code = "no_audio_uploaded"
+    error_code = 'no_audio_uploaded'
     description = "Please upload your audio."
     code = 400
 
 
 class AudioTooLargeError(BaseHTTPException):
-    error_code = "audio_too_large"
+    error_code = 'audio_too_large'
     description = "Audio size exceeded. {message}"
     code = 413
 
 
 class UnsupportedAudioTypeError(BaseHTTPException):
-    error_code = "unsupported_audio_type"
+    error_code = 'unsupported_audio_type'
     description = "Audio type not allowed."
     code = 415
 
 
 class ProviderNotSupportSpeechToTextError(BaseHTTPException):
-    error_code = "provider_not_support_speech_to_text"
+    error_code = 'provider_not_support_speech_to_text'
     description = "Provider not support speech to text."
     code = 400
 
 
 class NoFileUploadedError(BaseHTTPException):
-    error_code = "no_file_uploaded"
+    error_code = 'no_file_uploaded'
     description = "Please upload your file."
     code = 400
 
 
 class TooManyFilesError(BaseHTTPException):
-    error_code = "too_many_files"
+    error_code = 'too_many_files'
     description = "Only one file is allowed."
     code = 400
 
 
 class DraftWorkflowNotExist(BaseHTTPException):
-    error_code = "draft_workflow_not_exist"
+    error_code = 'draft_workflow_not_exist'
     description = "Draft workflow need to be initialized."
     code = 400
 
 
 class DraftWorkflowNotSync(BaseHTTPException):
-    error_code = "draft_workflow_not_sync"
+    error_code = 'draft_workflow_not_sync'
     description = "Workflow graph might have been modified, please refresh and resubmit."
     code = 400
 
 
 class TracingConfigNotExist(BaseHTTPException):
-    error_code = "trace_config_not_exist"
+    error_code = 'trace_config_not_exist'
     description = "Trace config not exist."
     code = 400
 
 
 class TracingConfigIsExist(BaseHTTPException):
-    error_code = "trace_config_is_exist"
+    error_code = 'trace_config_is_exist'
     description = "Trace config is exist."
     code = 400
 
 
 class TracingConfigCheckError(BaseHTTPException):
-    error_code = "trace_config_check_error"
+    error_code = 'trace_config_check_error'
     description = "Invalid Credentials."
     code = 400
-
-
-class InvokeRateLimitError(BaseHTTPException):
-    """Raised when the Invoke returns rate limit error."""
-
-    error_code = "rate_limit_error"
-    description = "Rate Limit Error"
-    code = 429

api/controllers/console/app/generator.py

@@ -24,21 +24,21 @@ class RuleGenerateApi(Resource):
     @account_initialization_required
     def post(self):
         parser = reqparse.RequestParser()
-        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('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
-        PROMPT_GENERATION_MAX_TOKENS = int(os.getenv("PROMPT_GENERATION_MAX_TOKENS", "512"))
+        PROMPT_GENERATION_MAX_TOKENS = int(os.getenv('PROMPT_GENERATION_MAX_TOKENS', '512'))
 
         try:
             rules = LLMGenerator.generate_rule_config(
                 tenant_id=account.current_tenant_id,
-                instruction=args["instruction"],
-                model_config=args["model_config"],
-                no_variable=args["no_variable"],
-                rule_config_max_tokens=PROMPT_GENERATION_MAX_TOKENS,
+                instruction=args['instruction'],
+                model_config=args['model_config'],
+                no_variable=args['no_variable'],
+                rule_config_max_tokens=PROMPT_GENERATION_MAX_TOKENS
             )
         except ProviderTokenNotInitError as ex:
             raise ProviderNotInitializeError(ex.description)
@@ -52,39 +52,4 @@ class RuleGenerateApi(Resource):
         return rules
 
 
-class RuleCodeGenerateApi(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    def post(self):
-        parser = reqparse.RequestParser()
-        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
-        CODE_GENERATION_MAX_TOKENS = int(os.getenv("CODE_GENERATION_MAX_TOKENS", "1024"))
-        try:
-            code_result = LLMGenerator.generate_code(
-                tenant_id=account.current_tenant_id,
-                instruction=args["instruction"],
-                model_config=args["model_config"],
-                code_language=args["code_language"],
-                max_tokens=CODE_GENERATION_MAX_TOKENS,
-            )
-        except ProviderTokenNotInitError as ex:
-            raise ProviderNotInitializeError(ex.description)
-        except QuotaExceededError:
-            raise ProviderQuotaExceededError()
-        except ModelCurrentlyNotSupportError:
-            raise ProviderModelCurrentlyNotSupportError()
-        except InvokeError as e:
-            raise CompletionRequestError(e.description)
-
-        return code_result
-
-
-api.add_resource(RuleGenerateApi, "/rule-generate")
-api.add_resource(RuleCodeGenerateApi, "/rule-code-generate")
+api.add_resource(RuleGenerateApi, '/rule-generate')

api/controllers/console/app/message.py

@@ -33,9 +33,9 @@ from services.message_service import MessageService
 
 class ChatMessageListApi(Resource):
     message_infinite_scroll_pagination_fields = {
-        "limit": fields.Integer,
-        "has_more": fields.Boolean,
-        "data": fields.List(fields.Nested(message_detail_fields)),
+        'limit': fields.Integer,
+        'has_more': fields.Boolean,
+        'data': fields.List(fields.Nested(message_detail_fields))
     }
 
     @setup_required
@@ -45,67 +45,55 @@ class ChatMessageListApi(Resource):
     @marshal_with(message_infinite_scroll_pagination_fields)
     def get(self, app_model):
         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")
+        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)
-            .filter(Conversation.id == args["conversation_id"], Conversation.app_id == app_model.id)
-            .first()
-        )
+        conversation = db.session.query(Conversation).filter(
+            Conversation.id == args['conversation_id'],
+            Conversation.app_id == app_model.id
+        ).first()
 
         if not conversation:
             raise NotFound("Conversation Not Exists.")
 
-        if args["first_id"]:
-            first_message = (
-                db.session.query(Message)
-                .filter(Message.conversation_id == conversation.id, Message.id == args["first_id"])
-                .first()
-            )
+        if args['first_id']:
+            first_message = db.session.query(Message) \
+                .filter(Message.conversation_id == conversation.id, Message.id == args['first_id']).first()
 
             if not first_message:
                 raise NotFound("First message not found")
 
-            history_messages = (
-                db.session.query(Message)
-                .filter(
-                    Message.conversation_id == conversation.id,
-                    Message.created_at < first_message.created_at,
-                    Message.id != first_message.id,
-                )
-                .order_by(Message.created_at.desc())
-                .limit(args["limit"])
-                .all()
-            )
+            history_messages = db.session.query(Message).filter(
+                Message.conversation_id == conversation.id,
+                Message.created_at < first_message.created_at,
+                Message.id != first_message.id
+            ) \
+                .order_by(Message.created_at.desc()).limit(args['limit']).all()
         else:
-            history_messages = (
-                db.session.query(Message)
-                .filter(Message.conversation_id == conversation.id)
-                .order_by(Message.created_at.desc())
-                .limit(args["limit"])
-                .all()
-            )
+            history_messages = db.session.query(Message).filter(Message.conversation_id == conversation.id) \
+                .order_by(Message.created_at.desc()).limit(args['limit']).all()
 
         has_more = False
-        if len(history_messages) == args["limit"]:
+        if len(history_messages) == args['limit']:
             current_page_first_message = history_messages[-1]
-            rest_count = (
-                db.session.query(Message)
-                .filter(
-                    Message.conversation_id == conversation.id,
-                    Message.created_at < current_page_first_message.created_at,
-                    Message.id != current_page_first_message.id,
-                )
-                .count()
-            )
+            rest_count = db.session.query(Message).filter(
+                Message.conversation_id == conversation.id,
+                Message.created_at < current_page_first_message.created_at,
+                Message.id != current_page_first_message.id
+            ).count()
 
             if rest_count > 0:
                 has_more = True
 
-        return InfiniteScrollPagination(data=history_messages, limit=args["limit"], has_more=has_more)
+        history_messages = list(reversed(history_messages))
+
+        return InfiniteScrollPagination(
+            data=history_messages,
+            limit=args['limit'],
+            has_more=has_more
+        )
 
 
 class MessageFeedbackApi(Resource):
@@ -115,46 +103,49 @@ class MessageFeedbackApi(Resource):
     @get_app_model
     def post(self, app_model):
         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")
+        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).filter(Message.id == message_id, Message.app_id == app_model.id).first()
+        message = db.session.query(Message).filter(
+            Message.id == message_id,
+            Message.app_id == app_model.id
+        ).first()
 
         if not message:
             raise NotFound("Message Not Exists.")
 
         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:
-            feedback.rating = args["rating"]
-        elif not args["rating"] and not feedback:
-            raise ValueError("rating cannot be None when feedback not exists")
+        elif args['rating'] and feedback:
+            feedback.rating = args['rating']
+        elif not args['rating'] and not feedback:
+            raise ValueError('rating cannot be None when feedback not exists')
         else:
             feedback = MessageFeedback(
                 app_id=app_model.id,
                 conversation_id=message.conversation_id,
                 message_id=message.id,
-                rating=args["rating"],
-                from_source="admin",
-                from_account_id=current_user.id,
+                rating=args['rating'],
+                from_source='admin',
+                from_account_id=current_user.id
             )
             db.session.add(feedback)
 
         db.session.commit()
 
-        return {"result": "success"}
+        return {'result': 'success'}
 
 
 class MessageAnnotationApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @cloud_edition_billing_resource_check("annotation")
+    @cloud_edition_billing_resource_check('annotation')
     @get_app_model
     @marshal_with(annotation_fields)
     def post(self, app_model):
@@ -162,10 +153,10 @@ class MessageAnnotationApi(Resource):
             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")
+        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)
 
@@ -178,9 +169,11 @@ class MessageAnnotationCountApi(Resource):
     @account_initialization_required
     @get_app_model
     def get(self, app_model):
-        count = db.session.query(MessageAnnotation).filter(MessageAnnotation.app_id == app_model.id).count()
+        count = db.session.query(MessageAnnotation).filter(
+            MessageAnnotation.app_id == app_model.id
+        ).count()
 
-        return {"count": count}
+        return {'count': count}
 
 
 class MessageSuggestedQuestionApi(Resource):
@@ -193,7 +186,10 @@ class MessageSuggestedQuestionApi(Resource):
 
         try:
             questions = MessageService.get_suggested_questions_after_answer(
-                app_model=app_model, message_id=message_id, user=current_user, invoke_from=InvokeFrom.DEBUGGER
+                app_model=app_model,
+                message_id=message_id,
+                user=current_user,
+                invoke_from=InvokeFrom.DEBUGGER
             )
         except MessageNotExistsError:
             raise NotFound("Message not found")
@@ -213,7 +209,7 @@ class MessageSuggestedQuestionApi(Resource):
             logging.exception("internal server error.")
             raise InternalServerError()
 
-        return {"data": questions}
+        return {'data': questions}
 
 
 class MessageApi(Resource):
@@ -225,7 +221,10 @@ class MessageApi(Resource):
     def get(self, app_model, message_id):
         message_id = str(message_id)
 
-        message = db.session.query(Message).filter(Message.id == message_id, Message.app_id == app_model.id).first()
+        message = db.session.query(Message).filter(
+            Message.id == message_id,
+            Message.app_id == app_model.id
+        ).first()
 
         if not message:
             raise NotFound("Message Not Exists.")
@@ -233,9 +232,9 @@ class MessageApi(Resource):
         return message
 
 
-api.add_resource(MessageSuggestedQuestionApi, "/apps/<uuid:app_id>/chat-messages/<uuid:message_id>/suggested-questions")
-api.add_resource(ChatMessageListApi, "/apps/<uuid:app_id>/chat-messages", endpoint="console_chat_messages")
-api.add_resource(MessageFeedbackApi, "/apps/<uuid:app_id>/feedbacks")
-api.add_resource(MessageAnnotationApi, "/apps/<uuid:app_id>/annotations")
-api.add_resource(MessageAnnotationCountApi, "/apps/<uuid:app_id>/annotations/count")
-api.add_resource(MessageApi, "/apps/<uuid:app_id>/messages/<uuid:message_id>", endpoint="console_message")
+api.add_resource(MessageSuggestedQuestionApi, '/apps/<uuid:app_id>/chat-messages/<uuid:message_id>/suggested-questions')
+api.add_resource(ChatMessageListApi, '/apps/<uuid:app_id>/chat-messages', endpoint='console_chat_messages')
+api.add_resource(MessageFeedbackApi, '/apps/<uuid:app_id>/feedbacks')
+api.add_resource(MessageAnnotationApi, '/apps/<uuid:app_id>/annotations')
+api.add_resource(MessageAnnotationCountApi, '/apps/<uuid:app_id>/annotations/count')
+api.add_resource(MessageApi, '/apps/<uuid:app_id>/messages/<uuid:message_id>', endpoint='console_message')

api/controllers/console/app/model_config.py

@@ -19,35 +19,37 @@ from services.app_model_config_service import AppModelConfigService
 
 
 class ModelConfigResource(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.AGENT_CHAT, AppMode.CHAT, AppMode.COMPLETION])
     def post(self, app_model):
+        
         """Modify app model config"""
         # validate config
         model_configuration = AppModelConfigService.validate_configuration(
-            tenant_id=current_user.current_tenant_id, config=request.json, app_mode=AppMode.value_of(app_model.mode)
+            tenant_id=current_user.current_tenant_id,
+            config=request.json,
+            app_mode=AppMode.value_of(app_model.mode)
         )
 
         new_app_model_config = AppModelConfig(
             app_id=app_model.id,
-            created_by=current_user.id,
-            updated_by=current_user.id,
         )
         new_app_model_config = new_app_model_config.from_model_config_dict(model_configuration)
 
         if app_model.mode == AppMode.AGENT_CHAT.value or app_model.is_agent:
             # get original app model config
-            original_app_model_config: AppModelConfig = (
-                db.session.query(AppModelConfig).filter(AppModelConfig.id == app_model.app_model_config_id).first()
-            )
+            original_app_model_config: AppModelConfig = db.session.query(AppModelConfig).filter(
+                AppModelConfig.id == app_model.app_model_config_id
+            ).first()
             agent_mode = original_app_model_config.agent_mode_dict
             # decrypt agent tool parameters if it's secret-input
             parameter_map = {}
             masked_parameter_map = {}
             tool_map = {}
-            for tool in agent_mode.get("tools") or []:
+            for tool in agent_mode.get('tools') or []:
                 if not isinstance(tool, dict) or len(tool.keys()) <= 3:
                     continue
 
@@ -64,7 +66,7 @@ class ModelConfigResource(Resource):
                         tool_runtime=tool_runtime,
                         provider_name=agent_tool_entity.provider_id,
                         provider_type=agent_tool_entity.provider_type,
-                        identity_id=f"AGENT.{app_model.id}",
+                        identity_id=f'AGENT.{app_model.id}'
                     )
                 except Exception as e:
                     continue
@@ -77,18 +79,18 @@ class ModelConfigResource(Resource):
                     parameters = {}
                     masked_parameter = {}
 
-                key = f"{agent_tool_entity.provider_id}.{agent_tool_entity.provider_type}.{agent_tool_entity.tool_name}"
+                key = f'{agent_tool_entity.provider_id}.{agent_tool_entity.provider_type}.{agent_tool_entity.tool_name}'
                 masked_parameter_map[key] = masked_parameter
                 parameter_map[key] = parameters
                 tool_map[key] = tool_runtime
 
             # encrypt agent tool parameters if it's secret-input
             agent_mode = new_app_model_config.agent_mode_dict
-            for tool in agent_mode.get("tools") or []:
+            for tool in agent_mode.get('tools') or []:
                 agent_tool_entity = AgentToolEntity(**tool)
 
                 # get tool
-                key = f"{agent_tool_entity.provider_id}.{agent_tool_entity.provider_type}.{agent_tool_entity.tool_name}"
+                key = f'{agent_tool_entity.provider_id}.{agent_tool_entity.provider_type}.{agent_tool_entity.tool_name}'
                 if key in tool_map:
                     tool_runtime = tool_map[key]
                 else:
@@ -106,7 +108,7 @@ class ModelConfigResource(Resource):
                     tool_runtime=tool_runtime,
                     provider_name=agent_tool_entity.provider_id,
                     provider_type=agent_tool_entity.provider_type,
-                    identity_id=f"AGENT.{app_model.id}",
+                    identity_id=f'AGENT.{app_model.id}'
                 )
                 manager.delete_tool_parameters_cache()
 
@@ -114,17 +116,15 @@ class ModelConfigResource(Resource):
                 if agent_tool_entity.tool_parameters:
                     if key not in masked_parameter_map:
                         continue
-
+                    
                     for masked_key, masked_value in masked_parameter_map[key].items():
-                        if (
-                            masked_key in agent_tool_entity.tool_parameters
-                            and agent_tool_entity.tool_parameters[masked_key] == masked_value
-                        ):
+                        if masked_key in agent_tool_entity.tool_parameters and \
+                                agent_tool_entity.tool_parameters[masked_key] == masked_value:
                             agent_tool_entity.tool_parameters[masked_key] = parameter_map[key].get(masked_key)
 
                 # encrypt parameters
                 if agent_tool_entity.tool_parameters:
-                    tool["tool_parameters"] = manager.encrypt_tool_parameters(agent_tool_entity.tool_parameters or {})
+                    tool['tool_parameters'] = manager.encrypt_tool_parameters(agent_tool_entity.tool_parameters or {})
 
             # update app model config
             new_app_model_config.agent_mode = json.dumps(agent_mode)
@@ -135,9 +135,12 @@ class ModelConfigResource(Resource):
         app_model.app_model_config_id = new_app_model_config.id
         db.session.commit()
 
-        app_model_config_was_updated.send(app_model, app_model_config=new_app_model_config)
+        app_model_config_was_updated.send(
+            app_model,
+            app_model_config=new_app_model_config
+        )
 
-        return {"result": "success"}
+        return {'result': 'success'}
 
 
-api.add_resource(ModelConfigResource, "/apps/<uuid:app_id>/model-config")
+api.add_resource(ModelConfigResource, '/apps/<uuid:app_id>/model-config')

api/controllers/console/app/ops_trace.py

@@ -18,11 +18,13 @@ class TraceAppConfigApi(Resource):
     @account_initialization_required
     def get(self, app_id):
         parser = reqparse.RequestParser()
-        parser.add_argument("tracing_provider", type=str, required=True, location="args")
+        parser.add_argument('tracing_provider', type=str, required=True, location='args')
         args = parser.parse_args()
 
         try:
-            trace_config = OpsService.get_tracing_app_config(app_id=app_id, tracing_provider=args["tracing_provider"])
+            trace_config = OpsService.get_tracing_app_config(
+                app_id=app_id, tracing_provider=args['tracing_provider']
+                )
             if not trace_config:
                 return {"has_not_configured": True}
             return trace_config
@@ -35,17 +37,19 @@ class TraceAppConfigApi(Resource):
     def post(self, app_id):
         """Create a new trace app configuration"""
         parser = reqparse.RequestParser()
-        parser.add_argument("tracing_provider", type=str, required=True, location="json")
-        parser.add_argument("tracing_config", type=dict, required=True, location="json")
+        parser.add_argument('tracing_provider', type=str, required=True, location='json')
+        parser.add_argument('tracing_config', type=dict, required=True, location='json')
         args = parser.parse_args()
 
         try:
             result = OpsService.create_tracing_app_config(
-                app_id=app_id, tracing_provider=args["tracing_provider"], tracing_config=args["tracing_config"]
+                app_id=app_id,
+                tracing_provider=args['tracing_provider'],
+                tracing_config=args['tracing_config']
             )
             if not result:
                 raise TracingConfigIsExist()
-            if result.get("error"):
+            if result.get('error'):
                 raise TracingConfigCheckError()
             return result
         except Exception as e:
@@ -57,13 +61,15 @@ class TraceAppConfigApi(Resource):
     def patch(self, app_id):
         """Update an existing trace app configuration"""
         parser = reqparse.RequestParser()
-        parser.add_argument("tracing_provider", type=str, required=True, location="json")
-        parser.add_argument("tracing_config", type=dict, required=True, location="json")
+        parser.add_argument('tracing_provider', type=str, required=True, location='json')
+        parser.add_argument('tracing_config', type=dict, required=True, location='json')
         args = parser.parse_args()
 
         try:
             result = OpsService.update_tracing_app_config(
-                app_id=app_id, tracing_provider=args["tracing_provider"], tracing_config=args["tracing_config"]
+                app_id=app_id,
+                tracing_provider=args['tracing_provider'],
+                tracing_config=args['tracing_config']
             )
             if not result:
                 raise TracingConfigNotExist()
@@ -77,11 +83,14 @@ class TraceAppConfigApi(Resource):
     def delete(self, app_id):
         """Delete an existing trace app configuration"""
         parser = reqparse.RequestParser()
-        parser.add_argument("tracing_provider", type=str, required=True, location="args")
+        parser.add_argument('tracing_provider', type=str, required=True, location='args')
         args = parser.parse_args()
 
         try:
-            result = OpsService.delete_tracing_app_config(app_id=app_id, tracing_provider=args["tracing_provider"])
+            result = OpsService.delete_tracing_app_config(
+                app_id=app_id,
+                tracing_provider=args['tracing_provider']
+            )
             if not result:
                 raise TracingConfigNotExist()
             return {"result": "success"}
@@ -89,4 +98,4 @@ class TraceAppConfigApi(Resource):
             raise e
 
 
-api.add_resource(TraceAppConfigApi, "/apps/<uuid:app_id>/trace-config")
+api.add_resource(TraceAppConfigApi, '/apps/<uuid:app_id>/trace-config')

api/controllers/console/app/site.py

@@ -1,5 +1,3 @@
-from datetime import datetime, timezone
-
 from flask_login import current_user
 from flask_restful import Resource, marshal_with, reqparse
 from werkzeug.exceptions import Forbidden, NotFound
@@ -12,29 +10,27 @@ from controllers.console.wraps import account_initialization_required
 from extensions.ext_database import db
 from fields.app_fields import app_site_fields
 from libs.login import login_required
-from models import Site
+from models.model import Site
 
 
 def parse_app_site_args():
     parser = reqparse.RequestParser()
-    parser.add_argument("title", type=str, required=False, location="json")
-    parser.add_argument("icon_type", type=str, required=False, location="json")
-    parser.add_argument("icon", type=str, required=False, location="json")
-    parser.add_argument("icon_background", type=str, required=False, location="json")
-    parser.add_argument("description", type=str, required=False, location="json")
-    parser.add_argument("default_language", type=supported_language, required=False, location="json")
-    parser.add_argument("chat_color_theme", type=str, required=False, location="json")
-    parser.add_argument("chat_color_theme_inverted", type=bool, required=False, location="json")
-    parser.add_argument("customize_domain", type=str, required=False, location="json")
-    parser.add_argument("copyright", type=str, required=False, location="json")
-    parser.add_argument("privacy_policy", type=str, required=False, location="json")
-    parser.add_argument("custom_disclaimer", type=str, required=False, location="json")
-    parser.add_argument(
-        "customize_token_strategy", type=str, choices=["must", "allow", "not_allow"], 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")
+    parser.add_argument('title', type=str, required=False, location='json')
+    parser.add_argument('icon', type=str, required=False, location='json')
+    parser.add_argument('icon_background', type=str, required=False, location='json')
+    parser.add_argument('description', type=str, required=False, location='json')
+    parser.add_argument('default_language', type=supported_language, required=False, location='json')
+    parser.add_argument('chat_color_theme', type=str, required=False, location='json')
+    parser.add_argument('chat_color_theme_inverted', type=bool, required=False, location='json')
+    parser.add_argument('customize_domain', type=str, required=False, location='json')
+    parser.add_argument('copyright', type=str, required=False, location='json')
+    parser.add_argument('privacy_policy', type=str, required=False, location='json')
+    parser.add_argument('custom_disclaimer', type=str, required=False, location='json')
+    parser.add_argument('customize_token_strategy', type=str, choices=['must', 'allow', 'not_allow'],
+                        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')
     return parser.parse_args()
 
 
@@ -51,38 +47,37 @@ class AppSite(Resource):
         if not current_user.is_editor:
             raise Forbidden()
 
-        site = db.session.query(Site).filter(Site.app_id == app_model.id).one_or_404()
+        site = db.session.query(Site). \
+            filter(Site.app_id == app_model.id). \
+            one_or_404()
 
         for attr_name in [
-            "title",
-            "icon_type",
-            "icon",
-            "icon_background",
-            "description",
-            "default_language",
-            "chat_color_theme",
-            "chat_color_theme_inverted",
-            "customize_domain",
-            "copyright",
-            "privacy_policy",
-            "custom_disclaimer",
-            "customize_token_strategy",
-            "prompt_public",
-            "show_workflow_steps",
-            "use_icon_as_answer_icon",
+            'title',
+            'icon',
+            'icon_background',
+            'description',
+            'default_language',
+            'chat_color_theme',
+            'chat_color_theme_inverted',
+            'customize_domain',
+            'copyright',
+            'privacy_policy',
+            'custom_disclaimer',
+            'customize_token_strategy',
+            'prompt_public',
+            'show_workflow_steps'
         ]:
             value = args.get(attr_name)
             if value is not None:
                 setattr(site, attr_name, value)
 
-        site.updated_by = current_user.id
-        site.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
         db.session.commit()
 
         return site
 
 
 class AppSiteAccessTokenReset(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
@@ -99,12 +94,10 @@ class AppSiteAccessTokenReset(Resource):
             raise NotFound
 
         site.code = Site.generate_code(16)
-        site.updated_by = current_user.id
-        site.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
         db.session.commit()
 
         return site
 
 
-api.add_resource(AppSite, "/apps/<uuid:app_id>/site")
-api.add_resource(AppSiteAccessTokenReset, "/apps/<uuid:app_id>/site/access-token-reset")
+api.add_resource(AppSite, '/apps/<uuid:app_id>/site')
+api.add_resource(AppSiteAccessTokenReset, '/apps/<uuid:app_id>/site/access-token-reset')

api/controllers/console/app/statistic.py

@@ -11,69 +11,13 @@ from controllers.console.app.wraps import get_app_model
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
 from extensions.ext_database import db
-from libs.helper import DatetimeString
+from libs.helper import datetime_string
 from libs.login import login_required
 from models.model import AppMode
 
 
-class DailyMessageStatistic(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @get_app_model
-    def get(self, app_model):
-        account = current_user
-
-        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()
-
-        sql_query = """SELECT
-    DATE(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
-    COUNT(*) AS message_count
-FROM
-    messages
-WHERE
-    app_id = :app_id"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id}
-
-        timezone = pytz.timezone(account.timezone)
-        utc_timezone = pytz.utc
-
-        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)
-
-            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(db.text(sql_query), arg_dict)
-            for i in rs:
-                response_data.append({"date": str(i.date), "message_count": i.message_count})
-
-        return jsonify({"data": response_data})
-
-
 class DailyConversationStatistic(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
@@ -82,55 +26,58 @@ class DailyConversationStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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,
-    COUNT(DISTINCT messages.conversation_id) AS conversation_count
-FROM
-    messages
-WHERE
-    app_id = :app_id"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id}
+        sql_query = '''
+        SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, count(distinct messages.conversation_id) AS conversation_count
+            FROM messages where app_id = :app_id 
+        '''
+        arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            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")
+        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 += ' and created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
             rs = conn.execute(db.text(sql_query), arg_dict)
             for i in rs:
-                response_data.append({"date": str(i.date), "conversation_count": i.conversation_count})
+                response_data.append({
+                    'date': str(i.date),
+                    'conversation_count': i.conversation_count
+                })
 
-        return jsonify({"data": response_data})
+        return jsonify({
+            'data': response_data
+        })
 
 
 class DailyTerminalsStatistic(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
@@ -139,52 +86,54 @@ class DailyTerminalsStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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,
-    COUNT(DISTINCT messages.from_end_user_id) AS terminal_count
-FROM
-    messages
-WHERE
-    app_id = :app_id"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id}
+        sql_query = '''
+                SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, count(distinct messages.from_end_user_id) AS terminal_count
+                    FROM messages where app_id = :app_id 
+                '''
+        arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            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")
+        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 += ' and created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
-            rs = conn.execute(db.text(sql_query), arg_dict)
+            rs = conn.execute(db.text(sql_query), arg_dict)            
             for i in rs:
-                response_data.append({"date": str(i.date), "terminal_count": i.terminal_count})
+                response_data.append({
+                    'date': str(i.date),
+                    'terminal_count': i.terminal_count
+                })
 
-        return jsonify({"data": response_data})
+        return jsonify({
+            'data': response_data
+        })
 
 
 class DailyTokenCostStatistic(Resource):
@@ -196,55 +145,58 @@ class DailyTokenCostStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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,
-    (SUM(messages.message_tokens) + SUM(messages.answer_tokens)) AS token_count,
-    SUM(total_price) AS total_price
-FROM
-    messages
-WHERE
-    app_id = :app_id"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id}
+        sql_query = '''
+                SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+                    (sum(messages.message_tokens) + sum(messages.answer_tokens)) as token_count,
+                    sum(total_price) as total_price
+                    FROM messages where app_id = :app_id 
+                '''
+        arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            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")
+        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 += ' and created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
             rs = conn.execute(db.text(sql_query), arg_dict)
             for i in rs:
-                response_data.append(
-                    {"date": str(i.date), "token_count": i.token_count, "total_price": i.total_price, "currency": "USD"}
-                )
+                response_data.append({
+                    'date': str(i.date),
+                    'token_count': i.token_count,
+                    'total_price': i.total_price,
+                    'currency': 'USD'
+                })
 
-        return jsonify({"data": response_data})
+        return jsonify({
+            'data': response_data
+        })
 
 
 class AverageSessionInteractionStatistic(Resource):
@@ -256,72 +208,60 @@ class AverageSessionInteractionStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
         args = parser.parse_args()
 
-        sql_query = """SELECT
-    DATE(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
-    AVG(subquery.message_count) AS interactions
-FROM
-    (
-        SELECT
-            m.conversation_id,
-            COUNT(m.id) AS message_count
-        FROM
-            conversations c
-        JOIN
-            messages m
-            ON c.id = m.conversation_id
-        WHERE
-            c.override_model_configs IS NULL
-            AND c.app_id = :app_id"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id}
+        sql_query = """SELECT date(DATE_TRUNC('day', c.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+AVG(subquery.message_count) AS interactions
+FROM (SELECT m.conversation_id, COUNT(m.id) AS message_count
+    FROM conversations c
+    JOIN messages m ON c.id = m.conversation_id
+    WHERE c.override_model_configs IS NULL AND c.app_id = :app_id"""
+        arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND c.created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            sql_query += ' and c.created_at >= :start'
+            arg_dict['start'] = start_datetime_utc
 
-        if args["end"]:
-            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
+        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
+            sql_query += ' and c.created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
         sql_query += """
-        GROUP BY m.conversation_id
-    ) subquery
-LEFT JOIN
-    conversations c
-    ON c.id = subquery.conversation_id
-GROUP BY
-    date
-ORDER BY
-    date"""
+        GROUP BY m.conversation_id) subquery
+LEFT JOIN conversations c on c.id=subquery.conversation_id
+GROUP BY date
+ORDER BY date"""
 
         response_data = []
-
+        
         with db.engine.begin() as conn:
             rs = conn.execute(db.text(sql_query), arg_dict)
             for i in rs:
-                response_data.append(
-                    {"date": str(i.date), "interactions": float(i.interactions.quantize(Decimal("0.01")))}
-                )
+                response_data.append({
+                    'date': str(i.date),
+                    'interactions': float(i.interactions.quantize(Decimal('0.01')))
+                })
 
-        return jsonify({"data": response_data})
+        return jsonify({
+            'data': response_data
+        })
 
 
 class UserSatisfactionRateStatistic(Resource):
@@ -333,61 +273,57 @@ class UserSatisfactionRateStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
         args = parser.parse_args()
 
-        sql_query = """SELECT
-    DATE(DATE_TRUNC('day', m.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date,
-    COUNT(m.id) AS message_count,
-    COUNT(mf.id) AS feedback_count
-FROM
-    messages m
-LEFT JOIN
-    message_feedbacks mf
-    ON mf.message_id=m.id AND mf.rating='like'
-WHERE
-    m.app_id = :app_id"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id}
+        sql_query = '''
+                        SELECT date(DATE_TRUNC('day', m.created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+                            COUNT(m.id) as message_count, COUNT(mf.id) as feedback_count 
+                            FROM messages m
+                            LEFT JOIN message_feedbacks mf on mf.message_id=m.id and mf.rating='like'
+                            WHERE m.app_id = :app_id 
+                        '''
+        arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND m.created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            sql_query += ' and m.created_at >= :start'
+            arg_dict['start'] = start_datetime_utc
 
-        if args["end"]:
-            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
+        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
+            sql_query += ' and m.created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
             rs = conn.execute(db.text(sql_query), arg_dict)
             for i in rs:
-                response_data.append(
-                    {
-                        "date": str(i.date),
-                        "rate": round((i.feedback_count * 1000 / i.message_count) if i.message_count > 0 else 0, 2),
-                    }
-                )
+                response_data.append({
+                    'date': str(i.date),
+                    'rate': round((i.feedback_count * 1000 / i.message_count) if i.message_count > 0 else 0, 2),
+                })
 
-        return jsonify({"data": response_data})
+        return jsonify({
+            'data': response_data
+        })
 
 
 class AverageResponseTimeStatistic(Resource):
@@ -399,52 +335,56 @@ class AverageResponseTimeStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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,
-    AVG(provider_response_latency) AS latency
-FROM
-    messages
-WHERE
-    app_id = :app_id"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id}
+        sql_query = '''
+                SELECT date(DATE_TRUNC('day', created_at AT TIME ZONE 'UTC' AT TIME ZONE :tz )) AS date, 
+                    AVG(provider_response_latency) as latency
+                    FROM messages
+                    WHERE app_id = :app_id
+                '''
+        arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            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")
+        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 += ' and created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
-            rs = conn.execute(db.text(sql_query), arg_dict)
+            rs = conn.execute(db.text(sql_query), arg_dict)            
             for i in rs:
-                response_data.append({"date": str(i.date), "latency": round(i.latency * 1000, 4)})
+                response_data.append({
+                    'date': str(i.date),
+                    'latency': round(i.latency * 1000, 4)
+                })
 
-        return jsonify({"data": response_data})
+        return jsonify({
+            'data': response_data
+        })
 
 
 class TokensPerSecondStatistic(Resource):
@@ -456,62 +396,63 @@ class TokensPerSecondStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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
+        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))
     END as tokens_per_second
-FROM
-    messages
-WHERE
-    app_id = :app_id"""
-        arg_dict = {"tz": account.timezone, "app_id": app_model.id}
+FROM messages
+WHERE app_id = :app_id'''
+        arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            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")
+        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 += ' and created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
             rs = conn.execute(db.text(sql_query), arg_dict)
             for i in rs:
-                response_data.append({"date": str(i.date), "tps": round(i.tokens_per_second, 4)})
+                response_data.append({
+                    'date': str(i.date),
+                    'tps': round(i.tokens_per_second, 4)
+                })
 
-        return jsonify({"data": response_data})
+        return jsonify({
+            'data': response_data
+        })
 
 
-api.add_resource(DailyMessageStatistic, "/apps/<uuid:app_id>/statistics/daily-messages")
-api.add_resource(DailyConversationStatistic, "/apps/<uuid:app_id>/statistics/daily-conversations")
-api.add_resource(DailyTerminalsStatistic, "/apps/<uuid:app_id>/statistics/daily-end-users")
-api.add_resource(DailyTokenCostStatistic, "/apps/<uuid:app_id>/statistics/token-costs")
-api.add_resource(AverageSessionInteractionStatistic, "/apps/<uuid:app_id>/statistics/average-session-interactions")
-api.add_resource(UserSatisfactionRateStatistic, "/apps/<uuid:app_id>/statistics/user-satisfaction-rate")
-api.add_resource(AverageResponseTimeStatistic, "/apps/<uuid:app_id>/statistics/average-response-time")
-api.add_resource(TokensPerSecondStatistic, "/apps/<uuid:app_id>/statistics/tokens-per-second")
+api.add_resource(DailyConversationStatistic, '/apps/<uuid:app_id>/statistics/daily-conversations')
+api.add_resource(DailyTerminalsStatistic, '/apps/<uuid:app_id>/statistics/daily-end-users')
+api.add_resource(DailyTokenCostStatistic, '/apps/<uuid:app_id>/statistics/token-costs')
+api.add_resource(AverageSessionInteractionStatistic, '/apps/<uuid:app_id>/statistics/average-session-interactions')
+api.add_resource(UserSatisfactionRateStatistic, '/apps/<uuid:app_id>/statistics/user-satisfaction-rate')
+api.add_resource(AverageResponseTimeStatistic, '/apps/<uuid:app_id>/statistics/average-response-time')
+api.add_resource(TokensPerSecondStatistic, '/apps/<uuid:app_id>/statistics/tokens-per-second')

api/controllers/console/app/workflow.py

@@ -13,14 +13,14 @@ from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.entities.app_invoke_entities import InvokeFrom
-from factories import variable_factory
+from core.app.segments import factory
+from core.errors.error import AppInvokeQuotaExceededError
 from fields.workflow_fields import workflow_fields
 from fields.workflow_run_fields import workflow_run_node_execution_fields
 from libs import helper
 from libs.helper import TimestampField, uuid_value
 from libs.login import current_user, login_required
-from models import App
-from models.model import AppMode
+from models.model import App, AppMode
 from services.app_dsl_service import AppDslService
 from services.app_generate_service import AppGenerateService
 from services.errors.app import WorkflowHashNotEqualError
@@ -64,58 +64,49 @@ class DraftWorkflowApi(Resource):
         # The role of the current user in the ta table must be admin, owner, or editor
         if not current_user.is_editor:
             raise Forbidden()
+        
+        content_type = request.headers.get('Content-Type', '')
 
-        content_type = request.headers.get("Content-Type", "")
-
-        if "application/json" in content_type:
+        if 'application/json' in content_type:
             parser = reqparse.RequestParser()
-            parser.add_argument("graph", type=dict, required=True, nullable=False, location="json")
-            parser.add_argument("features", type=dict, required=True, nullable=False, location="json")
-            parser.add_argument("hash", type=str, required=False, location="json")
+            parser.add_argument('graph', type=dict, required=True, nullable=False, location='json')
+            parser.add_argument('features', type=dict, required=True, nullable=False, location='json')
+            parser.add_argument('hash', type=str, required=False, location='json')
             # TODO: set this to required=True after frontend is updated
-            parser.add_argument("environment_variables", type=list, required=False, location="json")
-            parser.add_argument("conversation_variables", type=list, required=False, location="json")
+            parser.add_argument('environment_variables', type=list, required=False, location='json')
             args = parser.parse_args()
-        elif "text/plain" in content_type:
+        elif 'text/plain' in content_type:
             try:
-                data = json.loads(request.data.decode("utf-8"))
-                if "graph" not in data or "features" not in data:
-                    raise ValueError("graph or features not found in data")
+                data = json.loads(request.data.decode('utf-8'))
+                if 'graph' not in data or 'features' not in data:
+                    raise ValueError('graph or features not found in data')
 
-                if not isinstance(data.get("graph"), dict) or not isinstance(data.get("features"), dict):
-                    raise ValueError("graph or features is not a dict")
+                if not isinstance(data.get('graph'), dict) or not isinstance(data.get('features'), dict):
+                    raise ValueError('graph or features is not a dict')
 
                 args = {
-                    "graph": data.get("graph"),
-                    "features": data.get("features"),
-                    "hash": data.get("hash"),
-                    "environment_variables": data.get("environment_variables"),
-                    "conversation_variables": data.get("conversation_variables"),
+                    'graph': data.get('graph'),
+                    'features': data.get('features'),
+                    'hash': data.get('hash'),
+                    'environment_variables': data.get('environment_variables')
                 }
             except json.JSONDecodeError:
-                return {"message": "Invalid JSON data"}, 400
+                return {'message': 'Invalid JSON data'}, 400
         else:
             abort(415)
 
         workflow_service = WorkflowService()
 
         try:
-            environment_variables_list = args.get("environment_variables") or []
-            environment_variables = [
-                variable_factory.build_variable_from_mapping(obj) for obj in environment_variables_list
-            ]
-            conversation_variables_list = args.get("conversation_variables") or []
-            conversation_variables = [
-                variable_factory.build_variable_from_mapping(obj) for obj in conversation_variables_list
-            ]
+            environment_variables_list = args.get('environment_variables') or []
+            environment_variables = [factory.build_variable_from_mapping(obj) for obj in environment_variables_list]
             workflow = workflow_service.sync_draft_workflow(
                 app_model=app_model,
-                graph=args["graph"],
-                features=args["features"],
-                unique_hash=args.get("hash"),
+                graph=args['graph'],
+                features=args['features'],
+                unique_hash=args.get('hash'),
                 account=current_user,
                 environment_variables=environment_variables,
-                conversation_variables=conversation_variables,
             )
         except WorkflowHashNotEqualError:
             raise DraftWorkflowNotSync()
@@ -123,7 +114,7 @@ class DraftWorkflowApi(Resource):
         return {
             "result": "success",
             "hash": workflow.unique_hash,
-            "updated_at": TimestampField().format(workflow.updated_at or workflow.created_at),
+            "updated_at": TimestampField().format(workflow.updated_at or workflow.created_at)
         }
 
 
@@ -142,11 +133,13 @@ class DraftWorkflowImportApi(Resource):
             raise Forbidden()
 
         parser = reqparse.RequestParser()
-        parser.add_argument("data", type=str, required=True, nullable=False, location="json")
+        parser.add_argument('data', type=str, required=True, nullable=False, location='json')
         args = parser.parse_args()
 
         workflow = AppDslService.import_and_overwrite_workflow(
-            app_model=app_model, data=args["data"], account=current_user
+            app_model=app_model,
+            data=args['data'],
+            account=current_user
         )
 
         return workflow
@@ -164,19 +157,21 @@ class AdvancedChatDraftWorkflowRunApi(Resource):
         # 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("inputs", type=dict, location="json")
-        parser.add_argument("query", type=str, required=True, location="json", default="")
-        parser.add_argument("files", type=list, 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('inputs', type=dict, location='json')
+        parser.add_argument('query', type=str, required=True, location='json', default='')
+        parser.add_argument('files', type=list, location='json')
+        parser.add_argument('conversation_id', type=uuid_value, location='json')
         args = parser.parse_args()
 
         try:
             response = AppGenerateService.generate(
-                app_model=app_model, user=current_user, args=args, invoke_from=InvokeFrom.DEBUGGER, streaming=True
+                app_model=app_model,
+                user=current_user,
+                args=args,
+                invoke_from=InvokeFrom.DEBUGGER,
+                streaming=True
             )
 
             return helper.compact_generate_response(response)
@@ -190,7 +185,6 @@ class AdvancedChatDraftWorkflowRunApi(Resource):
             logging.exception("internal server error.")
             raise InternalServerError()
 
-
 class AdvancedChatDraftRunIterationNodeApi(Resource):
     @setup_required
     @login_required
@@ -203,14 +197,18 @@ class AdvancedChatDraftRunIterationNodeApi(Resource):
         # 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("inputs", type=dict, location="json")
+        parser.add_argument('inputs', type=dict, location='json')
         args = parser.parse_args()
 
         try:
             response = AppGenerateService.generate_single_iteration(
-                app_model=app_model, user=current_user, node_id=node_id, args=args, streaming=True
+                app_model=app_model,
+                user=current_user,
+                node_id=node_id,
+                args=args,
+                streaming=True
             )
 
             return helper.compact_generate_response(response)
@@ -224,7 +222,6 @@ class AdvancedChatDraftRunIterationNodeApi(Resource):
             logging.exception("internal server error.")
             raise InternalServerError()
 
-
 class WorkflowDraftRunIterationNodeApi(Resource):
     @setup_required
     @login_required
@@ -237,14 +234,18 @@ class WorkflowDraftRunIterationNodeApi(Resource):
         # 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("inputs", type=dict, location="json")
+        parser.add_argument('inputs', type=dict, location='json')
         args = parser.parse_args()
 
         try:
             response = AppGenerateService.generate_single_iteration(
-                app_model=app_model, user=current_user, node_id=node_id, args=args, streaming=True
+                app_model=app_model,
+                user=current_user,
+                node_id=node_id,
+                args=args,
+                streaming=True
             )
 
             return helper.compact_generate_response(response)
@@ -258,7 +259,6 @@ class WorkflowDraftRunIterationNodeApi(Resource):
             logging.exception("internal server error.")
             raise InternalServerError()
 
-
 class DraftWorkflowRunApi(Resource):
     @setup_required
     @login_required
@@ -271,21 +271,27 @@ class DraftWorkflowRunApi(Resource):
         # 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("inputs", type=dict, required=True, nullable=False, location="json")
-        parser.add_argument("files", type=list, required=False, location="json")
+        parser.add_argument('inputs', type=dict, required=True, nullable=False, location='json')
+        parser.add_argument('files', type=list, required=False, location='json')
         args = parser.parse_args()
 
-        response = AppGenerateService.generate(
-            app_model=app_model,
-            user=current_user,
-            args=args,
-            invoke_from=InvokeFrom.DEBUGGER,
-            streaming=True,
-        )
+        try:
+            response = AppGenerateService.generate(
+                app_model=app_model,
+                user=current_user,
+                args=args,
+                invoke_from=InvokeFrom.DEBUGGER,
+                streaming=True
+            )
 
-        return helper.compact_generate_response(response)
+            return helper.compact_generate_response(response)
+        except (ValueError, AppInvokeQuotaExceededError) as e:
+            raise e
+        except Exception as e:
+            logging.exception("internal server error.")
+            raise InternalServerError()
 
 
 class WorkflowTaskStopApi(Resource):
@@ -300,10 +306,12 @@ class WorkflowTaskStopApi(Resource):
         # The role of the current user in the ta table must be admin, owner, or editor
         if not current_user.is_editor:
             raise Forbidden()
-
+        
         AppQueueManager.set_stop_flag(task_id, InvokeFrom.DEBUGGER, current_user.id)
 
-        return {"result": "success"}
+        return {
+            "result": "success"
+        }
 
 
 class DraftWorkflowNodeRunApi(Resource):
@@ -319,20 +327,24 @@ class DraftWorkflowNodeRunApi(Resource):
         # 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("inputs", type=dict, required=True, nullable=False, location="json")
+        parser.add_argument('inputs', type=dict, required=True, nullable=False, location='json')
         args = parser.parse_args()
 
         workflow_service = WorkflowService()
         workflow_node_execution = workflow_service.run_draft_workflow_node(
-            app_model=app_model, node_id=node_id, user_inputs=args.get("inputs"), account=current_user
+            app_model=app_model,
+            node_id=node_id,
+            user_inputs=args.get('inputs'),
+            account=current_user
         )
 
         return workflow_node_execution
 
 
 class PublishedWorkflowApi(Resource):
+
     @setup_required
     @login_required
     @account_initialization_required
@@ -345,7 +357,7 @@ class PublishedWorkflowApi(Resource):
         # The role of the current user in the ta table must be admin, owner, or editor
         if not current_user.is_editor:
             raise Forbidden()
-
+        
         # fetch published workflow by app_model
         workflow_service = WorkflowService()
         workflow = workflow_service.get_published_workflow(app_model=app_model)
@@ -364,11 +376,14 @@ class PublishedWorkflowApi(Resource):
         # The role of the current user in the ta table must be admin, owner, or editor
         if not current_user.is_editor:
             raise Forbidden()
-
+        
         workflow_service = WorkflowService()
         workflow = workflow_service.publish_workflow(app_model=app_model, account=current_user)
 
-        return {"result": "success", "created_at": TimestampField().format(workflow.created_at)}
+        return {
+            "result": "success",
+            "created_at": TimestampField().format(workflow.created_at)
+        }
 
 
 class DefaultBlockConfigsApi(Resource):
@@ -383,7 +398,7 @@ class DefaultBlockConfigsApi(Resource):
         # The role of the current user in the ta table must be admin, owner, or editor
         if not current_user.is_editor:
             raise Forbidden()
-
+        
         # Get default block configs
         workflow_service = WorkflowService()
         return workflow_service.get_default_block_configs()
@@ -401,21 +416,24 @@ class DefaultBlockConfigApi(Resource):
         # 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("q", type=str, location="args")
+        parser.add_argument('q', type=str, location='args')
         args = parser.parse_args()
 
         filters = None
-        if args.get("q"):
+        if args.get('q'):
             try:
-                filters = json.loads(args.get("q"))
+                filters = json.loads(args.get('q'))
             except json.JSONDecodeError:
-                raise ValueError("Invalid filters")
+                raise ValueError('Invalid filters')
 
         # Get default block configs
         workflow_service = WorkflowService()
-        return workflow_service.get_default_block_config(node_type=block_type, filters=filters)
+        return workflow_service.get_default_block_config(
+            node_type=block_type,
+            filters=filters
+        )
 
 
 class ConvertToWorkflowApi(Resource):
@@ -432,43 +450,40 @@ class ConvertToWorkflowApi(Resource):
         # 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 request.data:
             parser = reqparse.RequestParser()
-            parser.add_argument("name", type=str, required=False, nullable=True, location="json")
-            parser.add_argument("icon_type", type=str, required=False, nullable=True, location="json")
-            parser.add_argument("icon", type=str, required=False, nullable=True, location="json")
-            parser.add_argument("icon_background", type=str, required=False, nullable=True, location="json")
+            parser.add_argument('name', type=str, required=False, nullable=True, location='json')
+            parser.add_argument('icon', type=str, required=False, nullable=True, location='json')
+            parser.add_argument('icon_background', type=str, required=False, nullable=True, location='json')
             args = parser.parse_args()
         else:
             args = {}
 
         # convert to workflow mode
         workflow_service = WorkflowService()
-        new_app_model = workflow_service.convert_to_workflow(app_model=app_model, account=current_user, args=args)
+        new_app_model = workflow_service.convert_to_workflow(
+            app_model=app_model,
+            account=current_user,
+            args=args
+        )
 
         # return app id
         return {
-            "new_app_id": new_app_model.id,
+            'new_app_id': new_app_model.id,
         }
 
 
-api.add_resource(DraftWorkflowApi, "/apps/<uuid:app_id>/workflows/draft")
-api.add_resource(DraftWorkflowImportApi, "/apps/<uuid:app_id>/workflows/draft/import")
-api.add_resource(AdvancedChatDraftWorkflowRunApi, "/apps/<uuid:app_id>/advanced-chat/workflows/draft/run")
-api.add_resource(DraftWorkflowRunApi, "/apps/<uuid:app_id>/workflows/draft/run")
-api.add_resource(WorkflowTaskStopApi, "/apps/<uuid:app_id>/workflow-runs/tasks/<string:task_id>/stop")
-api.add_resource(DraftWorkflowNodeRunApi, "/apps/<uuid:app_id>/workflows/draft/nodes/<string:node_id>/run")
-api.add_resource(
-    AdvancedChatDraftRunIterationNodeApi,
-    "/apps/<uuid:app_id>/advanced-chat/workflows/draft/iteration/nodes/<string:node_id>/run",
-)
-api.add_resource(
-    WorkflowDraftRunIterationNodeApi, "/apps/<uuid:app_id>/workflows/draft/iteration/nodes/<string:node_id>/run"
-)
-api.add_resource(PublishedWorkflowApi, "/apps/<uuid:app_id>/workflows/publish")
-api.add_resource(DefaultBlockConfigsApi, "/apps/<uuid:app_id>/workflows/default-workflow-block-configs")
-api.add_resource(
-    DefaultBlockConfigApi, "/apps/<uuid:app_id>/workflows/default-workflow-block-configs/<string:block_type>"
-)
-api.add_resource(ConvertToWorkflowApi, "/apps/<uuid:app_id>/convert-to-workflow")
+api.add_resource(DraftWorkflowApi, '/apps/<uuid:app_id>/workflows/draft')
+api.add_resource(DraftWorkflowImportApi, '/apps/<uuid:app_id>/workflows/draft/import')
+api.add_resource(AdvancedChatDraftWorkflowRunApi, '/apps/<uuid:app_id>/advanced-chat/workflows/draft/run')
+api.add_resource(DraftWorkflowRunApi, '/apps/<uuid:app_id>/workflows/draft/run')
+api.add_resource(WorkflowTaskStopApi, '/apps/<uuid:app_id>/workflow-runs/tasks/<string:task_id>/stop')
+api.add_resource(DraftWorkflowNodeRunApi, '/apps/<uuid:app_id>/workflows/draft/nodes/<string:node_id>/run')
+api.add_resource(AdvancedChatDraftRunIterationNodeApi, '/apps/<uuid:app_id>/advanced-chat/workflows/draft/iteration/nodes/<string:node_id>/run')
+api.add_resource(WorkflowDraftRunIterationNodeApi, '/apps/<uuid:app_id>/workflows/draft/iteration/nodes/<string:node_id>/run')
+api.add_resource(PublishedWorkflowApi, '/apps/<uuid:app_id>/workflows/publish')
+api.add_resource(DefaultBlockConfigsApi, '/apps/<uuid:app_id>/workflows/default-workflow-block-configs')
+api.add_resource(DefaultBlockConfigApi, '/apps/<uuid:app_id>/workflows/default-workflow-block-configs'
+                                        '/<string:block_type>')
+api.add_resource(ConvertToWorkflowApi, '/apps/<uuid:app_id>/convert-to-workflow')

api/controllers/console/app/workflow_app_log.py

@@ -7,8 +7,7 @@ from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
 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 models.model import App, AppMode
 from services.workflow_app_service import WorkflowAppService
 
 
@@ -23,19 +22,20 @@ class WorkflowAppLogApi(Resource):
         Get workflow app logs
         """
         parser = reqparse.RequestParser()
-        parser.add_argument("keyword", type=str, location="args")
-        parser.add_argument("status", type=str, choices=["succeeded", "failed", "stopped"], 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")
+        parser.add_argument('keyword', type=str, location='args')
+        parser.add_argument('status', type=str, choices=['succeeded', 'failed', 'stopped'], 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()
 
         # get paginate workflow app logs
         workflow_app_service = WorkflowAppService()
         workflow_app_log_pagination = workflow_app_service.get_paginate_workflow_app_logs(
-            app_model=app_model, args=args
+            app_model=app_model,
+            args=args
         )
 
         return workflow_app_log_pagination
 
 
-api.add_resource(WorkflowAppLogApi, "/apps/<uuid:app_id>/workflow-app-logs")
+api.add_resource(WorkflowAppLogApi, '/apps/<uuid:app_id>/workflow-app-logs')

api/controllers/console/app/workflow_run.py

@@ -13,8 +13,7 @@ from fields.workflow_run_fields import (
 )
 from libs.helper import uuid_value
 from libs.login import login_required
-from models import App
-from models.model import AppMode
+from models.model import App, AppMode
 from services.workflow_run_service import WorkflowRunService
 
 
@@ -29,12 +28,15 @@ class AdvancedChatAppWorkflowRunListApi(Resource):
         Get advanced chat app workflow run list
         """
         parser = reqparse.RequestParser()
-        parser.add_argument("last_id", type=uuid_value, location="args")
-        parser.add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
+        parser.add_argument('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()
 
         workflow_run_service = WorkflowRunService()
-        result = workflow_run_service.get_paginate_advanced_chat_workflow_runs(app_model=app_model, args=args)
+        result = workflow_run_service.get_paginate_advanced_chat_workflow_runs(
+            app_model=app_model,
+            args=args
+        )
 
         return result
 
@@ -50,12 +52,15 @@ class WorkflowRunListApi(Resource):
         Get workflow run list
         """
         parser = reqparse.RequestParser()
-        parser.add_argument("last_id", type=uuid_value, location="args")
-        parser.add_argument("limit", type=int_range(1, 100), required=False, default=20, location="args")
+        parser.add_argument('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()
 
         workflow_run_service = WorkflowRunService()
-        result = workflow_run_service.get_paginate_workflow_runs(app_model=app_model, args=args)
+        result = workflow_run_service.get_paginate_workflow_runs(
+            app_model=app_model,
+            args=args
+        )
 
         return result
 
@@ -93,10 +98,12 @@ class WorkflowRunNodeExecutionListApi(Resource):
         workflow_run_service = WorkflowRunService()
         node_executions = workflow_run_service.get_workflow_run_node_executions(app_model=app_model, run_id=run_id)
 
-        return {"data": node_executions}
+        return {
+            'data': node_executions
+        }
 
 
-api.add_resource(AdvancedChatAppWorkflowRunListApi, "/apps/<uuid:app_id>/advanced-chat/workflow-runs")
-api.add_resource(WorkflowRunListApi, "/apps/<uuid:app_id>/workflow-runs")
-api.add_resource(WorkflowRunDetailApi, "/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>")
-api.add_resource(WorkflowRunNodeExecutionListApi, "/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>/node-executions")
+api.add_resource(AdvancedChatAppWorkflowRunListApi, '/apps/<uuid:app_id>/advanced-chat/workflow-runs')
+api.add_resource(WorkflowRunListApi, '/apps/<uuid:app_id>/workflow-runs')
+api.add_resource(WorkflowRunDetailApi, '/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>')
+api.add_resource(WorkflowRunNodeExecutionListApi, '/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>/node-executions')

api/controllers/console/app/workflow_statistic.py

@@ -11,10 +11,10 @@ from controllers.console.app.wraps import get_app_model
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
 from extensions.ext_database import db
-from libs.helper import DatetimeString
+from libs.helper import datetime_string
 from libs.login import login_required
-from models.enums import WorkflowRunTriggeredFrom
 from models.model import AppMode
+from models.workflow import WorkflowRunTriggeredFrom
 
 
 class WorkflowDailyRunsStatistic(Resource):
@@ -26,58 +26,56 @@ class WorkflowDailyRunsStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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,
-    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.value,
-        }
+        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.value}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            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")
+        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 += ' and created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
             rs = conn.execute(db.text(sql_query), arg_dict)
             for i in rs:
-                response_data.append({"date": str(i.date), "runs": i.runs})
-
-        return jsonify({"data": response_data})
+                response_data.append({
+                    'date': str(i.date),
+                    'runs': i.runs
+                })
 
+        return jsonify({
+            'data': response_data
+        })
 
 class WorkflowDailyTerminalsStatistic(Resource):
     @setup_required
@@ -88,58 +86,56 @@ class WorkflowDailyTerminalsStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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,
-    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.value,
-        }
+        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.value}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            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")
+        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 += ' and created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
-            rs = conn.execute(db.text(sql_query), arg_dict)
+            rs = conn.execute(db.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})
+                response_data.append({
+                    'date': str(i.date),
+                    'terminal_count': i.terminal_count
+                })
 
+        return jsonify({
+            'data': response_data
+        })
 
 class WorkflowDailyTokenCostStatistic(Resource):
     @setup_required
@@ -150,63 +146,58 @@ class WorkflowDailyTokenCostStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%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,
-    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.value,
-        }
+        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.value}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query += " AND created_at >= :start"
-            arg_dict["start"] = start_datetime_utc
+            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")
+        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 += ' and created_at < :end'
+            arg_dict['end'] = end_datetime_utc
 
-        sql_query += " GROUP BY date ORDER BY date"
+        sql_query += ' GROUP BY date order by date'
 
         response_data = []
 
         with db.engine.begin() as conn:
             rs = conn.execute(db.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})
+                response_data.append({
+                    'date': str(i.date),
+                    'token_count': i.token_count,
+                })
 
+        return jsonify({
+            'data': response_data
+        })
 
 class WorkflowAverageAppInteractionStatistic(Resource):
     @setup_required
@@ -217,79 +208,71 @@ class WorkflowAverageAppInteractionStatistic(Resource):
         account = current_user
 
         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")
+        parser.add_argument('start', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
+        parser.add_argument('end', type=datetime_string('%Y-%m-%d %H:%M'), location='args')
         args = parser.parse_args()
 
-        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.value,
-        }
+        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.value}
 
         timezone = pytz.timezone(account.timezone)
         utc_timezone = pytz.utc
 
-        if args["start"]:
-            start_datetime = datetime.strptime(args["start"], "%Y-%m-%d %H:%M")
+        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)
 
-            sql_query = sql_query.replace("{{start}}", " AND c.created_at >= :start")
-            arg_dict["start"] = start_datetime_utc
+            sql_query = sql_query.replace('{{start}}', ' AND c.created_at >= :start')
+            arg_dict['start'] = start_datetime_utc
         else:
-            sql_query = sql_query.replace("{{start}}", "")
+            sql_query = sql_query.replace('{{start}}', '')
 
-        if args["end"]:
-            end_datetime = datetime.strptime(args["end"], "%Y-%m-%d %H:%M")
+        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
+            sql_query = sql_query.replace('{{end}}', ' and c.created_at < :end')
+            arg_dict['end'] = end_datetime_utc
         else:
-            sql_query = sql_query.replace("{{end}}", "")
+            sql_query = sql_query.replace('{{end}}', '')
 
         response_data = []
-
+        
         with db.engine.begin() as conn:
             rs = conn.execute(db.text(sql_query), arg_dict)
             for i in rs:
-                response_data.append(
-                    {"date": str(i.date), "interactions": float(i.interactions.quantize(Decimal("0.01")))}
-                )
+                response_data.append({
+                    'date': str(i.date),
+                    'interactions': float(i.interactions.quantize(Decimal('0.01')))
+                })
 
-        return jsonify({"data": response_data})
+        return jsonify({
+            'data': response_data
+        })
 
-
-api.add_resource(WorkflowDailyRunsStatistic, "/apps/<uuid:app_id>/workflow/statistics/daily-conversations")
-api.add_resource(WorkflowDailyTerminalsStatistic, "/apps/<uuid:app_id>/workflow/statistics/daily-terminals")
-api.add_resource(WorkflowDailyTokenCostStatistic, "/apps/<uuid:app_id>/workflow/statistics/token-costs")
-api.add_resource(
-    WorkflowAverageAppInteractionStatistic, "/apps/<uuid:app_id>/workflow/statistics/average-app-interactions"
-)
+api.add_resource(WorkflowDailyRunsStatistic, '/apps/<uuid:app_id>/workflow/statistics/daily-conversations')
+api.add_resource(WorkflowDailyTerminalsStatistic, '/apps/<uuid:app_id>/workflow/statistics/daily-terminals')
+api.add_resource(WorkflowDailyTokenCostStatistic, '/apps/<uuid:app_id>/workflow/statistics/token-costs')
+api.add_resource(WorkflowAverageAppInteractionStatistic, '/apps/<uuid:app_id>/workflow/statistics/average-app-interactions')

api/controllers/console/app/wraps.py

@@ -5,27 +5,27 @@ from typing import Optional, Union
 from controllers.console.app.error import AppNotFoundError
 from extensions.ext_database import db
 from libs.login import current_user
-from models import App
-from models.model import AppMode
+from models.model import App, AppMode
 
 
-def get_app_model(view: Optional[Callable] = None, *, mode: Union[AppMode, list[AppMode]] = None):
+def get_app_model(view: Optional[Callable] = None, *,
+                  mode: Union[AppMode, list[AppMode]] = None):
     def decorator(view_func):
         @wraps(view_func)
         def decorated_view(*args, **kwargs):
-            if not kwargs.get("app_id"):
-                raise ValueError("missing app_id in path parameters")
+            if not kwargs.get('app_id'):
+                raise ValueError('missing app_id in path parameters')
 
-            app_id = kwargs.get("app_id")
+            app_id = kwargs.get('app_id')
             app_id = str(app_id)
 
-            del kwargs["app_id"]
+            del kwargs['app_id']
 
-            app_model = (
-                db.session.query(App)
-                .filter(App.id == app_id, App.tenant_id == current_user.current_tenant_id, App.status == "normal")
-                .first()
-            )
+            app_model = db.session.query(App).filter(
+                App.id == app_id,
+                App.tenant_id == current_user.current_tenant_id,
+                App.status == 'normal'
+            ).first()
 
             if not app_model:
                 raise AppNotFoundError()
@@ -44,10 +44,9 @@ def get_app_model(view: Optional[Callable] = None, *, mode: Union[AppMode, list[
                     mode_values = {m.value for m in modes}
                     raise AppNotFoundError(f"App mode is not in the supported list: {mode_values}")
 
-            kwargs["app_model"] = app_model
+            kwargs['app_model'] = app_model
 
             return view_func(*args, **kwargs)
-
         return decorated_view
 
     if view is None:

api/controllers/console/auth/activate.py

@@ -1,77 +1,76 @@
+import base64
 import datetime
+import secrets
 
-from flask import request
 from flask_restful import Resource, reqparse
 
 from constants.languages import supported_language
 from controllers.console import api
 from controllers.console.error import AlreadyActivateError
 from extensions.ext_database import db
-from libs.helper import StrLen, email, extract_remote_ip, timezone
-from models.account import AccountStatus, Tenant
-from services.account_service import AccountService, RegisterService
+from libs.helper import email, str_len, timezone
+from libs.password import hash_password, valid_password
+from models.account import AccountStatus
+from services.account_service import RegisterService
 
 
 class ActivateCheckApi(Resource):
     def get(self):
         parser = reqparse.RequestParser()
-        parser.add_argument("workspace_id", type=str, required=False, nullable=True, location="args")
-        parser.add_argument("email", type=email, required=False, nullable=True, location="args")
-        parser.add_argument("token", type=str, required=True, nullable=False, location="args")
+        parser.add_argument('workspace_id', type=str, required=False, nullable=True, location='args')
+        parser.add_argument('email', type=email, required=False, nullable=True, location='args')
+        parser.add_argument('token', type=str, required=True, nullable=False, location='args')
         args = parser.parse_args()
 
-        workspaceId = args["workspace_id"]
-        reg_email = args["email"]
-        token = args["token"]
+        workspaceId = args['workspace_id']
+        reg_email = args['email']
+        token = args['token']
 
         invitation = RegisterService.get_invitation_if_token_valid(workspaceId, reg_email, token)
-        if invitation:
-            data = invitation.get("data", {})
-            tenant: Tenant = invitation.get("tenant", None)
-            workspace_name = tenant.name if tenant else None
-            workspace_id = tenant.id if tenant else None
-            invitee_email = data.get("email") if data else None
-            return {
-                "is_valid": invitation is not None,
-                "data": {"workspace_name": workspace_name, "workspace_id": workspace_id, "email": invitee_email},
-            }
-        else:
-            return {"is_valid": False}
+
+        return {'is_valid': invitation is not None, 'workspace_name': invitation['tenant'].name if invitation else None}
 
 
 class ActivateApi(Resource):
     def post(self):
         parser = reqparse.RequestParser()
-        parser.add_argument("workspace_id", type=str, required=False, nullable=True, location="json")
-        parser.add_argument("email", type=email, required=False, nullable=True, location="json")
-        parser.add_argument("token", type=str, required=True, nullable=False, location="json")
-        parser.add_argument("name", type=StrLen(30), required=True, nullable=False, location="json")
-        parser.add_argument(
-            "interface_language", type=supported_language, required=True, nullable=False, location="json"
-        )
-        parser.add_argument("timezone", type=timezone, required=True, nullable=False, location="json")
+        parser.add_argument('workspace_id', type=str, required=False, nullable=True, location='json')
+        parser.add_argument('email', type=email, required=False, nullable=True, location='json')
+        parser.add_argument('token', type=str, required=True, nullable=False, location='json')
+        parser.add_argument('name', type=str_len(30), required=True, nullable=False, location='json')
+        parser.add_argument('password', type=valid_password, required=True, nullable=False, location='json')
+        parser.add_argument('interface_language', type=supported_language, required=True, nullable=False,
+                            location='json')
+        parser.add_argument('timezone', type=timezone, required=True, nullable=False, location='json')
         args = parser.parse_args()
 
-        invitation = RegisterService.get_invitation_if_token_valid(args["workspace_id"], args["email"], args["token"])
+        invitation = RegisterService.get_invitation_if_token_valid(args['workspace_id'], args['email'], args['token'])
         if invitation is None:
             raise AlreadyActivateError()
 
-        RegisterService.revoke_token(args["workspace_id"], args["email"], args["token"])
+        RegisterService.revoke_token(args['workspace_id'], args['email'], args['token'])
 
-        account = invitation["account"]
-        account.name = args["name"]
+        account = invitation['account']
+        account.name = args['name']
 
-        account.interface_language = args["interface_language"]
-        account.timezone = args["timezone"]
-        account.interface_theme = "light"
+        # generate password salt
+        salt = secrets.token_bytes(16)
+        base64_salt = base64.b64encode(salt).decode()
+
+        # encrypt password with salt
+        password_hashed = hash_password(args['password'], salt)
+        base64_password_hashed = base64.b64encode(password_hashed).decode()
+        account.password = base64_password_hashed
+        account.password_salt = base64_salt
+        account.interface_language = args['interface_language']
+        account.timezone = args['timezone']
+        account.interface_theme = 'light'
         account.status = AccountStatus.ACTIVE.value
         account.initialized_at = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
         db.session.commit()
 
-        token_pair = AccountService.login(account, ip_address=extract_remote_ip(request))
-
-        return {"result": "success", "data": token_pair.model_dump()}
+        return {'result': 'success'}
 
 
-api.add_resource(ActivateCheckApi, "/activate/check")
-api.add_resource(ActivateApi, "/activate")
+api.add_resource(ActivateCheckApi, '/activate/check')
+api.add_resource(ActivateApi, '/activate')