chore: fix the lint error

.devcontainer/post_create_command.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-npm add -g pnpm@10.8.0
+npm add -g pnpm@9.12.2
 cd web && pnpm install
-pipx install uv
+pipx install poetry
 
-echo 'alias start-api="cd /workspaces/dify/api && uv run python -m flask run --host 0.0.0.0 --port=5001 --debug"' >> ~/.bashrc
-echo 'alias start-worker="cd /workspaces/dify/api && uv run python -m celery -A app.celery worker -P gevent -c 1 --loglevel INFO -Q dataset,generation,mail,ops_trace,app_deletion"' >> ~/.bashrc
+echo 'alias start-api="cd /workspaces/dify/api && poetry run python -m flask run --host 0.0.0.0 --port=5001 --debug"' >> ~/.bashrc
+echo 'alias start-worker="cd /workspaces/dify/api && poetry run python -m celery -A app.celery worker -P gevent -c 1 --loglevel INFO -Q dataset,generation,mail,ops_trace,app_deletion"' >> ~/.bashrc
 echo 'alias start-web="cd /workspaces/dify/web && pnpm dev"' >> ~/.bashrc
-echo 'alias start-containers="cd /workspaces/dify/docker && docker-compose -f docker-compose.middleware.yaml -p dify --env-file middleware.env up -d"' >> ~/.bashrc
-echo 'alias stop-containers="cd /workspaces/dify/docker && docker-compose -f docker-compose.middleware.yaml -p dify --env-file middleware.env down"' >> ~/.bashrc
+echo 'alias start-containers="cd /workspaces/dify/docker && docker-compose -f docker-compose.middleware.yaml -p dify up -d"' >> ~/.bashrc
+echo 'alias stop-containers="cd /workspaces/dify/docker && docker-compose -f docker-compose.middleware.yaml -p dify down"' >> ~/.bashrc
 
 source /home/vscode/.bashrc

.devcontainer/post_start_command.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cd api && uv sync
+cd api && poetry install

.github/actions/setup-poetry/action.yml

@@ -0,0 +1,36 @@
+name: Setup Poetry and Python
+
+inputs:
+  python-version:
+    description: Python version to use and the Poetry installed with
+    required: true
+    default: '3.11'
+  poetry-version:
+    description: Poetry version to set up
+    required: true
+    default: '2.0.1'
+  poetry-lockfile:
+    description: Path to the Poetry lockfile to restore cache from
+    required: true
+    default: ''
+
+runs:
+  using: composite
+  steps:
+    - name: Set up Python ${{ inputs.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ inputs.python-version }}
+        cache: pip
+
+    - name: Install Poetry
+      shell: bash
+      run: pip install poetry==${{ inputs.poetry-version }}
+
+    - name: Restore Poetry cache
+      if: ${{ inputs.poetry-lockfile != '' }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ inputs.python-version }}
+        cache: poetry
+        cache-dependency-path: ${{ inputs.poetry-lockfile }}

.github/actions/setup-uv/action.yml

@@ -1,34 +0,0 @@
-name: Setup UV and Python
-
-inputs:
-  python-version:
-    description: Python version to use and the UV installed with
-    required: true
-    default: '3.12'
-  uv-version:
-    description: UV version to set up
-    required: true
-    default: '0.6.14'
-  uv-lockfile:
-    description: Path to the UV lockfile to restore cache from
-    required: true
-    default: ''
-  enable-cache:
-    required: true
-    default: true
-
-runs:
-  using: composite
-  steps:
-    - name: Set up Python ${{ inputs.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ inputs.python-version }}
-
-    - name: Install uv
-      uses: astral-sh/setup-uv@v5
-      with:
-        version: ${{ inputs.uv-version }}
-        python-version: ${{ inputs.python-version }}
-        enable-cache: ${{ inputs.enable-cache }}
-        cache-dependency-glob: ${{ inputs.uv-lockfile }}

.github/workflows/api-tests.yml

@@ -17,9 +17,6 @@ jobs:
   test:
     name: API Tests
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
     strategy:
       matrix:
         python-version:
@@ -30,44 +27,35 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
-      - name: Setup UV and Python
-        uses: ./.github/actions/setup-uv
+      - name: Setup Poetry and Python ${{ matrix.python-version }}
+        uses: ./.github/actions/setup-poetry
         with:
           python-version: ${{ matrix.python-version }}
-          uv-lockfile: api/uv.lock
+          poetry-lockfile: api/poetry.lock
 
-      - name: Check UV lockfile
-        run: uv lock --project api --check
+      - name: Check Poetry lockfile
+        run: |
+          poetry check -C api --lock
+          poetry show -C api
 
       - name: Install dependencies
-        run: uv sync --project api --dev
+        run: poetry install -C api --with dev
+
+      - name: Check dependencies in pyproject.toml
+        run: poetry run -P api bash dev/pytest/pytest_artifacts.sh
 
       - name: Run Unit tests
-        run: |
-          uv run --project api bash dev/pytest/pytest_unit_tests.sh
-          # Extract coverage percentage and create a summary
-          TOTAL_COVERAGE=$(python -c 'import json; print(json.load(open("coverage.json"))["totals"]["percent_covered_display"])')
-
-          # Create a detailed coverage summary
-          echo "### Test Coverage Summary :test_tube:" >> $GITHUB_STEP_SUMMARY
-          echo "Total Coverage: ${TOTAL_COVERAGE}%" >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          uv run --project api coverage report >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+        run: poetry run -P api bash dev/pytest/pytest_unit_tests.sh
 
       - name: Run dify config tests
-        run: uv run --project api dev/pytest/pytest_config_tests.py
+        run: poetry run -P api python dev/pytest/pytest_config_tests.py
 
-      - name: MyPy Cache
-        uses: actions/cache@v4
-        with:
-          path: api/.mypy_cache
-          key: mypy-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('api/uv.lock') }}
-
-      - name: Run MyPy Checks
-        run: dev/mypy-check
+      - name: Run mypy
+        run: |
+          poetry run -C api python -m mypy --install-types --non-interactive .
 
       - name: Set up dotenvs
         run: |
@@ -87,4 +75,4 @@ jobs:
             ssrf_proxy
 
       - name: Run Workflow
-        run: uv run --project api bash dev/pytest/pytest_workflow.sh
+        run: poetry run -P api bash dev/pytest/pytest_workflow.sh

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

@@ -24,13 +24,13 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - name: Setup UV and Python
-        uses: ./.github/actions/setup-uv
+      - name: Setup Poetry and Python
+        uses: ./.github/actions/setup-poetry
         with:
-          uv-lockfile: api/uv.lock
+          poetry-lockfile: api/poetry.lock
 
       - name: Install dependencies
-        run: uv sync --project api
+        run: poetry install -C api
 
       - name: Prepare middleware env
         run: |
@@ -54,4 +54,6 @@ jobs:
       - name: Run DB Migration
         env:
           DEBUG: true
-        run: uv run --directory api flask upgrade-db
+        run: |
+          cd api
+          poetry run python -m flask upgrade-db

.github/workflows/docker-build.yml

@@ -42,7 +42,6 @@ jobs:
         with:
           push: false
           context: "{{defaultContext}}:${{ matrix.context }}"
