forked from langgenius/dify
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '926546b153a701dfbfc71eb8157f9a41320444f8'
* commit '926546b153a701dfbfc71eb8157f9a41320444f8': (486 commits) chore: bump version to 0.14.1 (langgenius#11784) feat:add hunyuan model(hunyuan-role, hunyuan-large, hunyuan-large-rol… (langgenius#11766) chore(opendal_storage): remove unused comment (langgenius#11783) feat: Disable the "Forgot your password?" button when the mail server setup is incomplete (langgenius#11653) chore(.env.example): add comments for opendal (langgenius#11778) Lindorm vdb bug-fix (langgenius#11790) fix: imperfect service-api introduction text (langgenius#11782) feat: add openai o1 & update pricing and max_token of other models (langgenius#11780) fix: file upload auth (langgenius#11774) feat: add parameters for JinaReaderTool (langgenius#11613) feat: full support for opendal and sync configurations between .env and docker-compose (langgenius#11754) feat(app_factory): speed up api startup (langgenius#11762) fix: Prevent redirection to /overview when accessing /workflow. (langgenius#11733) (doc) fix: update cURL examples to include Authorization header (langgenius#11750) Fix explore app icon (langgenius#11742) chore: improve gemini models (langgenius#11745) feat: use Gemini response metadata for token counting (langgenius#11743) chore: update comments in docker env file (langgenius#11705) feat(ark): support doubao vision series models (langgenius#11740) chore: the consistency of MultiModalPromptMessageContent (langgenius#11721) ... # Conflicts: # api/configs/app_config.py # api/core/helper/code_executor/code_executor.py # web/yarn.lock
- Loading branch information
Showing
1,427 changed files
with
49,580 additions
and
10,460 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| FROM mcr.microsoft.com/devcontainers/python:3.10 | ||
| FROM mcr.microsoft.com/devcontainers/python:3.12 | ||
|
|
||
| # [Optional] Uncomment this section to install additional OS packages. | ||
| # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ | ||
| # && apt-get -y install --no-install-recommends <your-package-list-here> | ||
| # && apt-get -y install --no-install-recommends <your-package-list-here> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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: '1.8.4' | ||
| 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 }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,25 @@ | ||
| # Checklist: | ||
| # Summary | ||
|
|
||
| > [!IMPORTANT] | ||
| > Please review the checklist below before submitting your pull request. | ||
| - [ ] Please open an issue before creating a PR or link to an existing issue | ||
| - [ ] I have performed a self-review of my own code | ||
| - [ ] I have commented my code, particularly in hard-to-understand areas | ||
| - [ ] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods | ||
|
|
||
| # Description | ||
|
|
||
| Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue. Close issue syntax: `Fixes #<issue number>`, see [documentation](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) for more details. | ||
| Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. | ||
|
|
||
| Fixes | ||
| > [!Tip] | ||
| > Close issue syntax: `Fixes #<issue number>` or `Resolves #<issue number>`, see [documentation](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) for more details. | ||
| ## Type of Change | ||
|
|
||
| - [ ] Bug fix (non-breaking change which fixes an issue) | ||
| - [ ] New feature (non-breaking change which adds functionality) | ||
| - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) | ||
| - [ ] This change requires a documentation update, included: [Dify Document](https://github.com/langgenius/dify-docs) | ||
| - [ ] Improvement, including but not limited to code refactoring, performance optimization, and UI/UX improvement | ||
| - [ ] Dependency upgrade | ||
|
|
||
| # Testing Instructions | ||
| # Screenshots | ||
|
|
||
| Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration | ||
| | Before | After | | ||
| |--------|-------| | ||
| | ... | ... | | ||
|
|
||
| - [ ] Test A | ||
| - [ ] Test B | ||
| # Checklist | ||
|
|
||
| > [!IMPORTANT] | ||
| > Please review the checklist below before submitting your pull request. | ||
| - [ ] This change requires a documentation update, included: [Dify Document](https://github.com/langgenius/dify-docs) | ||
| - [x] I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!) | ||
| - [x] I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change. | ||
| - [x] I've updated the documentation accordingly. | ||
| - [x] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| name: Run VDB Tests | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| paths: | ||
| - api/core/rag/datasource/** | ||
| - docker/** | ||
| - .github/workflows/vdb-tests.yml | ||
| - api/poetry.lock | ||
| - api/pyproject.toml | ||
|
|
||
| concurrency: | ||
| group: vdb-tests-${{ github.head_ref || github.run_id }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| test: | ||
| name: VDB Tests | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| python-version: | ||
| - "3.11" | ||
| - "3.12" | ||
|
|
||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup Poetry and Python ${{ matrix.python-version }} | ||
| uses: ./.github/actions/setup-poetry | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| poetry-lockfile: api/poetry.lock | ||
|
|
||
| - name: Check Poetry lockfile | ||
| run: | | ||
| poetry check -C api --lock | ||
| poetry show -C api | ||
| - name: Install dependencies | ||
| run: poetry install -C api --with dev | ||
|
|
||
| - name: Set up dotenvs | ||
| run: | | ||
| cp docker/.env.example docker/.env | ||
| cp docker/middleware.env.example docker/middleware.env | ||
| - name: Expose Service Ports | ||
| run: sh .github/workflows/expose_service_ports.sh | ||
|
|
||
| - name: Set up Vector Stores (TiDB, Weaviate, Qdrant, PGVector, Milvus, PgVecto-RS, Chroma, MyScale, ElasticSearch, Couchbase) | ||
| uses: hoverkraft-tech/compose-action@v2.0.2 | ||
| with: | ||
| compose-file: | | ||
| docker/docker-compose.yaml | ||
| services: | | ||
| weaviate | ||
| qdrant | ||
| couchbase-server | ||
| etcd | ||
| minio | ||
| milvus-standalone | ||
| pgvecto-rs | ||
| pgvector | ||
| chroma | ||
| elasticsearch | ||
| tidb | ||
| - name: Test Vector Stores | ||
| run: poetry run -C api bash dev/pytest/pytest_vdb.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.