Commit Graph

583 Commits

Author SHA1 Message Date
df1e84ef99 merge 2025-07-08 17:25:40 +08:00
236e184db6 chore: handle merge conflict 2025-07-06 15:48:11 +08:00
a201e9faee feat: Add Aliyun LLM Observability Integration (#21471) 2025-07-04 21:54:33 +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
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
ebc4fdc4b2 moving the MessageStatus class from the models.model module to models.enums module (#21867)
Signed-off-by: neatguycoding <15627489+NeatGuyCoding@users.noreply.github.com>
2025-07-03 13:56:23 +08:00
1af3d40c1a feat: Improve Observability with Arize & Phoenix Integration (#19840)
Co-authored-by: crazywoola <427733928@qq.com>
Co-authored-by: Gu <guchenhe@gmail.com>
2025-07-03 13:52:14 +08:00
31eb8548ef fix: Before publish the app, preview the voice of tts, it raise an er… (#21821)
Co-authored-by: 刘江波 <jiangbo721@163.com>
2025-07-03 10:53:14 +08:00
b316867bab Merge remote-tracking branch 'origin/main' into feat/tool-plugin-oauth 2025-07-02 21:54:50 +08:00
e17b33e004 chore: add message status enum (#21825)
Co-authored-by: 刘江波 <jiangbo721@163.com>
2025-07-02 21:22:28 +08:00
988a76066d feat(oauth): enhance OAuth client handling and add custom client support 2025-07-02 20:19:04 +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
e26c9ee44a merge 2025-07-02 14:17:48 +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
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
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
0d98f23549 fix(api): Fix resetting sys var causing internal server error 2025-06-30 15:21:57 +08:00
db0090972e Merge branch 'feat/plugin-auto-upgrade' into deploy/dev 2025-06-30 14:37:55 +08:00
c885b384a5 Merge branch 'main' into feat/mcp 2025-06-30 10:07:15 +08:00
a06af88b26 Feat/api validate model provider (#21582)
Co-authored-by: crazywoola <427733928@qq.com>
2025-06-27 09:59:44 +08:00
33f0457a23 fix: wrong token number when using qa_model and answer is updated. (#21574) 2025-06-27 09:11:41 +08:00
cea6522122 feat: add DYNAMIC_SELECT parameter type for dynamic options in parameter entities (#21425) 2025-06-26 17:44:14 +08:00
8a954c0b19 Merge branch 'main' into feat/tool-plugin-oauth 2025-06-26 13:29:15 +08:00
ba843c2691 feat(oauth): update api 2025-06-26 11:59:20 +08:00
ef35e9febb feat: add server identifer field 2025-06-26 10:32:05 +08:00
90aba77471 chore: remove unused code (#21497)
Co-authored-by: 刘江波 <jiangbo721@163.com>
2025-06-26 10:08:17 +08:00
6bb82f8ee0 Fix minor comment missing (#21517) 2025-06-26 10:06:49 +08:00
8f61408cb6 fix: change the mcp tool update logic 2025-06-26 09:42:19 +08:00
00f0b569cc Feat/kb index (#20868)
Co-authored-by: twwu <twwu@dify.ai>
2025-06-25 17:52:59 +08:00
6c9e99b0c6 Merge branch 'main' into feat/tool-plugin-oauth 2025-06-25 15:14:03 +08:00
1dd2607dfd feat(oauth): refactor proxy context (#21483) 2025-06-25 15:10:45 +08:00
ce4cc54cc9 feat(oauth): merge tool oauth and remove sequence number branches 2025-06-25 14:51:55 +08:00
1a2dfd950e Merge branch 'main' into feat/tool-plugin-oauth
# Conflicts:
#	api/core/plugin/impl/oauth.py
#	api/services/plugin/oauth_service.py
2025-06-25 14:31:15 +08:00
164e5481c5 feat(oauth): plugin oauth service (#21480) 2025-06-25 14:14:30 +08:00
f783ad68e4 chore(refactor): queries in service and auth components 2025-06-25 14:09:19 +08:00
268da31332 fix(api): adding variable to variable pool recursively while loading draft variables. (#21478)
This PR fix the issue that `ObjectSegment` are not recursively added to the draft variable pool while loading draft variables from database. It also fixes an issue about loading variables with more than two elements in the its selector.

Enhances #19735.
Closes #21477.
2025-06-25 12:39:22 +08:00
94f8e48647 Refactor update dataset (fix #21401) (#21402)
Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-06-25 11:44:35 +08:00