Commit Graph

3868 Commits

Author SHA1 Message Date
1feeea0abb Merge branch 'fix/install-preference-error' into deploy/dev 2025-07-08 14:31:21 +08:00
731ad0d349 Merge branch 'feat/mcp' into deploy/dev 2025-07-07 15:14:13 +08:00
1a67cb77cc fix: parameter key error 2025-07-07 15:13:43 +08:00
2d5b1a2b3d Merge branch 'feat/mcp' into deploy/dev 2025-07-06 15:49:51 +08:00
17c3033710 chore: change the oauth model 2025-07-06 15:48:36 +08:00
236e184db6 chore: handle merge conflict 2025-07-06 15:48:11 +08:00
2017951336 fix: resolve circular dependency in MCPToolProviderController 2025-07-04 18:45:07 +08:00
1d0ef4c4d8 refactor(tool_manager): clean up unused imports 2025-07-04 18:39:46 +08:00
5298e06763 Merge branch 'feat/tool-plugin-oauth' into deploy/dev
# Conflicts:
#	api/core/plugin/backwards_invocation/encrypt.py
#	api/core/tools/tool_manager.py
#	api/core/tools/utils/encryption.py
#	api/services/plugin/plugin_parameter_service.py
#	api/services/tools/api_tools_manage_service.py
#	api/services/tools/builtin_tools_manage_service.py
#	api/services/tools/tools_transform_service.py
2025-07-04 17:37:26 +08:00
0dc5bfb2c7 feat(oauth): refactor tool encryption utils 2025-07-04 17:28:22 +08:00
eaefa1b7e6 feat(oauth): refactor encryption 2025-07-04 17:28:13 +08:00
9f053f3bbc feat(oauth): rename ToolProviderCredentialType to CredentialType for consistency 2025-07-04 17:28:09 +08:00
26b46b88c9 feat(oauth): add multi credentials support 2025-07-04 17:28:06 +08:00
9d17bb10b4 fix(oauth): update default credential_type value to 'api-key' 2025-07-04 15:45:46 +08:00
556d031850 chore: handle migrations 2025-07-04 15:39:59 +08:00
478c156f7d feat(oauth&mcp): refactor credential encrypter 2025-07-04 15:28:41 +08:00
c160a0e5e3 Merge branch 'feat/tool-plugin-oauth' into deploy/dev
# Conflicts:
#	api/controllers/console/workspace/tool_providers.py
#	api/core/tools/entities/api_entities.py
#	api/core/tools/tool_manager.py
#	api/core/tools/utils/configuration.py
#	api/services/tools/tools_transform_service.py
2025-07-04 14:42:43 +08:00
9b25b7a8d8 feat(oauth): rename ToolProviderCredentialType to CredentialType for consistency 2025-07-04 14:29:34 +08:00
9ce6f34dc4 feat(oauth): add multi credentials support 2025-07-04 14:25:33 +08:00
b316867bab Merge remote-tracking branch 'origin/main' into feat/tool-plugin-oauth 2025-07-02 21:54:50 +08:00
988a76066d feat(oauth): enhance OAuth client handling and add custom client support 2025-07-02 20:19:04 +08:00
bb955806e0 chore(version): bump to 1.5.1 (#21808)
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-07-02 16:17:40 +08:00
2c1bf7c411 Merge branch 'main' into feat/mcp 2025-07-02 15:31:12 +08:00
e965eaca1f Merge branch 'feat/mcp' into deploy/dev 2025-07-02 15:25:17 +08:00
3e9368ce84 refactor: simplify logic based on review suggestions 2025-07-02 15:15:38 +08:00
6ef1e017df feat(oauth): add support for retrieving credential info and OAuth client schema 2025-07-02 14:58:50 +08:00
826bf25abf Fix: prevent SQL errors when metadata filter Constant value is None or blank (#21803) 2025-07-02 14:43:01 +08:00
e26c9ee44a merge 2025-07-02 14:17:48 +08:00
89250a36b7 fix(api): files not returned in the answer node (#21807) 2025-07-02 13:54:10 +08:00
c2e599cd85 fix(api): Fix resetting sys var causing internal server error (#21604)
and sorts draft variables by their creation time, ensures a consist order.
2025-07-02 13:36:35 +08:00
71d6cf1b1d fix: Make the latency and logs of web applications consistent. (#21578)
Co-authored-by: 刘江波 <jiangbo721@163.com>
2025-07-02 12:04:33 +08:00
39fe35b2e6 Merge branch 'main' into deploy/dev 2025-07-02 10:34:59 +08:00
7951a1c4df refactor(tool): implement multi provider credentials support 2025-07-02 10:05:18 +08:00
c4b960cc1a Improve Langfuse trace readability (#21777) 2025-07-02 09:15:24 +08:00
a82943a83d minor fix: add parameters in error msg of Plugin service returned no options (#21662) 2025-07-01 22:58:59 +08:00
9a4c1fe834 fix: if parameter is not required, continue (#21761)
Co-authored-by: 刘江波 <jiangbo721@163.com>
2025-07-01 21:25:45 +08:00
b9ff716c18 fix: incorrect api module version in pyproject.toml (#21755)
Co-authored-by: crazywoola <427733928@qq.com>
2025-07-01 17:12:52 +08:00
8516d15a4e fix: handle configure button for notion internal integration (#21412) 2025-07-01 16:58:00 +08:00
4198a533ad fix: code Interpreter error handling not work (#21736) 2025-07-01 16:16:34 +08:00
b814f16ecd Merge branch 'feat/mcp' into deploy/dev 2025-07-01 14:07:36 +08:00
3102a41ab7 fix: add api return uuid 2025-07-01 14:07:10 +08:00
daec82bd44 feat(oauth): refactor tool provider methods and enhance credential handling 2025-07-01 12:53:48 +08:00
1a7ad195f0 refactor: define the Dify project version in pyproject.toml (#20910) 2025-07-01 12:07:24 +08:00
cf2173644e Release db.session connection before workflow new thread long time operation (#21726)
Co-authored-by: 李强04 <liqiang04@gaotu.cn>
2025-07-01 12:05:29 +08:00
b8b9c3a783 fix: set the func.coalesce() second paramter default value #21239 (#21240)
Signed-off-by: YoungLH <974840768@qq.com>
2025-07-01 11:31:14 +08:00
4200d016f0 Merge branch 'chore/workflow-last-run' into deploy/dev 2025-07-01 11:05:32 +08:00
Han
69b6f6f5d2 Fixes issue 21157/20661 extra quote in agent node (#21674)
Co-authored-by: Wang Han <wanghan@zhejianglab.org>
2025-07-01 10:43:46 +08:00
9ded6f6a40 [fix] #21678 User input of remote file link on the run page form causes conversation/message interface error (#21683)
Co-authored-by: 李强04 <liqiang04@gaotu.cn>
2025-07-01 10:40:39 +08:00
55a6b330ec Add get document detail service api (#21700)
Co-authored-by: lizb <lizb@sugon.com>
2025-06-30 22:13:56 +08:00
75511d38c1 Merge branch 'feat/mcp' into deploy/dev 2025-06-30 16:16:56 +08:00