Novice
fd124e6d32
Merge main HEAD (segment 5) into sandboxed-agent-rebase
...
Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files.
Preserve sandbox/agent/collaboration features while adopting main's
UI refactorings (Dialog/AlertDialog/Popover), model provider updates,
and enterprise features.
Made-with: Cursor
2026-03-23 14:20:06 +08:00
Novice
94b01f6821
Merge commit '92bde350' into sandboxed-agent-rebase
...
Made-with: Cursor
# Conflicts:
# api/controllers/console/app/workflow_draft_variable.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/cot_chat_agent_runner.py
# api/core/agent/cot_completion_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/advanced_chat/app_generator.py
# api/core/app/apps/advanced_chat/app_runner.py
# api/core/app/apps/agent_chat/app_runner.py
# api/core/app/apps/workflow/app_generator.py
# api/core/app/apps/workflow/app_runner.py
# api/core/app/entities/app_invoke_entities.py
# api/core/app/entities/queue_entities.py
# api/core/llm_generator/output_parser/structured_output.py
# api/core/workflow/workflow_entry.py
# api/dify_graph/context/__init__.py
# api/dify_graph/entities/tool_entities.py
# api/dify_graph/file/file_manager.py
# api/dify_graph/graph_engine/response_coordinator/coordinator.py
# api/dify_graph/graph_events/node.py
# api/dify_graph/node_events/node.py
# api/dify_graph/nodes/agent/agent_node.py
# api/dify_graph/nodes/llm/entities.py
# api/dify_graph/nodes/llm/llm_utils.py
# api/dify_graph/nodes/llm/node.py
# api/dify_graph/nodes/question_classifier/question_classifier_node.py
# api/dify_graph/runtime/graph_runtime_state.py
# api/dify_graph/variables/segments.py
# api/factories/variable_factory.py
# api/services/variable_truncator.py
# api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py
# api/uv.lock
# web/app/components/app-sidebar/app-info.tsx
# web/app/components/app-sidebar/app-sidebar-dropdown.tsx
# web/app/components/app/create-app-modal/index.spec.tsx
# web/app/components/apps/__tests__/list.spec.tsx
# web/app/components/apps/app-card.tsx
# web/app/components/apps/list.tsx
# web/app/components/header/account-dropdown/compliance.tsx
# web/app/components/header/account-dropdown/index.tsx
# web/app/components/header/account-dropdown/support.tsx
# web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx
# web/app/components/workflow/panel/debug-and-preview/hooks.ts
# web/contract/console/apps.ts
# web/contract/router.ts
# web/eslint-suppressions.json
# web/next.config.ts
# web/pnpm-lock.yaml
2026-03-23 09:39:49 +08:00
Novice
cccff6768a
Merge commit '9c339239' into sandboxed-agent-rebase
...
Made-with: Cursor
# Conflicts:
# api/README.md
# api/controllers/console/app/workflow_draft_variable.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/advanced_chat/app_runner.py
# api/core/plugin/backwards_invocation/model.py
# api/core/prompt/advanced_prompt_transform.py
# api/core/workflow/nodes/base/node.py
# api/core/workflow/nodes/llm/llm_utils.py
# api/core/workflow/nodes/llm/node.py
# api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
# api/core/workflow/nodes/question_classifier/question_classifier_node.py
# api/core/workflow/runtime/graph_runtime_state.py
# api/extensions/storage/base_storage.py
# api/factories/variable_factory.py
# api/pyproject.toml
# api/services/variable_truncator.py
# api/uv.lock
# web/app/account/oauth/authorize/page.tsx
# web/app/components/app/configuration/config-var/config-modal/field.tsx
# web/app/components/base/alert.tsx
# web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx
# web/app/components/base/chat/chat/answer/more.tsx
# web/app/components/base/chat/chat/answer/operation.tsx
# web/app/components/base/chat/chat/answer/workflow-process.tsx
# web/app/components/base/chat/chat/citation/index.tsx
# web/app/components/base/chat/chat/citation/popup.tsx
# web/app/components/base/chat/chat/citation/progress-tooltip.tsx
# web/app/components/base/chat/chat/citation/tooltip.tsx
# web/app/components/base/chat/chat/question.tsx
# web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
# web/app/components/base/chat/embedded-chatbot/inputs-form/view-form-dropdown.tsx
# web/app/components/base/markdown-blocks/form.tsx
# web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx
# web/app/components/base/tag-management/panel.tsx
# web/app/components/base/tag-management/trigger.tsx
# web/app/components/header/account-setting/index.tsx
# web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
# web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx
# web/app/signin/utils/post-login-redirect.ts
# web/eslint-suppressions.json
# web/package.json
# web/pnpm-lock.yaml
2026-03-23 09:00:45 +08:00
Novice
89b76d6c33
Merge commit '657eeb65' into sandboxed-agent-rebase
...
Made-with: Cursor
# Conflicts:
# api/core/agent/cot_chat_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/memory/token_buffer_memory.py
# api/core/variables/segments.py
# api/core/workflow/file/file_manager.py
# api/core/workflow/nodes/agent/agent_node.py
# api/core/workflow/nodes/llm/llm_utils.py
# api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
# api/core/workflow/workflow_entry.py
# api/factories/variable_factory.py
# api/pyproject.toml
# api/services/variable_truncator.py
# api/uv.lock
# web/app/components/app/app-publisher/index.tsx
# web/app/components/app/overview/settings/index.tsx
# web/app/components/apps/app-card.tsx
# web/app/components/apps/index.tsx
# web/app/components/apps/list.tsx
# web/app/components/base/chat/chat-with-history/header-in-mobile.tsx
# web/app/components/base/features/new-feature-panel/conversation-opener/modal.tsx
# web/app/components/base/features/new-feature-panel/file-upload/setting-content.tsx
# web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
# web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx
# web/app/components/base/message-log-modal/index.tsx
# web/app/components/base/switch/index.tsx
# web/app/components/base/tab-slider-plain/index.tsx
# web/app/components/explore/try-app/app-info/index.tsx
# web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
# web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/required-switch.tsx
# web/app/components/workflow/nodes/llm/panel.tsx
# web/contract/router.ts
# web/eslint-suppressions.json
# web/i18n/fa-IR/workflow.json
2026-03-19 17:38:56 +08:00
7757bb5089
refactor(api): Query API to select function_1 ( #33565 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-17 23:29:16 +09:00
-LAN- and GitHub
4fd6b52808
refactor(api): move model_runtime into dify_graph ( #32858 )
2026-03-02 20:15:32 +08:00
-LAN- and GitHub
c917838f9c
refactor: move workflow package to dify_graph ( #32844 )
2026-03-02 18:42:30 +08:00
-LAN- and GitHub
a694533fc9
refactor(workflow): inject credential/model access ports into LLM nodes ( #32569 )
...
Signed-off-by: -LAN- <[email protected] >
2026-02-27 14:36:41 +08:00
7656d514b9
refactor(workflow-file): move core.file to core.workflow.file ( #32252 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-02-16 22:38:19 +08:00
Stream
e0082dbf18
revert: add tools for output in agent mode
...
feat: hide output tools and improve JSON formatting for structured output
feat: hide output tools and improve JSON formatting for structured output
fix: handle prompt template correctly to extract selectors for step run
fix: emit StreamChunkEvent correctly for sandbox agent
chore: better debug message
fix: incorrect output tool runtime selection
fix: type issues
fix: align parameter list
fix: align parameter list
fix: hide internal builtin providers from tool list
vibe: implement file structured output
vibe: implement file structured output
fix: refix parameter for tool
fix: crash
fix: crash
refactor: remove union types
fix: type check
Merge branch 'feat/structured-output-with-sandbox' into feat/support-agent-sandbox
fix: provide json as text
fix: provide json as text
fix: get AgentResult correctly
fix: provides correct prompts, tools and terminal predicates
fix: provides correct prompts, tools and terminal predicates
fix: circular import
feat: support structured output in sandbox and tool mode
2026-02-04 21:43:53 +08:00
Harry
10f5d9e7ad
fix: stream never ruff
2026-02-03 14:42:30 +08:00
Stream
9ad49340bf
refactor: remove union types
...
Signed-off-by: Stream <[email protected] >
2026-01-31 00:41:23 +08:00
Stream
2008768cb9
fix: provides correct prompts, tools and terminal predicates
...
Signed-off-by: Stream <[email protected] >
2026-01-30 08:44:26 +08:00
Stream
22b0a08a5f
fix: provides correct prompts, tools and terminal predicates
...
Signed-off-by: Stream <[email protected] >
2026-01-30 08:15:42 +08:00
Stream
7926024569
feat: support structured output in sandbox and tool mode
...
Signed-off-by: Stream <[email protected] >
2026-01-30 06:46:52 +08:00
yyh
a46bfdd0fc
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
2026-01-13 10:15:59 +08:00
1e10bf525c
refactor(models): Refine MessageAgentThought SQLAlchemy typing ( #27749 )
...
Co-authored-by: Asuka Minato <[email protected] >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-01-10 17:17:45 +09:00
Novice
2b23c43434
feat: add agent package
2025-12-09 11:36:47 +08:00
+10
85cda47c70
feat: knowledge pipeline ( #25360 )
...
Signed-off-by: -LAN- <[email protected] >
Co-authored-by: twwu <[email protected] >
Co-authored-by: crazywoola <[email protected] >
Co-authored-by: jyong <[email protected] >
Co-authored-by: Wu Tianwei <[email protected] >
Co-authored-by: QuantumGhost <[email protected] >
Co-authored-by: lyzno1 <[email protected] >
Co-authored-by: quicksand <[email protected] >
Co-authored-by: Jyong <[email protected] >
Co-authored-by: lyzno1 <[email protected] >
Co-authored-by: zxhlyh <[email protected] >
Co-authored-by: Yongtao Huang <[email protected] >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Joel <[email protected] >
Co-authored-by: Copilot <[email protected] >
Co-authored-by: nite-knite <[email protected] >
Co-authored-by: Hanqing Zhao <[email protected] >
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Harry <[email protected] >
2025-09-18 12:49:10 +08:00
bab4975809
chore: add ast-grep rule to convert Optional[T] to T | None ( #25560 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-15 13:06:33 +08:00
a78339a040
remove bare list, dict, Sequence, None, Any ( #25058 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <[email protected] >
2025-09-06 03:32:23 +08:00
be3af1e234
Migrate SQLAlchemy from 1.x to 2.0 with automated and manual adjustments ( #23224 )
...
Co-authored-by: Yongtao Huang <[email protected] >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-02 10:30:19 +08:00
805b698c2e
Feat/chat message image first for agent and advanced_chat APP ( #23796 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-08-22 16:42:15 +08:00
Will and GitHub
67a0751cf3
fix: Improve create_agent_thought and save_agent_thought Logic ( #21263 )
2025-07-27 11:06:37 +08:00
ef51678c73
orm filter -> where ( #22801 )
...
Signed-off-by: -LAN- <[email protected] >
Co-authored-by: -LAN- <[email protected] >
Co-authored-by: Claude <[email protected] >
2025-07-24 00:57:45 +08:00
6eb155ae69
feat(api/repo): Allow to config repository implementation ( #21458 )
...
Signed-off-by: -LAN- <[email protected] >
Co-authored-by: QuantumGhost <[email protected] >
2025-07-14 14:54:38 +08:00
535fff62f3
feat: add MCP support ( #20716 )
...
Co-authored-by: QuantumGhost <[email protected] >
2025-07-10 14:01:34 +08:00
Will and GitHub
bfa652f2d0
fix: metadata filtering condition variable unassigned; fix External K… ( #19208 )
2025-05-07 14:52:09 +08:00
a1158cc946
fix: Update prompt message content types to use Literal and add union type for content ( #17136 )
...
Co-authored-by: 朱庆超 <[email protected] >
Co-authored-by: crazywoola <[email protected] >
2025-04-22 16:17:55 +08:00
34cba83ac4
fix: bug that overwrote the llm model thought process when final_answ… ( #17074 )
...
Co-authored-by: 刘江波 <[email protected] >
2025-03-28 23:41:32 +08:00
+110
403e2d58b9
Introduce Plugins ( #13836 )
...
Signed-off-by: yihong0618 <[email protected] >
Signed-off-by: -LAN- <[email protected] >
Signed-off-by: xhe <[email protected] >
Signed-off-by: dependabot[bot] <[email protected] >
Co-authored-by: takatost <[email protected] >
Co-authored-by: kurokobo <[email protected] >
Co-authored-by: Novice Lee <[email protected] >
Co-authored-by: zxhlyh <[email protected] >
Co-authored-by: AkaraChen <[email protected] >
Co-authored-by: Yi <[email protected] >
Co-authored-by: Joel <[email protected] >
Co-authored-by: JzoNg <[email protected] >
Co-authored-by: twwu <[email protected] >
Co-authored-by: Hiroshi Fujita <[email protected] >
Co-authored-by: AkaraChen <[email protected] >
Co-authored-by: NFish <[email protected] >
Co-authored-by: Wu Tianwei <[email protected] >
Co-authored-by: 非法操作 <[email protected] >
Co-authored-by: Novice <[email protected] >
Co-authored-by: Hiroki Nagai <[email protected] >
Co-authored-by: Gen Sato <[email protected] >
Co-authored-by: eux <[email protected] >
Co-authored-by: huangzhuo1949 <[email protected] >
Co-authored-by: huangzhuo <[email protected] >
Co-authored-by: lotsik <[email protected] >
Co-authored-by: crazywoola <[email protected] >
Co-authored-by: nite-knite <[email protected] >
Co-authored-by: Jyong <[email protected] >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: gakkiyomi <[email protected] >
Co-authored-by: CN-P5 <[email protected] >
Co-authored-by: CN-P5 <[email protected] >
Co-authored-by: Chuehnone <[email protected] >
Co-authored-by: yihong <[email protected] >
Co-authored-by: Kevin9703 <[email protected] >
Co-authored-by: -LAN- <[email protected] >
Co-authored-by: Boris Feld <[email protected] >
Co-authored-by: mbo <[email protected] >
Co-authored-by: mabo <[email protected] >
Co-authored-by: Warren Chen <[email protected] >
Co-authored-by: JzoNgKVO <[email protected] >
Co-authored-by: jiandanfeng <[email protected] >
Co-authored-by: zhu-an <[email protected] >
Co-authored-by: zhaoqingyu.1075 <[email protected] >
Co-authored-by: 海狸大師 <[email protected] >
Co-authored-by: Xu Song <[email protected] >
Co-authored-by: rayshaw001 <[email protected] >
Co-authored-by: Ding Jiatong <[email protected] >
Co-authored-by: Bowen Liang <[email protected] >
Co-authored-by: JasonVV <[email protected] >
Co-authored-by: le0zh <[email protected] >
Co-authored-by: zhuxinliang <[email protected] >
Co-authored-by: k-zaku <[email protected] >
Co-authored-by: luckylhb90 <[email protected] >
Co-authored-by: hobo.l <[email protected] >
Co-authored-by: jiangbo721 <[email protected] >
Co-authored-by: 刘江波 <[email protected] >
Co-authored-by: Shun Miyazawa <[email protected] >
Co-authored-by: EricPan <[email protected] >
Co-authored-by: crazywoola <[email protected] >
Co-authored-by: sino <[email protected] >
Co-authored-by: Jhvcc <[email protected] >
Co-authored-by: lowell <[email protected] >
Co-authored-by: Boris Polonsky <[email protected] >
Co-authored-by: Ademílson Tonato <[email protected] >
Co-authored-by: Ademílson Tonato <[email protected] >
Co-authored-by: IWAI, Masaharu <[email protected] >
Co-authored-by: Yueh-Po Peng (Yabi) <[email protected] >
Co-authored-by: Jason <[email protected] >
Co-authored-by: Xin Zhang <[email protected] >
Co-authored-by: yjc980121 <[email protected] >
Co-authored-by: heyszt <[email protected] >
Co-authored-by: Abdullah AlOsaimi <[email protected] >
Co-authored-by: Abdullah AlOsaimi <[email protected] >
Co-authored-by: Yingchun Lai <[email protected] >
Co-authored-by: Hash Brown <[email protected] >
Co-authored-by: zuodongxu <[email protected] >
Co-authored-by: Masashi Tomooka <[email protected] >
Co-authored-by: aplio <[email protected] >
Co-authored-by: Obada Khalili <[email protected] >
Co-authored-by: Nam Vu <[email protected] >
Co-authored-by: Kei YAMAZAKI <[email protected] >
Co-authored-by: TechnoHouse <[email protected] >
Co-authored-by: Riddhimaan-Senapati <[email protected] >
Co-authored-by: MaFee921 <[email protected] >
Co-authored-by: te-chan <[email protected] >
Co-authored-by: HQidea <[email protected] >
Co-authored-by: Joshbly <[email protected] >
Co-authored-by: xhe <[email protected] >
Co-authored-by: weiwenyan-dev <[email protected] >
Co-authored-by: ex_wenyan.wei <[email protected] >
Co-authored-by: engchina <[email protected] >
Co-authored-by: engchina <[email protected] >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 呆萌闷油瓶 <[email protected] >
Co-authored-by: Kemal <[email protected] >
Co-authored-by: Lazy_Frog <[email protected] >
Co-authored-by: Yi Xiao <[email protected] >
Co-authored-by: Steven sun <[email protected] >
Co-authored-by: steven <[email protected] >
Co-authored-by: Kalo Chin <[email protected] >
Co-authored-by: Katy Tao <[email protected] >
Co-authored-by: depy <[email protected] >
Co-authored-by: 胡春东 <[email protected] >
Co-authored-by: Junjie.M <[email protected] >
Co-authored-by: MuYu <[email protected] >
Co-authored-by: Naoki Takashima <[email protected] >
Co-authored-by: Summer-Gu <[email protected] >
Co-authored-by: Fei He <[email protected] >
Co-authored-by: ybalbert001 <[email protected] >
Co-authored-by: Yuanbo Li <[email protected] >
Co-authored-by: douxc <[email protected] >
Co-authored-by: liuzhenghua <[email protected] >
Co-authored-by: Wu Jiayang <[email protected] >
Co-authored-by: Your Name <[email protected] >
Co-authored-by: kimjion <[email protected] >
Co-authored-by: AugNSo <[email protected] >
Co-authored-by: llinvokerl <[email protected] >
Co-authored-by: liusurong.lsr <[email protected] >
Co-authored-by: Vasu Negi <[email protected] >
Co-authored-by: Hundredwz <[email protected] >
Co-authored-by: Xiyuan Chen <[email protected] >
2025-02-17 17:05:13 +08:00
呆萌闷油瓶 and GitHub
bd2fec4813
fix : #12125 ( #12184 )
2024-12-29 11:52:12 +08:00
yihong and GitHub
56e15d09a9
feat: mypy for all type check ( #10921 )
2024-12-24 18:38:51 +08:00
Bowen Liang and GitHub
6c8e208ef3
chore: bump minimum supported Python version to 3.11 ( #10386 )
2024-11-24 13:28:46 +08:00
yihong and GitHub
0067b16d1e
fix: refactor all 'or []' and 'or {}' logic to make code more clear ( #10883 )
...
Signed-off-by: yihong0618 <[email protected] >
2024-11-21 10:34:43 +08:00
-LAN- and GitHub
25ca0278dd
refactor(core): Remove extra_config from File. ( #10203 )
2024-11-08 18:13:24 +08:00
非法操作 and GitHub
ddb960ddfb
feat: support Vectorizer can be used in workflow ( #9932 )
2024-10-28 16:52:57 +08:00
-LAN- and GitHub
e61752bd3a
feat/enhance the multi-modal support ( #8818 )
2024-10-21 10:43:49 +08:00
Hash Brown and GitHub
8c51d06222
feat: regenerate in Chat, agent and Chatflow app ( #7661 )
2024-09-22 03:15:11 +08:00
-LAN- and GitHub
ed37439ef7
refactor(api/core): Improve type hints and apply ruff formatter in agent runner and model manager. ( #8166 )
2024-09-10 15:00:25 +08:00
Bowen Liang and GitHub
bbb6fcc4f0
chore: update ruff from 0.5.x to 0.6.x ( #7384 )
2024-08-19 09:21:11 +08:00
Nam Vu and GitHub
dbc1ae45de
chore: update docstrings ( #7343 )
2024-08-16 14:19:01 +08:00
非法操作 and GitHub
1e28a8c033
chore: add create_json_message api for tools ( #5440 )
2024-06-24 15:46:16 +08:00
Bowen Liang and GitHub
f32b440c4a
chore: fix indention violations by applying E111 to E117 ruff rules ( #4925 )
2024-06-05 14:05:15 +08:00
Bowen Liang and GitHub
3542d55e67
improve: generalize tool parameter converter ( #4786 )
2024-06-03 21:26:58 +08:00
afed3610fc
fix organize agent's history messages without recalculating tokens ( #4324 )
...
Co-authored-by: chenyongzhao <[email protected] >
2024-05-29 15:25:20 +08:00
Yeuoly and GitHub
e852a21634
Feat/workflow phase2 ( #4687 )
2024-05-27 22:01:11 +08:00
Yeuoly and GitHub
3480f1c59e
refactor: tool parameter cache ( #3703 )
2024-04-23 15:22:42 +08:00
LIU HONGWEI and GitHub
c227f3d985
feat: Deprecate datetime.utcnow() in favor of datetime.now(timezone.utc).replace(tzinfo=None) for better timezone handling ( #3408 ) ( #3416 )
2024-04-12 16:22:24 +08:00
Yeuoly and GitHub
cea107b165
Refactor/react agent ( #3355 )
2024-04-11 18:34:17 +08:00