Skip to content

Commit 42a93ec

Browse files
authored
bump to 1.7.0 (#18)
* feat: bump to 1.7.0 * feat: note inconsistency with upstream repo * fix: python lint * feat: fix docker-compose images * fix: OB container health check * feat: replace images * fix: roll back deploymeny config
1 parent a5b2cc4 commit 42a93ec

File tree

2,048 files changed

+103313
-31374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,048 files changed

+103313
-31374
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
FROM mcr.microsoft.com/devcontainers/python:3.12
22

3-
# [Optional] Uncomment this section to install additional OS packages.
4-
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
5-
# && apt-get -y install --no-install-recommends <your-package-list-here>
3+
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
4+
&& apt-get -y install libgmp-dev libmpfr-dev libmpc-dev
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#!/bin/bash
22

3-
npm add -g pnpm@10.8.0
3+
npm add -g pnpm@10.13.1
44
cd web && pnpm install
55
pipx install uv
66

77
echo 'alias start-api="cd /workspaces/dify/api && uv run python -m flask run --host 0.0.0.0 --port=5001 --debug"' >> ~/.bashrc
88
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
99
echo 'alias start-web="cd /workspaces/dify/web && pnpm dev"' >> ~/.bashrc
10+
echo 'alias start-web-prod="cd /workspaces/dify/web && pnpm build && pnpm start"' >> ~/.bashrc
1011
echo 'alias start-containers="cd /workspaces/dify/docker && docker-compose -f docker-compose.middleware.yaml -p dify --env-file middleware.env up -d"' >> ~/.bashrc
1112
echo 'alias stop-containers="cd /workspaces/dify/docker && docker-compose -f docker-compose.middleware.yaml -p dify --env-file middleware.env down"' >> ~/.bashrc
1213

1314
source /home/vscode/.bashrc
15+

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ body:
88
label: Self Checks
99
description: "To make sure we get to you in time, please check the following :)"
1010
options:
11+
- label: I have read the [Contributing Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) and [Language Policy](https://github.com/langgenius/dify/issues/1542).
12+
required: true
1113
- label: This is only for bug report, if you would like to ask a question, please head to [Discussions](https://github.com/langgenius/dify/discussions/categories/general).
1214
required: true
1315
- label: I have searched for existing issues [search for existing issues](https://github.com/langgenius/dify/issues), including closed ones.
1416
required: true
15-
- label: I confirm that I am using English to submit this report (我已阅读并同意 [Language Policy](https://github.com/langgenius/dify/issues/1542)).
17+
- label: I confirm that I am using English to submit this report, otherwise it will be closed.
1618
required: true
17-
- label: "[FOR CHINESE USERS] 请务必使用英文提交 Issue,否则会被关闭。谢谢!:)"
19+
- label: 【中文用户 & Non English User】请使用英语提交,否则会被关闭 :)
1820
required: true
1921
- label: "Please do not modify this template :) and fill in all the required fields."
2022
required: true
@@ -42,20 +44,22 @@ body:
4244
attributes:
4345
label: Steps to reproduce
4446
description: We highly suggest including screenshots and a bug report log. Please use the right markdown syntax for code blocks.
45-
placeholder: Having detailed steps helps us reproduce the bug.
47+
placeholder: Having detailed steps helps us reproduce the bug. If you have logs, please use fenced code blocks (triple backticks ```) to format them.
4648
validations:
4749
required: true
4850

4951
- type: textarea
5052
attributes:
5153
label: ✔️ Expected Behavior
52-
placeholder: What were you expecting?
54+
description: Describe what you expected to happen.
55+
placeholder: What were you expecting? Please do not copy and paste the steps to reproduce here.
5356
validations:
54-
required: false
57+
required: true
5558

5659
- type: textarea
5760
attributes:
5861
label: ❌ Actual Behavior
59-
placeholder: What happened instead?
62+
description: Describe what actually happened.
63+
placeholder: What happened instead? Please do not copy and paste the steps to reproduce here.
6064
validations:
6165
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
blank_issues_enabled: false
22
contact_links:
3+
- name: "\U0001F4A1 Model Providers & Plugins"
4+
url: "https://github.com/langgenius/dify-official-plugins/issues/new/choose"
5+
about: Report issues with official plugins or model providers, you will need to provide the plugin version and other relevant details.
6+
- name: "\U0001F4AC Documentation Issues"
7+
url: "https://github.com/langgenius/dify-docs/issues/new"
8+
about: Report issues with the documentation, such as typos, outdated information, or missing content. Please provide the specific section and details of the issue.
39
- name: "\U0001F4E7 Discussions"
410
url: https://github.com/langgenius/dify/discussions/categories/general
5-
about: General discussions and request help from the community
11+
about: General discussions and seek help from the community

.github/ISSUE_TEMPLATE/document_issue.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ body:
88
label: Self Checks
99
description: "To make sure we get to you in time, please check the following :)"
1010
options:
11-
- label: I have searched for existing issues [search for existing issues](https://github.com/langgenius/dify/issues), including closed ones.
11+
- label: I have read the [Contributing Guide](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md) and [Language Policy](https://github.com/langgenius/dify/issues/1542).
1212
required: true
13-
- label: I confirm that I am using English to submit this report (我已阅读并同意 [Language Policy](https://github.com/langgenius/dify/issues/1542)).
13+
- label: I have searched for existing issues [search for existing issues](https://github.com/langgenius/dify/issues), including closed ones.
1414
required: true
15-
- label: "[FOR CHINESE USERS] 请务必使用英文提交 Issue,否则会被关闭。谢谢!:)"
15+
- label: I confirm that I am using English to submit this report, otherwise it will be closed.
1616
required: true
1717
- label: "Please do not modify this template :) and fill in all the required fields."
1818
required: true

.github/ISSUE_TEMPLATE/translation_issue.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inputs:
88
uv-version:
99
description: UV version to set up
1010
required: true
11-
default: '0.6.14'
11+
default: '~=0.7.11'
1212
uv-lockfile:
1313
description: Path to the UV lockfile to restore cache from
1414
required: true

.github/pull_request_template.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
# Summary
1+
> [!IMPORTANT]
2+
>
3+
> 1. Make sure you have read our [contribution guidelines](https://github.com/langgenius/dify/blob/main/CONTRIBUTING.md)
4+
> 2. Ensure there is an associated issue and you have been assigned to it
5+
> 3. Use the correct syntax to link this PR: `Fixes #<issue number>`.
26
3-
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.
7+
## Summary
48

5-
> [!Tip]
6-
> 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.
9+
<!-- 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. -->
710

8-
9-
# Screenshots
11+
## Screenshots
1012

1113
| Before | After |
1214
|--------|-------|
1315
| ... | ... |
1416

15-
# Checklist
16-
17-
> [!IMPORTANT]
18-
> Please review the checklist below before submitting your pull request.
17+
## Checklist
1918

2019
- [ ] This change requires a documentation update, included: [Dify Document](https://github.com/langgenius/dify-docs)
2120
- [x] I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
2221
- [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.
2322
- [x] I've updated the documentation accordingly.
2423
- [x] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods
25-

.github/workflows/api-tests.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,17 @@ jobs:
4747
- name: Run Unit tests
4848
run: |
4949
uv run --project api bash dev/pytest/pytest_unit_tests.sh
50+
51+
- name: Coverage Summary
52+
run: |
53+
set -x
5054
# Extract coverage percentage and create a summary
5155
TOTAL_COVERAGE=$(python -c 'import json; print(json.load(open("coverage.json"))["totals"]["percent_covered_display"])')
5256
5357
# Create a detailed coverage summary
5458
echo "### Test Coverage Summary :test_tube:" >> $GITHUB_STEP_SUMMARY
5559
echo "Total Coverage: ${TOTAL_COVERAGE}%" >> $GITHUB_STEP_SUMMARY
56-
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
57-
uv run --project api coverage report >> $GITHUB_STEP_SUMMARY
58-
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
60+
uv run --project api coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
5961
6062
- name: Run dify config tests
6163
run: uv run --project api dev/pytest/pytest_config_tests.py
@@ -83,9 +85,15 @@ jobs:
8385
compose-file: |
8486
docker/docker-compose.middleware.yaml
8587
services: |
88+
db
89+
redis
8690
sandbox
8791
ssrf_proxy
8892
93+
- name: setup test config
94+
run: |
95+
cp api/tests/integration_tests/.env.example api/tests/integration_tests/.env
96+
8997
- name: Run Workflow
9098
run: uv run --project api bash dev/pytest/pytest_workflow.sh
9199

0 commit comments

Comments
 (0)