Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: full support for opendal and sync configurations between .env and docker-compose #11754

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

laipz8200
Copy link
Member

@laipz8200 laipz8200 commented Dec 17, 2024

Summary

For Storage & OpenDAL

  1. Prevent the app factory from writing the contents of the dify config to the system environment.
  2. Use AwsS3Storage when the STORAGE_TYPE is set to s3.
  3. Optimized the debug-level logs of OpenDAL.
  4. Enabled the Retry Layer of OpenDAL.
  5. Removed examples of environment variables other than FS and provided complete OpenDAL integration by directly reading environment variables.

For docker compose configurations

  1. Add a script to sync docker/.env.example and docker/docker-compose.yaml.

Fixes #11710

Tip

Close issue syntax: Fixes #<issue number> or Resolves #<issue number>, see documentation for more details.

Screenshots

Before After
... ...

Checklist

Important

Please review the checklist below before submitting your pull request.

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. 📚 documentation Improvements or additions to documentation labels Dec 17, 2024
@laipz8200 laipz8200 changed the title Fix/support s3 iam mode fix: aws managed iam role cannot work Dec 17, 2024
@laipz8200 laipz8200 force-pushed the fix/support-s3-iam-mode branch from 300cd13 to 7978006 Compare December 17, 2024 12:57
@laipz8200 laipz8200 mentioned this pull request Dec 17, 2024
5 tasks
@laipz8200 laipz8200 requested a review from crazywoola December 17, 2024 13:12
@dosubot dosubot bot added size:XL This PR changes 500-999 lines, ignoring generated files. and removed size:L This PR changes 100-499 lines, ignoring generated files. labels Dec 17, 2024
@laipz8200 laipz8200 force-pushed the fix/support-s3-iam-mode branch from c5f28c7 to 803e9ee Compare December 17, 2024 14:51
@dosubot dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. and removed size:XL This PR changes 500-999 lines, ignoring generated files. labels Dec 17, 2024
@laipz8200 laipz8200 force-pushed the fix/support-s3-iam-mode branch 3 times, most recently from 3475250 to a4e5e49 Compare December 17, 2024 15:46
Signed-off-by: -LAN- <laipz8200@outlook.com>
…ple with docker-compose.yaml.

Signed-off-by: -LAN- <laipz8200@outlook.com>
@laipz8200 laipz8200 force-pushed the fix/support-s3-iam-mode branch from a4e5e49 to b86cee4 Compare December 17, 2024 15:54
@laipz8200 laipz8200 changed the title fix: aws managed iam role cannot work feat: full support for opendal and sync configurations between .env and docker-compose Dec 17, 2024
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Dec 18, 2024
@crazywoola crazywoola merged commit 99f40a9 into main Dec 18, 2024
15 checks passed
@crazywoola crazywoola deleted the fix/support-s3-iam-mode branch December 18, 2024 01:05
tastelikefeet added a commit to tastelikefeet/dify that referenced this pull request Dec 19, 2024
…elscope

* commit '2624a6dcd0b89dd7c1aac2d7bfe7f769e9e3c992': (630 commits)
  Fix explore app icon (langgenius#11808)
  ci: fix config ci and it works (langgenius#11807)
  ci: add config ci more disscuss check langgenius#11706 (langgenius#11752)
  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)
  ...
Scorpion1221 added a commit to yybht155/dify that referenced this pull request Dec 19, 2024
* 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
jiangbo721 pushed a commit to jiangbo721/dify that referenced this pull request Dec 20, 2024
…nd docker-compose (langgenius#11754)

Signed-off-by: -LAN- <laipz8200@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📚 documentation Improvements or additions to documentation lgtm This PR has been approved by a maintainer size:XXL This PR changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug]upload file error
2 participants