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

Unify plugin endpoint configuration for api and worker: An alternative solution to PR #13214 #13239

Merged

Conversation

BorisPolonsky
Copy link
Contributor

@BorisPolonsky BorisPolonsky commented Feb 5, 2025

Unify plugin endpoint configuration for api and worker by adopting PLUGIN_DAEMON_URL/PLUGIN_DAEMON_KEY and removing PLUGIN_API_URL/PLUGIN_API_KEY to avoid confusion.
This is an alternative solution to #13214, which does things the other way around.

Fixes #13113

Summary

PR #13055 introduces PLUGIN_API_URL and PLUGIN_API_KEY in docker-compose.yaml, which coexists with the original PLUGIN_DAEMON_URL and PLUGIN_DAEMON_KEY (the ones that actually take effect) and caused confusions that ends up in InternalServerError (#12664). This PR and the alternative solution #13214 aims to unify these two settings.

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

- Adopt `PLUGIN_DAEMON_URL` and `PLUGIN_DAEMON_KEY`
- Remove `PLUGIN_API_URL` and `PLUGIN_API_KEY`
@dosubot dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. 📚 documentation Improvements or additions to documentation labels Feb 5, 2025
@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Feb 5, 2025
@BorisPolonsky BorisPolonsky changed the title Unify plugin endpoint configuration for api and worker: Adopt PLUGIN_DAEMON_URL and PLUGIN_DAEMON_KEY and remove PLUGIN_API_URL and PLUGIN_API_KEY Unify plugin endpoint configuration for api and worker: An alternative solution to PR #13055 Feb 5, 2025
@BorisPolonsky BorisPolonsky changed the title Unify plugin endpoint configuration for api and worker: An alternative solution to PR #13055 Unify plugin endpoint configuration for api and worker: An alternative solution to PR #13214 Feb 5, 2025
@crazywoola crazywoola requested a review from Yeuoly February 6, 2025 01:22
Copy link
Collaborator

@Yeuoly Yeuoly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Feb 6, 2025
@Yeuoly Yeuoly merged commit beebba0 into langgenius:plugins/beta Feb 6, 2025
6 checks passed
@BorisPolonsky BorisPolonsky deleted the feat-revert-plugin-daemon-env branch February 6, 2025 04:02
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:S This PR changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants