delete remove tsne position

2024-07-02 14:55:05 +08:00 · 2024-07-02 14:52:41 +08:00
1082 changed files with 7880 additions and 34107 deletions
@@ -1,7 +1,6 @@
 #!/bin/bash

 cd web && npm install
-pipx install poetry

 echo 'alias start-api="cd /workspaces/dify/api && flask run --host 0.0.0.0 --port=5001 --debug"' >> ~/.bashrc
 echo 'alias start-worker="cd /workspaces/dify/api && celery -A app.celery worker -P gevent -c 1 --loglevel INFO -Q dataset,generation,mail,ops_trace,app_deletion"' >> ~/.bashrc
@@ -1,24 +0,0 @@
-title: "General Discussion"
-body:
-  - type: checkboxes
-    attributes:
-      label: Self Checks
-      description: "To make sure we get to you in time, please check the following :)"
-      options:
-        - label: I have searched for existing issues [search for existing issues](https://github.com/langgenius/dify/issues), including closed ones.
-          required: true
-        - label: I confirm that I am using English to submit this report (我已阅读并同意 [Language Policy](https://github.com/langgenius/dify/issues/1542)).
-          required: true
-        - label: "请务必使用英文提交 Issue，否则会被关闭。谢谢！:）"
-          required: true
-        - label: "Please do not modify this template :) and fill in all the required fields."
-          required: true
-  - type: textarea
-    attributes:
-      label: Content
-      placeholder: Please describe the content you would like to discuss.
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: Please limit one request per issue.
@@ -1,30 +0,0 @@
-title: "Help"
-body:
-  - type: checkboxes
-    attributes:
-      label: Self Checks
-      description: "To make sure we get to you in time, please check the following :)"
-      options:
-        - label: I have searched for existing issues [search for existing issues](https://github.com/langgenius/dify/issues), including closed ones.
-          required: true
-        - label: I confirm that I am using English to submit this report (我已阅读并同意 [Language Policy](https://github.com/langgenius/dify/issues/1542)).
-          required: true
-        - label: "请务必使用英文提交 Issue，否则会被关闭。谢谢！:）"
-          required: true
-        - label: "Please do not modify this template :) and fill in all the required fields."
-          required: true
-  - type: textarea
-    attributes:
-      label: 1. Is this request related to a challenge you're experiencing? Tell me about your story.
-      placeholder: Please describe the specific scenario or problem you're facing as clearly as possible. For instance "I was trying to use [feature] for [specific task], and [what happened]... It was frustrating because...."
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 2. Additional context or comments
-      placeholder: (Any other information, comments, documentations, links, or screenshots that would provide more clarity. This is the place to add anything else not covered above.)
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: Please limit one request per issue.
@@ -1,37 +0,0 @@
-title: Suggestions for New Features
-body:
-  - type: checkboxes
-    attributes:
-      label: Self Checks
-      description: "To make sure we get to you in time, please check the following :)"
-      options:
-        - label: I have searched for existing issues [search for existing issues](https://github.com/langgenius/dify/issues), including closed ones.
-          required: true
-        - label: I confirm that I am using English to submit this report (我已阅读并同意 [Language Policy](https://github.com/langgenius/dify/issues/1542)).
-          required: true
-        - label: "请务必使用英文提交 Issue，否则会被关闭。谢谢！:）"
-          required: true
-        - label: "Please do not modify this template :) and fill in all the required fields."
-          required: true
-  - type: textarea
-    attributes:
-      label: 1. Is this request related to a challenge you're experiencing? Tell me about your story.
-      placeholder: Please describe the specific scenario or problem you're facing as clearly as possible. For instance "I was trying to use [feature] for [specific task], and [what happened]... It was frustrating because...."
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 2. Additional context or comments
-      placeholder: (Any other information, comments, documentations, links, or screenshots that would provide more clarity. This is the place to add anything else not covered above.)
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: 3. Can you help us with this feature?
-      description: Let us know! This is not a commitment, but a starting point for collaboration.
-      options:
-        - label: I am interested in contributing to this feature.
-          required: false
-  - type: markdown
-    attributes:
-      value: Please limit one request per issue.
@@ -1,21 +1,13 @@
-# Checklist:
-
-> [!IMPORTANT]  
-> Please review the checklist below before submitting your pull request.
-
- [ ] Please open an issue before creating a PR or link to an existing issue
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods
-
 # Description

-Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue. Close issue syntax: `Fixes #<issue number>`, see [documentation](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) for more details.
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

-Fixes 
+Fixes # (issue)

 ## Type of Change

+Please delete options that are not relevant.
+
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
@@ -23,12 +15,18 @@ Fixes
 - [ ] Improvement, including but not limited to code refactoring, performance optimization, and UI/UX improvement
 - [ ] Dependency upgrade

-# Testing Instructions
+# How Has This Been Tested?

 Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

- [ ] Test A
- [ ] Test B
-
+- [ ] TODO

+# Suggested Checklist:

+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] My changes generate no new warnings
+- [ ] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods
+- [ ] `optional` I have made corresponding changes to the documentation 
+- [ ] `optional` I have added tests that prove my fix is effective or that my feature works
+- [ ] `optional` New and existing unit tests pass locally with my changes
@@ -75,7 +75,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)
+      - name: Set up Vector Stores (Weaviate, Qdrant, PGVector, Milvus, PgVecto-RS, Chroma)
        uses: hoverkraft-tech/compose-action@v2.0.0
        with:
          compose-file: |
@@ -89,6 +89,5 @@ jobs:
            pgvecto-rs
            pgvector
            chroma
-            myscale
      - name: Test Vector Stores
        run: poetry run -C api bash dev/pytest/pytest_vdb.sh
@@ -48,18 +48,18 @@ jobs:
          platform=${{ matrix.platform }}
          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV

-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ env.DOCKERHUB_USER }}
-          password: ${{ env.DOCKERHUB_TOKEN }}
-
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3

+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ env.DOCKERHUB_USER }}
+          password: ${{ env.DOCKERHUB_TOKEN }}
+
      - name: Extract metadata for Docker
        id: meta
        uses: docker/metadata-action@v5
@@ -174,6 +174,3 @@ sdks/python-client/dify_client.egg-info
 .vscode/*
 !.vscode/launch.json
 pyrightconfig.json
-api/.vscode
-
-.idea/
@@ -13,6 +13,7 @@
            "jinja": true,
            "env": {
                "FLASK_APP": "app.py",
+                "FLASK_DEBUG": "1",
                "GEVENT_SUPPORT": "True"
            },
            "args": [
@@ -81,7 +81,7 @@ Dify requires the following dependencies to build, make sure they're installed o

 Dify is composed of a backend and a frontend. Navigate to the backend directory by `cd api/`, then follow the [Backend README](api/README.md) to install it. In a separate terminal, navigate to the frontend directory by `cd web/`, then follow the [Frontend README](web/README.md) to install.

-Check the [installation FAQ](https://docs.dify.ai/learn-more/faq/self-host-faq) for a list of common issues and steps to troubleshoot.
+Check the [installation FAQ](https://docs.dify.ai/getting-started/faq/install-faq) for a list of common issues and steps to troubleshoot.

 ### 5. Visit dify in your browser

@@ -2,17 +2,17 @@

 考虑到我们的现状，我们需要灵活快速地交付，但我们也希望确保像你这样的贡献者在贡献过程中获得尽可能顺畅的体验。我们为此编写了这份贡献指南，旨在让你熟悉代码库和我们与贡献者的合作方式，以便你能快速进入有趣的部分。

-这份指南，就像 Dify 本身一样，是一个不断改进的工作。如果有时它落后于实际项目，我们非常感谢你的理解，并欢迎提供任何反馈以供我们改进。
+这份指南，就像 Dify 本身一样，是一个不断改进的工作。如果有时它落后于实际项目，我们非常感谢你的理解，并欢迎任何反馈以供我们改进。

-在许可方面，请花一分钟阅读我们简短的 [许可证和贡献者协议](./LICENSE)。社区还遵守 [行为准则](https://github.com/langgenius/.github/blob/main/CODE_OF_CONDUCT.md)。
+在许可方面，请花一分钟阅读我们简短的[许可证和贡献者协议](./LICENSE)。社区还遵守[行为准则](https://github.com/langgenius/.github/blob/main/CODE_OF_CONDUCT.md)。

 ## 在开始之前

-[查找](https://github.com/langgenius/dify/issues?q=is:issue+is:closed)现有问题，或 [创建](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)一个新问题。我们将问题分为两类：

 ### 功能请求：

-* 如果您要提出新的功能请求，请解释所提议的功能的目标，并尽可能提供详细的上下文。[@perzeusss](https://github.com/perzeuss) 制作了一个很好的 [功能请求助手](https://udify.app/chat/MK2kVSnw1gakVwMX)，可以帮助您起草需求。随时尝试一下。
+* 如果您要提出新的功能请求，请解释所提议的功能的目标，并尽可能提供详细的上下文。[@perzeusss](https://github.com/perzeuss)制作了一个很好的[功能请求助手](https://udify.app/chat/MK2kVSnw1gakVwMX)，可以帮助您起草需求。随时尝试一下。

 * 如果您想从现有问题中选择一个，请在其下方留下评论表示您的意愿。

@@ -20,44 +20,45 @@

 根据所提议的功能所属的领域不同，您可能需要与不同的团队成员交流。以下是我们团队成员目前正在从事的各个领域的概述：

-  | 团队成员                                                       | 工作范围                                                |
+  | Member                                                       | Scope                                                |
  | ------------------------------------------------------------ | ---------------------------------------------------- |
-  | [@yeuoly](https://github.com/Yeuoly)                         | 架构 Agents                                  |
-  | [@jyong](https://github.com/JohnJyong)                       | RAG 流水线设计                                  |
-  | [@GarfieldDai](https://github.com/GarfieldDai)               | 构建 workflow 编排                     |
-  | [@iamjoel](https://github.com/iamjoel) & [@zxhlyh](https://github.com/zxhlyh) | 让我们的前端更易用                  |
-  | [@guchenhe](https://github.com/guchenhe) & [@crazywoola](https://github.com/crazywoola) | 开发人员体验, 综合事项联系人 |
-  | [@takatost](https://github.com/takatost)                     | 产品整体方向和架构           |
+  | [@yeuoly](https://github.com/Yeuoly)                         | Architecting Agents                                  |
+  | [@jyong](https://github.com/JohnJyong)                       | RAG pipeline design                                  |
+  | [@GarfieldDai](https://github.com/GarfieldDai)               | Building workflow orchestrations                     |
+  | [@iamjoel](https://github.com/iamjoel) & [@zxhlyh](https://github.com/zxhlyh) | Making our frontend a breeze to use                  |
+  | [@guchenhe](https://github.com/guchenhe) & [@crazywoola](https://github.com/crazywoola) | Developer experience, points of contact for anything |
+  | [@takatost](https://github.com/takatost)                     | Overall product direction and architecture           |

-  事项优先级：
+  How we prioritize:

-  | 功能类型                                                 | 优先级        |
+  | Feature Type                                                 | Priority        |
  | ------------------------------------------------------------ | --------------- |
-  | 被团队成员标记为高优先级的功能    | 高优先级   |
-  | 在 [community feedback board](https://github.com/langgenius/dify/discussions/categories/feedbacks) 内反馈的常见功能请求 | 中等优先级 |
-  | 非核心功能和小幅改进                     | 低优先级    |
-  | 有价值当不紧急                                   | 未来功能  |
+  | High-Priority Features as being labeled by a team member     | High Priority   |
+  | Popular feature requests from our [community feedback board](https://github.com/langgenius/dify/discussions/categories/feedbacks) | Medium Priority |
+  | Non-core features and minor enhancements                     | Low Priority    |
+  | Valuable but not immediate                                   | Future-Feature  |

-### 其他任何事情（例如 bug 报告、性能优化、拼写错误更正）：
+### 其他任何事情（例如bug报告、性能优化、拼写错误更正）：
 * 立即开始编码。

-  事项优先级：
+  How we prioritize:

-  | Issue 类型                                                   | 优先级        |
+  | Issue Type                                                   | Priority        |
  | ------------------------------------------------------------ | --------------- |
-  | 核心功能的 Bugs（例如无法登录、应用无法工作、安全漏洞） | 紧急        |
-  | 非紧急 bugs, 性能提升                        | 中等优先级 |
-  | 小幅修复(错别字, 能正常工作但存在误导的 UI)                | 低优先级    |
+  | Bugs in core functions (cannot login, applications not working, security loopholes) | Critical        |
+  | Non-critical bugs, performance boosts                        | Medium Priority |
+  | Minor fixes (typos, confusing but working UI)                | Low Priority    |
+

 ## 安装

-以下是设置 Dify 进行开发的步骤：
+以下是设置Dify进行开发的步骤：

-### 1. Fork 该仓库
+### 1. Fork该仓库

 ### 2. 克隆仓库

-从终端克隆代码仓库：
+从终端克隆fork的仓库：

 ```
 git clone git@github.com:<github_username>/dify.git
@@ -75,72 +76,72 @@ Dify 依赖以下工具和库：

 ### 4. 安装

-Dify 由后端和前端组成。通过 `cd api/` 导航到后端目录，然后按照 [后端 README](api/README.md) 进行安装。在另一个终端中，通过 `cd web/` 导航到前端目录，然后按照 [前端 README](web/README.md) 进行安装。
+Dify由后端和前端组成。通过`cd api/`导航到后端目录，然后按照[后端README](api/README.md)进行安装。在另一个终端中，通过`cd web/`导航到前端目录，然后按照[前端README](web/README.md)进行安装。

-查看 [安装常见问题解答](https://docs.dify.ai/v/zh-hans/learn-more/faq/install-faq) 以获取常见问题列表和故障排除步骤。
+查看[安装常见问题解答](https://docs.dify.ai/getting-started/faq/install-faq)以获取常见问题列表和故障排除步骤。

-### 5. 在浏览器中访问 Dify
+### 5. 在浏览器中访问Dify

-为了验证您的设置，打开浏览器并访问 [http://localhost:3000](http://localhost:3000)（默认或您自定义的 URL 和端口）。现在您应该看到 Dify 正在运行。
+为了验证您的设置，打开浏览器并访问[http://localhost:3000](http://localhost:3000)（默认或您自定义的URL和端口）。现在您应该看到Dify正在运行。

 ## 开发

-如果您要添加模型提供程序，请参考 [此指南](https://github.com/langgenius/dify/blob/main/api/core/model_runtime/README.md)。
+如果您要添加模型提供程序，请参考[此指南](https://github.com/langgenius/dify/blob/main/api/core/model_runtime/README.md)。

-如果您要向 Agent 或 Workflow 添加工具提供程序，请参考 [此指南](./api/core/tools/README.md)。
+如果您要向Agent或Workflow添加工具提供程序，请参考[此指南](./api/core/tools/README.md)。

-为了帮助您快速了解您的贡献在哪个部分，以下是 Dify 后端和前端的简要注释大纲：
+为了帮助您快速了解您的贡献在哪个部分，以下是Dify后端和前端的简要注释大纲：

 ### 后端

-Dify 的后端使用 Python 编写，使用 [Flask](https://flask.palletsprojects.com/en/3.0.x/) 框架。它使用 [SQLAlchemy](https://www.sqlalchemy.org/) 作为 ORM，使用 [Celery](https://docs.celeryq.dev/en/stable/getting-started/introduction.html) 作为任务队列。授权逻辑通过 Flask-login 进行处理。
+Dify的后端使用Python编写，使用[Flask](https://flask.palletsprojects.com/en/3.0.x/)框架。它使用[SQLAlchemy](https://www.sqlalchemy.org/)作为ORM，使用[Celery](https://docs.celeryq.dev/en/stable/getting-started/introduction.html)作为任务队列。授权逻辑通过Flask-login进行处理。

 ```
 [api/]
-├── constants             // 用于整个代码库的常量设置。
-├── controllers           // API 路由定义和请求处理逻辑。
-├── core                  // 核心应用编排、模型集成和工具。
-├── docker                // Docker 和容器化相关配置。
-├── events                // 事件处理和处理。
-├── extensions            // 与第三方框架/平台的扩展。
-├── fields                // 用于序列化/封装的字段定义。
-├── libs                  // 可重用的库和助手。
-├── migrations            // 数据库迁移脚本。
-├── models                // 数据库模型和架构定义。
-├── services              // 指定业务逻辑。
-├── storage               // 私钥存储。
-├── tasks                 // 异步任务和后台作业的处理。
+├── constants             // Constant settings used throughout code base.
+├── controllers           // API route definitions and request handling logic.           
+├── core                  // Core application orchestration, model integrations, and tools.
+├── docker                // Docker & containerization related configurations.
+├── events                // Event handling and processing
+├── extensions            // Extensions with 3rd party frameworks/platforms.
+├── fields                // field definitions for serialization/marshalling.
+├── libs                  // Reusable libraries and helpers.
+├── migrations            // Scripts for database migration.
+├── models                // Database models & schema definitions.
+├── services              // Specifies business logic.
+├── storage               // Private key storage.      
+├── tasks                 // Handling of async tasks and background jobs.
 └── tests
 ```

 ### 前端

-该网站使用基于 Typescript 的 [Next.js](https://nextjs.org/) 模板进行引导，并使用 [Tailwind CSS](https://tailwindcss.com/) 进行样式设计。[React-i18next](https://react.i18next.com/) 用于国际化。
+该网站使用基于Typescript的[Next.js](https://nextjs.org/)模板进行引导，并使用[Tailwind CSS](https://tailwindcss.com/)进行样式设计。[React-i18next](https://react.i18next.com/)用于国际化。

 ```
 [web/]
-├── app                   // 布局、页面和组件
-│   ├── (commonLayout)    // 整个应用通用的布局
-│   ├── (shareLayout)     // 在特定会话中共享的布局
-│   ├── activate          // 激活页面
-│   ├── components        // 页面和布局共享的组件
-│   ├── install           // 安装页面
-│   ├── signin            // 登录页面
-│   └── styles            // 全局共享的样式
-├── assets                // 静态资源
-├── bin                   // 构建步骤运行的脚本
-├── config                // 可调整的设置和选项
-├── context               // 应用中不同部分使用的共享上下文
-├── dictionaries          // 语言特定的翻译文件
-├── docker                // 容器配置
-├── hooks                 // 可重用的钩子
-├── i18n                  // 国际化配置
-├── models                // 描述数据模型和 API 响应的形状
-├── public                // 如 favicon 等元资源
-├── service               // 定义 API 操作的形状
+├── app                   // layouts, pages, and components
+│   ├── (commonLayout)    // common layout used throughout the app
+│   ├── (shareLayout)     // layouts specifically shared across token-specific sessions 
+│   ├── activate          // activate page
+│   ├── components        // shared by pages and layouts
+│   ├── install           // install page
+│   ├── signin            // signin page
+│   └── styles            // globally shared styles
+├── assets                // Static assets
+├── bin                   // scripts ran at build step
+├── config                // adjustable settings and options 
+├── context               // shared contexts used by different portions of the app
+├── dictionaries          // Language-specific translate files 
+├── docker                // container configurations
+├── hooks                 // Reusable hooks
+├── i18n                  // Internationalization configuration
+├── models                // describes data models & shapes of API responses
+├── public                // meta assets like favicon
+├── service               // specifies shapes of API actions
 ├── test                  
-├── types                 // 函数参数和返回值的描述
-└── utils                 // 共享的实用函数
+├── types                 // descriptions of function params and return values
+└── utils                 // Shared utility functions
 ```

 ## 提交你的 PR
@@ -82,7 +82,7 @@ Dify はバックエンドとフロントエンドから構成されています
 まず`cd api/`でバックエンドのディレクトリに移動し、[Backend README](api/README.md)に従ってインストールします。
 次に別のターミナルで、`cd web/`でフロントエンドのディレクトリに移動し、[Frontend README](web/README.md)に従ってインストールしてください。

-よくある問題とトラブルシューティングの手順については、[installation FAQ](https://docs.dify.ai/v/japanese/learn-more/faq/install-faq) を確認してください。
+よくある問題とトラブルシューティングの手順については、[installation FAQ](https://docs.dify.ai/getting-started/faq/install-faq) を確認してください。

 ### 5. ブラウザで dify にアクセスする

@@ -216,6 +216,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).
+* [Email](mailto:support@dify.ai?subject=[GitHub]Questions%20About%20Dify). Best for: questions you have about using Dify.AI.
 * [Discord](https://discord.gg/FngNHpbcY7). 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.

@@ -199,6 +199,7 @@ docker compose up -d
 ## المجتمع والاتصال
 * [مناقشة Github](https://github.com/langgenius/dify/discussions). الأفضل لـ: مشاركة التعليقات وطرح الأسئلة.
 * [المشكلات على GitHub](https://github.com/langgenius/dify/issues). الأفضل لـ: الأخطاء التي تواجهها في استخدام Dify.AI، واقتراحات الميزات. انظر [دليل المساهمة](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md).
+* [البريد الإلكتروني](mailto:support@dify.ai?subject=[GitHub]Questions%20About%20Dify). الأفضل لـ: الأسئلة التي تتعلق باستخدام Dify.AI.
 * [Discord](https://discord.gg/FngNHpbcY7). الأفضل لـ: مشاركة تطبيقاتك والترفيه مع المجتمع.
 * [تويتر](https://twitter.com/dify_ai). الأفضل لـ: مشاركة تطبيقاتك والترفيه مع المجتمع.

@@ -224,6 +224,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).
+* [Correo electrónico](mailto:support@dify.ai?subject=[GitHub]Questions%20About%20Dify). Lo mejor para: preguntas que tengas sobre el uso de Dify.AI.
 * [Discord](https://discord.gg/FngNHpbcY7). 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.

@@ -222,6 +222,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).
+* [E-mail](mailto:support@dify.ai?subject=[GitHub]Questions%20About%20Dify). Meilleur pour: les questions que vous avez sur l'utilisation de Dify.AI.
 * [Discord](https://discord.gg/FngNHpbcY7). 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é.

@@ -221,6 +221,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)を参照してください
+* [Email](mailto:support@dify.ai?subject=[GitHub]Questions%20About%20Dify). 主に: Dify.AIの使用に関する質問。
 * [Discord](https://discord.gg/FngNHpbcY7). 主に: アプリケーションの共有やコミュニティとの交流。
 * [Twitter](https://twitter.com/dify_ai). 主に: アプリケーションの共有やコミュニティとの交流。

@@ -238,7 +239,7 @@ docker compose up -d
    <td>無料の30分間のミーティングをスケジュール</td>
  </tr>
  <tr>
-    <td><a href='https://github.com/langgenius/dify/issues'>技術サポート</a></td>
+    <td><a href='mailto:support@dify.ai?subject=[GitHub]Technical%20Support'>技術サポート</a></td>
    <td>技術的な問題やサポートに関する質問</td>
  </tr>
  <tr>
@@ -224,6 +224,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).
+* [Email](mailto:support@dify.ai?subject=[GitHub]Questions%20About%20Dify). Best for: questions you have about using Dify.AI.
 * [Discord](https://discord.gg/FngNHpbcY7). 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.

@@ -214,6 +214,7 @@ Dify를 Kubernetes에 배포하고 프리미엄 스케일링 설정을 구성했

 * [Github 토론](https://github.com/langgenius/dify/discussions). 피드백 공유 및 질문하기에 적합합니다.
 * [GitHub 이슈](https://github.com/langgenius/dify/issues). Dify.AI 사용 중 발견한 버그와 기능 제안에 적합합니다. [기여 가이드](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md)를 참조하세요. 
+* [이메일](mailto:support@dify.ai?subject=[GitHub]Questions%20About%20Dify). Dify.AI 사용에 대한 질문하기에 적합합니다.
 * [디스코드](https://discord.gg/FngNHpbcY7). 애플리케이션 공유 및 커뮤니티와 소통하기에 적합합니다.
 * [트위터](https://twitter.com/dify_ai). 애플리케이션 공유 및 커뮤니티와 소통하기에 적합합니다.

@@ -83,7 +83,7 @@ OCI_REGION=your-region
 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
+# Vector database configuration, support: weaviate, qdrant, milvus, relyt, pgvecto_rs, pgvector, pgvector, chroma, opensearch, tidb_vector
 VECTOR_STORE=weaviate

 # Weaviate configuration
@@ -106,14 +106,6 @@ MILVUS_USER=root
 MILVUS_PASSWORD=Milvus
 MILVUS_SECURE=false

-# MyScale configuration
-MYSCALE_HOST=127.0.0.1
-MYSCALE_PORT=8123
-MYSCALE_USER=default
-MYSCALE_PASSWORD=
-MYSCALE_DATABASE=default
-MYSCALE_FTS_PARAMS=
-
 # Relyt configuration
 RELYT_HOST=127.0.0.1
 RELYT_PORT=5432
@@ -159,16 +151,6 @@ CHROMA_DATABASE=default_database
 CHROMA_AUTH_PROVIDER=chromadb.auth.token_authn.TokenAuthenticationServerProvider
 CHROMA_AUTH_CREDENTIALS=difyai123456

-# AnalyticDB configuration
-ANALYTICDB_KEY_ID=your-ak
-ANALYTICDB_KEY_SECRET=your-sk
-ANALYTICDB_REGION_ID=cn-hangzhou
-ANALYTICDB_INSTANCE_ID=gp-ab123456
-ANALYTICDB_ACCOUNT=testaccount
-ANALYTICDB_PASSWORD=testpassword
-ANALYTICDB_NAMESPACE=dify
-ANALYTICDB_NAMESPACE_PASSWORD=difypassword
-
 # OpenSearch configuration
 OPENSEARCH_HOST=127.0.0.1
 OPENSEARCH_PORT=9200
@@ -255,8 +237,4 @@ WORKFLOW_CALL_MAX_DEPTH=5

 # App configuration
 APP_MAX_EXECUTION_TIME=1200
-APP_MAX_ACTIVE_REQUESTS=0

-
-# Celery beat configuration
-CELERY_BEAT_SCHEDULER_TIME=1
@@ -5,7 +5,8 @@ WORKDIR /app/api

 # Install Poetry
 ENV POETRY_VERSION=1.8.3
-RUN pip install --no-cache-dir poetry==${POETRY_VERSION}
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir --upgrade poetry==${POETRY_VERSION}

 # Configure Poetry
 ENV POETRY_CACHE_DIR=/tmp/poetry_cache
@@ -11,7 +11,6 @@

   ```bash
   cd ../docker
-   cp middleware.env.example middleware.env
   docker compose -f docker-compose.middleware.yaml -p dify up -d
   cd ../api
   ```
@@ -1,6 +1,8 @@
 import os

-if os.environ.get("DEBUG", "false").lower() != 'true':
+from configs.app_config import DifyConfig
+
+if not os.environ.get("DEBUG") or os.environ.get("DEBUG", "false").lower() != 'true':
    from gevent import monkey

    monkey.patch_all()
@@ -21,9 +23,7 @@ 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

 # DO NOT REMOVE BELOW
 from events import event_handlers
@@ -43,8 +43,6 @@ from extensions import (
 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
 from services.account_service import AccountService

@@ -83,7 +81,7 @@ def create_flask_app_with_configs() -> Flask:
    with configs loaded from .env file
    """
    dify_app = DifyApp(__name__)
-    dify_app.config.from_mapping(dify_config.model_dump())
+    dify_app.config.from_mapping(DifyConfig().model_dump())

    # populate configs into system environment variables
    for key, value in dify_app.config.items():
@@ -181,10 +179,7 @@ def load_user_from_request(request_from_flask_login):
    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
+    return AccountService.load_logged_in_account(account_id=user_id, token=auth_token)


@login_manager.unauthorized_handler
@@ -8,7 +8,6 @@ import click
 from flask import current_app
 from werkzeug.exceptions import NotFound

-from configs import dify_config
 from constants.languages import languages
 from core.rag.datasource.vdb.vector_factory import Vector
 from core.rag.datasource.vdb.vector_type import VectorType
@@ -113,7 +112,7 @@ def reset_encrypt_key_pair():
    After the reset, all LLM credentials will become invalid, requiring re-entry.
    Only support SELF_HOSTED mode.
    """
-    if dify_config.EDITION != 'SELF_HOSTED':
+    if current_app.config['EDITION'] != 'SELF_HOSTED':
        click.echo(click.style('Sorry, only support SELF_HOSTED mode.', fg='red'))
        return

@@ -337,14 +336,6 @@ def migrate_knowledge_vector_database():
                        "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.")

@@ -1,3 +0,0 @@
-from .app_config import DifyConfig
-
-dify_config = DifyConfig()
@@ -1,5 +1,4 @@
-from pydantic import Field, computed_field
-from pydantic_settings import SettingsConfigDict
+from pydantic_settings import BaseSettings, SettingsConfigDict

 from configs.deploy import DeploymentConfig
 from configs.enterprise import EnterpriseFeatureConfig
@@ -9,7 +8,13 @@ from configs.middleware import MiddlewareConfig
 from configs.packaging import PackagingInfo


+# TODO: Both `BaseModel` and `BaseSettings` has `model_config` attribute but they are in different types.
+# This inheritance is depends on the order of the classes.
+# It is better to use `BaseSettings` as the base class.
 class DifyConfig(
+    # based on pydantic-settings
+    BaseSettings,
+
    # Packaging info
    PackagingInfo,

@@ -29,39 +34,12 @@ class DifyConfig(
    # **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',
-        frozen=True,

        # ignore extra attributes
        extra='ignore',
    )
-
-    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
@@ -1,8 +1,7 @@
-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class DeploymentConfig(BaseSettings):
+class DeploymentConfig(BaseModel):
    """
    Deployment configs
    """
@@ -1,8 +1,7 @@
-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class EnterpriseFeatureConfig(BaseSettings):
+class EnterpriseFeatureConfig(BaseModel):
    """
    Enterprise feature configs.
    **Before using, please contact business@dify.ai by email to inquire about licensing matters.**
@@ -1,3 +1,5 @@
+from pydantic import BaseModel
+
 from configs.extra.notion_config import NotionConfig
 from configs.extra.sentry_config import SentryConfig

@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class NotionConfig(BaseSettings):
+class NotionConfig(BaseModel):
    """
    Notion integration configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, NonNegativeFloat
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, NonNegativeFloat


-class SentryConfig(BaseSettings):
+class SentryConfig(BaseModel):
    """
    Sentry configs
    """
@@ -1,12 +1,11 @@
 from typing import Optional

-from pydantic import AliasChoices, Field, NonNegativeInt, PositiveInt, computed_field
-from pydantic_settings import BaseSettings
+from pydantic import AliasChoices, BaseModel, Field, NonNegativeInt, PositiveInt, computed_field

 from configs.feature.hosted_service import HostedServiceConfig


-class SecurityConfig(BaseSettings):
+class SecurityConfig(BaseModel):
    """
    Secret Key configs
    """
@@ -18,13 +17,8 @@ class SecurityConfig(BaseSettings):
        default=None,
    )

-    RESET_PASSWORD_TOKEN_EXPIRY_HOURS: PositiveInt = Field(
-        description='Expiry time in hours for reset token',
-        default=24,
-    )

-
-class AppExecutionConfig(BaseSettings):
+class AppExecutionConfig(BaseModel):
    """
    App Execution configs
    """
@@ -32,13 +26,9 @@ class AppExecutionConfig(BaseSettings):
        description='execution timeout in seconds for app execution',
        default=1200,
    )
-    APP_MAX_ACTIVE_REQUESTS: NonNegativeInt = Field(
-        description='max active request per app, 0 means unlimited',
-        default=0,
-    )


-class CodeExecutionSandboxConfig(BaseSettings):
+class CodeExecutionSandboxConfig(BaseModel):
    """
    Code Execution Sandbox configs
    """
@@ -53,36 +43,36 @@ class CodeExecutionSandboxConfig(BaseSettings):
    )


-class EndpointConfig(BaseSettings):
+class EndpointConfig(BaseModel):
    """
    Module URL configs
    """
    CONSOLE_API_URL: str = Field(
        description='The backend URL prefix of the console API.'
                    'used to concatenate the login authorization callback or notion integration callback.',
-        default='',
+        default='https://cloud.dify.ai',
    )

    CONSOLE_WEB_URL: str = Field(
        description='The front-end URL prefix of the console web.'
                    'used to concatenate some front-end addresses and for CORS configuration use.',
-        default='',
+        default='https://cloud.dify.ai',
    )

    SERVICE_API_URL: str = Field(
        description='Service API Url prefix.'
                    'used to display Service API Base Url to the front-end.',
-        default='',
+        default='https://api.dify.ai',
    )

    APP_WEB_URL: str = Field(
        description='WebApp Url prefix.'
                    'used to display WebAPP API Base Url to the front-end.',
-        default='',
+        default='https://udify.app',
    )


-class FileAccessConfig(BaseSettings):
+class FileAccessConfig(BaseModel):
    """
    File Access configs
    """
@@ -92,7 +82,7 @@ class FileAccessConfig(BaseSettings):
                    'Url is signed and has expiration time.',
        validation_alias=AliasChoices('FILES_URL', 'CONSOLE_API_URL'),
        alias_priority=1,
-        default='',
+        default='https://cloud.dify.ai',
    )

    FILES_ACCESS_TIMEOUT: int = Field(
@@ -101,7 +91,7 @@ class FileAccessConfig(BaseSettings):
    )


-class FileUploadConfig(BaseSettings):
+class FileUploadConfig(BaseModel):
    """
    File Uploading configs
    """
@@ -126,7 +116,7 @@ class FileUploadConfig(BaseSettings):
    )


-class HttpConfig(BaseSettings):
+class HttpConfig(BaseModel):
    """
    HTTP configs
    """
@@ -158,7 +148,7 @@ class HttpConfig(BaseSettings):
        return self.inner_WEB_API_CORS_ALLOW_ORIGINS.split(',')


-class InnerAPIConfig(BaseSettings):
+class InnerAPIConfig(BaseModel):
    """
    Inner API configs
    """
@@ -173,7 +163,7 @@ class InnerAPIConfig(BaseSettings):
    )


-class LoggingConfig(BaseSettings):
+class LoggingConfig(BaseModel):
    """
    Logging configs
    """
@@ -205,7 +195,7 @@ class LoggingConfig(BaseSettings):
    )


-class ModelLoadBalanceConfig(BaseSettings):
+class ModelLoadBalanceConfig(BaseModel):
    """
    Model load balance configs
    """
@@ -215,7 +205,7 @@ class ModelLoadBalanceConfig(BaseSettings):
    )


-class BillingConfig(BaseSettings):
+class BillingConfig(BaseModel):
    """
    Platform Billing Configurations
    """
@@ -225,7 +215,7 @@ class BillingConfig(BaseSettings):
    )


-class UpdateConfig(BaseSettings):
+class UpdateConfig(BaseModel):
    """
    Update configs
    """
@@ -235,7 +225,7 @@ class UpdateConfig(BaseSettings):
    )


-class WorkflowConfig(BaseSettings):
+class WorkflowConfig(BaseModel):
    """
    Workflow feature configs
    """
@@ -256,7 +246,7 @@ class WorkflowConfig(BaseSettings):
    )


-class OAuthConfig(BaseSettings):
+class OAuthConfig(BaseModel):
    """
    oauth configs
    """
@@ -286,7 +276,7 @@ class OAuthConfig(BaseSettings):
    )


-class ModerationConfig(BaseSettings):
+class ModerationConfig(BaseModel):
    """
    Moderation in app configs.
    """
@@ -298,7 +288,7 @@ class ModerationConfig(BaseSettings):
    )


-class ToolConfig(BaseSettings):
+class ToolConfig(BaseModel):
    """
    Tool configs
    """
@@ -309,7 +299,7 @@ class ToolConfig(BaseSettings):
    )


-class MailConfig(BaseSettings):
+class MailConfig(BaseModel):
    """
    Mail Configurations
    """
@@ -365,7 +355,7 @@ class MailConfig(BaseSettings):
    )


-class RagEtlConfig(BaseSettings):
+class RagEtlConfig(BaseModel):
    """
    RAG ETL Configurations.
    """
@@ -391,7 +381,7 @@ class RagEtlConfig(BaseSettings):
    )


-class DataSetConfig(BaseSettings):
+class DataSetConfig(BaseModel):
    """
    Dataset configs
    """
@@ -401,12 +391,8 @@ class DataSetConfig(BaseSettings):
        default=30,
    )

-    DATASET_OPERATOR_ENABLED: bool = Field(
-        description='whether to enable dataset operator',
-        default=False,
-    )

-class WorkspaceConfig(BaseSettings):
+class WorkspaceConfig(BaseModel):
    """
    Workspace configs
    """
@@ -417,7 +403,7 @@ class WorkspaceConfig(BaseSettings):
    )


-class IndexingConfig(BaseSettings):
+class IndexingConfig(BaseModel):
    """
    Indexing configs.
    """
@@ -428,20 +414,13 @@ class IndexingConfig(BaseSettings):
    )


-class ImageFormatConfig(BaseSettings):
+class ImageFormatConfig(BaseModel):
    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='the time of the celery scheduler, default to 1 day',
-        default=1,
-    )
-
-
 class FeatureConfig(
    # place the configs in alphabet order
    AppExecutionConfig,
@@ -469,6 +448,5 @@ class FeatureConfig(

    # hosted services config
    HostedServiceConfig,
-    CeleryBeatConfig,
 ):
    pass
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, NonNegativeInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, NonNegativeInt


-class HostedOpenAiConfig(BaseSettings):
+class HostedOpenAiConfig(BaseModel):
    """
    Hosted OpenAI service config
    """
@@ -69,7 +68,7 @@ class HostedOpenAiConfig(BaseSettings):
    )


-class HostedAzureOpenAiConfig(BaseSettings):
+class HostedAzureOpenAiConfig(BaseModel):
    """
    Hosted OpenAI service config
    """
@@ -79,7 +78,7 @@ class HostedAzureOpenAiConfig(BaseSettings):
        default=False,
    )

-    HOSTED_AZURE_OPENAI_API_KEY: Optional[str] = Field(
+    HOSTED_OPENAI_API_KEY: Optional[str] = Field(
        description='',
        default=None,
    )
@@ -95,7 +94,7 @@ class HostedAzureOpenAiConfig(BaseSettings):
    )


-class HostedAnthropicConfig(BaseSettings):
+class HostedAnthropicConfig(BaseModel):
    """
    Hosted Azure OpenAI service config
    """
@@ -126,7 +125,7 @@ class HostedAnthropicConfig(BaseSettings):
    )


-class HostedMinmaxConfig(BaseSettings):
+class HostedMinmaxConfig(BaseModel):
    """
    Hosted Minmax service config
    """
@@ -137,7 +136,7 @@ class HostedMinmaxConfig(BaseSettings):
    )


-class HostedSparkConfig(BaseSettings):
+class HostedSparkConfig(BaseModel):
    """
    Hosted Spark service config
    """
@@ -148,7 +147,7 @@ class HostedSparkConfig(BaseSettings):
    )


-class HostedZhipuAIConfig(BaseSettings):
+class HostedZhipuAIConfig(BaseModel):
    """
    Hosted Minmax service config
    """
@@ -159,7 +158,7 @@ class HostedZhipuAIConfig(BaseSettings):
    )


-class HostedModerationConfig(BaseSettings):
+class HostedModerationConfig(BaseModel):
    """
    Hosted Moderation service config
    """
@@ -175,7 +174,7 @@ class HostedModerationConfig(BaseSettings):
    )


-class HostedFetchAppTemplateConfig(BaseSettings):
+class HostedFetchAppTemplateConfig(BaseModel):
    """
    Hosted Moderation service config
    """
@@ -1,7 +1,6 @@
 from typing import Any, Optional

-from pydantic import Field, NonNegativeInt, PositiveInt, computed_field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, NonNegativeInt, PositiveInt, computed_field

 from configs.middleware.cache.redis_config import RedisConfig
 from configs.middleware.storage.aliyun_oss_storage_config import AliyunOSSStorageConfig
@@ -10,10 +9,8 @@ from configs.middleware.storage.azure_blob_storage_config import AzureBlobStorag
 from configs.middleware.storage.google_cloud_storage_config import GoogleCloudStorageConfig
 from configs.middleware.storage.oci_storage_config import OCIStorageConfig
 from configs.middleware.storage.tencent_cos_storage_config import TencentCloudCOSStorageConfig
-from configs.middleware.vdb.analyticdb_config import AnalyticdbConfig
 from configs.middleware.vdb.chroma_config import ChromaConfig
 from configs.middleware.vdb.milvus_config import MilvusConfig
-from configs.middleware.vdb.myscale_config import MyScaleConfig
 from configs.middleware.vdb.opensearch_config import OpenSearchConfig
 from configs.middleware.vdb.oracle_config import OracleConfig
 from configs.middleware.vdb.pgvector_config import PGVectorConfig
@@ -25,7 +22,7 @@ from configs.middleware.vdb.tidb_vector_config import TiDBVectorConfig
 from configs.middleware.vdb.weaviate_config import WeaviateConfig


-class StorageConfig(BaseSettings):
+class StorageConfig(BaseModel):
    STORAGE_TYPE: str = Field(
        description='storage type,'
                    ' default to `local`,'
@@ -39,14 +36,14 @@ class StorageConfig(BaseSettings):
    )


-class VectorStoreConfig(BaseSettings):
+class VectorStoreConfig(BaseModel):
    VECTOR_STORE: Optional[str] = Field(
        description='vector store type',
        default=None,
    )


-class KeywordStoreConfig(BaseSettings):
+class KeywordStoreConfig(BaseModel):
    KEYWORD_STORE: str = Field(
        description='keyword store type',
        default='jieba',
@@ -84,11 +81,6 @@ class DatabaseConfig:
        default='',
    )

-    DB_EXTRAS: str = Field(
-        description='db extras options. Example: keepalives_idle=60&keepalives=1',
-        default='',
-    )
-
    SQLALCHEMY_DATABASE_URI_SCHEME: str = Field(
        description='db uri scheme',
        default='postgresql',
@@ -97,12 +89,7 @@ class DatabaseConfig:
    @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
-        ).strip("&")
-        db_extras = f"?{db_extras}" if db_extras else ""
+        db_extras = f"?client_encoding={self.DB_CHARSET}" if self.DB_CHARSET else ""
        return (f"{self.SQLALCHEMY_DATABASE_URI_SCHEME}://"
                f"{self.DB_USERNAME}:{self.DB_PASSWORD}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_DATABASE}"
                f"{db_extras}")
@@ -127,7 +114,7 @@ class DatabaseConfig:
        default=False,
    )

-    SQLALCHEMY_ECHO: bool | str = Field(
+    SQLALCHEMY_ECHO: bool = Field(
        description='whether to enable SqlAlchemy echo',
        default=False,
    )
@@ -185,10 +172,8 @@ class MiddlewareConfig(

    # configs of vdb and vdb providers
    VectorStoreConfig,
-    AnalyticdbConfig,
    ChromaConfig,
    MilvusConfig,
-    MyScaleConfig,
    OpenSearchConfig,
    OracleConfig,
    PGVectorConfig,
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, NonNegativeInt, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, NonNegativeInt, PositiveInt


-class RedisConfig(BaseSettings):
+class RedisConfig(BaseModel):
    """
    Redis configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class AliyunOSSStorageConfig(BaseSettings):
+class AliyunOSSStorageConfig(BaseModel):
    """
    Aliyun storage configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class S3StorageConfig(BaseSettings):
+class S3StorageConfig(BaseModel):
    """
    S3 storage configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class AzureBlobStorageConfig(BaseSettings):
+class AzureBlobStorageConfig(BaseModel):
    """
    Azure Blob storage configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class GoogleCloudStorageConfig(BaseSettings):
+class GoogleCloudStorageConfig(BaseModel):
    """
    Google Cloud storage configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class OCIStorageConfig(BaseSettings):
+class OCIStorageConfig(BaseModel):
    """
    OCI storage configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class TencentCloudCOSStorageConfig(BaseSettings):
+class TencentCloudCOSStorageConfig(BaseModel):
    """
    Tencent Cloud COS storage configs
    """
@@ -1,44 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, Field
-
-
-class AnalyticdbConfig(BaseModel):
-    """
-    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 authentication."
-    )
-    ANALYTICDB_KEY_SECRET : Optional[str] = Field(
-        default=None,
-        description="The Secret Access Key corresponding to the Access Key ID for secure access."
-    )
-    ANALYTICDB_REGION_ID : Optional[str] = Field(
-        default=None,
-        description="The region where the AnalyticDB instance is deployed (e.g., 'cn-hangzhou')."
-    )
-    ANALYTICDB_INSTANCE_ID : Optional[str] = Field(
-        default=None,
-        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."
-    )
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class ChromaConfig(BaseSettings):
+class ChromaConfig(BaseModel):
    """
    Chroma configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class MilvusConfig(BaseSettings):
+class MilvusConfig(BaseModel):
    """
    Milvus configs
    """
@@ -1,38 +0,0 @@
-
-from pydantic import BaseModel, Field, PositiveInt
-
-
-class MyScaleConfig(BaseModel):
-    """
-    MyScale configs
-    """
-
-    MYSCALE_HOST: str = Field(
-        description='MyScale host',
-        default='localhost',
-    )
-
-    MYSCALE_PORT: PositiveInt = Field(
-        description='MyScale port',
-        default=8123,
-    )
-
-    MYSCALE_USER: str = Field(
-        description='MyScale user',
-        default='default',
-    )
-
-    MYSCALE_PASSWORD: str = Field(
-        description='MyScale password',
-        default='',
-    )
-
-    MYSCALE_DATABASE: str = Field(
-        description='MyScale database name',
-        default='default',
-    )
-
-    MYSCALE_FTS_PARAMS: str = Field(
-        description='MyScale fts index parameters',
-        default='',
-    )
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class OpenSearchConfig(BaseSettings):
+class OpenSearchConfig(BaseModel):
    """
    OpenSearch configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class OracleConfig(BaseSettings):
+class OracleConfig(BaseModel):
    """
    ORACLE configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class PGVectorConfig(BaseSettings):
+class PGVectorConfig(BaseModel):
    """
    PGVector configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class PGVectoRSConfig(BaseSettings):
+class PGVectoRSConfig(BaseModel):
    """
    PGVectoRS configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, NonNegativeInt, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, NonNegativeInt, PositiveInt


-class QdrantConfig(BaseSettings):
+class QdrantConfig(BaseModel):
    """
    Qdrant configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class RelytConfig(BaseSettings):
+class RelytConfig(BaseModel):
    """
    Relyt configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, NonNegativeInt, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class TencentVectorDBConfig(BaseSettings):
+class TencentVectorDBConfig(BaseModel):
    """
    Tencent Vector configs
    """
@@ -25,7 +24,7 @@ class TencentVectorDBConfig(BaseSettings):
    )

    TENCENT_VECTOR_DB_USERNAME: Optional[str] = Field(
-        description='Tencent Vector username',
+        description='Tencent Vector password',
        default=None,
    )

@@ -39,12 +38,7 @@ class TencentVectorDBConfig(BaseSettings):
        default=1,
    )

-    TENCENT_VECTOR_DB_REPLICAS: NonNegativeInt = Field(
+    TENCENT_VECTOR_DB_REPLICAS: PositiveInt = Field(
        description='Tencent Vector replicas',
        default=2,
    )
-
-    TENCENT_VECTOR_DB_DATABASE: Optional[str] = Field(
-        description='Tencent Vector Database',
-        default=None,
-    )
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class TiDBVectorConfig(BaseSettings):
+class TiDBVectorConfig(BaseModel):
    """
    TiDB Vector configs
    """
@@ -1,10 +1,9 @@
 from typing import Optional

-from pydantic import Field, PositiveInt
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field, PositiveInt


-class WeaviateConfig(BaseSettings):
+class WeaviateConfig(BaseModel):
    """
    Weaviate configs
    """
@@ -1,15 +1,14 @@
-from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic import BaseModel, Field


-class PackagingInfo(BaseSettings):
+class PackagingInfo(BaseModel):
    """
    Packaging build information
    """

    CURRENT_VERSION: str = Field(
        description='Dify version',
-        default='0.6.15',
+        default='0.6.12-fix1',
    )

    COMMIT_SHA: str = Field(
@@ -1,2 +0,0 @@
-# TODO: Update all string in code to use this constant
-HIDDEN_VALUE = '[__HIDDEN__]'
@@ -14,7 +14,7 @@ language_timezone_mapping = {
    'vi-VN': 'Asia/Ho_Chi_Minh',
    'ro-RO': 'Europe/Bucharest',
    'pl-PL': 'Europe/Warsaw',
-    'hi-IN': 'Asia/Kolkata',
+    'hi-IN': 'Asia/Kolkata'
 }

 languages = list(language_timezone_mapping.keys())
@@ -1,4 +0,0 @@
-TTS_AUTO_PLAY_TIMEOUT = 5
-
-# sleep 20 ms ( 40ms => 1280 byte audio file,20ms => 640 byte audio file)
-TTS_AUTO_PLAY_YIELD_CPU_TIME = 0.02
@@ -1,3 +0,0 @@
-from contextvars import ContextVar
-
-tenant_id: ContextVar[str] = ContextVar('tenant_id')
@@ -30,7 +30,7 @@ from .app import (
 )

 # Import auth controllers
-from .auth import activate, data_source_bearer_auth, data_source_oauth, forgot_password, login, oauth
+from .auth import activate, data_source_bearer_auth, data_source_oauth, login, oauth

 # Import billing controllers
 from .billing import billing
@@ -15,7 +15,6 @@ from fields.app_fields import (
    app_pagination_fields,
 )
 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']
@@ -98,42 +97,8 @@ class AppImportApi(Resource):
        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
-        )
-
-        return app, 201
-
-
-class AppImportFromUrlApi(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @marshal_with(app_detail_fields_with_site)
-    @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
-        if not current_user.is_editor:
-            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')
-        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
-        )
+        app_service = AppService()
+        app = app_service.import_app(current_user.current_tenant_id, args['data'], args, current_user)

        return app, 201

@@ -169,7 +134,6 @@ class AppApi(Resource):
        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()
@@ -212,13 +176,9 @@ class AppCopyApi(Resource):
        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
-        )
+        app_service = AppService()
+        data = app_service.export_app(app_model)
+        app = app_service.import_app(current_user.current_tenant_id, data, args, current_user)

        return app, 201

@@ -234,13 +194,10 @@ class AppExportApi(Resource):
        if not current_user.is_editor:
            raise Forbidden()

-        # Add include_secret params
-        parser = reqparse.RequestParser()
-        parser.add_argument('include_secret', type=inputs.boolean, default=False, location='args')
-        args = parser.parse_args()
+        app_service = AppService()

        return {
-            "data": AppDslService.export_dsl(app_model=app_model, include_secret=args['include_secret'])
+            "data": app_service.export_app(app_model)
        }


@@ -364,7 +321,6 @@ class AppTraceApi(Resource):

 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')
@@ -81,36 +81,15 @@ class ChatMessageTextApi(Resource):
    @account_initialization_required
    @get_app_model
    def post(self, app_model):
-        from werkzeug.exceptions import InternalServerError
-
        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')
-            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') if args.get('voice') else text_to_speech.get('voice')
-            else:
-                try:
-                    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
+                text=request.form['text'],
+                voice=request.form['voice'],
+                streaming=False
            )
-            return response
+
+            return {'data': response.data.decode('latin1')}
        except services.errors.app_model_config.AppModelConfigBrokenError:
            logging.exception("App model config broken.")
            raise AppUnavailableError()
@@ -19,12 +19,7 @@ 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 core.errors.error import (
-    AppInvokeQuotaExceededError,
-    ModelCurrentlyNotSupportError,
-    ProviderTokenNotInitError,
-    QuotaExceededError,
-)
+from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.helper import uuid_value
@@ -80,7 +75,7 @@ class CompletionMessageApi(Resource):
            raise ProviderModelCurrentlyNotSupportError()
        except InvokeError as e:
            raise CompletionRequestError(e.description)
-        except (ValueError, AppInvokeQuotaExceededError) as e:
+        except ValueError as e:
            raise e
        except Exception as e:
            logging.exception("internal server error.")
@@ -146,7 +141,7 @@ class ChatMessageApi(Resource):
            raise ProviderModelCurrentlyNotSupportError()
        except InvokeError as e:
            raise CompletionRequestError(e.description)
-        except (ValueError, AppInvokeQuotaExceededError) as e:
+        except ValueError as e:
            raise e
        except Exception as e:
            logging.exception("internal server error.")
@@ -22,19 +22,17 @@ 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('audiences', type=str, required=True, nullable=False, location='json')
+        parser.add_argument('hoping_to_solve', type=str, required=True, nullable=False, location='json')
        args = parser.parse_args()

        account = current_user

        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']
+                account.current_tenant_id,
+                args['audiences'],
+                args['hoping_to_solve']
            )
        except ProviderTokenNotInitError as ex:
            raise ProviderNotInitializeError(ex.description)
@@ -281,7 +281,7 @@ class UserSatisfactionRateStatistic(Resource):
                        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'
+                            LEFT JOIN message_feedbacks mf on mf.message_id=m.id
                            WHERE m.app_id = :app_id 
                        '''
        arg_dict = {'tz': account.timezone, 'app_id': app_model.id}
@@ -13,15 +13,12 @@ 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 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.model import App, AppMode
-from services.app_dsl_service import AppDslService
 from services.app_generate_service import AppGenerateService
 from services.errors.app import WorkflowHashNotEqualError
 from services.workflow_service import WorkflowService
@@ -42,7 +39,7 @@ 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()
-
+        
        # fetch draft workflow by app_model
        workflow_service = WorkflowService()
        workflow = workflow_service.get_draft_workflow(app_model=app_model)
@@ -65,15 +62,13 @@ class DraftWorkflowApi(Resource):
        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:
            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')
-            # TODO: set this to required=True after frontend is updated
-            parser.add_argument('environment_variables', type=list, required=False, location='json')
            args = parser.parse_args()
        elif 'text/plain' in content_type:
            try:
@@ -87,8 +82,7 @@ class DraftWorkflowApi(Resource):
                args = {
                    'graph': data.get('graph'),
                    'features': data.get('features'),
-                    'hash': data.get('hash'),
-                    'environment_variables': data.get('environment_variables')
+                    'hash': data.get('hash')
                }
            except json.JSONDecodeError:
                return {'message': 'Invalid JSON data'}, 400
@@ -98,15 +92,12 @@ class DraftWorkflowApi(Resource):
        workflow_service = WorkflowService()

        try:
-            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'],
+                graph=args.get('graph'),
+                features=args.get('features'),
                unique_hash=args.get('hash'),
-                account=current_user,
-                environment_variables=environment_variables,
+                account=current_user
            )
        except WorkflowHashNotEqualError:
            raise DraftWorkflowNotSync()
@@ -136,7 +127,8 @@ class DraftWorkflowImportApi(Resource):
        parser.add_argument('data', type=str, required=True, nullable=False, location='json')
        args = parser.parse_args()

-        workflow = AppDslService.import_and_overwrite_workflow(
+        workflow_service = WorkflowService()
+        workflow = workflow_service.import_draft_workflow(
            app_model=app_model,
            data=args['data'],
            account=current_user
@@ -287,7 +279,7 @@ class DraftWorkflowRunApi(Resource):
            )

            return helper.compact_generate_response(response)
-        except (ValueError, AppInvokeQuotaExceededError) as e:
+        except ValueError as e:
            raise e
        except Exception as e:
            logging.exception("internal server error.")
@@ -6,7 +6,6 @@ from flask_login import current_user
 from flask_restful import Resource
 from werkzeug.exceptions import Forbidden

-from configs import dify_config
 from controllers.console import api
 from libs.login import login_required
 from libs.oauth_data_source import NotionOAuth
@@ -17,11 +16,11 @@ from ..wraps import account_initialization_required

 def get_oauth_providers():
    with current_app.app_context():
-        if not dify_config.NOTION_CLIENT_ID or not dify_config.NOTION_CLIENT_SECRET:
-            return {}
-        notion_oauth = NotionOAuth(client_id=dify_config.NOTION_CLIENT_ID,
-                                   client_secret=dify_config.NOTION_CLIENT_SECRET,
-                                   redirect_uri=dify_config.CONSOLE_API_URL + '/console/api/oauth/data-source/callback/notion')
+        notion_oauth = NotionOAuth(client_id=current_app.config.get('NOTION_CLIENT_ID'),
+                                   client_secret=current_app.config.get(
+                                       'NOTION_CLIENT_SECRET'),
+                                   redirect_uri=current_app.config.get(
+                                       'CONSOLE_API_URL') + '/console/api/oauth/data-source/callback/notion')

        OAUTH_PROVIDERS = {
            'notion': notion_oauth
@@ -40,10 +39,8 @@ class OAuthDataSource(Resource):
            print(vars(oauth_provider))
        if not oauth_provider:
            return {'error': 'Invalid provider'}, 400
-        if dify_config.NOTION_INTEGRATION_TYPE == 'internal':
-            internal_secret = dify_config.NOTION_INTERNAL_SECRET
-            if not internal_secret:
-                return {'error': 'Internal secret is not set'},
+        if current_app.config.get('NOTION_INTEGRATION_TYPE') == 'internal':
+            internal_secret = current_app.config.get('NOTION_INTERNAL_SECRET')
            oauth_provider.save_internal_access_token(internal_secret)
            return { 'data': '' }
        else:
@@ -63,13 +60,13 @@ class OAuthDataSourceCallback(Resource):
        if 'code' in request.args:
            code = request.args.get('code')

-            return redirect(f'{dify_config.CONSOLE_WEB_URL}?type=notion&code={code}')
+            return redirect(f'{current_app.config.get("CONSOLE_WEB_URL")}?type=notion&code={code}')
        elif 'error' in request.args:
            error = request.args.get('error')

-            return redirect(f'{dify_config.CONSOLE_WEB_URL}?type=notion&error={error}')
+            return redirect(f'{current_app.config.get("CONSOLE_WEB_URL")}?type=notion&error={error}')
        else:
-            return redirect(f'{dify_config.CONSOLE_WEB_URL}?type=notion&error=Access denied')
+            return redirect(f'{current_app.config.get("CONSOLE_WEB_URL")}?type=notion&error=Access denied')
        

 class OAuthDataSourceBinding(Resource):
@@ -5,28 +5,3 @@ class ApiKeyAuthFailedError(BaseHTTPException):
    error_code = 'auth_failed'
    description = "{message}"
    code = 500
-
-
-class InvalidEmailError(BaseHTTPException):
-    error_code = 'invalid_email'
-    description = "The email address is not valid."
-    code = 400
-
-
-class PasswordMismatchError(BaseHTTPException):
-    error_code = 'password_mismatch'
-    description = "The passwords do not match."
-    code = 400
-
-
-class InvalidTokenError(BaseHTTPException):
-    error_code = 'invalid_or_expired_token'
-    description = "The token is invalid or has expired."
-    code = 400
-
-
-class PasswordResetRateLimitExceededError(BaseHTTPException):
-    error_code = 'password_reset_rate_limit_exceeded'
-    description = "Password reset rate limit exceeded. Try again later."
-    code = 429
-
@@ -1,107 +0,0 @@
-import base64
-import logging
-import secrets
-
-from flask_restful import Resource, reqparse
-
-from controllers.console import api
-from controllers.console.auth.error import (
-    InvalidEmailError,
-    InvalidTokenError,
-    PasswordMismatchError,
-    PasswordResetRateLimitExceededError,
-)
-from controllers.console.setup import setup_required
-from extensions.ext_database import db
-from libs.helper import email as email_validate
-from libs.password import hash_password, valid_password
-from models.account import Account
-from services.account_service import AccountService
-from services.errors.account import RateLimitExceededError
-
-
-class ForgotPasswordSendEmailApi(Resource):
-
-    @setup_required
-    def post(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument('email', type=str, required=True, location='json')
-        args = parser.parse_args()
-
-        email = args['email']
-
-        if not email_validate(email):
-            raise InvalidEmailError()
-
-        account = Account.query.filter_by(email=email).first()
-
-        if account:
-            try:
-                AccountService.send_reset_password_email(account=account)
-            except RateLimitExceededError:
-                logging.warning(f"Rate limit exceeded for email: {account.email}")
-                raise PasswordResetRateLimitExceededError()
-        else:
-            # Return success to avoid revealing email registration status
-            logging.warning(f"Attempt to reset password for unregistered email: {email}")
-
-        return {"result": "success"}
-
-
-class ForgotPasswordCheckApi(Resource):
-
-    @setup_required
-    def post(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument('token', type=str, required=True, nullable=False, location='json')
-        args = parser.parse_args()
-        token = args['token']
-
-        reset_data = AccountService.get_reset_password_data(token)
-
-        if reset_data is None:
-            return {'is_valid': False, 'email': None}
-        return {'is_valid': True, 'email': reset_data.get('email')}
-
-
-class ForgotPasswordResetApi(Resource):
-
-    @setup_required
-    def post(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument('token', type=str, required=True, nullable=False, location='json')
-        parser.add_argument('new_password', type=valid_password, required=True, nullable=False, location='json')
-        parser.add_argument('password_confirm', type=valid_password, required=True, nullable=False, location='json')
-        args = parser.parse_args()
-
-        new_password = args['new_password']
-        password_confirm = args['password_confirm']
-
-        if str(new_password).strip() != str(password_confirm).strip():
-            raise PasswordMismatchError()
-
-        token = args['token']
-        reset_data = AccountService.get_reset_password_data(token)
-
-        if reset_data is None:
-            raise InvalidTokenError()
-
-        AccountService.revoke_reset_password_token(token)
-
-        salt = secrets.token_bytes(16)
-        base64_salt = base64.b64encode(salt).decode()
-
-        password_hashed = hash_password(new_password, salt)
-        base64_password_hashed = base64.b64encode(password_hashed).decode()
-
-        account = Account.query.filter_by(email=reset_data.get('email')).first()
-        account.password = base64_password_hashed
-        account.password_salt = base64_salt
-        db.session.commit()
-
-        return {'result': 'success'}
-
-
-api.add_resource(ForgotPasswordSendEmailApi, '/forgot-password')
-api.add_resource(ForgotPasswordCheckApi, '/forgot-password/validity')
-api.add_resource(ForgotPasswordResetApi, '/forgot-password/resets')
@@ -1,7 +1,7 @@
 from typing import cast

 import flask_login
-from flask import request
+from flask import current_app, request
 from flask_restful import Resource, reqparse

 import services
@@ -56,14 +56,14 @@ class LogoutApi(Resource):
 class ResetPasswordApi(Resource):
    @setup_required
    def get(self):
-        # parser = reqparse.RequestParser()
-        # parser.add_argument('email', type=email, required=True, location='json')
-        # args = parser.parse_args()
+        parser = reqparse.RequestParser()
+        parser.add_argument('email', type=email, required=True, location='json')
+        args = parser.parse_args()

        # import mailchimp_transactional as MailchimpTransactional
        # from mailchimp_transactional.api_client import ApiClientError

-        # account = {'email': args['email']}
+        account = {'email': args['email']}
        # account = AccountService.get_by_email(args['email'])
        # if account is None:
        #     raise ValueError('Email not found')
@@ -71,22 +71,22 @@ class ResetPasswordApi(Resource):
        # AccountService.update_password(account, new_password)

        # todo: Send email
-        # MAILCHIMP_API_KEY = current_app.config['MAILCHIMP_TRANSACTIONAL_API_KEY']
+        MAILCHIMP_API_KEY = current_app.config['MAILCHIMP_TRANSACTIONAL_API_KEY']
        # mailchimp = MailchimpTransactional(MAILCHIMP_API_KEY)

-        # message = {
-        #     'from_email': 'noreply@example.com',
-        #     'to': [{'email': account['email']}],
-        #     'subject': 'Reset your Dify password',
-        #     'html': """
-        #         <p>Dear User,</p>
-        #         <p>The Dify team has generated a new password for you, details as follows:</p> 
-        #         <p><strong>{new_password}</strong></p>
-        #         <p>Please change your password to log in as soon as possible.</p>
-        #         <p>Regards,</p>
-        #         <p>The Dify Team</p> 
-        #     """
-        # }
+        message = {
+            'from_email': 'noreply@example.com',
+            'to': [{'email': account.email}],
+            'subject': 'Reset your Dify password',
+            'html': """
+                <p>Dear User,</p>
+                <p>The Dify team has generated a new password for you, details as follows:</p> 
+                <p><strong>{new_password}</strong></p>
+                <p>Please change your password to log in as soon as possible.</p>
+                <p>Regards,</p>
+                <p>The Dify Team</p> 
+            """
+        }

        # response = mailchimp.messages.send({
        #     'message': message,
@@ -6,7 +6,6 @@ import requests
 from flask import current_app, redirect, request
 from flask_restful import Resource

-from configs import dify_config
 from constants.languages import languages
 from extensions.ext_database import db
 from libs.helper import get_remote_ip
@@ -19,24 +18,22 @@ from .. import api

 def get_oauth_providers():
    with current_app.app_context():
-        if not dify_config.GITHUB_CLIENT_ID or not dify_config.GITHUB_CLIENT_SECRET:
-            github_oauth = None
-        else:
-            github_oauth = GitHubOAuth(
-                client_id=dify_config.GITHUB_CLIENT_ID,
-                client_secret=dify_config.GITHUB_CLIENT_SECRET,
-                redirect_uri=dify_config.CONSOLE_API_URL + '/console/api/oauth/authorize/github',
-            )
-        if not dify_config.GOOGLE_CLIENT_ID or not dify_config.GOOGLE_CLIENT_SECRET:
-            google_oauth = None
-        else:
-            google_oauth = GoogleOAuth(
-                client_id=dify_config.GOOGLE_CLIENT_ID,
-                client_secret=dify_config.GOOGLE_CLIENT_SECRET,
-                redirect_uri=dify_config.CONSOLE_API_URL + '/console/api/oauth/authorize/google',
-            )
+        github_oauth = GitHubOAuth(client_id=current_app.config.get('GITHUB_CLIENT_ID'),
+                                   client_secret=current_app.config.get(
+                                       'GITHUB_CLIENT_SECRET'),
+                                   redirect_uri=current_app.config.get(
+                                       'CONSOLE_API_URL') + '/console/api/oauth/authorize/github')

-        OAUTH_PROVIDERS = {'github': github_oauth, 'google': google_oauth}
+        google_oauth = GoogleOAuth(client_id=current_app.config.get('GOOGLE_CLIENT_ID'),
+                                   client_secret=current_app.config.get(
+                                       'GOOGLE_CLIENT_SECRET'),
+                                   redirect_uri=current_app.config.get(
+                                       'CONSOLE_API_URL') + '/console/api/oauth/authorize/google')
+
+        OAUTH_PROVIDERS = {
+            'github': github_oauth,
+            'google': google_oauth
+        }
        return OAUTH_PROVIDERS


@@ -66,7 +63,8 @@ class OAuthCallback(Resource):
            token = oauth_provider.get_access_token(code)
            user_info = oauth_provider.get_user_info(token)
        except requests.exceptions.HTTPError as e:
-            logging.exception(f'An error occurred during the OAuth process with {provider}: {e.response.text}')
+            logging.exception(
+                f"An error occurred during the OAuth process with {provider}: {e.response.text}")
            return {'error': 'OAuth process failed'}, 400

        account = _generate_account(provider, user_info)
@@ -83,7 +81,7 @@ class OAuthCallback(Resource):

        token = AccountService.login(account, ip_address=get_remote_ip(request))

-        return redirect(f'{dify_config.CONSOLE_WEB_URL}?console_token={token}')
+        return redirect(f'{current_app.config.get("CONSOLE_WEB_URL")}?console_token={token}')


 def _get_account_by_openid_or_email(provider: str, user_info: OAuthUserInfo) -> Optional[Account]:
@@ -103,7 +101,11 @@ def _generate_account(provider: str, user_info: OAuthUserInfo):
        # Create account
        account_name = user_info.name if user_info.name else 'Dify'
        account = RegisterService.register(
-            email=user_info.email, name=account_name, password=None, open_id=user_info.id, provider=provider
+            email=user_info.email,
+            name=account_name,
+            password=None,
+            open_id=user_info.id,
+            provider=provider
        )

        # Set interface language
@@ -1,11 +1,10 @@
 import flask_restful
-from flask import request
+from flask import current_app, request
 from flask_login import current_user
 from flask_restful import Resource, marshal, marshal_with, reqparse
 from werkzeug.exceptions import Forbidden, NotFound

 import services
-from configs import dify_config
 from controllers.console import api
 from controllers.console.apikey import api_key_fields, api_key_list
 from controllers.console.app.error import ProviderNotInitializeError
@@ -26,7 +25,7 @@ from fields.document_fields import document_status_fields
 from libs.login import login_required
 from models.dataset import Dataset, Document, DocumentSegment
 from models.model import ApiToken, UploadFile
-from services.dataset_service import DatasetPermissionService, DatasetService, DocumentService
+from services.dataset_service import DatasetService, DocumentService


 def _validate_name(name):
@@ -86,12 +85,6 @@ class DatasetListApi(Resource):
            else:
                item['embedding_available'] = True

-            if item.get('permission') == 'partial_members':
-                part_users_list = DatasetPermissionService.get_dataset_partial_member_list(item['id'])
-                item.update({'partial_member_list': part_users_list})
-            else:
-                item.update({'partial_member_list': []})
-
        response = {
            'data': data,
            'has_more': len(datasets) == limit,
@@ -115,8 +108,8 @@ class DatasetListApi(Resource):
                            help='Invalid indexing technique.')
        args = parser.parse_args()

-        # The role of the current user in the ta table must be admin, owner, or editor, or dataset_operator
-        if not current_user.is_dataset_editor:
+        # The role of the current user in the ta table must be admin, owner, or editor
+        if not current_user.is_editor:
            raise Forbidden()

        try:
@@ -147,10 +140,6 @@ class DatasetApi(Resource):
        except services.errors.account.NoPermissionError as e:
            raise Forbidden(str(e))
        data = marshal(dataset, dataset_detail_fields)
-        if data.get('permission') == 'partial_members':
-            part_users_list = DatasetPermissionService.get_dataset_partial_member_list(dataset_id_str)
-            data.update({'partial_member_list': part_users_list})
-
        # check embedding setting
        provider_manager = ProviderManager()
        configurations = provider_manager.get_configurations(
@@ -174,11 +163,6 @@ class DatasetApi(Resource):
                data['embedding_available'] = False
        else:
            data['embedding_available'] = True
-
-        if data.get('permission') == 'partial_members':
-            part_users_list = DatasetPermissionService.get_dataset_partial_member_list(dataset_id_str)
-            data.update({'partial_member_list': part_users_list})
-
        return data, 200

    @setup_required
@@ -204,21 +188,17 @@ class DatasetApi(Resource):
                            nullable=True,
                            help='Invalid indexing technique.')
        parser.add_argument('permission', type=str, location='json', choices=(
-            'only_me', 'all_team_members', 'partial_members'), help='Invalid permission.'
-                            )
+            'only_me', 'all_team_members'), help='Invalid permission.')
        parser.add_argument('embedding_model', type=str,
                            location='json', help='Invalid embedding model.')
        parser.add_argument('embedding_model_provider', type=str,
                            location='json', help='Invalid embedding model provider.')
        parser.add_argument('retrieval_model', type=dict, location='json', help='Invalid retrieval model.')
-        parser.add_argument('partial_member_list', type=list, location='json', help='Invalid parent user list.')
        args = parser.parse_args()
-        data = request.get_json()

-        # The role of the current user in the ta table must be admin, owner, editor, or dataset_operator
-        DatasetPermissionService.check_permission(
-            current_user, dataset, data.get('permission'), data.get('partial_member_list')
-        )
+        # The role of the current user in the ta table must be admin, owner, or editor
+        if not current_user.is_editor:
+            raise Forbidden()

        dataset = DatasetService.update_dataset(
            dataset_id_str, args, current_user)
@@ -226,20 +206,7 @@ class DatasetApi(Resource):
        if dataset is None:
            raise NotFound("Dataset not found.")

-        result_data = marshal(dataset, dataset_detail_fields)
-        tenant_id = current_user.current_tenant_id
-
-        if data.get('partial_member_list') and data.get('permission') == 'partial_members':
-            DatasetPermissionService.update_partial_member_list(
-                tenant_id, dataset_id_str, data.get('partial_member_list')
-            )
-        else:
-            DatasetPermissionService.clear_partial_member_list(dataset_id_str)
-
-        partial_member_list = DatasetPermissionService.get_dataset_partial_member_list(dataset_id_str)
-        result_data.update({'partial_member_list': partial_member_list})
-
-        return result_data, 200
+        return marshal(dataset, dataset_detail_fields), 200

    @setup_required
    @login_required
@@ -248,12 +215,11 @@ class DatasetApi(Resource):
        dataset_id_str = str(dataset_id)

        # The role of the current user in the ta table must be admin, owner, or editor
-        if not current_user.is_editor or current_user.is_dataset_operator:
+        if not current_user.is_editor:
            raise Forbidden()

        try:
            if DatasetService.delete_dataset(dataset_id_str, current_user):
-                DatasetPermissionService.clear_partial_member_list(dataset_id_str)
                return {'result': 'success'}, 204
            else:
                raise NotFound("Dataset not found.")
@@ -531,7 +497,7 @@ class DatasetApiBaseUrlApi(Resource):
    @account_initialization_required
    def get(self):
        return {
-            'api_base_url': (dify_config.SERVICE_API_URL if dify_config.SERVICE_API_URL
+            'api_base_url': (current_app.config['SERVICE_API_URL'] if current_app.config['SERVICE_API_URL']
                             else request.host_url.rstrip('/')) + '/v1'
        }

@@ -541,20 +507,20 @@ class DatasetRetrievalSettingApi(Resource):
    @login_required
    @account_initialization_required
    def get(self):
-        vector_type = dify_config.VECTOR_STORE
+        vector_type = current_app.config['VECTOR_STORE']
        match vector_type:
-            case VectorType.MILVUS | VectorType.RELYT | VectorType.PGVECTOR | VectorType.TIDB_VECTOR | VectorType.CHROMA | VectorType.TENCENT:
+            case VectorType.MILVUS | VectorType.RELYT | VectorType.PGVECTOR | VectorType.TIDB_VECTOR | VectorType.CHROMA | VectorType.TENCENT | VectorType.ORACLE:
                return {
                    'retrieval_method': [
-                        RetrievalMethod.SEMANTIC_SEARCH.value
+                        RetrievalMethod.SEMANTIC_SEARCH
                    ]
                }
-            case VectorType.QDRANT | VectorType.WEAVIATE | VectorType.OPENSEARCH | VectorType.ANALYTICDB | VectorType.MYSCALE | VectorType.ORACLE:
+            case VectorType.QDRANT | VectorType.WEAVIATE | VectorType.OPENSEARCH:
                return {
                    'retrieval_method': [
-                        RetrievalMethod.SEMANTIC_SEARCH.value,
-                        RetrievalMethod.FULL_TEXT_SEARCH.value,
-                        RetrievalMethod.HYBRID_SEARCH.value,
+                        RetrievalMethod.SEMANTIC_SEARCH,
+                        RetrievalMethod.FULL_TEXT_SEARCH,
+                        RetrievalMethod.HYBRID_SEARCH,
                    ]
                }
            case _:
@@ -567,18 +533,18 @@ class DatasetRetrievalSettingMockApi(Resource):
    @account_initialization_required
    def get(self, vector_type):
        match vector_type:
-            case VectorType.MILVUS | VectorType.RELYT | VectorType.PGVECTOR | VectorType.TIDB_VECTOR | VectorType.CHROMA | VectorType.TENCENT:
+            case VectorType.MILVUS | VectorType.RELYT | VectorType.PGVECTOR | VectorType.TIDB_VECTOR | VectorType.CHROMA | VectorType.TENCENT | VectorType.ORACLE:
                return {
                    'retrieval_method': [
-                        RetrievalMethod.SEMANTIC_SEARCH.value
+                        RetrievalMethod.SEMANTIC_SEARCH
                    ]
                }
-            case VectorType.QDRANT | VectorType.WEAVIATE | VectorType.OPENSEARCH| VectorType.ANALYTICDB | VectorType.MYSCALE | VectorType.ORACLE:
+            case VectorType.QDRANT | VectorType.WEAVIATE | VectorType.OPENSEARCH:
                return {
                    'retrieval_method': [
-                        RetrievalMethod.SEMANTIC_SEARCH.value,
-                        RetrievalMethod.FULL_TEXT_SEARCH.value,
-                        RetrievalMethod.HYBRID_SEARCH.value,
+                        RetrievalMethod.SEMANTIC_SEARCH,
+                        RetrievalMethod.FULL_TEXT_SEARCH,
+                        RetrievalMethod.HYBRID_SEARCH,
                    ]
                }
            case _:
@@ -603,27 +569,6 @@ class DatasetErrorDocs(Resource):
        }, 200


-class DatasetPermissionUserListApi(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    def get(self, dataset_id):
-        dataset_id_str = str(dataset_id)
-        dataset = DatasetService.get_dataset(dataset_id_str)
-        if dataset is None:
-            raise NotFound("Dataset not found.")
-        try:
-            DatasetService.check_dataset_permission(dataset, current_user)
-        except services.errors.account.NoPermissionError as e:
-            raise Forbidden(str(e))
-
-        partial_members_list = DatasetPermissionService.get_dataset_partial_member_list(dataset_id_str)
-
-        return {
-            'data': partial_members_list,
-        }, 200
-
-
 api.add_resource(DatasetListApi, '/datasets')
 api.add_resource(DatasetApi, '/datasets/<uuid:dataset_id>')
 api.add_resource(DatasetUseCheckApi, '/datasets/<uuid:dataset_id>/use-check')
@@ -637,4 +582,3 @@ api.add_resource(DatasetApiDeleteApi, '/datasets/api-keys/<uuid:api_key_id>')
 api.add_resource(DatasetApiBaseUrlApi, '/datasets/api-base-info')
 api.add_resource(DatasetRetrievalSettingApi, '/datasets/retrieval-setting')
 api.add_resource(DatasetRetrievalSettingMockApi, '/datasets/retrieval-setting/<string:vector_type>')
-api.add_resource(DatasetPermissionUserListApi, '/datasets/<uuid:dataset_id>/permission-part-users')
@@ -228,7 +228,7 @@ class DatasetDocumentListApi(Resource):
            raise NotFound('Dataset not found.')

        # The role of the current user in the ta table must be admin, owner, or editor
-        if not current_user.is_dataset_editor:
+        if not current_user.is_editor:
            raise Forbidden()

        try:
@@ -294,11 +294,6 @@ class DatasetInitApi(Resource):
        parser.add_argument('retrieval_model', type=dict, required=False, nullable=False,
                            location='json')
        args = parser.parse_args()
-
-        # The role of the current user in the ta table must be admin, owner, or editor, or dataset_operator
-        if not current_user.is_dataset_editor:
-            raise Forbidden()
-
        if args['indexing_technique'] == 'high_quality':
            try:
                model_manager = ModelManager()
@@ -762,19 +757,15 @@ class DocumentStatusApi(DocumentResource):
        dataset = DatasetService.get_dataset(dataset_id)
        if dataset is None:
            raise NotFound("Dataset not found.")
-
-        # The role of the current user in the ta table must be admin, owner, or editor
-        if not current_user.is_dataset_editor:
-            raise Forbidden()
-
        # check user's model setting
        DatasetService.check_dataset_model_setting(dataset)

-        # check user's permission
-        DatasetService.check_dataset_permission(dataset, current_user)
-
        document = self.get_document(dataset_id, document_id)

+        # The role of the current user in the ta table must be admin, owner, or editor
+        if not current_user.is_editor:
+            raise Forbidden()
+
        indexing_cache_key = 'document_{}_indexing'.format(document.id)
        cache_result = redis_client.get(indexing_cache_key)
        if cache_result is not None:
@@ -964,11 +955,10 @@ class DocumentRenameApi(DocumentResource):
    @account_initialization_required
    @marshal_with(document_fields)
    def post(self, dataset_id, document_id):
-        # The role of the current user in the ta table must be admin, owner, editor, or dataset_operator
-        if not current_user.is_dataset_editor:
+        # 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()
-        dataset = DatasetService.get_dataset(dataset_id)
-        DatasetService.check_dataset_operator_permission(current_user, dataset)
+
        parser = reqparse.RequestParser()
        parser.add_argument('name', type=str, required=True, nullable=False, location='json')
        args = parser.parse_args()
@@ -75,7 +75,7 @@ class DatasetDocumentSegmentListApi(Resource):
        )

        if last_id is not None:
-            last_segment = db.session.get(DocumentSegment, str(last_id))
+            last_segment = DocumentSegment.query.get(str(last_id))
            if last_segment:
                query = query.filter(
                    DocumentSegment.position > last_segment.position)
@@ -1,9 +1,8 @@
-from flask import request
+from flask import current_app, request
 from flask_login import current_user
 from flask_restful import Resource, marshal_with

 import services
-from configs import dify_config
 from controllers.console import api
 from controllers.console.datasets.error import (
    FileTooLargeError,
@@ -27,9 +26,9 @@ class FileApi(Resource):
    @account_initialization_required
    @marshal_with(upload_config_fields)
    def get(self):
-        file_size_limit = dify_config.UPLOAD_FILE_SIZE_LIMIT
-        batch_count_limit = dify_config.UPLOAD_FILE_BATCH_LIMIT
-        image_file_size_limit = dify_config.UPLOAD_IMAGE_FILE_SIZE_LIMIT
+        file_size_limit = current_app.config.get("UPLOAD_FILE_SIZE_LIMIT")
+        batch_count_limit = current_app.config.get("UPLOAD_FILE_BATCH_LIMIT")
+        image_file_size_limit = current_app.config.get("UPLOAD_IMAGE_FILE_SIZE_LIMIT")
        return {
            'file_size_limit': file_size_limit,
            'batch_count_limit': batch_count_limit,
@@ -77,7 +76,7 @@ class FileSupportTypeApi(Resource):
    @login_required
    @account_initialization_required
    def get(self):
-        etl_type = dify_config.ETL_TYPE
+        etl_type = current_app.config['ETL_TYPE']
        allowed_extensions = UNSTRUCTURED_ALLOWED_EXTENSIONS if etl_type == 'Unstructured' else ALLOWED_EXTENSIONS
        return {'allowed_extensions': allowed_extensions}

@@ -19,7 +19,6 @@ from controllers.console.app.error import (
 from controllers.console.explore.wraps import InstalledAppResource
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
-from models.model import AppMode
 from services.audio_service import AudioService
 from services.errors.audio import (
    AudioTooLargeServiceError,
@@ -71,36 +70,16 @@ class ChatAudioApi(InstalledAppResource):

 class ChatTextApi(InstalledAppResource):
    def post(self, installed_app):
-        from flask_restful import reqparse
-
        app_model = installed_app.app
-        try:
-            parser = reqparse.RequestParser()
-            parser.add_argument('message_id', type=str, required=False, location='json')
-            parser.add_argument('voice', type=str, location='json')
-            parser.add_argument('text', 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') if args.get('voice') else text_to_speech.get('voice')
-            else:
-                try:
-                    voice = args.get('voice') if args.get('voice') else app_model.app_model_config.text_to_speech_dict.get('voice')
-                except Exception:
-                    voice = None
+        try:
            response = AudioService.transcript_tts(
                app_model=app_model,
-                message_id=message_id,
-                voice=voice,
-                text=text
+                text=request.form['text'],
+                voice=request.form['voice'] if request.form.get('voice') else app_model.app_model_config.text_to_speech_dict.get('voice'),
+                streaming=False
            )
-            return response
+            return {'data': response.data.decode('latin1')}
        except services.errors.app_model_config.AppModelConfigBrokenError:
            logging.exception("App model config broken.")
            raise AppUnavailableError()
@@ -129,5 +108,3 @@ class ChatTextApi(InstalledAppResource):

 api.add_resource(ChatAudioApi, '/installed-apps/<uuid:installed_app_id>/audio-to-text', endpoint='installed_app_audio')
 api.add_resource(ChatTextApi, '/installed-apps/<uuid:installed_app_id>/text-to-audio', endpoint='installed_app_text')
-# api.add_resource(ChatTextApiWithMessageId, '/installed-apps/<uuid:installed_app_id>/text-to-audio/message-id',
-#                  endpoint='installed_app_text_with_message_id')
@@ -1,7 +1,7 @@

+from flask import current_app
 from flask_restful import fields, marshal_with

-from configs import dify_config
 from controllers.console import api
 from controllers.console.app.error import AppUnavailableError
 from controllers.console.explore.wraps import InstalledAppResource
@@ -78,7 +78,7 @@ class AppParameterApi(InstalledAppResource):
                                                     "transfer_methods": ["remote_url", "local_file"]
                                                 }}),
            'system_parameters': {
-                'image_file_size_limit': dify_config.UPLOAD_IMAGE_FILE_SIZE_LIMIT
+                'image_file_size_limit': current_app.config.get('UPLOAD_IMAGE_FILE_SIZE_LIMIT')
            }
        }

@@ -1,9 +1,8 @@
 import os

-from flask import session
+from flask import current_app, session
 from flask_restful import Resource, reqparse

-from configs import dify_config
 from libs.helper import str_len
 from models.model import DifySetup
 from services.account_service import TenantService
@@ -41,7 +40,7 @@ class InitValidateAPI(Resource):
        return {'result': 'success'}, 201

 def get_init_validate_status():
-    if dify_config.EDITION == 'SELF_HOSTED':
+    if current_app.config['EDITION'] == 'SELF_HOSTED':
        if os.environ.get('INIT_PASSWORD'):
            return session.get('is_init_validated') or DifySetup.query.first()
    
@@ -1,9 +1,8 @@
 from functools import wraps

-from flask import request
+from flask import current_app, request
 from flask_restful import Resource, reqparse

-from configs import dify_config
 from libs.helper import email, get_remote_ip, str_len
 from libs.password import valid_password
 from models.model import DifySetup
@@ -18,7 +17,7 @@ from .wraps import only_edition_self_hosted
 class SetupApi(Resource):

    def get(self):
-        if dify_config.EDITION == 'SELF_HOSTED':
+        if current_app.config['EDITION'] == 'SELF_HOSTED':
            setup_status = get_setup_status()
            if setup_status:
                return {
@@ -78,7 +77,7 @@ def setup_required(view):


 def get_setup_status():
-    if dify_config.EDITION == 'SELF_HOSTED':
+    if current_app.config['EDITION'] == 'SELF_HOSTED':
        return DifySetup.query.first()
    else:
        return True
@@ -36,7 +36,7 @@ class TagListApi(Resource):
    @account_initialization_required
    def post(self):
        # The role of the current user in the ta table must be admin, owner, or editor
-        if not (current_user.is_editor or current_user.is_dataset_editor):
+        if not current_user.is_editor:
            raise Forbidden()

        parser = reqparse.RequestParser()
@@ -68,7 +68,7 @@ class TagUpdateDeleteApi(Resource):
    def patch(self, tag_id):
        tag_id = str(tag_id)
        # The role of the current user in the ta table must be admin, owner, or editor
-        if not (current_user.is_editor or current_user.is_dataset_editor):
+        if not current_user.is_editor:
            raise Forbidden()

        parser = reqparse.RequestParser()
@@ -109,8 +109,8 @@ class TagBindingCreateApi(Resource):
    @login_required
    @account_initialization_required
    def post(self):
-        # The role of the current user in the ta table must be admin, owner, editor, or dataset_operator
-        if not (current_user.is_editor or current_user.is_dataset_editor):
+        # 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()
@@ -134,8 +134,8 @@ class TagBindingDeleteApi(Resource):
    @login_required
    @account_initialization_required
    def post(self):
-        # The role of the current user in the ta table must be admin, owner, editor, or dataset_operator
-        if not (current_user.is_editor or current_user.is_dataset_editor):
+        # 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()
@@ -3,10 +3,9 @@ import json
 import logging

 import requests
+from flask import current_app
 from flask_restful import Resource, reqparse

-from configs import dify_config
-
 from . import api


@@ -16,16 +15,16 @@ class VersionApi(Resource):
        parser = reqparse.RequestParser()
        parser.add_argument('current_version', type=str, required=True, location='args')
        args = parser.parse_args()
-        check_update_url = dify_config.CHECK_UPDATE_URL
+        check_update_url = current_app.config['CHECK_UPDATE_URL']

        result = {
-            'version': dify_config.CURRENT_VERSION,
+            'version': current_app.config['CURRENT_VERSION'],
            'release_date': '',
            'release_notes': '',
            'can_auto_update': False,
            'features': {
-                'can_replace_logo': dify_config.CAN_REPLACE_LOGO,
-                'model_load_balancing_enabled': dify_config.MODEL_LB_ENABLED
+                'can_replace_logo': current_app.config['CAN_REPLACE_LOGO'],
+                'model_load_balancing_enabled': current_app.config['MODEL_LB_ENABLED']
            }
        }

@@ -1,11 +1,10 @@
 import datetime

 import pytz
-from flask import request
+from flask import current_app, request
 from flask_login import current_user
 from flask_restful import Resource, fields, marshal_with, reqparse

-from configs import dify_config
 from constants.languages import supported_language
 from controllers.console import api
 from controllers.console.setup import setup_required
@@ -37,7 +36,7 @@ class AccountInitApi(Resource):

        parser = reqparse.RequestParser()

-        if dify_config.EDITION == 'CLOUD':
+        if current_app.config['EDITION'] == 'CLOUD':
            parser.add_argument('invitation_code', type=str, location='json')

        parser.add_argument(
@@ -46,7 +45,7 @@ class AccountInitApi(Resource):
                            required=True, location='json')
        args = parser.parse_args()

-        if dify_config.EDITION == 'CLOUD':
+        if current_app.config['EDITION'] == 'CLOUD':
            if not args['invitation_code']:
                raise ValueError('invitation_code is required')

@@ -246,8 +245,6 @@ class AccountIntegrateApi(Resource):
        return {'data': integrate_data}


-
-
 # Register API resources
 api.add_resource(AccountInitApi, '/account/init')
 api.add_resource(AccountProfileApi, '/account/profile')
@@ -1,8 +1,8 @@
+from flask import current_app
 from flask_login import current_user
 from flask_restful import Resource, abort, marshal_with, reqparse

 import services
-from configs import dify_config
 from controllers.console import api
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required, cloud_edition_billing_resource_check
@@ -48,7 +48,7 @@ class MemberInviteEmailApi(Resource):

        inviter = current_user
        invitation_results = []
-        console_web_url = dify_config.CONSOLE_WEB_URL
+        console_web_url = current_app.config.get("CONSOLE_WEB_URL")
        for invitee_email in invitee_emails:
            try:
                token = RegisterService.invite_new_member(inviter.current_tenant, invitee_email, interface_language, role=invitee_role, inviter=inviter)
@@ -117,7 +117,7 @@ class MemberUpdateRoleApi(Resource):
        if not TenantAccountRole.is_valid_role(new_role):
            return {'code': 'invalid-role', 'message': 'Invalid role'}, 400

-        member = db.session.get(Account, str(member_id))
+        member = Account.query.get(str(member_id))
        if not member:
            abort(404)

@@ -131,20 +131,7 @@ class MemberUpdateRoleApi(Resource):
        return {'result': 'success'}


-class DatasetOperatorMemberListApi(Resource):
-    """List all members of current tenant."""
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @marshal_with(account_with_role_list_fields)
-    def get(self):
-        members = TenantService.get_dataset_operator_members(current_user.current_tenant)
-        return {'result': 'success', 'accounts': members}, 200
-
-
 api.add_resource(MemberListApi, '/workspaces/current/members')
 api.add_resource(MemberInviteEmailApi, '/workspaces/current/members/invite-email')
 api.add_resource(MemberCancelInviteApi, '/workspaces/current/members/<uuid:member_id>')
 api.add_resource(MemberUpdateRoleApi, '/workspaces/current/members/<uuid:member_id>/update-role')
-api.add_resource(DatasetOperatorMemberListApi, '/workspaces/current/dataset-operators')
@@ -1,11 +1,10 @@
 import io

-from flask import send_file
+from flask import current_app, send_file
 from flask_login import current_user
 from flask_restful import Resource, reqparse
 from werkzeug.exceptions import Forbidden

-from configs import dify_config
 from controllers.console import api
 from controllers.console.setup import setup_required
 from controllers.console.wraps import account_initialization_required
@@ -105,7 +104,7 @@ class ToolBuiltinProviderIconApi(Resource):
    @setup_required
    def get(self, provider):
        icon_bytes, mimetype = BuiltinToolManageService.get_builtin_tool_provider_icon(provider)
-        icon_cache_max_age = dify_config.TOOL_ICON_CACHE_MAX_AGE
+        icon_cache_max_age = current_app.config.get('TOOL_ICON_CACHE_MAX_AGE')
        return send_file(io.BytesIO(icon_bytes), mimetype=mimetype, max_age=icon_cache_max_age)

 class ToolApiProviderAddApi(Resource):
@@ -1,10 +1,9 @@
 import json
 from functools import wraps

-from flask import abort, request
+from flask import abort, current_app, request
 from flask_login import current_user

-from configs import dify_config
 from controllers.console.workspace.error import AccountNotInitializedError
 from services.feature_service import FeatureService
 from services.operation_service import OperationService
@@ -27,7 +26,7 @@ def account_initialization_required(view):
 def only_edition_cloud(view):
    @wraps(view)
    def decorated(*args, **kwargs):
-        if dify_config.EDITION != 'CLOUD':
+        if current_app.config['EDITION'] != 'CLOUD':
            abort(404)

        return view(*args, **kwargs)
@@ -38,7 +37,7 @@ def only_edition_cloud(view):
 def only_edition_self_hosted(view):
    @wraps(view)
    def decorated(*args, **kwargs):
-        if dify_config.EDITION != 'SELF_HOSTED':
+        if current_app.config['EDITION'] != 'SELF_HOSTED':
            abort(404)

        return view(*args, **kwargs)
@@ -3,9 +3,8 @@ from functools import wraps
 from hashlib import sha1
 from hmac import new as hmac_new

-from flask import abort, request
+from flask import abort, current_app, request

-from configs import dify_config
 from extensions.ext_database import db
 from models.model import EndUser

@@ -13,12 +12,12 @@ from models.model import EndUser
 def inner_api_only(view):
    @wraps(view)
    def decorated(*args, **kwargs):
-        if not dify_config.INNER_API:
+        if not current_app.config['INNER_API']:
            abort(404)

        # get header 'X-Inner-Api-Key'
        inner_api_key = request.headers.get('X-Inner-Api-Key')
-        if not inner_api_key or inner_api_key != dify_config.INNER_API_KEY:
+        if not inner_api_key or inner_api_key != current_app.config['INNER_API_KEY']:
            abort(404)

        return view(*args, **kwargs)
@@ -29,7 +28,7 @@ def inner_api_only(view):
 def inner_api_user_auth(view):
    @wraps(view)
    def decorated(*args, **kwargs):
-        if not dify_config.INNER_API:
+        if not current_app.config['INNER_API']:
            return view(*args, **kwargs)

        # get header 'X-Inner-Api-Key'
@@ -1,7 +1,7 @@

+from flask import current_app
 from flask_restful import Resource, fields, marshal_with

-from configs import dify_config
 from controllers.service_api import api
 from controllers.service_api.app.error import AppUnavailableError
 from controllers.service_api.wraps import validate_app_token
@@ -78,7 +78,7 @@ class AppParameterApi(Resource):
                                                     "transfer_methods": ["remote_url", "local_file"]
                                                 }}),
            'system_parameters': {
-                'image_file_size_limit': dify_config.UPLOAD_IMAGE_FILE_SIZE_LIMIT
+                'image_file_size_limit': current_app.config.get('UPLOAD_IMAGE_FILE_SIZE_LIMIT')
            }
        }

@@ -20,7 +20,7 @@ from controllers.service_api.app.error import (
 from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
-from models.model import App, AppMode, EndUser
+from models.model import App, EndUser
 from services.audio_service import AudioService
 from services.errors.audio import (
    AudioTooLargeServiceError,
@@ -72,32 +72,19 @@ class AudioApi(Resource):
 class TextApi(Resource):
    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.JSON))
    def post(self, app_model: App, end_user: EndUser):
-        try:
-            parser = reqparse.RequestParser()
-            parser.add_argument('message_id', type=str, required=False, location='json')
-            parser.add_argument('voice', type=str, location='json')
-            parser.add_argument('text', type=str, location='json')
-            parser.add_argument('streaming', type=bool, location='json')
-            args = parser.parse_args()
+        parser = reqparse.RequestParser()
+        parser.add_argument('text', type=str, required=True, nullable=False, location='json')
+        parser.add_argument('voice', type=str, location='json')
+        parser.add_argument('streaming', type=bool, required=False, nullable=False, 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') if args.get('voice') else text_to_speech.get('voice')
-            else:
-                try:
-                    voice = args.get('voice') if args.get('voice') else app_model.app_model_config.text_to_speech_dict.get('voice')
-                except Exception:
-                    voice = None
+        try:
            response = AudioService.transcript_tts(
                app_model=app_model,
-                message_id=message_id,
-                end_user=end_user.external_user_id,
-                voice=voice,
-                text=text
+                text=args['text'],
+                end_user=end_user,
+                voice=args.get('voice'),
+                streaming=args['streaming']
            )

            return response
@@ -17,12 +17,7 @@ from controllers.service_api.app.error import (
 from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.errors.error import (
-    AppInvokeQuotaExceededError,
-    ModelCurrentlyNotSupportError,
-    ProviderTokenNotInitError,
-    QuotaExceededError,
-)
+from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
 from libs import helper
 from libs.helper import uuid_value
@@ -74,7 +69,7 @@ class CompletionApi(Resource):
            raise ProviderModelCurrentlyNotSupportError()
        except InvokeError as e:
            raise CompletionRequestError(e.description)
-        except (ValueError, AppInvokeQuotaExceededError) as e:
+        except ValueError as e:
            raise e
        except Exception as e:
            logging.exception("internal server error.")
@@ -137,7 +132,7 @@ class ChatApi(Resource):
            raise ProviderModelCurrentlyNotSupportError()
        except InvokeError as e:
            raise CompletionRequestError(e.description)
-        except (ValueError, AppInvokeQuotaExceededError) as e:
+        except ValueError as e:
            raise e
        except Exception as e:
            logging.exception("internal server error.")
@@ -1,6 +1,6 @@
 import logging

-from flask_restful import Resource, fields, marshal_with, reqparse
+from flask_restful import Resource, reqparse
 from werkzeug.exceptions import InternalServerError

 from controllers.service_api import api
@@ -14,50 +14,16 @@ from controllers.service_api.app.error import (
 from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
 from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.errors.error import (
-    AppInvokeQuotaExceededError,
-    ModelCurrentlyNotSupportError,
-    ProviderTokenNotInitError,
-    QuotaExceededError,
-)
+from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
-from extensions.ext_database import db
 from libs import helper
 from models.model import App, AppMode, EndUser
-from models.workflow import WorkflowRun
 from services.app_generate_service import AppGenerateService

 logger = logging.getLogger(__name__)


 class WorkflowRunApi(Resource):
-    workflow_run_fields = {
-        'id': fields.String,
-        'workflow_id': fields.String,
-        'status': fields.String,
-        'inputs': fields.Raw,
-        'outputs': fields.Raw,
-        'error': fields.String,
-        'total_steps': fields.Integer,
-        'total_tokens': fields.Integer,
-        'created_at': fields.DateTime,
-        'finished_at': fields.DateTime,
-        'elapsed_time': fields.Float,
-    }
-
-    @validate_app_token
-    @marshal_with(workflow_run_fields)
-    def get(self, app_model: App, workflow_id: str):
-        """
-        Get a workflow task running detail
-        """
-        app_mode = AppMode.value_of(app_model.mode)
-        if app_mode != AppMode.WORKFLOW:
-            raise NotWorkflowAppError()
-
-        workflow_run = db.session.query(WorkflowRun).filter(WorkflowRun.id == workflow_id).first()
-        return workflow_run
-
    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.JSON, required=True))
    def post(self, app_model: App, end_user: EndUser):
        """
@@ -93,7 +59,7 @@ class WorkflowRunApi(Resource):
            raise ProviderModelCurrentlyNotSupportError()
        except InvokeError as e:
            raise CompletionRequestError(e.description)
-        except (ValueError, AppInvokeQuotaExceededError) as e:
+        except ValueError as e:
            raise e
        except Exception as e:
            logging.exception("internal server error.")
@@ -117,5 +83,5 @@ class WorkflowTaskStopApi(Resource):
        }


-api.add_resource(WorkflowRunApi, '/workflows/run/<string:workflow_id>', '/workflows/run')
+api.add_resource(WorkflowRunApi, '/workflows/run')
 api.add_resource(WorkflowTaskStopApi, '/workflows/tasks/<string:task_id>/stop')
@@ -1,6 +1,6 @@
+from flask import current_app
 from flask_restful import Resource

-from configs import dify_config
 from controllers.service_api import api


@@ -9,7 +9,7 @@ class IndexApi(Resource):
        return {
            "welcome": "Dify OpenAPI",
            "api_version": "v1",
-            "server_version": dify_config.CURRENT_VERSION,
+            "server_version": current_app.config['CURRENT_VERSION']
        }


@@ -1,6 +1,6 @@
+from flask import current_app
 from flask_restful import fields, marshal_with

-from configs import dify_config
 from controllers.web import api
 from controllers.web.error import AppUnavailableError
 from controllers.web.wraps import WebApiResource
@@ -75,7 +75,7 @@ class AppParameterApi(WebApiResource):
                "transfer_methods": ["remote_url", "local_file"]
            }}),
            'system_parameters': {
-                'image_file_size_limit': dify_config.UPLOAD_IMAGE_FILE_SIZE_LIMIT
+                'image_file_size_limit': current_app.config.get('UPLOAD_IMAGE_FILE_SIZE_LIMIT')
            }
        }

@@ -19,7 +19,7 @@ from controllers.web.error import (
 from controllers.web.wraps import WebApiResource
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from core.model_runtime.errors.invoke import InvokeError
-from models.model import App, AppMode
+from models.model import App
 from services.audio_service import AudioService
 from services.errors.audio import (
    AudioTooLargeServiceError,
@@ -69,38 +69,16 @@ class AudioApi(WebApiResource):

 class TextApi(WebApiResource):
    def post(self, app_model: App, end_user):
-        from flask_restful import reqparse
        try:
-            parser = reqparse.RequestParser()
-            parser.add_argument('message_id', type=str, required=False, location='json')
-            parser.add_argument('voice', type=str, location='json')
-            parser.add_argument('text', 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') if args.get('voice') else text_to_speech.get('voice')
-            else:
-                try:
-                    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,
-                message_id=message_id,
+                text=request.form['text'],
                end_user=end_user.external_user_id,
-                voice=voice,
-                text=text
+                voice=request.form['voice'] if request.form.get('voice') else None,
+                streaming=False
            )

-            return response
+            return {'data': response.data.decode('latin1')}
        except services.errors.app_model_config.AppModelConfigBrokenError:
            logging.exception("App model config broken.")
            raise AppUnavailableError()
@@ -1,8 +1,8 @@

+from flask import current_app
 from flask_restful import fields, marshal_with
 from werkzeug.exceptions import Forbidden

-from configs import dify_config
 from controllers.web import api
 from controllers.web.wraps import WebApiResource
 from extensions.ext_database import db
@@ -84,7 +84,7 @@ class AppSiteInfo:
        self.can_replace_logo = can_replace_logo

        if can_replace_logo:
-            base_url = dify_config.FILES_URL
+            base_url = current_app.config.get('FILES_URL')
            remove_webapp_brand = tenant.custom_config_dict.get('remove_webapp_brand', False)
            replace_webapp_logo = f'{base_url}/files/workspaces/{tenant.id}/webapp-logo' if tenant.custom_config_dict.get('replace_webapp_logo') else None
            self.custom_config = {
@@ -342,14 +342,10 @@ class FunctionCallAgentRunner(BaseAgentRunner):
        """
        tool_calls = []
        for prompt_message in llm_result_chunk.delta.message.tool_calls:
-            args = {}
-            if prompt_message.function.arguments != '':
-                args = json.loads(prompt_message.function.arguments)
-
            tool_calls.append((
                prompt_message.id,
                prompt_message.function.name,
-                args,
+                json.loads(prompt_message.function.arguments),
            ))

        return tool_calls
@@ -363,14 +359,10 @@ class FunctionCallAgentRunner(BaseAgentRunner):
        """
        tool_calls = []
        for prompt_message in llm_result.message.tool_calls:
-            args = {}
-            if prompt_message.function.arguments != '':
-                args = json.loads(prompt_message.function.arguments)
-
            tool_calls.append((
                prompt_message.id,
                prompt_message.function.name,
-                args,
+                json.loads(prompt_message.function.arguments),
            ))

        return tool_calls
@@ -1,7 +1,6 @@
-from collections.abc import Mapping
-from typing import Any
+from typing import Optional, Union

-from core.app.app_config.entities import AppAdditionalFeatures
+from core.app.app_config.entities import AppAdditionalFeatures, EasyUIBasedAppModelConfigFrom
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
 from core.app.app_config.features.more_like_this.manager import MoreLikeThisConfigManager
 from core.app.app_config.features.opening_statement.manager import OpeningStatementConfigManager
@@ -11,19 +10,37 @@ from core.app.app_config.features.suggested_questions_after_answer.manager impor
    SuggestedQuestionsAfterAnswerConfigManager,
 )
 from core.app.app_config.features.text_to_speech.manager import TextToSpeechConfigManager
-from models.model import AppMode
+from models.model import AppMode, AppModelConfig


 class BaseAppConfigManager:
+
    @classmethod
-    def convert_features(cls, config_dict: Mapping[str, Any], app_mode: AppMode) -> AppAdditionalFeatures:
+    def convert_to_config_dict(cls, config_from: EasyUIBasedAppModelConfigFrom,
+                               app_model_config: Union[AppModelConfig, dict],
+                               config_dict: Optional[dict] = None) -> dict:
+        """
+        Convert app model config to config dict
+        :param config_from: app model config from
+        :param app_model_config: app model config
+        :param config_dict: app model config dict
+        :return:
+        """
+        if config_from != EasyUIBasedAppModelConfigFrom.ARGS:
+            app_model_config_dict = app_model_config.to_dict()
+            config_dict = app_model_config_dict.copy()
+
+        return config_dict
+
+    @classmethod
+    def convert_features(cls, config_dict: dict, app_mode: AppMode) -> AppAdditionalFeatures:
        """
        Convert app config to app model config

        :param config_dict: app config
        :param app_mode: app mode
        """
-        config_dict = dict(config_dict.items())
+        config_dict = config_dict.copy()

        additional_features = AppAdditionalFeatures()
        additional_features.show_retrieve_source = RetrievalResourceConfigManager.convert(
@@ -114,10 +114,6 @@ class VariableEntity(BaseModel):
    default: Optional[str] = None
    hint: Optional[str] = None

-    @property
-    def name(self) -> str:
-        return self.variable
-

 class ExternalDataVariableEntity(BaseModel):
    """
@@ -1,12 +1,11 @@
-from collections.abc import Mapping
-from typing import Any, Optional
+from typing import Optional

 from core.app.app_config.entities import FileExtraConfig


 class FileUploadConfigManager:
    @classmethod
-    def convert(cls, config: Mapping[str, Any], is_vision: bool = True) -> Optional[FileExtraConfig]:
+    def convert(cls, config: dict, is_vision: bool = True) -> Optional[FileExtraConfig]:
        """
        Convert model config to model config

@@ -3,13 +3,13 @@ from core.app.app_config.entities import TextToSpeechEntity

 class TextToSpeechConfigManager:
    @classmethod
-    def convert(cls, config: dict):
+    def convert(cls, config: dict) -> bool:
        """
        Convert model config to model config

        :param config: model config args
        """
-        text_to_speech = None
+        text_to_speech = False
        text_to_speech_dict = config.get('text_to_speech')
        if text_to_speech_dict:
            if text_to_speech_dict.get('enabled'):
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jyong	6e6604d28c	delete remove tsne position	2024-07-02 14:55:05 +08:00
jyong	e7b792f537	delete remove tsne position	2024-07-02 14:52:41 +08:00