197ba5f6ef
Merge branch 'main' into deploy/dev
...
# Conflicts:
# api/core/app/apps/advanced_chat/app_runner.py
# api/core/app/apps/pipeline/pipeline_generator.py
# api/core/entities/mcp_provider.py
# api/core/helper/marketplace.py
# api/models/workflow.py
# api/services/tools/tools_transform_service.py
# api/tasks/document_indexing_task.py
# api/tests/test_containers_integration_tests/core/__init__.py
# api/tests/test_containers_integration_tests/tasks/test_document_indexing_task.py
# dev/start-worker
# docker/.env.example
# web/app/components/base/chat/embedded-chatbot/hooks.tsx
# web/app/components/workflow/hooks/use-workflow.ts
# web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
# web/global.d.ts
# web/pnpm-lock.yaml
# web/service/use-plugins.ts
2025-11-06 15:58:41 +08:00
2abbc14703
refactor: replace hardcoded user plan strings with CloudPlan enum ( #27675 )
2025-11-03 11:51:09 +08:00
0ded6303c1
feat: implement MCP specification 2025-06-18 ( #25766 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-10-27 17:07:51 +08:00
b5e23b84ce
Merge branch 'feat/mcp-06-18' into deploy/dev
2025-10-27 14:54:11 +08:00
5a4afcf8fd
chore: remove the expensive decrypt action for tool list
2025-10-27 14:53:41 +08:00
b827bcdd47
Merge branch 'feat/mcp-06-18' into deploy/dev
2025-10-27 13:02:56 +08:00
0b021273bc
chore: handle session
2025-10-27 13:02:13 +08:00
b48a7c7cda
Merge branch 'feat/mcp-06-18' into deploy/dev
2025-10-23 17:20:21 +08:00
ffd3a461f6
refactor(mcp): clean the auth code
2025-10-23 17:00:02 +08:00
40e3d4dc7d
Merge branch 'feat/mcp-06-18' into deploy/dev
2025-10-20 10:58:27 +08:00
c22ba3f537
Merge branch 'main' into feat/mcp-06-18
2025-10-20 10:29:09 +08:00
4488c090b2
fluent api ( #27093 )
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-19 12:54:41 +09:00
cced33d068
use deco to avoid current_user ( #26077 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-10-16 15:45:51 +09:00
a12350f0a0
Merge branch 'feat/mcp-06-18' into deploy/dev
2025-10-15 15:06:32 +08:00
979d35d87f
feat: encrypt user's client secret
2025-10-15 14:40:14 +08:00
6405228f3f
feat: improve the refresh token
2025-10-15 11:45:04 +08:00
23d073f16c
fix: mcp update controller missing headers
2025-10-15 11:09:36 +08:00
8a68c2877b
fix: mcp update controller missing headers
2025-10-15 10:49:32 +08:00
4cb42499ae
Merge branch 'feat/mcp-06-18' into deploy/dev
2025-10-14 21:42:21 +08:00
5c6a2af448
chore: fix review issues
2025-10-14 20:36:13 +08:00
d5a7a537e5
Merge branch 'main' into feat/mcp-06-18
2025-10-14 09:49:06 +08:00
0a6b78f883
Use hook to get userid ( #26839 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-10-14 09:20:37 +08:00
0a6da0bf2f
chore: change the field
2025-10-13 18:06:23 +08:00
064075ab5f
Merge branch 'feat/collaboration' into deploy/dev
2025-10-13 16:43:23 +08:00
a538f80e95
Merge branch 'main' into feat/mcp-06-18
2025-10-13 13:54:01 +08:00
67762cf1d8
chore: resolve merge conflict in pnpm-lock.yaml
...
Merged origin/main into feat/collaboration and resolved dependency lock file conflicts by regenerating pnpm-lock.yaml through clean install.
Changes:
- Resolved eslint version differences (9.36.0 vs 9.35.0)
- Updated lock file reflects current dependency resolution
- All other changes from main branch successfully merged
2025-10-13 11:53:43 +08:00
2f50f3fd4b
refactor: use libs.login current_user in console controllers ( #26745 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
2025-10-13 10:33:33 +08:00
05751ac492
Merge branch 'feat/memory-orchestration-be-dev-env' into deploy/dev
2025-10-11 16:16:15 +08:00
1a4600ce77
Merge remote-tracking branch 'origin/deploy/dev' into feat/memory-orchestration-be-dev-env
...
# Conflicts:
# api/models/__init__.py
# api/uv.lock
2025-10-11 15:01:26 +08:00
f19630bcf5
Merge remote-tracking branch 'origin/main' into feat/collaboration
2025-10-11 14:43:20 +08:00
048a2c7979
mr credit pool
2025-10-11 12:03:53 +08:00
c1e8584b97
feat: Refactor api.add_resource to @console_ns.route decorator ( #26386 )
...
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
2025-10-10 16:23:39 +08:00
aa51662d98
refactor(api): add new endpoints for workspace management and update routing ( #26465 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-10-10 15:59:14 +08:00
841b7fa7ce
Merge branch 'main' into feat/mcp-06-18
2025-10-10 10:53:15 +08:00
740f970041
feat: add client credentials auth
2025-10-09 17:54:46 +08:00
2ff280c4bf
add credit pool sys
2025-09-26 11:18:28 +08:00
c41140d654
add credit pool sys
2025-09-26 10:45:24 +08:00
81c6e52401
Merge remote-tracking branch 'origin/p254' into p284
2025-09-18 15:14:55 +08:00
85cda47c70
feat: knowledge pipeline ( #25360 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: jyong <718720800@qq.com>
Co-authored-by: Wu Tianwei <30284043+WTW0313@users.noreply.github.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: quicksand <quicksandzn@gmail.com>
Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
Co-authored-by: Yongtao Huang <yongtaoh2022@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: Hanqing Zhao <sherry9277@gmail.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Harry <xh001x@hotmail.com>
2025-09-18 12:49:10 +08:00
e2fd3f2983
feat: add unit test
2025-09-16 16:18:50 +08:00
f137af4ec5
refactor(mcp): clean the oauth code
2025-09-16 14:16:38 +08:00
aed9955105
refactor(mcp): clean the client service code
2025-09-16 10:54:31 +08:00
f16151ea29
refactor(mcp): clean the client code
2025-09-12 15:23:53 +08:00
aa44c38b58
feat: update mcp to 0618 to support output schema
2025-09-10 17:27:11 +08:00
f091868b7c
use new get avatar api
2025-09-10 15:15:43 +08:00
cbc0e639e4
update sql in batch ( #24801 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
2025-09-10 13:00:17 +08:00
b51c724a94
refactor: Migrate part of the console basic API module to Flask-RESTX ( #24732 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
2025-09-10 12:15:47 +08:00
08dd3f7b50
Fix basedpyright type errors ( #25435 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-10 01:54:26 +08:00
f891c67eca
feat: add MCP server headers support #22718 ( #24760 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: Novice <novice12185727@gmail.com>
2025-09-08 14:10:55 +08:00
f6059ef389
add more typing ( #24949 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-08 10:40:00 +08:00
Stream