-          file: "${{ matrix.file }}"
           platforms: ${{ matrix.platform }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

.github/workflows/style.yml

@@ -18,6 +18,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
       - name: Check changed files
@@ -28,27 +29,24 @@ jobs:
             api/**
             .github/workflows/style.yml
 
-      - name: Setup UV and Python
+      - name: Setup Poetry and Python
         if: steps.changed-files.outputs.any_changed == 'true'
-        uses: ./.github/actions/setup-uv
-        with:
-          uv-lockfile: api/uv.lock
-          enable-cache: false
+        uses: ./.github/actions/setup-poetry
 
       - name: Install dependencies
         if: steps.changed-files.outputs.any_changed == 'true'
-        run: uv sync --project api --dev
+        run: poetry install -C api --only lint
 
       - name: Ruff check
         if: steps.changed-files.outputs.any_changed == 'true'
         run: |
-          uv run --directory api ruff --version
-          uv run --directory api ruff check ./
-          uv run --directory api ruff format --check ./
+          poetry run -C api ruff --version
+          poetry run -C api ruff check ./
+          poetry run -C api ruff format --check ./
 
       - name: Dotenv check
         if: steps.changed-files.outputs.any_changed == 'true'
-        run: uv run --project api dotenv-linter ./api/.env.example ./web/.env.example
+        run: poetry run -P api dotenv-linter ./api/.env.example ./web/.env.example
 
       - name: Lint hints
         if: failure()
@@ -65,6 +63,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
       - name: Check changed files
@@ -83,7 +82,7 @@ jobs:
         uses: actions/setup-node@v4
         if: steps.changed-files.outputs.any_changed == 'true'
         with:
-          node-version: 22
+          node-version: 20
           cache: pnpm
           cache-dependency-path: ./web/package.json
 
@@ -103,6 +102,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
       - name: Check changed files
@@ -133,6 +133,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
       - name: Check changed files
@@ -152,7 +153,6 @@ jobs:
         env:
           BASH_SEVERITY: warning
           DEFAULT_BRANCH: main
-          FILTER_REGEX_INCLUDE: pnpm-lock.yaml
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IGNORE_GENERATED_FILES: true
           IGNORE_GITIGNORED_FILES: true

.github/workflows/tool-test-sdks.yaml

@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16, 18, 20, 22]
+        node-version: [16, 18, 20]
 
     defaults:
       run:
@@ -27,6 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
       - name: Use Node.js ${{ matrix.node-version }}

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

@@ -33,7 +33,7 @@ jobs:
 
       - name: Set up Node.js
         if: env.FILES_CHANGED == 'true'
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
         with:
           node-version: 'lts/*'
 

.github/workflows/vdb-tests.yml

@@ -8,7 +8,7 @@ on:
       - api/core/rag/datasource/**
       - docker/**
       - .github/workflows/vdb-tests.yml
-      - api/uv.lock
+      - api/poetry.lock
       - api/pyproject.toml
 
 concurrency:
@@ -29,19 +29,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
-      - name: Setup UV and Python
-        uses: ./.github/actions/setup-uv
+      - name: Setup Poetry and Python ${{ matrix.python-version }}
+        uses: ./.github/actions/setup-poetry
         with:
           python-version: ${{ matrix.python-version }}
-          uv-lockfile: api/uv.lock
+          poetry-lockfile: api/poetry.lock
 
-      - name: Check UV lockfile
-        run: uv lock --project api --check
+      - name: Check Poetry lockfile
+        run: |
+          poetry check -C api --lock
+          poetry show -C api
 
       - name: Install dependencies
-        run: uv sync --project api --dev
+        run: poetry install -C api --with dev
 
       - name: Set up dotenvs
         run: |
@@ -73,11 +76,12 @@ jobs:
             milvus-standalone
             pgvecto-rs
             pgvector
+            opengauss
             chroma
             elasticsearch
 
       - name: Check TiDB Ready
-        run: uv run --project api python api/tests/integration_tests/vdb/tidb_vector/check_tiflash_ready.py
+        run: poetry run -P api python api/tests/integration_tests/vdb/tidb_vector/check_tiflash_ready.py
 
       - name: Test Vector Stores
-        run: uv run --project api bash dev/pytest/pytest_vdb.sh
+        run: poetry run -P api bash dev/pytest/pytest_vdb.sh

.github/workflows/web-tests.yml

@@ -23,6 +23,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
       - name: Check changed files
@@ -30,26 +31,25 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: web/**
+      # to run pnpm, should install package canvas, but it always install failed on amd64 under ubuntu-latest
+      # - name: Install pnpm
+      #   uses: pnpm/action-setup@v4
+      #   with:
+      #     version: 10
+      #     run_install: false
 
-      - name: Install pnpm
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-          run_install: false
+      # - name: Setup Node.js
+      #   uses: actions/setup-node@v4
+      #   if: steps.changed-files.outputs.any_changed == 'true'
+      #   with:
+      #     node-version: 20
+      #     cache: pnpm
+      #     cache-dependency-path: ./web/package.json
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        if: steps.changed-files.outputs.any_changed == 'true'
-        with:
-          node-version: 22
-          cache: pnpm
-          cache-dependency-path: ./web/package.json
+      # - name: Install dependencies
+      #   if: steps.changed-files.outputs.any_changed == 'true'
+      #   run: pnpm install --frozen-lockfile
 
-      - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: pnpm install --frozen-lockfile
-
-      - name: Run tests
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: pnpm test
+      # - name: Run tests
+      #   if: steps.changed-files.outputs.any_changed == 'true'
+      #   run: pnpm test

.gitignore

@@ -46,7 +46,6 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-coverage.json
 *.cover
 *.py,cover
 .hypothesis/
@@ -104,7 +103,6 @@ celerybeat.pid
 
 # Environments
 .env
-.env-local
 .venv
 env/
 venv/

CONTRIBUTING.md

@@ -18,7 +18,7 @@ Need to update an existing model runtime, tool, or squash some bugs? Head over t
 
 Join the fun, contribute, and let's build something awesome together! 💡✨
 
-Don't forget to link an existing issue or open a new issue in the PR's description.
+Don't forget to link an existing issue or open an new issue in the PR's description.
 
 ### Bug reports
 
@@ -68,7 +68,7 @@ How we prioritize:
 4. Please add tests for your changes accordingly
 5. Ensure your code passes the existing tests
 6. Please link the issue in the PR description, `fixes #<issue_number>`
-7. Get merged! 
+7. Get merrged! 
 ### Setup the project
 
 #### Frontend
@@ -90,4 +90,4 @@ We recommend reviewing this document carefully before proceeding with the setup,
 Feel free to reach out if you encounter any issues during the setup process.
 ## Getting Help
 
-If you ever get stuck or get a burning question while contributing, simply shoot your queries our way via the related GitHub issue, or hop onto our [Discord](https://discord.gg/8Tpq4AcN9c) for a quick chat.
+If you ever get stuck or got a burning question while contributing, simply shoot your queries our way via the related GitHub issue, or hop onto our [Discord](https://discord.gg/8Tpq4AcN9c) for a quick chat.

CONTRIBUTING_CN.md

@@ -6,7 +6,7 @@
 
 本指南和 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)。
 
 ## 开始之前
 

CONTRIBUTING_ES.md

@@ -1,93 +0,0 @@
-# CONTRIBUIR
-
-Así que estás buscando contribuir a Dify - eso es fantástico, estamos ansiosos por ver lo que haces. Como una startup con personal y financiación limitados, tenemos grandes ambiciones de diseñar el flujo de trabajo más intuitivo para construir y gestionar aplicaciones LLM. Cualquier ayuda de la comunidad cuenta, realmente.
-
-Necesitamos ser ágiles y enviar rápidamente dado donde estamos, pero también queremos asegurarnos de que colaboradores como tú obtengan una experiencia lo más fluida posible al contribuir. Hemos elaborado esta guía de contribución con ese propósito, con el objetivo de familiarizarte con la base de código y cómo trabajamos con los colaboradores, para que puedas pasar rápidamente a la parte divertida.
-
-Esta guía, como Dify mismo, es un trabajo en constante progreso. Agradecemos mucho tu comprensión si a veces se queda atrás del proyecto real, y damos la bienvenida a cualquier comentario para que podamos mejorar.
-
-En términos de licencia, por favor tómate un minuto para leer nuestro breve [Acuerdo de Licencia y Colaborador](./LICENSE). La comunidad también se adhiere al [código de conducta](https://github.com/langgenius/.github/blob/main/CODE_OF_CONDUCT.md).
-
-## Antes de empezar
-
-¿Buscas algo en lo que trabajar? Explora nuestros [buenos primeros issues](https://github.com/langgenius/dify/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) y elige uno para comenzar.
-
-¿Tienes un nuevo modelo o herramienta genial para añadir? Abre un PR en nuestro [repositorio de plugins](https://github.com/langgenius/dify-plugins) y muéstranos lo que has construido.
-
-¿Necesitas actualizar un modelo existente, herramienta o corregir algunos errores? Dirígete a nuestro [repositorio oficial de plugins](https://github.com/langgenius/dify-official-plugins) y haz tu magia.
-
-¡Únete a la diversión, contribuye y construyamos algo increíble juntos! 💡✨
-
-No olvides vincular un issue existente o abrir uno nuevo en la descripción del PR.
-
-### Informes de errores
-
-> [!IMPORTANT]
-> Por favor, asegúrate de incluir la siguiente información al enviar un informe de error:
-
-- Un título claro y descriptivo
-- Una descripción detallada del error, incluyendo cualquier mensaje de error
-- Pasos para reproducir el error
-- Comportamiento esperado
-- **Logs**, si están disponibles, para problemas del backend, esto es realmente importante, puedes encontrarlos en los logs de docker-compose
-- Capturas de pantalla o videos, si es aplicable
-
-Cómo priorizamos:
-
-  | Tipo de Issue                                                | Prioridad       |
-  | ------------------------------------------------------------ | --------------- |
-  | Errores en funciones principales (servicio en la nube, no poder iniciar sesión, aplicaciones que no funcionan, fallos de seguridad) | Crítica         |
-  | Errores no críticos, mejoras de rendimiento                 | Prioridad Media |
-  | Correcciones menores (errores tipográficos, UI confusa pero funcional) | Prioridad Baja  |
-
-### Solicitudes de funcionalidades
-
-> [!NOTE]
-> Por favor, asegúrate de incluir la siguiente información al enviar una solicitud de funcionalidad:
-
-- Un título claro y descriptivo
-- Una descripción detallada de la funcionalidad
-- Un caso de uso para la funcionalidad
-- Cualquier otro contexto o capturas de pantalla sobre la solicitud de funcionalidad
-
-Cómo priorizamos:
-
-  | Tipo de Funcionalidad                                        | Prioridad       |
-  | ------------------------------------------------------------ | --------------- |
-  | Funcionalidades de alta prioridad etiquetadas por un miembro del equipo | Prioridad Alta  |
-  | Solicitudes populares de funcionalidades de nuestro [tablero de comentarios de la comunidad](https://github.com/langgenius/dify/discussions/categories/feedbacks) | Prioridad Media |
-  | Funcionalidades no principales y mejoras menores            | Prioridad Baja  |
-  | Valiosas pero no inmediatas                                 | Futura-Funcionalidad |
-## Enviando tu PR
-
-### Proceso de Pull Request
-
-1. Haz un fork del repositorio
-2. Antes de redactar un PR, por favor crea un issue para discutir los cambios que quieres hacer
-3. Crea una nueva rama para tus cambios
-4. Por favor añade pruebas para tus cambios en consecuencia
-5. Asegúrate de que tu código pasa las pruebas existentes
-6. Por favor vincula el issue en la descripción del PR, `fixes #<número_del_issue>`
-7. ¡Fusiona tu código!
-### Configuración del proyecto
-
-#### Frontend
-
-Para configurar el servicio frontend, por favor consulta nuestra [guía completa](https://github.com/langgenius/dify/blob/main/web/README.md) en el archivo `web/README.md`. Este documento proporciona instrucciones detalladas para ayudarte a configurar el entorno frontend correctamente.
-
-#### Backend
-
-Para configurar el servicio backend, por favor consulta nuestras [instrucciones detalladas](https://github.com/langgenius/dify/blob/main/api/README.md) en el archivo `api/README.md`. Este documento contiene una guía paso a paso para ayudarte a poner en marcha el backend sin problemas.
-
-#### Otras cosas a tener en cuenta
-
-Recomendamos revisar este documento cuidadosamente antes de proceder con la configuración, ya que contiene información esencial sobre:
-- Requisitos previos y dependencias
-- Pasos de instalación
-- Detalles de configuración
-- Consejos comunes de solución de problemas
-
-No dudes en contactarnos si encuentras algún problema durante el proceso de configuración.
-## Obteniendo Ayuda
-
-Si alguna vez te quedas atascado o tienes una pregunta urgente mientras contribuyes, simplemente envíanos tus consultas a través del issue relacionado de GitHub, o únete a nuestro [Discord](https://discord.gg/8Tpq4AcN9c) para una charla rápida. 

CONTRIBUTING_FR.md

@@ -1,93 +0,0 @@
-# CONTRIBUER
-
-Vous cherchez donc à contribuer à Dify - c'est fantastique, nous avons hâte de voir ce que vous allez faire. En tant que startup avec un personnel et un financement limités, nous avons de grandes ambitions pour concevoir le flux de travail le plus intuitif pour construire et gérer des applications LLM. Toute aide de la communauté compte, vraiment.
-
-Nous devons être agiles et livrer rapidement compte tenu de notre position, mais nous voulons aussi nous assurer que des contributeurs comme vous obtiennent une expérience aussi fluide que possible lors de leur contribution. Nous avons élaboré ce guide de contribution dans ce but, visant à vous familiariser avec la base de code et comment nous travaillons avec les contributeurs, afin que vous puissiez rapidement passer à la partie amusante.
-
-Ce guide, comme Dify lui-même, est un travail en constante évolution. Nous apprécions grandement votre compréhension si parfois il est en retard par rapport au projet réel, et nous accueillons tout commentaire pour nous aider à nous améliorer.
-
-En termes de licence, veuillez prendre une minute pour lire notre bref [Accord de Licence et de Contributeur](./LICENSE). La communauté adhère également au [code de conduite](https://github.com/langgenius/.github/blob/main/CODE_OF_CONDUCT.md).
-
-## Avant de vous lancer
-
-Vous cherchez quelque chose à réaliser ? Parcourez nos [problèmes pour débutants](https://github.com/langgenius/dify/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) et choisissez-en un pour commencer !
-
-Vous avez un nouveau modèle ou un nouvel outil à ajouter ? Ouvrez une PR dans notre [dépôt de plugins](https://github.com/langgenius/dify-plugins) et montrez-nous ce que vous avez créé.
-
-Vous devez mettre à jour un modèle existant, un outil ou corriger des bugs ? Rendez-vous sur notre [dépôt officiel de plugins](https://github.com/langgenius/dify-official-plugins) et faites votre magie !
-
-Rejoignez l'aventure, contribuez, et construisons ensemble quelque chose d'extraordinaire ! 💡✨
-
-N'oubliez pas de lier un problème existant ou d'ouvrir un nouveau problème dans la description de votre PR.
-
-### Rapports de bugs
-
-> [!IMPORTANT]
-> Veuillez vous assurer d'inclure les informations suivantes lors de la soumission d'un rapport de bug :
-
-- Un titre clair et descriptif
-- Une description détaillée du bug, y compris tous les messages d'erreur
-- Les étapes pour reproduire le bug
-- Comportement attendu
-- **Logs**, si disponibles, pour les problèmes de backend, c'est vraiment important, vous pouvez les trouver dans les logs de docker-compose
-- Captures d'écran ou vidéos, si applicable
-
-Comment nous priorisons :
-
-  | Type de Problème                                              | Priorité        |
-  | ------------------------------------------------------------ | --------------- |
-  | Bugs dans les fonctions principales (service cloud, impossibilité de se connecter, applications qui ne fonctionnent pas, failles de sécurité) | Critique        |
-  | Bugs non critiques, améliorations de performance             | Priorité Moyenne |
-  | Corrections mineures (fautes de frappe, UI confuse mais fonctionnelle) | Priorité Basse  |
-
-### Demandes de fonctionnalités
-
-> [!NOTE]
-> Veuillez vous assurer d'inclure les informations suivantes lors de la soumission d'une demande de fonctionnalité :
-
-- Un titre clair et descriptif
-- Une description détaillée de la fonctionnalité
-- Un cas d'utilisation pour la fonctionnalité
-- Tout autre contexte ou captures d'écran concernant la demande de fonctionnalité
-
-Comment nous priorisons :
-
-  | Type de Fonctionnalité                                        | Priorité        |
-  | ------------------------------------------------------------ | --------------- |
-  | Fonctionnalités hautement prioritaires étiquetées par un membre de l'équipe | Priorité Haute  |
-  | Demandes populaires de fonctionnalités de notre [tableau de feedback communautaire](https://github.com/langgenius/dify/discussions/categories/feedbacks) | Priorité Moyenne |
-  | Fonctionnalités non essentielles et améliorations mineures   | Priorité Basse  |
-  | Précieuses mais non immédiates                               | Fonctionnalité Future |
-## Soumettre votre PR
-
-### Processus de Pull Request
-
-1. Forkez le dépôt
-2. Avant de rédiger une PR, veuillez créer un problème pour discuter des changements que vous souhaitez apporter
-3. Créez une nouvelle branche pour vos changements
-4. Veuillez ajouter des tests pour vos changements en conséquence
-5. Assurez-vous que votre code passe les tests existants
-6. Veuillez lier le problème dans la description de la PR, `fixes #<numéro_du_problème>`
-7. Faites fusionner votre code !
-### Configuration du projet
-
-#### Frontend
-
-Pour configurer le service frontend, veuillez consulter notre [guide complet](https://github.com/langgenius/dify/blob/main/web/README.md) dans le fichier `web/README.md`. Ce document fournit des instructions détaillées pour vous aider à configurer correctement l'environnement frontend.
-
-#### Backend
-
-Pour configurer le service backend, veuillez consulter nos [instructions détaillées](https://github.com/langgenius/dify/blob/main/api/README.md) dans le fichier `api/README.md`. Ce document contient un guide étape par étape pour vous aider à faire fonctionner le backend sans problème.
-
-#### Autres choses à noter
-
-Nous recommandons de revoir attentivement ce document avant de procéder à la configuration, car il contient des informations essentielles sur :
-- Prérequis et dépendances
-- Étapes d'installation
-- Détails de configuration
-- Conseils courants de dépannage
-
-N'hésitez pas à nous contacter si vous rencontrez des problèmes pendant le processus de configuration.
-## Obtenir de l'aide
-
-Si jamais vous êtes bloqué ou avez une question urgente en contribuant, envoyez-nous simplement vos questions via le problème GitHub concerné, ou rejoignez notre [Discord](https://discord.gg/8Tpq4AcN9c) pour une discussion rapide. 

CONTRIBUTING_KR.md

@@ -1,93 +0,0 @@
-# 기여하기
-
-Dify에 기여하려고 하시는군요 - 정말 멋집니다, 당신이 무엇을 할지 기대가 됩니다. 인력과 자금이 제한된 스타트업으로서, 우리는 LLM 애플리케이션을 구축하고 관리하기 위한 가장 직관적인 워크플로우를 설계하고자 하는 큰 야망을 가지고 있습니다. 커뮤니티의 모든 도움은 정말 중요합니다.
-
-우리는 현재 상황에서 민첩하게 빠르게 배포해야 하지만, 동시에 당신과 같은 기여자들이 기여하는 과정에서 최대한 원활한 경험을 얻을 수 있도록 하고 싶습니다. 우리는 이러한 목적으로 이 기여 가이드를 작성했으며, 여러분이 코드베이스와 우리가 기여자들과 어떻게 협업하는지에 대해 친숙해질 수 있도록 돕고, 빠르게 재미있는 부분으로 넘어갈 수 있도록 하고자 합니다.
-
-이 가이드는 Dify 자체와 마찬가지로 끊임없이 진행 중인 작업입니다. 때로는 실제 프로젝트보다 뒤처질 수 있다는 점을 이해해 주시면 감사하겠으며, 개선을 위한 피드백은 언제든지 환영합니다.
-
-라이센스 측면에서, 간략한 [라이센스 및 기여자 동의서](./LICENSE)를 읽어보는 시간을 가져주세요. 커뮤니티는 또한 [행동 강령](https://github.com/langgenius/.github/blob/main/CODE_OF_CONDUCT.md)을 준수합니다.
-
-## 시작하기 전에
-
-처리할 작업을 찾고 계신가요? [초보자를 위한 이슈](https://github.com/langgenius/dify/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22)를 살펴보고 시작할 것을 선택하세요!
-
-추가할 새로운 모델 런타임이나 도구가 있나요? 우리의 [플러그인 저장소](https://github.com/langgenius/dify-plugins)에 PR을 열고 당신이 만든 것을 보여주세요.
-
-기존 모델 런타임, 도구를 업데이트하거나 버그를 수정해야 하나요? 우리의 [공식 플러그인 저장소](https://github.com/langgenius/dify-official-plugins)로 가서 당신의 마법을 펼치세요!
-
-함께 즐기고, 기여하고, 멋진 것을 함께 만들어 봅시다! 💡✨
-
-PR 설명에 기존 이슈를 연결하거나 새 이슈를 여는 것을 잊지 마세요.
-
-### 버그 보고
-
-> [!IMPORTANT]
-> 버그 보고서를 제출할 때 다음 정보를 포함해 주세요:
-
-- 명확하고 설명적인 제목
-- 오류 메시지를 포함한 버그에 대한 상세한 설명
-- 버그를 재현하는 단계
-- 예상되는 동작
-- 가능한 경우 **로그**, 백엔드 이슈의 경우 매우 중요합니다. docker-compose 로그에서 찾을 수 있습니다
-- 해당되는 경우 스크린샷 또는 비디오
-
-우선순위 결정 방법:
-
-  | 이슈 유형                                                     | 우선순위        |
-  | ------------------------------------------------------------ | --------------- |
-  | 핵심 기능의 버그(클라우드 서비스, 로그인 불가, 애플리케이션 작동 불능, 보안 취약점) | 중대            |
-  | 비중요 버그, 성능 향상                                        | 중간 우선순위   |
-  | 사소한 수정(오타, 혼란스럽지만 작동하는 UI)                    | 낮은 우선순위   |
-
-### 기능 요청
-
-> [!NOTE]
-> 기능 요청을 제출할 때 다음 정보를 포함해 주세요:
-
-- 명확하고 설명적인 제목
-- 기능에 대한 상세한 설명
-- 해당 기능의 사용 사례
-- 기능 요청에 관한 기타 컨텍스트 또는 스크린샷
-
-우선순위 결정 방법:
-
-  | 기능 유형                                                     | 우선순위        |
-  | ------------------------------------------------------------ | --------------- |
-  | 팀 구성원에 의해 레이블이 지정된 고우선순위 기능               | 높은 우선순위   |
-  | 우리의 [커뮤니티 피드백 보드](https://github.com/langgenius/dify/discussions/categories/feedbacks)에서 인기 있는 기능 요청 | 중간 우선순위   |
-  | 비핵심 기능 및 사소한 개선                                     | 낮은 우선순위   |
-  | 가치 있지만 즉시 필요하지 않은 기능                            | 미래 기능       |
-## PR 제출하기
-
-### Pull Request 프로세스
-
-1. 저장소를 포크하세요
-2. PR을 작성하기 전에, 변경하고자 하는 내용에 대해 논의하기 위한 이슈를 생성해 주세요
-3. 변경 사항을 위한 새 브랜치를 만드세요
-4. 변경 사항에 대한 테스트를 적절히 추가해 주세요
-5. 코드가 기존 테스트를 통과하는지 확인하세요
-6. PR 설명에 이슈를 연결해 주세요, `fixes #<이슈_번호>`
-7. 병합 완료!
-### 프로젝트 설정하기
-
-#### 프론트엔드
-
-프론트엔드 서비스를 설정하려면, `web/README.md` 파일에 있는 우리의 [종합 가이드](https://github.com/langgenius/dify/blob/main/web/README.md)를 참조하세요. 이 문서는 프론트엔드 환경을 적절히 설정하는 데 도움이 되는 자세한 지침을 제공합니다.
-
-#### 백엔드
-
-백엔드 서비스를 설정하려면, `api/README.md` 파일에 있는 우리의 [상세 지침](https://github.com/langgenius/dify/blob/main/api/README.md)을 참조하세요. 이 문서는 백엔드를 원활하게 실행하는 데 도움이 되는 단계별 가이드를 포함하고 있습니다.
-
-#### 기타 참고 사항
-
-설정을 진행하기 전에 이 문서를 주의 깊게 검토하는 것을 권장합니다. 다음과 같은 필수 정보가 포함되어 있습니다:
-- 필수 조건 및 종속성
-- 설치 단계
-- 구성 세부 정보
-- 일반적인 문제 해결 팁
-
-설정 과정에서 문제가 발생하면 언제든지 연락해 주세요.
-## 도움 받기
-
-기여하는 동안 막히거나 긴급한 질문이 있으면, 관련 GitHub 이슈를 통해 질문을 보내거나, 빠른 대화를 위해 우리의 [Discord](https://discord.gg/8Tpq4AcN9c)에 참여하세요. 

CONTRIBUTING_PT.md

@@ -1,93 +0,0 @@
-# CONTRIBUINDO
-
-Então você está procurando contribuir para o Dify - isso é incrível, mal podemos esperar para ver o que você vai fazer. Como uma startup com equipe e financiamento limitados, temos grandes ambições de projetar o fluxo de trabalho mais intuitivo para construir e gerenciar aplicações LLM. Qualquer ajuda da comunidade conta, verdadeiramente.
-
-Precisamos ser ágeis e entregar rapidamente considerando onde estamos, mas também queremos garantir que colaboradores como você tenham uma experiência o mais tranquila possível ao contribuir. Montamos este guia de contribuição com esse propósito, visando familiarizá-lo com a base de código e como trabalhamos com os colaboradores, para que você possa rapidamente passar para a parte divertida.
-
-Este guia, como o próprio Dify, é um trabalho em constante evolução. Agradecemos muito a sua compreensão se às vezes ele ficar atrasado em relação ao projeto real, e damos as boas-vindas a qualquer feedback para que possamos melhorar.
-
-Em termos de licenciamento, por favor, dedique um minuto para ler nosso breve [Acordo de Licença e Contribuidor](./LICENSE). A comunidade também adere ao [código de conduta](https://github.com/langgenius/.github/blob/main/CODE_OF_CONDUCT.md).
-
-## Antes de começar
-
-Procurando algo para resolver? Navegue por nossos [problemas para iniciantes](https://github.com/langgenius/dify/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) e escolha um para começar!
-
-Tem um novo modelo ou ferramenta para adicionar? Abra um PR em nosso [repositório de plugins](https://github.com/langgenius/dify-plugins) e mostre-nos o que você construiu.
-
-Precisa atualizar um modelo existente, ferramenta ou corrigir alguns bugs? Vá para nosso [repositório oficial de plugins](https://github.com/langgenius/dify-official-plugins) e faça sua mágica!
-
-Junte-se à diversão, contribua e vamos construir algo incrível juntos! 💡✨
-
-Não se esqueça de vincular um problema existente ou abrir um novo problema na descrição do PR.
-
-### Relatórios de bugs
-
-> [!IMPORTANT]
-> Por favor, certifique-se de incluir as seguintes informações ao enviar um relatório de bug:
-
-- Um título claro e descritivo
-- Uma descrição detalhada do bug, incluindo quaisquer mensagens de erro
-- Passos para reproduzir o bug
-- Comportamento esperado
-- **Logs**, se disponíveis, para problemas de backend, isso é realmente importante, você pode encontrá-los nos logs do docker-compose
-- Capturas de tela ou vídeos, se aplicável
-
-Como priorizamos:
-
-  | Tipo de Problema                                              | Prioridade      |
-  | ------------------------------------------------------------ | --------------- |
-  | Bugs em funções centrais (serviço em nuvem, não conseguir fazer login, aplicações não funcionando, falhas de segurança) | Crítica         |
-  | Bugs não críticos, melhorias de desempenho                   | Prioridade Média |
-  | Correções menores (erros de digitação, interface confusa mas funcional) | Prioridade Baixa |
-
-### Solicitações de recursos
-
-> [!NOTE]
-> Por favor, certifique-se de incluir as seguintes informações ao enviar uma solicitação de recurso:
-
-- Um título claro e descritivo
-- Uma descrição detalhada do recurso
-- Um caso de uso para o recurso
-- Qualquer outro contexto ou capturas de tela sobre a solicitação de recurso
-
-Como priorizamos:
-
-  | Tipo de Recurso                                              | Prioridade      |
-  | ------------------------------------------------------------ | --------------- |
-  | Recursos de alta prioridade conforme rotulado por um membro da equipe | Prioridade Alta |
-  | Solicitações populares de recursos do nosso [quadro de feedback da comunidade](https://github.com/langgenius/dify/discussions/categories/feedbacks) | Prioridade Média |
-  | Recursos não essenciais e melhorias menores                  | Prioridade Baixa |
-  | Valiosos mas não imediatos                                  | Recurso Futuro  |
-## Enviando seu PR
-
-### Processo de Pull Request
-
-1. Faça um fork do repositório
-2. Antes de elaborar um PR, por favor crie um problema para discutir as mudanças que você quer fazer
-3. Crie um novo branch para suas alterações
-4. Por favor, adicione testes para suas alterações conforme apropriado
-5. Certifique-se de que seu código passa nos testes existentes
-6. Por favor, vincule o problema na descrição do PR, `fixes #<número_do_problema>`
-7. Faça o merge do seu código!
-### Configurando o projeto
-
-#### Frontend
-
-Para configurar o serviço frontend, por favor consulte nosso [guia abrangente](https://github.com/langgenius/dify/blob/main/web/README.md) no arquivo `web/README.md`. Este documento fornece instruções detalhadas para ajudá-lo a configurar o ambiente frontend adequadamente.
-
-#### Backend
-
-Para configurar o serviço backend, por favor consulte nossas [instruções detalhadas](https://github.com/langgenius/dify/blob/main/api/README.md) no arquivo `api/README.md`. Este documento contém um guia passo a passo para ajudá-lo a colocar o backend em funcionamento sem problemas.
-
-#### Outras coisas a observar
-
-Recomendamos revisar este documento cuidadosamente antes de prosseguir com a configuração, pois ele contém informações essenciais sobre:
-- Pré-requisitos e dependências
-- Etapas de instalação
-- Detalhes de configuração
-- Dicas comuns de solução de problemas
-
-Sinta-se à vontade para entrar em contato se encontrar quaisquer problemas durante o processo de configuração.
-## Obtendo Ajuda
-
-Se você ficar preso ou tiver uma dúvida urgente enquanto contribui, simplesmente envie suas perguntas através do problema relacionado no GitHub, ou entre no nosso [Discord](https://discord.gg/8Tpq4AcN9c) para uma conversa rápida. 

CONTRIBUTING_TR.md

@@ -1,93 +0,0 @@
-# KATKIDA BULUNMAK
-
-Demek Dify'a katkıda bulunmak istiyorsunuz - bu harika, ne yapacağınızı görmek için sabırsızlanıyoruz. Sınırlı personel ve finansmana sahip bir startup olarak, LLM uygulamaları oluşturmak ve yönetmek için en sezgisel iş akışını tasarlama konusunda büyük hedeflerimiz var. Topluluktan gelen her türlü yardım gerçekten önemli.
-
-Bulunduğumuz noktada çevik olmamız ve hızlı hareket etmemiz gerekiyor, ancak sizin gibi katkıda bulunanların mümkün olduğunca sorunsuz bir deneyim yaşamasını da sağlamak istiyoruz. Bu katkı rehberini bu amaçla hazırladık; sizi kod tabanıyla ve katkıda bulunanlarla nasıl çalıştığımızla tanıştırmayı, böylece hızlıca eğlenceli kısma geçebilmenizi hedefliyoruz.
-
-Bu rehber, Dify'ın kendisi gibi, sürekli gelişen bir çalışmadır. Bazen gerçek projenin gerisinde kalırsa anlayışınız için çok minnettarız ve gelişmemize yardımcı olacak her türlü geri bildirimi memnuniyetle karşılıyoruz.
-
-Lisanslama konusunda, lütfen kısa [Lisans ve Katkıda Bulunan Anlaşmamızı](./LICENSE) okumak için bir dakikanızı ayırın. Topluluk ayrıca [davranış kurallarına](https://github.com/langgenius/.github/blob/main/CODE_OF_CONDUCT.md) da uyar.
-
-## Başlamadan Önce
-
-Üzerinde çalışacak bir şey mi arıyorsunuz? [İlk katkıda bulunanlar için iyi sorunlarımıza](https://github.com/langgenius/dify/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22) göz atın ve başlamak için birini seçin!
-
-Eklenecek harika bir yeni model runtime'ı veya aracınız mı var? [Eklenti depomuzda](https://github.com/langgenius/dify-plugins) bir PR açın ve ne yaptığınızı bize gösterin.
-
-Mevcut bir model runtime'ını, aracı güncellemek veya bazı hataları düzeltmek mi istiyorsunuz? [Resmi eklenti depomuza](https://github.com/langgenius/dify-official-plugins) gidin ve sihrinizi gösterin!
-
-Eğlenceye katılın, katkıda bulunun ve birlikte harika bir şeyler inşa edelim! 💡✨
-
-PR açıklamasında mevcut bir sorunu bağlamayı veya yeni bir sorun açmayı unutmayın.
-
-### Hata Raporları
-
-> [!IMPORTANT]
-> Lütfen bir hata raporu gönderirken aşağıdaki bilgileri dahil ettiğinizden emin olun:
-
-- Net ve açıklayıcı bir başlık
-- Hata mesajları dahil hatanın ayrıntılı bir açıklaması
-- Hatayı tekrarlamak için adımlar
-- Beklenen davranış
-- Mümkünse **Loglar**, backend sorunları için, bu gerçekten önemlidir, bunları docker-compose loglarında bulabilirsiniz
-- Uygunsa ekran görüntüleri veya videolar
-
-Nasıl önceliklendiriyoruz:
-
-  | Sorun Türü                                                    | Öncelik         |
-  | ------------------------------------------------------------ | --------------- |
-  | Temel işlevlerdeki hatalar (bulut hizmeti, giriş yapamama, çalışmayan uygulamalar, güvenlik açıkları) | Kritik          |
-  | Kritik olmayan hatalar, performans artışları                 | Orta Öncelik    |
-  | Küçük düzeltmeler (yazım hataları, kafa karıştırıcı ama çalışan UI) | Düşük Öncelik   |
-
-### Özellik İstekleri
-
-> [!NOTE]
-> Lütfen bir özellik isteği gönderirken aşağıdaki bilgileri dahil ettiğinizden emin olun:
-
-- Net ve açıklayıcı bir başlık
-- Özelliğin ayrıntılı bir açıklaması
-- Özellik için bir kullanım durumu
-- Özellik isteği hakkında diğer bağlamlar veya ekran görüntüleri
-
-Nasıl önceliklendiriyoruz:
-
-  | Özellik Türü                                                 | Öncelik         |
-  | ------------------------------------------------------------ | --------------- |
-  | Bir ekip üyesi tarafından etiketlenen Yüksek Öncelikli Özellikler | Yüksek Öncelik  |
-  | [Topluluk geri bildirim panosundan](https://github.com/langgenius/dify/discussions/categories/feedbacks) popüler özellik istekleri | Orta Öncelik    |
-  | Temel olmayan özellikler ve küçük geliştirmeler              | Düşük Öncelik   |
-  | Değerli ama acil olmayan                                     | Gelecek-Özellik |
-## PR'nizi Göndermek
-
-### Pull Request Süreci
-
-1. Depoyu fork edin
-2. Bir PR taslağı oluşturmadan önce, yapmak istediğiniz değişiklikleri tartışmak için lütfen bir sorun oluşturun
-3. Değişiklikleriniz için yeni bir dal oluşturun
-4. Lütfen değişiklikleriniz için uygun testler ekleyin
-5. Kodunuzun mevcut testleri geçtiğinden emin olun
-6. Lütfen PR açıklamasında sorunu bağlayın, `fixes #<sorun_numarası>`
-7. Kodunuzu birleştirin!
-### Projeyi Kurma
-
-#### Frontend
-
-Frontend hizmetini kurmak için, lütfen `web/README.md` dosyasındaki kapsamlı [rehberimize](https://github.com/langgenius/dify/blob/main/web/README.md) bakın. Bu belge, frontend ortamını düzgün bir şekilde kurmanıza yardımcı olacak ayrıntılı talimatlar sağlar.
-
-#### Backend
-
-Backend hizmetini kurmak için, lütfen `api/README.md` dosyasındaki detaylı [talimatlarımıza](https://github.com/langgenius/dify/blob/main/api/README.md) bakın. Bu belge, backend'i sorunsuz bir şekilde çalıştırmanıza yardımcı olacak adım adım bir kılavuz içerir.
-
-#### Dikkat Edilecek Diğer Şeyler
-
-Kuruluma geçmeden önce bu belgeyi dikkatlice incelemenizi öneririz, çünkü şunlar hakkında temel bilgiler içerir:
-- Ön koşullar ve bağımlılıklar
-- Kurulum adımları
-- Yapılandırma detayları
-- Yaygın sorun giderme ipuçları
-
-Kurulum süreci sırasında herhangi bir sorunla karşılaşırsanız bizimle iletişime geçmekten çekinmeyin.
-## Yardım Almak
-
-Katkıda bulunurken takılırsanız veya yanıcı bir sorunuz olursa, sorularınızı ilgili GitHub sorunu aracılığıyla bize gönderin veya hızlı bir sohbet için [Discord'umuza](https://discord.gg/8Tpq4AcN9c) katılın. 

LICENSE

@@ -10,6 +10,8 @@ a. Multi-tenant service: Unless explicitly authorized by Dify in writing, you ma
 b. LOGO and copyright information: In the process of using Dify's frontend, you may not remove or modify the LOGO or copyright information in the Dify console or applications. This restriction is inapplicable to uses of Dify that do not involve its frontend.
     - Frontend Definition: For the purposes of this license, the "frontend" of Dify includes all components located in the `web/` directory when running Dify from the raw source code, or the "web" image when running Dify with Docker.
 
+Please contact business@dify.ai by email to inquire about licensing matters.
+
 2. As a contributor, you should agree that:
 
 a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.

README.md

@@ -8,7 +8,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Self-hosting</a> ·
   <a href="https://docs.dify.ai">Documentation</a> ·
-  <a href="https://dify.ai/pricing">Dify edition overview</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Enterprise inquiry</a>
 </p>
 
 <p align="center">

README_AR.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">الاستضافة الذاتية</a> ·
   <a href="https://docs.dify.ai">التوثيق</a> ·
-  <a href="https://dify.ai/pricing">نظرة عامة على منتجات Dify</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">استفسار الشركات (للإنجليزية فقط)</a>
 </p>
 
 <p align="center">

README_BN.md

@@ -8,7 +8,7 @@
   <a href="https://cloud.dify.ai">ডিফাই ক্লাউড</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">সেল্ফ-হোস্টিং</a> ·
   <a href="https://docs.dify.ai">ডকুমেন্টেশন</a> ·
-  <a href="https://dify.ai/pricing">Dify পণ্যের রূপভেদ</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">ব্যাবসায়িক অনুসন্ধান</a>
 </p>
 
 <p align="center">

README_CN.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify 云服务</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">自托管</a> ·
   <a href="https://docs.dify.ai">文档</a> ·
-  <a href="https://dify.ai/pricing">Dify 产品形态总览</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">（需用英文）常见问题解答 / 联系团队</a>
 </div>
 
 <p align="center">
@@ -254,6 +254,8 @@ docker compose up -d
 - [Discord](https://discord.gg/FngNHpbcY7)。👉：分享您的应用程序并与社区交流。
 - [X(Twitter)](https://twitter.com/dify_ai)。👉：分享您的应用程序并与社区交流。
 - [商业许可](mailto:business@dify.ai?subject=[GitHub]Business%20License%20Inquiry)。👉：有关商业用途许可 Dify.AI 的商业咨询。
+ - [微信]() 👉：扫描下方二维码，添加微信好友，备注 Dify，我们将邀请您加入 Dify 社区。  
+<img src="./images/wechat.png" alt="wechat" width="100"/>
 
 ## 安全问题
 

README_DE.md

@@ -8,7 +8,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Selbstgehostetes</a> ·
   <a href="https://docs.dify.ai">Dokumentation</a> ·
-  <a href="https://dify.ai/pricing">Überblick über die Dify-Produkte</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Anfrage an Unternehmen</a>
 </p>
 
 <p align="center">

README_ES.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Auto-alojamiento</a> ·
   <a href="https://docs.dify.ai">Documentación</a> ·
-  <a href="https://dify.ai/pricing">Resumen de las ediciones de Dify</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Consultas empresariales (en inglés)</a>
 </p>
 
 <p align="center">

README_FR.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Auto-hébergement</a> ·
   <a href="https://docs.dify.ai">Documentation</a> ·
-  <a href="https://dify.ai/pricing">Présentation des différentes offres Dify</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Demande d’entreprise (en anglais seulement)</a>
 </p>
 
 <p align="center">

README_JA.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">セルフホスティング</a> ·
   <a href="https://docs.dify.ai">ドキュメント</a> ·
-  <a href="https://dify.ai/pricing">Difyの各種エディションについて</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">企業のお問い合わせ（英語のみ）</a>
 </p>
 
 <p align="center">

README_KL.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Self-hosting</a> ·
   <a href="https://docs.dify.ai">Documentation</a> ·
-  <a href="https://dify.ai/pricing">Dify product editions</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Commercial enquiries</a>
 </p>
 
 <p align="center">

README_KR.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify 클라우드</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">셀프-호스팅</a> ·
   <a href="https://docs.dify.ai">문서</a> ·
-  <a href="https://dify.ai/pricing">Dify 제품 에디션 안내</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">기업 문의 (영어만 가능)</a>
 </p>
 
 <p align="center">

README_PT.md

@@ -8,7 +8,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Auto-hospedagem</a> ·
   <a href="https://docs.dify.ai">Documentação</a> ·
-  <a href="https://dify.ai/pricing">Visão geral das edições do Dify</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Consultas empresariais</a>
 </p>
 
 <p align="center">

README_SI.md

@@ -8,7 +8,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Samostojno gostovanje</a> ·
   <a href="https://docs.dify.ai">Dokumentacija</a> ·
-  <a href="https://dify.ai/pricing">Pregled ponudb izdelkov Dify</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Povpraševanje za podjetja</a>
 </p>
 
 <p align="center">

README_TR.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify Bulut</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Kendi Sunucunuzda Barındırma</a> ·
   <a href="https://docs.dify.ai">Dokümantasyon</a> ·
-  <a href="https://dify.ai/pricing">Dify ürün seçeneklerine genel bakış</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Yalnızca İngilizce: Kurumsal Sorgulama</a>
 </p>
 
 <p align="center">

README_TW.md

@@ -8,7 +8,7 @@
   <a href="https://cloud.dify.ai">Dify 雲端服務</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">自行託管</a> ·
   <a href="https://docs.dify.ai">說明文件</a> ·
-  <a href="https://dify.ai/pricing">產品方案概覽</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">企業諮詢</a>
 </p>
 
 <p align="center">

README_VI.md

@@ -4,7 +4,7 @@
   <a href="https://cloud.dify.ai">Dify Cloud</a> ·
   <a href="https://docs.dify.ai/getting-started/install-self-hosted">Tự triển khai</a> ·
   <a href="https://docs.dify.ai">Tài liệu</a> ·
-  <a href="https://dify.ai/pricing">Tổng quan các lựa chọn sản phẩm Dify</a>
+  <a href="https://udify.app/chat/22L1zSxg6yW1cWQg">Yêu cầu doanh nghiệp</a>
 </p>
 
 <p align="center">

api/.env.example

@@ -137,7 +137,7 @@ 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, couchbase, vikingdb, upstash, lindorm, oceanbase, opengauss, tablestore
+# support: weaviate, qdrant, milvus, myscale, relyt, pgvecto_rs, pgvector, pgvector, chroma, opensearch, tidb_vector, couchbase, vikingdb, upstash, lindorm, oceanbase, opengauss
 VECTOR_STORE=weaviate
 
 # Weaviate configuration
@@ -165,7 +165,6 @@ MILVUS_URI=http://127.0.0.1:19530
 MILVUS_TOKEN=
 MILVUS_USER=root
 MILVUS_PASSWORD=Milvus
-MILVUS_ANALYZER_PARAMS=
 
 # MyScale configuration
 MYSCALE_HOST=127.0.0.1
@@ -190,7 +189,6 @@ TENCENT_VECTOR_DB_USERNAME=dify
 TENCENT_VECTOR_DB_DATABASE=dify
 TENCENT_VECTOR_DB_SHARD=1
 TENCENT_VECTOR_DB_REPLICAS=2
-TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH=false
 
 # ElasticSearch configuration
 ELASTICSEARCH_HOST=127.0.0.1
@@ -214,12 +212,6 @@ PGVECTOR_DATABASE=postgres
 PGVECTOR_MIN_CONNECTION=1
 PGVECTOR_MAX_CONNECTION=5
 
-# TableStore Vector configuration
-TABLESTORE_ENDPOINT=https://instance-name.cn-hangzhou.ots.aliyuncs.com
-TABLESTORE_INSTANCE_NAME=instance-name
-TABLESTORE_ACCESS_KEY_ID=xxx
-TABLESTORE_ACCESS_KEY_SECRET=xxx
-
 # Tidb Vector configuration
 TIDB_VECTOR_HOST=xxx.eu-central-1.xxx.aws.tidbcloud.com
 TIDB_VECTOR_PORT=4000
@@ -305,7 +297,6 @@ OCEANBASE_VECTOR_USER=root@test
 OCEANBASE_VECTOR_PASSWORD=difyai123456
 OCEANBASE_VECTOR_DATABASE=test
 OCEANBASE_MEMORY_LIMIT=6G
-OCEANBASE_ENABLE_HYBRID_SEARCH=false
 
 # openGauss configuration
 OPENGAUSS_HOST=127.0.0.1
@@ -327,7 +318,6 @@ UPLOAD_AUDIO_FILE_SIZE_LIMIT=50
 MULTIMODAL_SEND_FORMAT=base64
 PROMPT_GENERATION_MAX_TOKENS=512
 CODE_GENERATION_MAX_TOKENS=1024
-PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
 
 # Mail configuration, support: resend, smtp
 MAIL_TYPE=
@@ -424,12 +414,6 @@ WORKFLOW_CALL_MAX_DEPTH=5
 WORKFLOW_PARALLEL_DEPTH_LIMIT=3
 MAX_VARIABLE_SIZE=204800
 
-# Workflow storage configuration
-# Options: rdbms, hybrid
-# rdbms: Use only the relational database (default)
-# hybrid: Save new data to object storage, read from both object storage and RDBMS
-WORKFLOW_NODE_EXECUTION_STORAGE=rdbms
-
 # App configuration
 APP_MAX_EXECUTION_TIME=1200
 APP_MAX_ACTIVE_REQUESTS=0
@@ -470,19 +454,3 @@ CREATE_TIDB_SERVICE_JOB_ENABLED=false
 MAX_SUBMIT_COUNT=100
 # Lockout duration in seconds
 LOGIN_LOCKOUT_DURATION=86400
-
-# Enable OpenTelemetry
-ENABLE_OTEL=false
-OTLP_BASE_ENDPOINT=http://localhost:4318
-OTLP_API_KEY=
-OTEL_EXPORTER_TYPE=otlp
-OTEL_SAMPLING_RATE=0.1
-OTEL_BATCH_EXPORT_SCHEDULE_DELAY=5000
-OTEL_MAX_QUEUE_SIZE=2048
-OTEL_MAX_EXPORT_BATCH_SIZE=512
-OTEL_METRIC_EXPORT_INTERVAL=60000
-OTEL_BATCH_EXPORT_TIMEOUT=10000
-OTEL_METRIC_EXPORT_TIMEOUT=30000
-
-# Prevent Clickjacking
-ALLOW_EMBED=false

api/Dockerfile

@@ -3,11 +3,20 @@ FROM python:3.12-slim-bookworm AS base
 
 WORKDIR /app/api
 
-# Install uv
-ENV UV_VERSION=0.6.14
+# Install Poetry
+ENV POETRY_VERSION=2.0.1
 
-RUN pip install --no-cache-dir uv==${UV_VERSION}
+# if you located in China, you can use aliyun mirror to speed up
+# RUN pip install --no-cache-dir poetry==${POETRY_VERSION} -i https://mirrors.aliyun.com/pypi/simple/
 
+RUN pip install --no-cache-dir poetry==${POETRY_VERSION}
+
+# Configure Poetry
+ENV POETRY_CACHE_DIR=/tmp/poetry_cache
+ENV POETRY_NO_INTERACTION=1
+ENV POETRY_VIRTUALENVS_IN_PROJECT=true
+ENV POETRY_VIRTUALENVS_CREATE=true
+ENV POETRY_REQUESTS_TIMEOUT=15
 
 FROM base AS packages
 
@@ -18,8 +27,8 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends gcc g++ libc-dev libffi-dev libgmp-dev libmpfr-dev libmpc-dev
 
 # Install Python dependencies
-COPY pyproject.toml uv.lock ./
-RUN uv sync --locked
+COPY pyproject.toml poetry.lock ./
+RUN poetry install --sync --no-cache --no-root
 
 # production stage
 FROM base AS production

api/README.md

@@ -3,10 +3,7 @@
 ## Usage
 
 > [!IMPORTANT]
-> 
-> In the v1.3.0 release, `poetry` has been replaced with
-> [`uv`](https://docs.astral.sh/uv/) as the package manager
-> for Dify API backend service.
+> In the v0.6.12 release, we deprecated `pip` as the package management tool for Dify API Backend service and replaced it with `poetry`.
 
 1. Start the docker-compose stack
 
@@ -40,19 +37,19 @@
 
 4. Create environment.
 
-   Dify API service uses [UV](https://docs.astral.sh/uv/) to manage dependencies.
-   First, you need to add the uv package manager, if you don't have it already.
+   Dify API service uses [Poetry](https://python-poetry.org/docs/) to manage dependencies. First, you need to add the poetry shell plugin, if you don't have it already, in order to run in a virtual environment. [Note: Poetry shell is no longer a native command so you need to install the poetry plugin beforehand]
 
    ```bash
-   pip install uv
-   # Or on macOS
-   brew install uv
+   poetry self add poetry-plugin-shell
    ```
+   
+   Then, You can execute `poetry shell` to activate the environment.
 
 5. Install dependencies
 
    ```bash
-   uv sync --dev
+   poetry env use 3.12
+   poetry install
    ```
 
 6. Run migrate
@@ -60,21 +57,21 @@
    Before the first launch, migrate the database to the latest version.
 
    ```bash
-   uv run flask db upgrade
+   poetry run python -m flask db upgrade
    ```
 
 7. Start backend
 
    ```bash
-   uv run flask run --host 0.0.0.0 --port=5001 --debug
+   poetry run python -m flask run --host 0.0.0.0 --port=5001 --debug
    ```
 
 8. Start Dify [web](../web) service.
-9. Setup your application by visiting `http://localhost:3000`.
+9. Setup your application by visiting `http://localhost:3000`...
 10. If you need to handle and debug the async tasks (e.g. dataset importing and documents indexing), please start the worker service.
 
    ```bash
-   uv run celery -A app.celery worker -P gevent -c 1 --loglevel INFO -Q dataset,generation,mail,ops_trace,app_deletion
+   poetry run python -m celery -A app.celery worker -P gevent -c 1 --loglevel INFO -Q dataset,generation,mail,ops_trace,app_deletion
    ```
 
 ## Testing
@@ -82,11 +79,11 @@
 1. Install dependencies for both the backend and the test environment
 
    ```bash
-   uv sync --dev
+   poetry install -C api --with dev
    ```
 
 2. Run the tests locally with mocked system environment variables in `tool.pytest_env` section in `pyproject.toml`
 
    ```bash
-   uv run -P api bash dev/pytest/pytest_all_tests.sh
+   poetry run -P api bash dev/pytest/pytest_all_tests.sh
    ```

api/app_factory.py

@@ -51,11 +51,8 @@ def initialize_extensions(app: DifyApp):
         ext_login,
         ext_mail,
         ext_migrate,
-        ext_otel,
-        ext_otel_patch,
         ext_proxy_fix,
         ext_redis,
-        ext_repositories,
         ext_sentry,
         ext_set_secretkey,
         ext_storage,
@@ -76,7 +73,6 @@ def initialize_extensions(app: DifyApp):
         ext_migrate,
         ext_redis,
         ext_storage,
-        ext_repositories,
         ext_celery,
         ext_login,
         ext_mail,
@@ -85,8 +81,6 @@ def initialize_extensions(app: DifyApp):
         ext_proxy_fix,
         ext_blueprints,
         ext_commands,
-        ext_otel_patch,  # Apply patch before initializing OpenTelemetry
-        ext_otel,
     ]
     for ext in extensions:
         short_name = ext.__name__.split(".")[-1]

api/commands.py

@@ -276,7 +276,6 @@ def migrate_knowledge_vector_database():
         VectorType.ORACLE,
         VectorType.ELASTICSEARCH,
         VectorType.OPENGAUSS,
-        VectorType.TABLESTORE,
     }
     lower_collection_vector_types = {
         VectorType.ANALYTICDB,

api/configs/app_config.py

@@ -9,11 +9,9 @@ from .enterprise import EnterpriseFeatureConfig
 from .extra import ExtraServiceConfig
 from .feature import FeatureConfig
 from .middleware import MiddlewareConfig
-from .observability import ObservabilityConfig
 from .packaging import PackagingInfo
 from .remote_settings_sources import RemoteSettingsSource, RemoteSettingsSourceConfig, RemoteSettingsSourceName
 from .remote_settings_sources.apollo import ApolloSettingsSource
-from .remote_settings_sources.nacos import NacosSettingsSource
 
 logger = logging.getLogger(__name__)
 
@@ -35,8 +33,6 @@ class RemoteSettingsSourceFactory(PydanticBaseSettingsSource):
         match remote_source_name:
             case RemoteSettingsSourceName.APOLLO:
                 remote_source = ApolloSettingsSource(current_state)
-            case RemoteSettingsSourceName.NACOS:
-                remote_source = NacosSettingsSource(current_state)
             case _:
                 logger.warning(f"Unsupported remote source: {remote_source_name}")
                 return {}
@@ -63,8 +59,6 @@ class DifyConfig(
     MiddlewareConfig,
     # Extra service configs
     ExtraServiceConfig,
-    # Observability configs
-    ObservabilityConfig,
     # Remote source configs
     RemoteSettingsSourceConfig,
     # Enterprise feature configs

api/configs/feature/__init__.py

@@ -12,7 +12,7 @@ from pydantic import (
 )
 from pydantic_settings import BaseSettings
 
-from .hosted_service import HostedServiceConfig
+from configs.feature.hosted_service import HostedServiceConfig
 
 
 class SecurityConfig(BaseSettings):
@@ -442,7 +442,7 @@ class LoggingConfig(BaseSettings):
 
 class ModelLoadBalanceConfig(BaseSettings):
     """
-    Configuration for model load balancing and token counting
+    Configuration for model load balancing
     """
 
     MODEL_LB_ENABLED: bool = Field(
@@ -450,11 +450,6 @@ class ModelLoadBalanceConfig(BaseSettings):
         default=False,
     )
 
-    PLUGIN_BASED_TOKEN_COUNTING_ENABLED: bool = Field(
-        description="Enable or disable plugin based token counting. If disabled, token counting will return 0.",
-        default=False,
-    )
-
 
 class BillingConfig(BaseSettings):
     """
@@ -519,11 +514,6 @@ class WorkflowNodeExecutionConfig(BaseSettings):
         default=100,
     )
 
-    WORKFLOW_NODE_EXECUTION_STORAGE: str = Field(
-        default="rdbms",
-        description="Storage backend for WorkflowNodeExecution. Options: 'rdbms', 'hybrid'",
-    )
-
 
 class AuthConfig(BaseSettings):
     """
@@ -858,11 +848,6 @@ class AccountConfig(BaseSettings):
         default=5,
     )
 
-    EDUCATION_ENABLED: bool = Field(
-        description="whether to enable education identity",
-        default=False,
-    )
-
 
 class FeatureConfig(
     # place the configs in alphabet order

api/configs/feature/hosted_service/__init__.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import Field, NonNegativeInt
+from pydantic import Field, NonNegativeInt, computed_field
 from pydantic_settings import BaseSettings
 
 

api/configs/middleware/__init__.py

@@ -22,7 +22,6 @@ from .vdb.baidu_vector_config import BaiduVectorDBConfig
 from .vdb.chroma_config import ChromaConfig
 from .vdb.couchbase_config import CouchbaseConfig
 from .vdb.elasticsearch_config import ElasticsearchConfig
-from .vdb.huawei_cloud_config import HuaweiCloudConfig
 from .vdb.lindorm_config import LindormConfig
 from .vdb.milvus_config import MilvusConfig
 from .vdb.myscale_config import MyScaleConfig
@@ -34,7 +33,6 @@ from .vdb.pgvector_config import PGVectorConfig
 from .vdb.pgvectors_config import PGVectoRSConfig
 from .vdb.qdrant_config import QdrantConfig
 from .vdb.relyt_config import RelytConfig
-from .vdb.tablestore_config import TableStoreConfig
 from .vdb.tencent_vector_config import TencentVectorDBConfig
 from .vdb.tidb_on_qdrant_config import TidbOnQdrantConfig
 from .vdb.tidb_vector_config import TiDBVectorConfig
@@ -264,7 +262,6 @@ class MiddlewareConfig(
     VectorStoreConfig,
     AnalyticdbConfig,
     ChromaConfig,
-    HuaweiCloudConfig,
     MilvusConfig,
     MyScaleConfig,
     OpenSearchConfig,
@@ -286,6 +283,5 @@ class MiddlewareConfig(
     OceanBaseVectorConfig,
     BaiduVectorDBConfig,
     OpenGaussConfig,
-    TableStoreConfig,
 ):
     pass

api/configs/middleware/vdb/huawei_cloud_config.py

@@ -1,25 +0,0 @@
-from typing import Optional
-
-from pydantic import Field
-from pydantic_settings import BaseSettings
-
-
-class HuaweiCloudConfig(BaseSettings):
-    """
-    Configuration settings for Huawei cloud search service
-    """
-
-    HUAWEI_CLOUD_HOSTS: Optional[str] = Field(
-        description="Hostname or IP address of the Huawei cloud search service instance",
-        default=None,
-    )
-
-    HUAWEI_CLOUD_USER: Optional[str] = Field(
-        description="Username for authenticating with Huawei cloud search service",
-        default=None,
-    )
-
-    HUAWEI_CLOUD_PASSWORD: Optional[str] = Field(
-        description="Password for authenticating with Huawei cloud search service",
-        default=None,
-    )

api/configs/middleware/vdb/milvus_config.py

@@ -39,8 +39,3 @@ class MilvusConfig(BaseSettings):
         "older versions",
         default=True,
     )
-
-    MILVUS_ANALYZER_PARAMS: Optional[str] = Field(
-        description='Milvus text analyzer parameters, e.g., {"type": "chinese"} for Chinese segmentation support.',
-        default=None,
-    )

api/configs/middleware/vdb/oceanbase_config.py

@@ -33,9 +33,3 @@ class OceanBaseVectorConfig(BaseSettings):
         description="Name of the OceanBase Vector database to connect to",
         default=None,
     )
-
-    OCEANBASE_ENABLE_HYBRID_SEARCH: bool = Field(
-        description="Enable hybrid search features (requires OceanBase >= 4.3.5.1). Set to false for compatibility "
-        "with older versions",
-        default=False,
-    )

api/configs/middleware/vdb/tablestore_config.py

@@ -1,30 +0,0 @@
-from typing import Optional
-
-from pydantic import Field
-from pydantic_settings import BaseSettings
-
-
-class TableStoreConfig(BaseSettings):
-    """
-    Configuration settings for TableStore.
-    """
-
-    TABLESTORE_ENDPOINT: Optional[str] = Field(
-        description="Endpoint address of the TableStore server (e.g. 'https://instance-name.cn-hangzhou.ots.aliyuncs.com')",
-        default=None,
-    )
-
-    TABLESTORE_INSTANCE_NAME: Optional[str] = Field(
-        description="Instance name to access TableStore server (eg. 'instance-name')",
-        default=None,
-    )
-
-    TABLESTORE_ACCESS_KEY_ID: Optional[str] = Field(
-        description="AccessKey id for the instance name",
-        default=None,
-    )
-
-    TABLESTORE_ACCESS_KEY_SECRET: Optional[str] = Field(
-        description="AccessKey secret for the instance name",
-        default=None,
-    )

api/configs/middleware/vdb/tencent_vector_config.py

@@ -48,8 +48,3 @@ class TencentVectorDBConfig(BaseSettings):
         description="Name of the specific Tencent Vector Database to connect to",
         default=None,
     )
-
-    TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH: bool = Field(
-        description="Enable hybrid search features",
-        default=False,
-    )

api/configs/observability/__init__.py

@@ -1,9 +0,0 @@
-from configs.observability.otel.otel_config import OTelConfig
-
-
-class ObservabilityConfig(OTelConfig):
-    """
-    Observability configuration settings
-    """
-
-    pass

api/configs/observability/otel/otel_config.py

@@ -1,44 +0,0 @@
-from pydantic import Field
-from pydantic_settings import BaseSettings
-
-
-class OTelConfig(BaseSettings):
-    """
-    OpenTelemetry configuration settings
-    """
-
-    ENABLE_OTEL: bool = Field(
-        description="Whether to enable OpenTelemetry",
-        default=False,
-    )
-
-    OTLP_BASE_ENDPOINT: str = Field(
-        description="OTLP base endpoint",
-        default="http://localhost:4318",
-    )
-
-    OTLP_API_KEY: str = Field(
-        description="OTLP API key",
-        default="",
-    )
-
-    OTEL_EXPORTER_TYPE: str = Field(
-        description="OTEL exporter type",
-        default="otlp",
-    )
-
-    OTEL_SAMPLING_RATE: float = Field(default=0.1, description="Sampling rate for traces (0.0 to 1.0)")
-
-    OTEL_BATCH_EXPORT_SCHEDULE_DELAY: int = Field(
-        default=5000, description="Batch export schedule delay in milliseconds"
-    )
-
-    OTEL_MAX_QUEUE_SIZE: int = Field(default=2048, description="Maximum queue size for the batch span processor")
-
-    OTEL_MAX_EXPORT_BATCH_SIZE: int = Field(default=512, description="Maximum export batch size")
-
-    OTEL_METRIC_EXPORT_INTERVAL: int = Field(default=60000, description="Metric export interval in milliseconds")
-
-    OTEL_BATCH_EXPORT_TIMEOUT: int = Field(default=10000, description="Batch export timeout in milliseconds")
-
-    OTEL_METRIC_EXPORT_TIMEOUT: int = Field(default=30000, description="Metric export timeout in milliseconds")

api/configs/packaging/__init__.py

@@ -9,7 +9,7 @@ class PackagingInfo(BaseSettings):
 
     CURRENT_VERSION: str = Field(
         description="Dify version",
-        default="1.3.0",
+        default="1.1.3",
     )
 
     COMMIT_SHA: str = Field(

api/configs/remote_settings_sources/__init__.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from pydantic import Field
 
 from .apollo import ApolloSettingsSourceInfo

api/configs/remote_settings_sources/apollo/client.py

@@ -270,7 +270,7 @@ class ApolloClient:
         while not self._stopping:
             for namespace in self._notification_map:
                 self._do_heart_beat(namespace)
-            time.sleep(60 * 10)  # 10 minutes
+            time.sleep(60 * 10)  # 10分钟
 
     def _do_heart_beat(self, namespace):
         url = "{}/configs/{}/{}/{}?ip={}".format(self.config_url, self.app_id, self.cluster, namespace, self.ip)

api/configs/remote_settings_sources/enums.py

@@ -3,4 +3,3 @@ from enum import StrEnum
 
 class RemoteSettingsSourceName(StrEnum):
     APOLLO = "apollo"
-    NACOS = "nacos"

api/configs/remote_settings_sources/nacos/__init__.py

@@ -1,52 +0,0 @@
-import logging
-import os
-from collections.abc import Mapping
-from typing import Any
-
-from pydantic.fields import FieldInfo
-
-from .http_request import NacosHttpClient
-
-logger = logging.getLogger(__name__)
-
-from configs.remote_settings_sources.base import RemoteSettingsSource
-
-from .utils import _parse_config
-
-
-class NacosSettingsSource(RemoteSettingsSource):
-    def __init__(self, configs: Mapping[str, Any]):
-        self.configs = configs
-        self.remote_configs: dict[str, Any] = {}
-        self.async_init()
-
-    def async_init(self):
-        data_id = os.getenv("DIFY_ENV_NACOS_DATA_ID", "dify-api-env.properties")
-        group = os.getenv("DIFY_ENV_NACOS_GROUP", "nacos-dify")
-        tenant = os.getenv("DIFY_ENV_NACOS_NAMESPACE", "")
-
-        params = {"dataId": data_id, "group": group, "tenant": tenant}
-        try:
-            content = NacosHttpClient().http_request("/nacos/v1/cs/configs", method="GET", headers={}, params=params)
-            self.remote_configs = self._parse_config(content)
-        except Exception as e:
-            logger.exception("[get-access-token] exception occurred")
-            raise
-
-    def _parse_config(self, content: str) -> dict:
-        if not content:
-            return {}
-        try:
-            return _parse_config(self, content)
-        except Exception as e:
-            raise RuntimeError(f"Failed to parse config: {e}")
-
-    def get_field_value(self, field: FieldInfo, field_name: str) -> tuple[Any, str, bool]:
-        if not isinstance(self.remote_configs, dict):
-            raise ValueError(f"remote configs is not dict, but {type(self.remote_configs)}")
-
-        field_value = self.remote_configs.get(field_name)
-        if field_value is None:
-            return None, field_name, False
-
-        return field_value, field_name, False

api/configs/remote_settings_sources/nacos/http_request.py

@@ -1,83 +0,0 @@
-import base64
-import hashlib
-import hmac
-import logging
-import os
-import time
-
-import requests
-
-logger = logging.getLogger(__name__)
-
-
-class NacosHttpClient:
-    def __init__(self):
-        self.username = os.getenv("DIFY_ENV_NACOS_USERNAME")
-        self.password = os.getenv("DIFY_ENV_NACOS_PASSWORD")
-        self.ak = os.getenv("DIFY_ENV_NACOS_ACCESS_KEY")
-        self.sk = os.getenv("DIFY_ENV_NACOS_SECRET_KEY")
-        self.server = os.getenv("DIFY_ENV_NACOS_SERVER_ADDR", "localhost:8848")
-        self.token = None
-        self.token_ttl = 18000
-        self.token_expire_time: float = 0
-
-    def http_request(self, url, method="GET", headers=None, params=None):
-        try:
-            self._inject_auth_info(headers, params)
-            response = requests.request(method, url="http://" + self.server + url, headers=headers, params=params)
-            response.raise_for_status()
-            return response.text
-        except requests.exceptions.RequestException as e:
-            return f"Request to Nacos failed: {e}"
-
-    def _inject_auth_info(self, headers, params, module="config"):
-        headers.update({"User-Agent": "Nacos-Http-Client-In-Dify:v0.0.1"})
-
-        if module == "login":
-            return
-
-        ts = str(int(time.time() * 1000))
-
-        if self.ak and self.sk:
-            sign_str = self.get_sign_str(params["group"], params["tenant"], ts)
-            headers["Spas-AccessKey"] = self.ak
-            headers["Spas-Signature"] = self.__do_sign(sign_str, self.sk)
-            headers["timeStamp"] = ts
-        if self.username and self.password:
-            self.get_access_token(force_refresh=False)
-            params["accessToken"] = self.token
-
-    def __do_sign(self, sign_str, sk):
-        return (
-            base64.encodebytes(hmac.new(sk.encode(), sign_str.encode(), digestmod=hashlib.sha1).digest())
-            .decode()
-            .strip()
-        )
-
-    def get_sign_str(self, group, tenant, ts):
-        sign_str = ""
-        if tenant:
-            sign_str = tenant + "+"
-        if group:
-            sign_str = sign_str + group + "+"
-        if sign_str:
-            sign_str += ts
-        return sign_str
-
-    def get_access_token(self, force_refresh=False):
-        current_time = time.time()
-        if self.token and not force_refresh and self.token_expire_time > current_time:
-            return self.token
-
-        params = {"username": self.username, "password": self.password}
-        url = "http://" + self.server + "/nacos/v1/auth/login"
-        try:
-            resp = requests.request("POST", url, headers=None, params=params)
-            resp.raise_for_status()
-            response_data = resp.json()
-            self.token = response_data.get("accessToken")
-            self.token_ttl = response_data.get("tokenTtl", 18000)
-            self.token_expire_time = current_time + self.token_ttl - 10
-        except Exception as e:
-            logger.exception("[get-access-token] exception occur")
-            raise

api/configs/remote_settings_sources/nacos/utils.py

@@ -1,31 +0,0 @@
-def _parse_config(self, content: str) -> dict[str, str]:
-    config: dict[str, str] = {}
-    if not content:
-        return config
-
-    for line in content.splitlines():
-        cleaned_line = line.strip()
-        if not cleaned_line or cleaned_line.startswith(("#", "!")):
-            continue
-
-        separator_index = -1
-        for i, c in enumerate(cleaned_line):
-            if c in ("=", ":") and (i == 0 or cleaned_line[i - 1] != "\\"):
-                separator_index = i
-                break
-
-        if separator_index == -1:
-            continue
-
-        key = cleaned_line[:separator_index].strip()
-        raw_value = cleaned_line[separator_index + 1 :].strip()
-
-        try:
-            decoded_value = bytes(raw_value, "utf-8").decode("unicode_escape")
-            decoded_value = decoded_value.replace(r"\=", "=").replace(r"\:", ":")
-        except UnicodeDecodeError:
-            decoded_value = raw_value
-
-        config[key] = decoded_value
-
-    return config

api/constants/__init__.py

@@ -3,8 +3,6 @@ from configs import dify_config
 HIDDEN_VALUE = "[__HIDDEN__]"
 UUID_NIL = "00000000-0000-0000-0000-000000000000"
 
-DEFAULT_FILE_NUMBER_LIMITS = 3
-
 IMAGE_EXTENSIONS = ["jpg", "jpeg", "png", "webp", "gif", "svg"]
 IMAGE_EXTENSIONS.extend([ext.upper() for ext in IMAGE_EXTENSIONS])
 

api/controllers/common/helpers.py

@@ -4,6 +4,8 @@ import platform
 import re
 import urllib.parse
 import warnings
+from collections.abc import Mapping
+from typing import Any
 from uuid import uuid4
 
 import httpx
@@ -27,6 +29,8 @@ except ImportError:
 
 from pydantic import BaseModel
 
+from configs import dify_config
+
 
 class FileInfo(BaseModel):
     filename: str
@@ -83,3 +87,38 @@ def guess_file_info_from_response(response: httpx.Response):
         mimetype=mimetype,
         size=int(response.headers.get("Content-Length", -1)),
     )
+
+
+def get_parameters_from_feature_dict(*, features_dict: Mapping[str, Any], user_input_form: list[dict[str, Any]]):
+    return {
+        "opening_statement": features_dict.get("opening_statement"),
+        "suggested_questions": features_dict.get("suggested_questions", []),
+        "suggested_questions_after_answer": features_dict.get("suggested_questions_after_answer", {"enabled": False}),
+        "speech_to_text": features_dict.get("speech_to_text", {"enabled": False}),
+        "text_to_speech": features_dict.get("text_to_speech", {"enabled": False}),
+        "retriever_resource": features_dict.get("retriever_resource", {"enabled": False}),
+        "annotation_reply": features_dict.get("annotation_reply", {"enabled": False}),
+        "more_like_this": features_dict.get("more_like_this", {"enabled": False}),
+        "user_input_form": user_input_form,
+        "sensitive_word_avoidance": features_dict.get(
+            "sensitive_word_avoidance", {"enabled": False, "type": "", "configs": []}
+        ),
+        "file_upload": features_dict.get(
+            "file_upload",
+            {
+                "image": {
+                    "enabled": False,
+                    "number_limits": 3,
+                    "detail": "high",
+                    "transfer_methods": ["remote_url", "local_file"],
+                }
+            },
+        ),
+        "system_parameters": {
+            "image_file_size_limit": dify_config.UPLOAD_IMAGE_FILE_SIZE_LIMIT,
+            "video_file_size_limit": dify_config.UPLOAD_VIDEO_FILE_SIZE_LIMIT,
+            "audio_file_size_limit": dify_config.UPLOAD_AUDIO_FILE_SIZE_LIMIT,
+            "file_size_limit": dify_config.UPLOAD_FILE_SIZE_LIMIT,
+            "workflow_file_upload_limit": dify_config.WORKFLOW_FILE_UPLOAD_LIMIT,
+        },
+    }

api/controllers/console/app/annotation.py

@@ -89,7 +89,7 @@ class AnnotationReplyActionStatusApi(Resource):
         app_annotation_job_key = "{}_app_annotation_job_{}".format(action, str(job_id))
         cache_result = redis_client.get(app_annotation_job_key)
         if cache_result is None:
-            raise ValueError("The job does not exist.")
+            raise ValueError("The job is not exist.")
 
         job_status = cache_result.decode()
         error_msg = ""
@@ -226,7 +226,7 @@ class AnnotationBatchImportStatusApi(Resource):
         indexing_cache_key = "app_annotation_batch_import_{}".format(str(job_id))
         cache_result = redis_client.get(indexing_cache_key)
         if cache_result is None:
-            raise ValueError("The job does not exist.")
+            raise ValueError("The job is not exist.")
         job_status = cache_result.decode()
         error_msg = ""
         if job_status == "error":

api/controllers/console/app/app_import.py

@@ -8,7 +8,6 @@ from werkzeug.exceptions import Forbidden
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import (
     account_initialization_required,
-    cloud_edition_billing_resource_check,
     setup_required,
 )
 from extensions.ext_database import db
@@ -24,7 +23,6 @@ class AppImportApi(Resource):
     @login_required
     @account_initialization_required
     @marshal_with(app_import_fields)
-    @cloud_edition_billing_resource_check("apps")
     def post(self):
         # Check user role first
         if not current_user.is_editor:

api/controllers/console/app/audio.py

@@ -80,6 +80,8 @@ class ChatMessageTextApi(Resource):
     @account_initialization_required
     @get_app_model
     def post(self, app_model: App):
+        from werkzeug.exceptions import InternalServerError
+
         try:
             parser = reqparse.RequestParser()
             parser.add_argument("message_id", type=str, location="json")

api/controllers/console/app/generator.py

@@ -85,35 +85,5 @@ class RuleCodeGenerateApi(Resource):
         return code_result
 
 
-class RuleStructuredOutputGenerateApi(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    def post(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("instruction", type=str, required=True, nullable=False, location="json")
-        parser.add_argument("model_config", type=dict, required=True, nullable=False, location="json")
-        args = parser.parse_args()
-
-        account = current_user
-        try:
-            structured_output = LLMGenerator.generate_structured_output(
-                tenant_id=account.current_tenant_id,
-                instruction=args["instruction"],
-                model_config=args["model_config"],
-            )
-        except ProviderTokenNotInitError as ex:
-            raise ProviderNotInitializeError(ex.description)
-        except QuotaExceededError:
-            raise ProviderQuotaExceededError()
-        except ModelCurrentlyNotSupportError:
-            raise ProviderModelCurrentlyNotSupportError()
-        except InvokeError as e:
-            raise CompletionRequestError(e.description)
-
-        return structured_output
-
-
 api.add_resource(RuleGenerateApi, "/rule-generate")
 api.add_resource(RuleCodeGenerateApi, "/rule-code-generate")
-api.add_resource(RuleStructuredOutputGenerateApi, "/rule-structured-output-generate")

api/controllers/console/app/workflow_app_log.py

@@ -1,4 +1,5 @@
-from dateutil.parser import isoparse
+from datetime import datetime
+
 from flask_restful import Resource, marshal_with, reqparse  # type: ignore
 from flask_restful.inputs import int_range  # type: ignore
 from sqlalchemy.orm import Session
@@ -40,10 +41,10 @@ class WorkflowAppLogApi(Resource):
 
         args.status = WorkflowRunStatus(args.status) if args.status else None
         if args.created_at__before:
-            args.created_at__before = isoparse(args.created_at__before)
+            args.created_at__before = datetime.fromisoformat(args.created_at__before.replace("Z", "+00:00"))
 
         if args.created_at__after:
-            args.created_at__after = isoparse(args.created_at__after)
+            args.created_at__after = datetime.fromisoformat(args.created_at__after.replace("Z", "+00:00"))
 
         # get paginate workflow app logs
         workflow_app_service = WorkflowAppService()

api/controllers/console/auth/data_source_oauth.py

@@ -74,9 +74,7 @@ class OAuthDataSourceBinding(Resource):
         if not oauth_provider:
             return {"error": "Invalid provider"}, 400
         if "code" in request.args:
-            code = request.args.get("code", "")
-            if not code:
-                return {"error": "Invalid code"}, 400
+            code = request.args.get("code")
             try:
                 oauth_provider.get_access_token(code)
             except requests.exceptions.HTTPError as e:

api/controllers/console/auth/forgot_password.py

@@ -16,7 +16,7 @@ from controllers.console.auth.error import (
     PasswordMismatchError,
 )
 from controllers.console.error import AccountInFreezeError, AccountNotFound, EmailSendIpLimitError
-from controllers.console.wraps import email_password_login_enabled, setup_required
+from controllers.console.wraps import setup_required
 from events.tenant_event import tenant_was_created
 from extensions.ext_database import db
 from libs.helper import email, extract_remote_ip
@@ -30,7 +30,6 @@ from services.feature_service import FeatureService
 
 class ForgotPasswordSendEmailApi(Resource):
     @setup_required
-    @email_password_login_enabled
     def post(self):
         parser = reqparse.RequestParser()
         parser.add_argument("email", type=email, required=True, location="json")
@@ -63,7 +62,6 @@ class ForgotPasswordSendEmailApi(Resource):
 
 class ForgotPasswordCheckApi(Resource):
     @setup_required
-    @email_password_login_enabled
     def post(self):
         parser = reqparse.RequestParser()
         parser.add_argument("email", type=str, required=True, location="json")
@@ -88,21 +86,12 @@ class ForgotPasswordCheckApi(Resource):
             AccountService.add_forgot_password_error_rate_limit(args["email"])
             raise EmailCodeError()
 
-        # Verified, revoke the first token
-        AccountService.revoke_reset_password_token(args["token"])
-
-        # Refresh token data by generating a new token
-        _, new_token = AccountService.generate_reset_password_token(
-            user_email, code=args["code"], additional_data={"phase": "reset"}
-        )
-
         AccountService.reset_forgot_password_error_rate_limit(args["email"])
-        return {"is_valid": True, "email": token_data.get("email"), "token": new_token}
+        return {"is_valid": True, "email": token_data.get("email")}
 
 
 class ForgotPasswordResetApi(Resource):
     @setup_required
-    @email_password_login_enabled
     def post(self):
         parser = reqparse.RequestParser()
         parser.add_argument("token", type=str, required=True, nullable=False, location="json")
@@ -110,67 +99,53 @@ class ForgotPasswordResetApi(Resource):
         parser.add_argument("password_confirm", type=valid_password, required=True, nullable=False, location="json")
         args = parser.parse_args()
 
-        # Validate passwords match
-        if args["new_password"] != args["password_confirm"]:
+        new_password = args["new_password"]
+        password_confirm = args["password_confirm"]
+
+        if str(new_password).strip() != str(password_confirm).strip():
             raise PasswordMismatchError()
 
-        # Validate token and get reset data
-        reset_data = AccountService.get_reset_password_data(args["token"])
-        if not reset_data:
-            raise InvalidTokenError()
-        # Must use token in reset phase
-        if reset_data.get("phase", "") != "reset":
+        token = args["token"]
+        reset_data = AccountService.get_reset_password_data(token)
+
+        if reset_data is None:
             raise InvalidTokenError()
 
-        # Revoke token to prevent reuse
-        AccountService.revoke_reset_password_token(args["token"])
+        AccountService.revoke_reset_password_token(token)
 
-        # Generate secure salt and hash password
         salt = secrets.token_bytes(16)
-        password_hashed = hash_password(args["new_password"], salt)
+        base64_salt = base64.b64encode(salt).decode()
 
-        email = reset_data.get("email", "")
+        password_hashed = hash_password(new_password, salt)
+        base64_password_hashed = base64.b64encode(password_hashed).decode()
 
         with Session(db.engine) as session:
-            account = session.execute(select(Account).filter_by(email=email)).scalar_one_or_none()
-
-            if account:
-                self._update_existing_account(account, password_hashed, salt, session)
-            else:
-                self._create_new_account(email, args["password_confirm"])
+            account = session.execute(select(Account).filter_by(email=reset_data.get("email"))).scalar_one_or_none()
+        if account:
+            account.password = base64_password_hashed
+            account.password_salt = base64_salt
+            db.session.commit()
+            tenant = TenantService.get_join_tenants(account)
+            if not tenant and not FeatureService.get_system_features().is_allow_create_workspace:
+                tenant = TenantService.create_tenant(f"{account.name}'s Workspace")
+                TenantService.create_tenant_member(tenant, account, role="owner")
+                account.current_tenant = tenant
+                tenant_was_created.send(tenant)
+        else:
+            try:
+                account = AccountService.create_account_and_tenant(
+                    email=reset_data.get("email", ""),
+                    name=reset_data.get("email", ""),
+                    password=password_confirm,
+                    interface_language=languages[0],
+                )
+            except WorkSpaceNotAllowedCreateError:
+                pass
+            except AccountRegisterError:
+                raise AccountInFreezeError()
 
         return {"result": "success"}
 
-    def _update_existing_account(self, account, password_hashed, salt, session):
-        # Update existing account credentials
-        account.password = base64.b64encode(password_hashed).decode()
-        account.password_salt = base64.b64encode(salt).decode()
-        session.commit()
-
-        # Create workspace if needed
-        if (
-            not TenantService.get_join_tenants(account)
-            and FeatureService.get_system_features().is_allow_create_workspace
-        ):
-            tenant = TenantService.create_tenant(f"{account.name}'s Workspace")
-            TenantService.create_tenant_member(tenant, account, role="owner")
-            account.current_tenant = tenant
-            tenant_was_created.send(tenant)
-
-    def _create_new_account(self, email, password):
-        # Create new account if allowed
-        try:
-            AccountService.create_account_and_tenant(
-                email=email,
-                name=email,
-                password=password,
-                interface_language=languages[0],
-            )
-        except WorkSpaceNotAllowedCreateError:
-            pass
-        except AccountRegisterError:
-            raise AccountInFreezeError()
-
 
 api.add_resource(ForgotPasswordSendEmailApi, "/forgot-password")
 api.add_resource(ForgotPasswordCheckApi, "/forgot-password/validity")

api/controllers/console/auth/login.py

@@ -22,7 +22,7 @@ from controllers.console.error import (
     EmailSendIpLimitError,
     NotAllowedCreateWorkspace,
 )
-from controllers.console.wraps import email_password_login_enabled, setup_required
+from controllers.console.wraps import setup_required
 from events.tenant_event import tenant_was_created
 from libs.helper import email, extract_remote_ip
 from libs.password import valid_password
@@ -38,7 +38,6 @@ class LoginApi(Resource):
     """Resource for user login."""
 
     @setup_required
-    @email_password_login_enabled
     def post(self):
         """Authenticate user and login."""
         parser = reqparse.RequestParser()
@@ -111,7 +110,6 @@ class LogoutApi(Resource):
 
 class ResetPasswordSendEmailApi(Resource):
     @setup_required
-    @email_password_login_enabled
     def post(self):
         parser = reqparse.RequestParser()
         parser.add_argument("email", type=email, required=True, location="json")

api/controllers/console/datasets/datasets.py

@@ -641,10 +641,12 @@ class DatasetRetrievalSettingApi(Resource):
                 VectorType.RELYT
                 | VectorType.TIDB_VECTOR
                 | VectorType.CHROMA
+                | VectorType.TENCENT
                 | VectorType.PGVECTO_RS
                 | VectorType.BAIDU
                 | VectorType.VIKINGDB
                 | VectorType.UPSTASH
+                | VectorType.OCEANBASE
             ):
                 return {"retrieval_method": [RetrievalMethod.SEMANTIC_SEARCH.value]}
             case (
@@ -662,10 +664,6 @@ class DatasetRetrievalSettingApi(Resource):
                 | VectorType.COUCHBASE
                 | VectorType.MILVUS
                 | VectorType.OPENGAUSS
-                | VectorType.OCEANBASE
-                | VectorType.TABLESTORE
-                | VectorType.HUAWEI_CLOUD
-                | VectorType.TENCENT
             ):
                 return {
                     "retrieval_method": [
@@ -689,10 +687,12 @@ class DatasetRetrievalSettingMockApi(Resource):
                 | VectorType.RELYT
                 | VectorType.TIDB_VECTOR
                 | VectorType.CHROMA
+                | VectorType.TENCENT
                 | VectorType.PGVECTO_RS
                 | VectorType.BAIDU
                 | VectorType.VIKINGDB
                 | VectorType.UPSTASH
+                | VectorType.OCEANBASE
             ):
                 return {"retrieval_method": [RetrievalMethod.SEMANTIC_SEARCH.value]}
             case (
@@ -708,10 +708,6 @@ class DatasetRetrievalSettingMockApi(Resource):
                 | VectorType.PGVECTOR
                 | VectorType.LINDORM
                 | VectorType.OPENGAUSS
-                | VectorType.OCEANBASE
-                | VectorType.TABLESTORE
-                | VectorType.TENCENT
-                | VectorType.HUAWEI_CLOUD
             ):
                 return {
                     "retrieval_method": [

api/controllers/console/datasets/datasets_segments.py

@@ -398,7 +398,7 @@ class DatasetDocumentSegmentBatchImportApi(Resource):
         indexing_cache_key = "segment_batch_import_{}".format(job_id)
         cache_result = redis_client.get(indexing_cache_key)
         if cache_result is None:
-            raise ValueError("The job does not exist.")
+            raise ValueError("The job is not exist.")
 
         return {"job_id": job_id, "job_status": cache_result.decode()}, 200
 

api/controllers/console/datasets/external.py

@@ -21,6 +21,12 @@ def _validate_name(name):
     return name
 
 
+def _validate_description_length(description):
+    if description and len(description) > 400:
+        raise ValueError("Description cannot exceed 400 characters.")
+    return description
+
+
 class ExternalApiTemplateListApi(Resource):
     @setup_required
     @login_required

api/controllers/console/datasets/metadata.py

@@ -14,6 +14,18 @@ from services.entities.knowledge_entities.knowledge_entities import (
 from services.metadata_service import MetadataService
 
 
+def _validate_name(name):
+    if not name or len(name) < 1 or len(name) > 40:
+        raise ValueError("Name must be between 1 to 40 characters.")
+    return name
+
+
+def _validate_description_length(description):
+    if len(description) > 400:
+        raise ValueError("Description cannot exceed 400 characters.")
+    return description
+
+
 class DatasetMetadataCreateApi(Resource):
     @setup_required
     @login_required

api/controllers/console/datasets/website.py

@@ -14,12 +14,7 @@ class WebsiteCrawlApi(Resource):
     def post(self):
         parser = reqparse.RequestParser()
         parser.add_argument(
-            "provider",
-            type=str,
-            choices=["firecrawl", "watercrawl", "jinareader"],
-            required=True,
-            nullable=True,
-            location="json",
+            "provider", type=str, choices=["firecrawl", "jinareader"], required=True, nullable=True, location="json"
         )
         parser.add_argument("url", type=str, required=True, nullable=True, location="json")
         parser.add_argument("options", type=dict, required=True, nullable=True, location="json")
@@ -39,9 +34,7 @@ class WebsiteCrawlStatusApi(Resource):
     @account_initialization_required
     def get(self, job_id: str):
         parser = reqparse.RequestParser()
-        parser.add_argument(
-            "provider", type=str, choices=["firecrawl", "watercrawl", "jinareader"], required=True, location="args"
-        )
+        parser.add_argument("provider", type=str, choices=["firecrawl", "jinareader"], required=True, location="args")
         args = parser.parse_args()
         # get crawl status
         try:

api/controllers/console/error.py

@@ -103,18 +103,6 @@ class AccountInFreezeError(BaseHTTPException):
     )
 
 
-class EducationVerifyLimitError(BaseHTTPException):
-    error_code = "education_verify_limit"
-    description = "Rate limit exceeded"
-    code = 429
-
-
-class EducationActivateLimitError(BaseHTTPException):
-    error_code = "education_activate_limit"
-    description = "Rate limit exceeded"
-    code = 429
-
-
 class CompilanceRateLimitError(BaseHTTPException):
     error_code = "compilance_rate_limit"
     description = "Rate limit exceeded for downloading compliance report."

api/controllers/console/explore/parameter.py

@@ -1,10 +1,10 @@
 from flask_restful import marshal_with  # type: ignore
 
 from controllers.common import fields
+from controllers.common import helpers as controller_helpers
 from controllers.console import api
 from controllers.console.app.error import AppUnavailableError
 from controllers.console.explore.wraps import InstalledAppResource
-from core.app.app_config.common.parameters_mapping import get_parameters_from_feature_dict
 from models.model import AppMode, InstalledApp
 from services.app_service import AppService
 
@@ -36,7 +36,9 @@ class AppParameterApi(InstalledAppResource):
 
             user_input_form = features_dict.get("user_input_form", [])
 
-        return get_parameters_from_feature_dict(features_dict=features_dict, user_input_form=user_input_form)
+        return controller_helpers.get_parameters_from_feature_dict(
+            features_dict=features_dict, user_input_form=user_input_form
+        )
 
 
 class ExploreAppMetaApi(InstalledAppResource):

api/controllers/console/workspace/account.py

@@ -15,13 +15,7 @@ from controllers.console.workspace.error import (
     InvalidInvitationCodeError,
     RepeatPasswordNotMatchError,
 )
-from controllers.console.wraps import (
-    account_initialization_required,
-    cloud_edition_billing_enabled,
-    enterprise_license_required,
-    only_edition_cloud,
-    setup_required,
-)
+from controllers.console.wraps import account_initialization_required, enterprise_license_required, setup_required
 from extensions.ext_database import db
 from fields.member_fields import account_fields
 from libs.helper import TimestampField, timezone
@@ -286,6 +280,8 @@ class AccountDeleteApi(Resource):
 class AccountDeleteUpdateFeedbackApi(Resource):
     @setup_required
     def post(self):
+        account = current_user
+
         parser = reqparse.RequestParser()
         parser.add_argument("email", type=str, required=True, location="json")
         parser.add_argument("feedback", type=str, required=True, location="json")
@@ -296,79 +292,6 @@ class AccountDeleteUpdateFeedbackApi(Resource):
         return {"result": "success"}
 
 
-class EducationVerifyApi(Resource):
-    verify_fields = {
-        "token": fields.String,
-    }
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @only_edition_cloud
-    @cloud_edition_billing_enabled
-    @marshal_with(verify_fields)
-    def get(self):
-        account = current_user
-
-        return BillingService.EducationIdentity.verify(account.id, account.email)
-
-
-class EducationApi(Resource):
-    status_fields = {
-        "result": fields.Boolean,
-    }
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @only_edition_cloud
-    @cloud_edition_billing_enabled
-    def post(self):
-        account = current_user
-
-        parser = reqparse.RequestParser()
-        parser.add_argument("token", type=str, required=True, location="json")
-        parser.add_argument("institution", type=str, required=True, location="json")
-        parser.add_argument("role", type=str, required=True, location="json")
-        args = parser.parse_args()
-
-        return BillingService.EducationIdentity.activate(account, args["token"], args["institution"], args["role"])
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @only_edition_cloud
-    @cloud_edition_billing_enabled
-    @marshal_with(status_fields)
-    def get(self):
-        account = current_user
-
-        return BillingService.EducationIdentity.is_active(account.id)
-
-
-class EducationAutoCompleteApi(Resource):
-    data_fields = {
-        "data": fields.List(fields.String),
-        "curr_page": fields.Integer,
-        "has_next": fields.Boolean,
-    }
-
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @only_edition_cloud
-    @cloud_edition_billing_enabled
-    @marshal_with(data_fields)
-    def get(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("keywords", type=str, required=True, location="args")
-        parser.add_argument("page", type=int, required=False, location="args", default=0)
-        parser.add_argument("limit", type=int, required=False, location="args", default=20)
-        args = parser.parse_args()
-
-        return BillingService.EducationIdentity.autocomplete(args["keywords"], args["page"], args["limit"])
-
-
 # Register API resources
 api.add_resource(AccountInitApi, "/account/init")
 api.add_resource(AccountProfileApi, "/account/profile")
@@ -382,8 +305,5 @@ api.add_resource(AccountIntegrateApi, "/account/integrates")
 api.add_resource(AccountDeleteVerifyApi, "/account/delete/verify")
 api.add_resource(AccountDeleteApi, "/account/delete")
 api.add_resource(AccountDeleteUpdateFeedbackApi, "/account/delete/feedback")
-api.add_resource(EducationVerifyApi, "/account/education/verify")
-api.add_resource(EducationApi, "/account/education")
-api.add_resource(EducationAutoCompleteApi, "/account/education/autocomplete")
 # api.add_resource(AccountEmailApi, '/account/email')
 # api.add_resource(AccountEmailVerifyApi, '/account/email-verify')

api/controllers/console/workspace/endpoint.py

@@ -5,7 +5,6 @@ from werkzeug.exceptions import Forbidden
 from controllers.console import api
 from controllers.console.wraps import account_initialization_required, setup_required
 from core.model_runtime.utils.encoders import jsonable_encoder
-from core.plugin.manager.exc import PluginPermissionDeniedError
 from libs.login import login_required
 from services.plugin.endpoint_service import EndpointService
 
@@ -29,18 +28,15 @@ class EndpointCreateApi(Resource):
         settings = args["settings"]
         name = args["name"]
 
-        try:
-            return {
-                "success": EndpointService.create_endpoint(
-                    tenant_id=user.current_tenant_id,
-                    user_id=user.id,
-                    plugin_unique_identifier=plugin_unique_identifier,
-                    name=name,
-                    settings=settings,
-                )
-            }
-        except PluginPermissionDeniedError as e:
-            raise ValueError(e.description) from e
+        return {
+            "success": EndpointService.create_endpoint(
+                tenant_id=user.current_tenant_id,
+                user_id=user.id,
+                plugin_unique_identifier=plugin_unique_identifier,
+                name=name,
+                settings=settings,
+            )
+        }
 
 
 class EndpointListApi(Resource):

api/controllers/console/workspace/plugin.py

@@ -49,23 +49,6 @@ class PluginListApi(Resource):
         return jsonable_encoder({"plugins": plugins})
 
 
-class PluginListLatestVersionsApi(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    def post(self):
-        req = reqparse.RequestParser()
-        req.add_argument("plugin_ids", type=list, required=True, location="json")
-        args = req.parse_args()
-
-        try:
-            versions = PluginService.list_latest_versions(args["plugin_ids"])
-        except PluginDaemonClientSideError as e:
-            raise ValueError(e)
-
-        return jsonable_encoder({"versions": versions})
-
-
 class PluginListInstallationsFromIdsApi(Resource):
     @setup_required
     @login_required
@@ -249,36 +232,11 @@ class PluginInstallFromMarketplaceApi(Resource):
         return jsonable_encoder(response)
 
 
-class PluginFetchMarketplacePkgApi(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    @plugin_permission_required(install_required=True)
-    def get(self):
-        tenant_id = current_user.current_tenant_id
-
-        parser = reqparse.RequestParser()
-        parser.add_argument("plugin_unique_identifier", type=str, required=True, location="args")
-        args = parser.parse_args()
-
-        try:
-            return jsonable_encoder(
-                {
-                    "manifest": PluginService.fetch_marketplace_pkg(
-                        tenant_id,
-                        args["plugin_unique_identifier"],
-                    )
-                }
-            )
-        except PluginDaemonClientSideError as e:
-            raise ValueError(e)
-
-
 class PluginFetchManifestApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def get(self):
         tenant_id = current_user.current_tenant_id
 
@@ -302,7 +260,7 @@ class PluginFetchInstallTasksApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def get(self):
         tenant_id = current_user.current_tenant_id
 
@@ -323,7 +281,7 @@ class PluginFetchInstallTaskApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def get(self, task_id: str):
         tenant_id = current_user.current_tenant_id
 
@@ -337,7 +295,7 @@ class PluginDeleteInstallTaskApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def post(self, task_id: str):
         tenant_id = current_user.current_tenant_id
 
@@ -351,7 +309,7 @@ class PluginDeleteAllInstallTaskItemsApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def post(self):
         tenant_id = current_user.current_tenant_id
 
@@ -365,7 +323,7 @@ class PluginDeleteInstallTaskItemApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def post(self, task_id: str, identifier: str):
         tenant_id = current_user.current_tenant_id
 
@@ -379,7 +337,7 @@ class PluginUpgradeFromMarketplaceApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def post(self):
         tenant_id = current_user.current_tenant_id
 
@@ -402,7 +360,7 @@ class PluginUpgradeFromGithubApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def post(self):
         tenant_id = current_user.current_tenant_id
 
@@ -433,7 +391,7 @@ class PluginUninstallApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    @plugin_permission_required(install_required=True)
+    @plugin_permission_required(debug_required=True)
     def post(self):
         req = reqparse.RequestParser()
         req.add_argument("plugin_installation_id", type=str, required=True, location="json")
@@ -495,7 +453,6 @@ class PluginFetchPermissionApi(Resource):
 
 api.add_resource(PluginDebuggingKeyApi, "/workspaces/current/plugin/debugging-key")
 api.add_resource(PluginListApi, "/workspaces/current/plugin/list")
-api.add_resource(PluginListLatestVersionsApi, "/workspaces/current/plugin/list/latest-versions")
 api.add_resource(PluginListInstallationsFromIdsApi, "/workspaces/current/plugin/list/installations/ids")
 api.add_resource(PluginIconApi, "/workspaces/current/plugin/icon")
 api.add_resource(PluginUploadFromPkgApi, "/workspaces/current/plugin/upload/pkg")
@@ -513,7 +470,6 @@ api.add_resource(PluginDeleteInstallTaskApi, "/workspaces/current/plugin/tasks/<
 api.add_resource(PluginDeleteAllInstallTaskItemsApi, "/workspaces/current/plugin/tasks/delete_all")
 api.add_resource(PluginDeleteInstallTaskItemApi, "/workspaces/current/plugin/tasks/<task_id>/delete/<path:identifier>")
 api.add_resource(PluginUninstallApi, "/workspaces/current/plugin/uninstall")
-api.add_resource(PluginFetchMarketplacePkgApi, "/workspaces/current/plugin/marketplace/pkg")
 
 api.add_resource(PluginChangePermissionApi, "/workspaces/current/plugin/permission/change")
 api.add_resource(PluginFetchPermissionApi, "/workspaces/current/plugin/permission/fetch")

api/controllers/console/workspace/workspace.py

@@ -216,23 +216,6 @@ class WebappLogoWorkspaceApi(Resource):
         return {"id": upload_file.id}, 201
 
 
-class WorkspaceInfoApi(Resource):
-    @setup_required
-    @login_required
-    @account_initialization_required
-    # Change workspace name
-    def post(self):
-        parser = reqparse.RequestParser()
-        parser.add_argument("name", type=str, required=True, location="json")
-        args = parser.parse_args()
-
-        tenant = Tenant.query.filter(Tenant.id == current_user.current_tenant_id).one_or_404()
-        tenant.name = args["name"]
-        db.session.commit()
-
-        return {"result": "success", "tenant": marshal(WorkspaceService.get_tenant_info(tenant), tenant_fields)}
-
-
 api.add_resource(TenantListApi, "/workspaces")  # GET for getting all tenants
 api.add_resource(WorkspaceListApi, "/all-workspaces")  # GET for getting all tenants
 api.add_resource(TenantApi, "/workspaces/current", endpoint="workspaces_current")  # GET for getting current tenant info
@@ -240,4 +223,3 @@ api.add_resource(TenantApi, "/info", endpoint="info")  # Deprecated
 api.add_resource(SwitchWorkspaceApi, "/workspaces/switch")  # POST for switching tenant
 api.add_resource(CustomConfigWorkspaceApi, "/workspaces/custom-config")
 api.add_resource(WebappLogoWorkspaceApi, "/workspaces/custom-config/webapp-logo/upload")
-api.add_resource(WorkspaceInfoApi, "/workspaces/info")  # POST for changing workspace info

api/controllers/console/wraps.py

@@ -54,17 +54,6 @@ def only_edition_self_hosted(view):
     return decorated
 
 
-def cloud_edition_billing_enabled(view):
-    @wraps(view)
-    def decorated(*args, **kwargs):
-        features = FeatureService.get_features(current_user.current_tenant_id)
-        if not features.billing.enabled:
-            abort(403, "Billing feature is not enabled.")
-        return view(*args, **kwargs)
-
-    return decorated
-
-
 def cloud_edition_billing_resource_check(resource: str):
     def interceptor(view):
         @wraps(view)
@@ -210,16 +199,3 @@ def enterprise_license_required(view):
         return view(*args, **kwargs)
 
     return decorated
-
-
-def email_password_login_enabled(view):
-    @wraps(view)
-    def decorated(*args, **kwargs):
-        features = FeatureService.get_system_features()
-        if features.enable_email_password_login:
-            return view(*args, **kwargs)
-
-        # otherwise, return 403
-        abort(403)
-
-    return decorated

api/controllers/files/upload.py

@@ -1,5 +1,3 @@
-from mimetypes import guess_extension
-
 from flask import request
 from flask_restful import Resource, marshal_with  # type: ignore
 from werkzeug.exceptions import Forbidden
@@ -11,8 +9,8 @@ from controllers.files.error import UnsupportedFileTypeError
 from controllers.inner_api.plugin.wraps import get_user
 from controllers.service_api.app.error import FileTooLargeError
 from core.file.helpers import verify_plugin_file_signature
-from core.tools.tool_file_manager import ToolFileManager
 from fields.file_fields import file_fields
+from services.file_service import FileService
 
 
 class PluginUploadFileApi(Resource):
@@ -53,26 +51,19 @@ class PluginUploadFileApi(Resource):
             raise Forbidden("Invalid request.")
 
         try:
-            tool_file = ToolFileManager.create_file_by_raw(
-                user_id=user.id,
-                tenant_id=tenant_id,
-                file_binary=file.read(),
-                mimetype=mimetype,
+            upload_file = FileService.upload_file(
                 filename=filename,
-                conversation_id=None,
+                content=file.read(),
+                mimetype=mimetype,
+                user=user,
+                source=None,
             )
-
-            extension = guess_extension(tool_file.mimetype) or ".bin"
-            preview_url = ToolFileManager.sign_file(tool_file_id=tool_file.id, extension=extension)
-            tool_file.mime_type = mimetype
-            tool_file.extension = extension
-            tool_file.preview_url = preview_url
         except services.errors.file.FileTooLargeError as file_too_large_error:
             raise FileTooLargeError(file_too_large_error.description)
         except services.errors.file.UnsupportedFileTypeError:
             raise UnsupportedFileTypeError()
 
-        return tool_file, 201
+        return upload_file, 201
 
 
 api.add_resource(PluginUploadFileApi, "/files/upload/for-plugin")

api/controllers/inner_api/plugin/plugin.py

@@ -13,7 +13,6 @@ from core.plugin.backwards_invocation.model import PluginModelBackwardsInvocatio
 from core.plugin.backwards_invocation.node import PluginNodeBackwardsInvocation
 from core.plugin.backwards_invocation.tool import PluginToolBackwardsInvocation
 from core.plugin.entities.request import (
-    RequestFetchAppInfo,
     RequestInvokeApp,
     RequestInvokeEncrypt,
     RequestInvokeLLM,
@@ -279,17 +278,6 @@ class PluginUploadFileRequestApi(Resource):
         return BaseBackwardsInvocationResponse(data={"url": url}).model_dump()
 
 
-class PluginFetchAppInfoApi(Resource):
-    @setup_required
-    @plugin_inner_api_only
-    @get_user_tenant
-    @plugin_data(payload_type=RequestFetchAppInfo)
-    def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestFetchAppInfo):
-        return BaseBackwardsInvocationResponse(
-            data=PluginAppBackwardsInvocation.fetch_app_info(payload.app_id, tenant_model.id)
-        ).model_dump()
-
-
 api.add_resource(PluginInvokeLLMApi, "/invoke/llm")
 api.add_resource(PluginInvokeTextEmbeddingApi, "/invoke/text-embedding")
 api.add_resource(PluginInvokeRerankApi, "/invoke/rerank")
@@ -303,4 +291,3 @@ api.add_resource(PluginInvokeAppApi, "/invoke/app")
 api.add_resource(PluginInvokeEncryptApi, "/invoke/encrypt")
 api.add_resource(PluginInvokeSummaryApi, "/invoke/summary")
 api.add_resource(PluginUploadFileRequestApi, "/upload/file/request")
-api.add_resource(PluginFetchAppInfoApi, "/fetch/app/info")

api/controllers/service_api/__init__.py

@@ -6,6 +6,5 @@ bp = Blueprint("service_api", __name__, url_prefix="/v1")
 api = ExternalApi(bp)
 
 from . import index
-from .app import annotation, app, audio, completion, conversation, file, message, workflow
+from .app import app, audio, completion, conversation, file, message, workflow
 from .dataset import dataset, document, hit_testing, metadata, segment, upload_file
-from .workspace import models

api/controllers/service_api/app/annotation.py

@@ -1,107 +0,0 @@
-from flask import request
-from flask_restful import Resource, marshal, marshal_with, reqparse  # type: ignore
-from werkzeug.exceptions import Forbidden
-
-from controllers.service_api import api
-from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
-from extensions.ext_redis import redis_client
-from fields.annotation_fields import (
-    annotation_fields,
-)
-from libs.login import current_user
-from models.model import App, EndUser
-from services.annotation_service import AppAnnotationService
-
-
-class AnnotationReplyActionApi(Resource):
-    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.JSON))
-    def post(self, app_model: App, end_user: EndUser, action):
-        parser = reqparse.RequestParser()
-        parser.add_argument("score_threshold", required=True, type=float, location="json")
-        parser.add_argument("embedding_provider_name", required=True, type=str, location="json")
-        parser.add_argument("embedding_model_name", required=True, type=str, location="json")
-        args = parser.parse_args()
-        if action == "enable":
-            result = AppAnnotationService.enable_app_annotation(args, app_model.id)
-        elif action == "disable":
-            result = AppAnnotationService.disable_app_annotation(app_model.id)
-        else:
-            raise ValueError("Unsupported annotation reply action")
-        return result, 200
-
-
-class AnnotationReplyActionStatusApi(Resource):
-    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.QUERY))
-    def get(self, app_model: App, end_user: EndUser, job_id, action):
-        job_id = str(job_id)
-        app_annotation_job_key = "{}_app_annotation_job_{}".format(action, str(job_id))
-        cache_result = redis_client.get(app_annotation_job_key)
-        if cache_result is None:
-            raise ValueError("The job does not exist.")
-
-        job_status = cache_result.decode()
-        error_msg = ""
-        if job_status == "error":
-            app_annotation_error_key = "{}_app_annotation_error_{}".format(action, str(job_id))
-            error_msg = redis_client.get(app_annotation_error_key).decode()
-
-        return {"job_id": job_id, "job_status": job_status, "error_msg": error_msg}, 200
-
-
-class AnnotationListApi(Resource):
-    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.QUERY))
-    def get(self, app_model: App, end_user: EndUser):
-        page = request.args.get("page", default=1, type=int)
-        limit = request.args.get("limit", default=20, type=int)
-        keyword = request.args.get("keyword", default="", type=str)
-
-        annotation_list, total = AppAnnotationService.get_annotation_list_by_app_id(app_model.id, page, limit, keyword)
-        response = {
-            "data": marshal(annotation_list, annotation_fields),
-            "has_more": len(annotation_list) == limit,
-            "limit": limit,
-            "total": total,
-            "page": page,
-        }
-        return response, 200
-
-    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.JSON))
-    @marshal_with(annotation_fields)
-    def post(self, app_model: App, end_user: EndUser):
-        parser = reqparse.RequestParser()
-        parser.add_argument("question", required=True, type=str, location="json")
-        parser.add_argument("answer", required=True, type=str, location="json")
-        args = parser.parse_args()
-        annotation = AppAnnotationService.insert_app_annotation_directly(args, app_model.id)
-        return annotation
-
-
-class AnnotationUpdateDeleteApi(Resource):
-    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.JSON))
-    @marshal_with(annotation_fields)
-    def post(self, app_model: App, end_user: EndUser, annotation_id):
-        if not current_user.is_editor:
-            raise Forbidden()
-
-        annotation_id = str(annotation_id)
-        parser = reqparse.RequestParser()
-        parser.add_argument("question", required=True, type=str, location="json")
-        parser.add_argument("answer", required=True, type=str, location="json")
-        args = parser.parse_args()
-        annotation = AppAnnotationService.update_app_annotation_directly(args, app_model.id, annotation_id)
-        return annotation
-
-    @validate_app_token(fetch_user_arg=FetchUserArg(fetch_from=WhereisUserArg.QUERY))
-    def delete(self, app_model: App, end_user: EndUser, annotation_id):
-        if not current_user.is_editor:
-            raise Forbidden()
-
-        annotation_id = str(annotation_id)
-        AppAnnotationService.delete_app_annotation(app_model.id, annotation_id)
-        return {"result": "success"}, 200
-
-
-api.add_resource(AnnotationReplyActionApi, "/apps/annotation-reply/<string:action>")
-api.add_resource(AnnotationReplyActionStatusApi, "/apps/annotation-reply/<string:action>/status/<uuid:job_id>")
-api.add_resource(AnnotationListApi, "/apps/annotations")
-api.add_resource(AnnotationUpdateDeleteApi, "/apps/annotations/<uuid:annotation_id>")

api/controllers/service_api/app/app.py

@@ -1,10 +1,10 @@
 from flask_restful import Resource, marshal_with  # type: ignore
 
 from controllers.common import fields
+from controllers.common import helpers as controller_helpers
 from controllers.service_api import api
 from controllers.service_api.app.error import AppUnavailableError
 from controllers.service_api.wraps import validate_app_token
-from core.app.app_config.common.parameters_mapping import get_parameters_from_feature_dict
 from models.model import App, AppMode
 from services.app_service import AppService
 
@@ -32,7 +32,9 @@ class AppParameterApi(Resource):
 
             user_input_form = features_dict.get("user_input_form", [])
 
-        return get_parameters_from_feature_dict(features_dict=features_dict, user_input_form=user_input_form)
+        return controller_helpers.get_parameters_from_feature_dict(
+            features_dict=features_dict, user_input_form=user_input_form
+        )
 
 
 class AppMetaApi(Resource):

api/controllers/service_api/app/message.py

@@ -1,4 +1,3 @@
-import json
 import logging
 
 from flask_restful import Resource, fields, marshal_with, reqparse  # type: ignore
@@ -11,7 +10,7 @@ from controllers.service_api.app.error import NotChatAppError
 from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
 from core.app.entities.app_invoke_entities import InvokeFrom
 from fields.conversation_fields import message_file_fields
-from fields.message_fields import agent_thought_fields, feedback_fields
+from fields.message_fields import agent_thought_fields, feedback_fields, retriever_resource_fields
 from fields.raws import FilesContainedField
 from libs.helper import TimestampField, uuid_value
 from models.model import App, AppMode, EndUser
@@ -29,11 +28,7 @@ class MessageListApi(Resource):
         "answer": fields.String(attribute="re_sign_file_url_answer"),
         "message_files": fields.List(fields.Nested(message_file_fields)),
         "feedback": fields.Nested(feedback_fields, attribute="user_feedback", allow_null=True),
-        "retriever_resources": fields.Raw(
-            attribute=lambda obj: json.loads(obj.message_metadata).get("retriever_resources", [])
-            if obj.message_metadata
-            else []
-        ),
+        "retriever_resources": fields.List(fields.Nested(retriever_resource_fields)),
         "created_at": TimestampField,
         "agent_thoughts": fields.List(fields.Nested(agent_thought_fields)),
         "status": fields.String,

api/controllers/service_api/app/workflow.py

@@ -1,6 +1,6 @@
 import logging
+from datetime import datetime
 
-from dateutil.parser import isoparse
 from flask_restful import Resource, fields, marshal_with, reqparse  # type: ignore
 from flask_restful.inputs import int_range  # type: ignore
 from sqlalchemy.orm import Session
@@ -27,7 +27,6 @@ from core.model_runtime.errors.invoke import InvokeError
 from extensions.ext_database import db
 from fields.workflow_app_log_fields import workflow_app_log_pagination_fields
 from libs import helper
-from libs.helper import TimestampField
 from models.model import App, AppMode, EndUser
 from models.workflow import WorkflowRun, WorkflowRunStatus
 from services.app_generate_service import AppGenerateService
@@ -45,8 +44,8 @@ workflow_run_fields = {
     "error": fields.String,
     "total_steps": fields.Integer,
     "total_tokens": fields.Integer,
-    "created_at": TimestampField,
-    "finished_at": TimestampField,
+    "created_at": fields.DateTime,
+    "finished_at": fields.DateTime,
     "elapsed_time": fields.Float,
 }
 
@@ -54,7 +53,7 @@ workflow_run_fields = {
 class WorkflowRunDetailApi(Resource):
     @validate_app_token
     @marshal_with(workflow_run_fields)
-    def get(self, app_model: App, workflow_run_id: str):
+    def get(self, app_model: App, workflow_id: str):
         """
         Get a workflow task running detail
         """
@@ -62,7 +61,7 @@ class WorkflowRunDetailApi(Resource):
         if app_mode != AppMode.WORKFLOW:
             raise NotWorkflowAppError()
 
-        workflow_run = db.session.query(WorkflowRun).filter(WorkflowRun.id == workflow_run_id).first()
+        workflow_run = db.session.query(WorkflowRun).filter(WorkflowRun.id == workflow_id).first()
         return workflow_run
 
 
@@ -140,10 +139,10 @@ class WorkflowAppLogApi(Resource):
 
         args.status = WorkflowRunStatus(args.status) if args.status else None
         if args.created_at__before:
-            args.created_at__before = isoparse(args.created_at__before)
+            args.created_at__before = datetime.fromisoformat(args.created_at__before.replace("Z", "+00:00"))
 
         if args.created_at__after:
-            args.created_at__after = isoparse(args.created_at__after)
+            args.created_at__after = datetime.fromisoformat(args.created_at__after.replace("Z", "+00:00"))
 
         # get paginate workflow app logs
         workflow_app_service = WorkflowAppService()
@@ -163,6 +162,6 @@ class WorkflowAppLogApi(Resource):
 
 
 api.add_resource(WorkflowRunApi, "/workflows/run")
-api.add_resource(WorkflowRunDetailApi, "/workflows/run/<string:workflow_run_id>")
+api.add_resource(WorkflowRunDetailApi, "/workflows/run/<string:workflow_id>")
 api.add_resource(WorkflowTaskStopApi, "/workflows/tasks/<string:task_id>/stop")
 api.add_resource(WorkflowAppLogApi, "/workflows/logs")

api/controllers/service_api/dataset/dataset.py

@@ -1,6 +1,6 @@
 from flask import request
 from flask_restful import marshal, reqparse  # type: ignore
-from werkzeug.exceptions import Forbidden, NotFound
+from werkzeug.exceptions import NotFound
 
 import services.dataset_service
 from controllers.service_api import api
@@ -12,8 +12,7 @@ from core.provider_manager import ProviderManager
 from fields.dataset_fields import dataset_detail_fields
 from libs.login import current_user
 from models.dataset import Dataset, DatasetPermissionEnum
-from services.dataset_service import DatasetPermissionService, DatasetService
-from services.entities.knowledge_entities.knowledge_entities import RetrievalModel
+from services.dataset_service import DatasetService
 
 
 def _validate_name(name):
@@ -22,12 +21,6 @@ def _validate_name(name):
     return name
 
 
-def _validate_description_length(description):
-    if len(description) > 400:
-        raise ValueError("Description cannot exceed 400 characters.")
-    return description
-
-
 class DatasetListApi(DatasetApiResource):
     """Resource for datasets."""
 
@@ -121,11 +114,8 @@ class DatasetListApi(DatasetApiResource):
             nullable=True,
             required=False,
         )
-        parser.add_argument("retrieval_model", type=dict, required=False, nullable=True, location="json")
-        parser.add_argument("embedding_model", type=str, required=False, nullable=True, location="json")
-        parser.add_argument("embedding_model_provider", type=str, required=False, nullable=True, location="json")
-
         args = parser.parse_args()
+
         try:
             dataset = DatasetService.create_empty_dataset(
                 tenant_id=tenant_id,
@@ -137,11 +127,6 @@ class DatasetListApi(DatasetApiResource):
                 provider=args["provider"],
                 external_knowledge_api_id=args["external_knowledge_api_id"],
                 external_knowledge_id=args["external_knowledge_id"],
-                embedding_model_provider=args["embedding_model_provider"],
-                embedding_model_name=args["embedding_model"],
-                retrieval_model=RetrievalModel(**args["retrieval_model"])
-                if args["retrieval_model"] is not None
-                else None,
             )
         except services.errors.dataset.DatasetNameDuplicateError:
             raise DatasetNameDuplicateError()
@@ -152,151 +137,11 @@ class DatasetListApi(DatasetApiResource):
 class DatasetApi(DatasetApiResource):
     """Resource for dataset."""
 
-    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))
-        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(tenant_id=current_user.current_tenant_id)
-
-        embedding_models = configurations.get_models(model_type=ModelType.TEXT_EMBEDDING, only_active=True)
-
-        model_names = []
-        for embedding_model in embedding_models:
-            model_names.append(f"{embedding_model.model}:{embedding_model.provider.provider}")
-
-        if data["indexing_technique"] == "high_quality":
-            item_model = f"{data['embedding_model']}:{data['embedding_model_provider']}"
-            if item_model in model_names:
-                data["embedding_available"] = True
-            else:
-                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
-
-    def patch(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.")
-
-        parser = reqparse.RequestParser()
-        parser.add_argument(
-            "name",
-            nullable=False,
-            help="type is required. Name must be between 1 to 40 characters.",
-            type=_validate_name,
-        )
-        parser.add_argument("description", location="json", store_missing=False, type=_validate_description_length)
-        parser.add_argument(
-            "indexing_technique",
-            type=str,
-            location="json",
-            choices=Dataset.INDEXING_TECHNIQUE_LIST,
-            nullable=True,
-            help="Invalid indexing technique.",
-        )
-        parser.add_argument(
-            "permission",
-            type=str,
-            location="json",
-            choices=(DatasetPermissionEnum.ONLY_ME, DatasetPermissionEnum.ALL_TEAM, DatasetPermissionEnum.PARTIAL_TEAM),
-            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.")
-
-        parser.add_argument(
-            "external_retrieval_model",
-            type=dict,
-            required=False,
-            nullable=True,
-            location="json",
-            help="Invalid external retrieval model.",
-        )
-
-        parser.add_argument(
-            "external_knowledge_id",
-            type=str,
-            required=False,
-            nullable=True,
-            location="json",
-            help="Invalid external knowledge id.",
-        )
-
-        parser.add_argument(
-            "external_knowledge_api_id",
-            type=str,
-            required=False,
-            nullable=True,
-            location="json",
-            help="Invalid external knowledge api id.",
-        )
-        args = parser.parse_args()
-        data = request.get_json()
-
-        # check embedding model setting
-        if data.get("indexing_technique") == "high_quality":
-            DatasetService.check_embedding_model_setting(
-                dataset.tenant_id, data.get("embedding_model_provider"), data.get("embedding_model")
-            )
-
-        # 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")
-        )
-
-        dataset = DatasetService.update_dataset(dataset_id_str, args, current_user)
-
-        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")
-            )
-        # clear partial member list when permission is only_me or all_team_members
-        elif (
-            data.get("permission") == DatasetPermissionEnum.ONLY_ME
-            or data.get("permission") == DatasetPermissionEnum.ALL_TEAM
-        ):
-            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
-
     def delete(self, _, dataset_id):
         """
         Deletes a dataset given its ID.
 
         Args:
-            _: ignore
             dataset_id (UUID): The ID of the dataset to be deleted.
 
         Returns:
@@ -312,7 +157,6 @@ class DatasetApi(DatasetApiResource):
 
         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.")

api/controllers/service_api/dataset/document.py

@@ -49,9 +49,7 @@ class DocumentAddByTextApi(DatasetApiResource):
         parser.add_argument(
             "indexing_technique", type=str, choices=Dataset.INDEXING_TECHNIQUE_LIST, nullable=False, location="json"
         )
-        parser.add_argument("retrieval_model", type=dict, required=False, nullable=True, location="json")
-        parser.add_argument("embedding_model", type=str, required=False, nullable=True, location="json")
-        parser.add_argument("embedding_model_provider", type=str, required=False, nullable=True, location="json")
+        parser.add_argument("retrieval_model", type=dict, required=False, nullable=False, location="json")
 
         args = parser.parse_args()
         dataset_id = str(dataset_id)
@@ -59,7 +57,7 @@ class DocumentAddByTextApi(DatasetApiResource):
         dataset = db.session.query(Dataset).filter(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id).first()
 
         if not dataset:
-            raise ValueError("Dataset does not exist.")
+            raise ValueError("Dataset is not exist.")
 
         if not dataset.indexing_technique and not args["indexing_technique"]:
             raise ValueError("indexing_technique is required.")
@@ -116,7 +114,7 @@ class DocumentUpdateByTextApi(DatasetApiResource):
         dataset = db.session.query(Dataset).filter(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id).first()
 
         if not dataset:
-            raise ValueError("Dataset does not exist.")
+            raise ValueError("Dataset is not exist.")
 
         # indexing_technique is already set in dataset since this is an update
         args["indexing_technique"] = dataset.indexing_technique
@@ -174,7 +172,7 @@ class DocumentAddByFileApi(DatasetApiResource):
         dataset = db.session.query(Dataset).filter(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id).first()
 
         if not dataset:
-            raise ValueError("Dataset does not exist.")
+            raise ValueError("Dataset is not exist.")
         if not dataset.indexing_technique and not args.get("indexing_technique"):
             raise ValueError("indexing_technique is required.")
 
@@ -241,7 +239,7 @@ class DocumentUpdateByFileApi(DatasetApiResource):
         dataset = db.session.query(Dataset).filter(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id).first()
 
         if not dataset:
-            raise ValueError("Dataset does not exist.")
+            raise ValueError("Dataset is not exist.")
 
         # indexing_technique is already set in dataset since this is an update
         args["indexing_technique"] = dataset.indexing_technique
@@ -305,7 +303,7 @@ class DocumentDeleteApi(DatasetApiResource):
         dataset = db.session.query(Dataset).filter(Dataset.tenant_id == tenant_id, Dataset.id == dataset_id).first()
 
         if not dataset:
-            raise ValueError("Dataset does not exist.")
+            raise ValueError("Dataset is not exist.")
 
         document = DocumentService.get_document(dataset.id, document_id)
 
@@ -343,7 +341,7 @@ class DocumentListApi(DatasetApiResource):
             search = f"%{search}%"
             query = query.filter(Document.name.like(search))
 
-        query = query.order_by(desc(Document.created_at), desc(Document.position))
+        query = query.order_by(desc(Document.created_at))
 
         paginated_documents = query.paginate(page=page, per_page=limit, max_per_page=100, error_out=False)
         documents = paginated_documents.items

api/controllers/service_api/dataset/metadata.py

@@ -13,6 +13,18 @@ from services.entities.knowledge_entities.knowledge_entities import (
 from services.metadata_service import MetadataService
 
 
+def _validate_name(name):
+    if not name or len(name) < 1 or len(name) > 40:
+        raise ValueError("Name must be between 1 to 40 characters.")
+    return name
+
+
+def _validate_description_length(description):
+    if len(description) > 400:
+        raise ValueError("Description cannot exceed 400 characters.")
+    return description
+
+
 class DatasetMetadataCreateServiceApi(DatasetApiResource):
     def post(self, tenant_id, dataset_id):
         parser = reqparse.RequestParser()

api/controllers/service_api/dataset/segment.py

@@ -117,13 +117,14 @@ class SegmentApi(DatasetApiResource):
         parser.add_argument("keyword", type=str, default=None, location="args")
         args = parser.parse_args()
 
+        status_list = args["status"]
+        keyword = args["keyword"]
+
         segments, total = SegmentService.get_segments(
             document_id=document_id,
             tenant_id=current_user.current_tenant_id,
             status_list=args["status"],
             keyword=args["keyword"],
-            page=page,
-            limit=limit,
         )
 
         response = {

api/controllers/service_api/workspace/models.py

@@ -1,21 +0,0 @@
-from flask_login import current_user  # type: ignore
-from flask_restful import Resource  # type: ignore
-
-from controllers.service_api import api
-from controllers.service_api.wraps import validate_dataset_token
-from core.model_runtime.utils.encoders import jsonable_encoder
-from services.model_provider_service import ModelProviderService
-
-
-class ModelProviderAvailableModelApi(Resource):
-    @validate_dataset_token
-    def get(self, _, model_type):
-        tenant_id = current_user.current_tenant_id
-
-        model_provider_service = ModelProviderService()
-        models = model_provider_service.get_models_by_model_type(tenant_id=tenant_id, model_type=model_type)
-
-        return jsonable_encoder({"data": models})
-
-
-api.add_resource(ModelProviderAvailableModelApi, "/workspaces/current/models/model-types/<string:model_type>")

api/controllers/service_api/wraps.py

@@ -59,27 +59,6 @@ def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optio
             if tenant.status == TenantStatus.ARCHIVE:
                 raise Forbidden("The workspace's status is archived.")
 
-            tenant_account_join = (
-                db.session.query(Tenant, TenantAccountJoin)
-                .filter(Tenant.id == api_token.tenant_id)
-                .filter(TenantAccountJoin.tenant_id == Tenant.id)
-                .filter(TenantAccountJoin.role.in_(["owner"]))
-                .filter(Tenant.status == TenantStatus.NORMAL)
-                .one_or_none()
-            )  # TODO: only owner information is required, so only one is returned.
-            if tenant_account_join:
-                tenant, ta = tenant_account_join
-                account = db.session.query(Account).filter(Account.id == ta.account_id).first()
-                # Login admin
-                if account:
-                    account.current_tenant = tenant
-                    current_app.login_manager._update_request_context_with_user(account)  # type: ignore
-                    user_logged_in.send(current_app._get_current_object(), user=_get_user())  # type: ignore
-                else:
-                    raise Unauthorized("Tenant owner account does not exist.")
-            else:
-                raise Unauthorized("Tenant does not exist.")
-
             kwargs["app_model"] = app_model
 
             if fetch_user_arg:

api/controllers/web/app.py

@@ -1,10 +1,10 @@
 from flask_restful import marshal_with  # type: ignore
 
 from controllers.common import fields
+from controllers.common import helpers as controller_helpers
 from controllers.web import api
 from controllers.web.error import AppUnavailableError
 from controllers.web.wraps import WebApiResource
-from core.app.app_config.common.parameters_mapping import get_parameters_from_feature_dict
 from models.model import App, AppMode
 from services.app_service import AppService
 
@@ -31,7 +31,9 @@ class AppParameterApi(WebApiResource):
 
             user_input_form = features_dict.get("user_input_form", [])
 
-        return get_parameters_from_feature_dict(features_dict=features_dict, user_input_form=user_input_form)
+        return controller_helpers.get_parameters_from_feature_dict(
+            features_dict=features_dict, user_input_form=user_input_form
+        )
 
 
 class AppMeta(WebApiResource):

api/controllers/web/message.py

@@ -46,7 +46,6 @@ class MessageListApi(WebApiResource):
         "retriever_resources": fields.List(fields.Nested(retriever_resource_fields)),
         "created_at": TimestampField,
         "agent_thoughts": fields.List(fields.Nested(agent_thought_fields)),
-        "metadata": fields.Raw(attribute="message_metadata_dict"),
         "status": fields.String,
         "error": fields.String,
     }

api/controllers/web/passport.py

@@ -19,8 +19,6 @@ class PassportResource(Resource):
     def get(self):
         system_features = FeatureService.get_system_features()
         app_code = request.headers.get("X-App-Code")
-        user_id = request.args.get("user_id")
-
         if app_code is None:
             raise Unauthorized("X-App-Code header is missing.")
 
@@ -38,33 +36,16 @@ class PassportResource(Resource):
         if not app_model or app_model.status != "normal" or not app_model.enable_site:
             raise NotFound()
 
-        if user_id:
-            end_user = (
-                db.session.query(EndUser).filter(EndUser.app_id == app_model.id, EndUser.session_id == user_id).first()
-            )
+        end_user = EndUser(
+            tenant_id=app_model.tenant_id,
+            app_id=app_model.id,
+            type="browser",
+            is_anonymous=True,
+            session_id=generate_session_id(),
+        )
 
-            if end_user:
-                pass
-            else:
-                end_user = EndUser(
-                    tenant_id=app_model.tenant_id,
-                    app_id=app_model.id,
-                    type="browser",
-                    is_anonymous=True,
-                    session_id=user_id,
-                )
-                db.session.add(end_user)
-                db.session.commit()
-        else:
-            end_user = EndUser(
-                tenant_id=app_model.tenant_id,
-                app_id=app_model.id,
-                type="browser",
-                is_anonymous=True,
-                session_id=generate_session_id(),
-            )
-            db.session.add(end_user)
-            db.session.commit()
+        db.session.add(end_user)
+        db.session.commit()
 
         payload = {
             "iss": site.app_id,

api/core/agent/base_agent_runner.py

@@ -21,13 +21,14 @@ from core.model_runtime.entities import (
     AssistantPromptMessage,
     LLMUsage,
     PromptMessage,
+    PromptMessageContent,
     PromptMessageTool,
     SystemPromptMessage,
     TextPromptMessageContent,
     ToolPromptMessage,
     UserPromptMessage,
 )
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
+from core.model_runtime.entities.message_entities import ImagePromptMessageContent
 from core.model_runtime.entities.model_entities import ModelFeature
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
 from core.prompt.utils.extract_thread_messages import extract_thread_messages
@@ -331,7 +332,7 @@ class BaseAgentRunner(AppRunner):
         agent_thought = updated_agent_thought
 
         if thought:
-            agent_thought.thought += thought
+            agent_thought.thought = thought
 
         if tool_name:
             agent_thought.tool = tool_name
@@ -500,7 +501,7 @@ class BaseAgentRunner(AppRunner):
         )
         if not file_objs:
             return UserPromptMessage(content=message.query)
-        prompt_message_contents: list[PromptMessageContentUnionTypes] = []
+        prompt_message_contents: list[PromptMessageContent] = []
         prompt_message_contents.append(TextPromptMessageContent(data=message.query))
         for file in file_objs:
             prompt_message_contents.append(

api/core/agent/cot_agent_runner.py

@@ -191,7 +191,7 @@ class CotAgentRunner(BaseAgentRunner, ABC):
                     # action is final answer, return final answer directly
                     try:
                         if isinstance(scratchpad.action.action_input, dict):
-                            final_answer = json.dumps(scratchpad.action.action_input, ensure_ascii=False)
+                            final_answer = json.dumps(scratchpad.action.action_input)
                         elif isinstance(scratchpad.action.action_input, str):
                             final_answer = scratchpad.action.action_input
                         else:

api/core/agent/cot_chat_agent_runner.py

@@ -5,11 +5,12 @@ from core.file import file_manager
 from core.model_runtime.entities import (
     AssistantPromptMessage,
     PromptMessage,
+    PromptMessageContent,
     SystemPromptMessage,
     TextPromptMessageContent,
     UserPromptMessage,
 )
-from core.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
+from core.model_runtime.entities.message_entities import ImagePromptMessageContent
 from core.model_runtime.utils.encoders import jsonable_encoder
 
 
@@ -39,7 +40,7 @@ class CotChatAgentRunner(CotAgentRunner):
         Organize user query
         """
         if self.files:
-            prompt_message_contents: list[PromptMessageContentUnionTypes] = []
+            prompt_message_contents: list[PromptMessageContent] = []
             prompt_message_contents.append(TextPromptMessageContent(data=query))
 
             # get image detail config