copilot-swe-agent[bot]
215d3ed42d
Merge remote-tracking branch 'origin/deploy/dev' into feat/evaluation
...
# Conflicts:
# .vite-hooks/pre-commit
# api/controllers/console/__init__.py
# api/core/agent/base_agent_runner.py
# api/core/app/app_config/easy_ui_based_app/model_config/converter.py
# api/core/app/apps/agent_chat/app_runner.py
# api/core/entities/provider_configuration.py
# api/core/helper/moderation.py
# api/core/model_manager.py
# api/core/rag/embedding/cached_embedding.py
# api/core/rag/retrieval/dataset_retrieval.py
# api/core/rag/splitter/fixed_text_splitter.py
# api/core/workflow/nodes/datasource/datasource_node.py
# api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
# api/models/human_input.py
# api/providers/trace/trace-tencent/src/dify_trace_tencent/span_builder.py
# api/services/workflow_service.py
# api/tasks/trigger_processing_tasks.py
# api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
# api/tests/integration_tests/workflow/nodes/test_http.py
# api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
# api/tests/unit_tests/controllers/service_api/app/test_conversation.py
# api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
# api/tests/unit_tests/core/variables/test_segment.py
# api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
# api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
# api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
# api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
# api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py
# api/tests/unit_tests/services/workflow/test_workflow_human_input_delivery.py
# web/app/(commonLayout)/layout.tsx
# web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
# web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx
# web/app/components/app/workflow-log/__tests__/list.spec.tsx
# web/app/components/apps/__tests__/list.spec.tsx
# web/app/components/apps/list.tsx
# web/app/components/base/chat/chat-with-history/header/operation.tsx
# web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
# web/app/components/header/account-setting/data-source-page-new/operator.tsx
# web/app/components/header/account-setting/members-page/operation/index.tsx
# web/app/components/plugins/marketplace/sort-dropdown/__tests__/index.spec.tsx
# web/app/components/plugins/marketplace/sort-dropdown/index.tsx
# web/app/components/plugins/plugin-page/plugin-tasks/index.tsx
# web/app/components/workflow/header/__tests__/test-run-menu.spec.tsx
# web/app/components/workflow/header/test-run-menu.tsx
# web/app/components/workflow/nodes/_base/components/next-step/operator.tsx
# web/app/components/workflow/nodes/_base/components/panel-operator/index.tsx
# web/app/components/workflow/nodes/assigner/components/__tests__/operation-selector.spec.tsx
# web/app/components/workflow/nodes/assigner/components/operation-selector.tsx
# web/app/components/workflow/operator/__tests__/more-actions.spec.tsx
# web/app/components/workflow/operator/zoom-in-out.tsx
# web/app/components/workflow/panel/version-history-panel/context-menu/menu-item.tsx
# web/app/components/workflow/selection-contextmenu.tsx
# web/eslint-suppressions.json
Co-authored-by: FFXN <31929997+FFXN@users.noreply.github.com>
2026-04-20 07:03:29 +00:00
99
3e876e173a
chore(api): adapt Graphon 0.2.2 upgrade ( #35377 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-18 11:16:24 +00:00
copilot-swe-agent[bot]
fa74a4ed67
Merge deploy/dev into feat/evaluation - resolve merge conflicts
...
Agent-Logs-Url: https://github.com/langgenius/dify/sessions/489dd945-dfff-462a-9c76-d29fdaa55de2
Co-authored-by: FFXN <31929997+FFXN@users.noreply.github.com>
2026-04-17 08:29:13 +00:00
Yunlu Wen
3193e8a712
chore: reorg imports ( #35308 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-16 08:50:02 +00:00
jimcody1995
7f4fe4d064
test: migrate clean notion task tests to SQLAlchemy 2.0 APIs ( #35159 )
2026-04-16 07:52:11 +00:00
bohdansolovie
9fa50774b4
test: migrate duplicate and vector index task integration tests to SQLAlchemy 2.0 APIs ( #35292 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-16 04:36:33 +00:00
Tim Ren
e6b5923ff1
test(types): replace Account/Tenant status string literals with enum values ( #35267 )
...
Co-authored-by: xr843 <xianren843@protonmail.com>
2026-04-15 15:52:38 +00:00
bohdansolovie
a3042e6332
test: migrate clean_notion_document integration tests to SQLAlchemy 2… ( #35147 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-14 13:31:42 +00:00
bohdansolovie
e5fd3133f4
test: migrate task integration tests to SQLAlchemy 2.0 query APIs ( #35170 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-14 13:27:39 +00:00
bohdansolovie
a951cc996b
test: migrate document indexing task tests to SQLAlchemy 2.0 select API ( #35145 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-14 07:56:11 +00:00
bohdansolovie
173e0d6f35
test: migrate clean_dataset integration tests to SQLAlchemy 2.0 APIs ( #35146 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-14 07:56:07 +00:00
bohdansolovie
84f25807db
test: migrate mail_human_input_delivery cleanup fixture to SQLAlchemy 2.0 delete API ( #35090 )
2026-04-13 19:31:11 +00:00
bohdansolovie
a12d740a5d
test: migrate mail and segment indexing integration tests to SQLAlchemy 2.0 APIs ( #35091 )
2026-04-13 19:22:34 +00:00
bohdansolovie
3bbb014dc7
test: migrate remove_app_and_related_data integration tests to SQLAlchemy 2.0 APIs ( #35092 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-13 19:22:07 +00:00
99
40591a7c50
refactor(api): use standalone graphon package ( #34209 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-27 21:05:32 +00:00
99
52e7492cbc
refactor(api): rename dify_graph to graphon ( #34095 )
2026-03-25 21:58:56 +08:00
-LAN-
56593f20b0
refactor(api): continue decoupling dify_graph from API concerns ( #33580 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WH-2099 <wh2099@pm.me>
2026-03-25 20:32:24 +08:00
tmimmanuel
d87263f7c3
refactor: select in console datasets document controller ( #34029 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-25 12:47:25 +09:00
tmimmanuel
8b634a9bee
refactor: use EnumText for ApiToolProvider.schema_type_str and Docume… ( #33983 )
2026-03-24 13:27:50 +09:00
tmimmanuel
e4f1d3c63a
refactor: use EnumText(StorageType) for UploadFile.storage_type ( #33728 )
2026-03-19 15:15:32 +09:00
tmimmanuel
3870b2ad2d
refactor: use EnumText for dataset and replace string literals 4 ( #33606 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-18 09:18:08 +09:00
tmimmanuel
e64f4d6039
refactor: replace sa.String with EnumText in mapped_column for type s… ( #33332 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-14 13:38:27 +09:00
GuanMu
3f515dcdda
refactor: use generate_valid_password helper for creating test account passwords ( #33192 )
...
Co-authored-by: Crazywoola <100913391+crazywoola@users.noreply.github.com>
2026-03-10 15:42:52 +08:00
wangxiaolei
9970f4449a
refactor: reuse redis connection instead of create new one ( #32678 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-09 15:53:21 +08:00
木之本澪
df3c66a8ac
test: migrate duplicate_document_indexing_task SQL tests to testcontainers ( #32540 )
...
Co-authored-by: KinomotoMio <200703522+KinomotoMio@users.noreply.github.com>
2026-03-05 02:35:24 +09:00
Renzo
ad000c42b7
feat: replace db.session with db_session_with_containers ( #32942 )
2026-03-04 14:50:41 +09:00
wangxiaolei
e14b09d4db
refactor: human input node decouple db ( #32900 )
2026-03-04 13:18:32 +08:00
-LAN-
c917838f9c
refactor: move workflow package to dify_graph ( #32844 )
2026-03-02 18:42:30 +08:00
edvatar
248202c220
fix: remove references to non-existent Document attributes in test ( #32654 )
...
Signed-off-by: edvatar <88481784+toroleapinc@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
2026-03-02 10:14:56 +08:00
weiguang li
b462a96fa0
fix: serialize data_source_info with json.dumps in Notion sync task ( #32747 )
2026-03-01 19:37:51 +08:00
-LAN-
20fcc95db9
test(api): add autospec to MagicMock-based patch usage ( #32752 )
2026-03-01 04:30:45 +08:00
-LAN-
1f0fca89a8
refactor(workflow): move variables package into core.workflow ( #32750 )
2026-03-01 03:15:09 +08:00
木之本澪
f9196f7bea
test: migrate document_indexing_sync_task SQL tests to testcontainers ( #32534 )
...
Co-authored-by: KinomotoMio <200703522+KinomotoMio@users.noreply.github.com>
2026-02-27 21:36:32 +09:00
木之本澪
0bf5f4df3b
test: migrate dataset_indexing_task SQL tests to testcontainers ( #32531 )
...
Co-authored-by: KinomotoMio <200703522+KinomotoMio@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-02-27 06:06:42 +09:00
不做了睡大觉
cec6d82650
fix: add None checks for tenant.id in dataset vector index tests ( #32603 )
...
Co-authored-by: User <user@example.com>
2026-02-26 17:15:45 +09:00
木之本澪
64296da7e7
test: migrate remove_app_and_related_data_task SQL tests to testcontainers ( #32547 )
...
Co-authored-by: KinomotoMio <200703522+KinomotoMio@users.noreply.github.com>
2026-02-25 05:12:23 +09:00
wangxiaolei
d546210040
refactor: document_indexing_sync_task split db session ( #32129 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-02-09 17:12:16 +08:00
QuantumGhost
a1fc280102
feat: Human Input Node ( #32060 )
...
The frontend and backend implementation for the human input node.
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zhsama <torvalds@linux.do>
2026-02-09 14:57:23 +08:00
wangxiaolei
aa800d838d
refactor: partition Celery task sessions into smaller, discrete execu… ( #32085 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-02-08 21:01:54 +08:00
wangxiaolei
b886b3f6c8
fix: fix miss use db.session ( #31971 )
2026-02-05 14:42:34 +08:00
QuantumGhost
90fe9abab7
revert: revert human input relevant code ( #31766 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-01-30 19:18:49 +08:00
QuantumGhost
03e3acfc71
feat(api): Human Input Node (backend part) ( #31646 )
...
The backend part of the human in the loop (HITL) feature and relevant architecture / workflow engine changes.
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: 盐粒 Yanli <yanli@dify.ai>
Co-authored-by: CrabSAMA <40541269+CrabSAMA@users.noreply.github.com>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: yihong <zouzou0208@gmail.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
2026-01-30 10:18:49 +08:00
wangxiaolei
121d301a41
refactor: use session factory instead of call db.session directly ( #31198 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-01-21 13:43:06 +08:00
-LAN-
55de731f9c
refactor(api): clarify published RAG pipeline invoke naming ( #30644 )
2026-01-06 23:48:06 +09:00
Jyong
9affc546c6
Feat/support multimodal embedding ( #29115 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-12-09 14:41:46 +08:00
hj24
3cb944f318
feat: enable tenant isolation on duplicate document indexing tasks ( #29080 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-12-08 17:54:57 +08:00
Asuka Minato
751ce4ec41
more typed orm ( #28577 )
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-11-24 21:01:46 +08:00
Asuka Minato
6241b87f90
more typed orm ( #28519 )
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-11-24 10:50:20 +08:00
Jyong
47dc26f011
fix document index test ( #28113 )
2025-11-12 16:00:10 +08:00
hj24
37903722fe
refactor: implement tenant self queue for rag tasks ( #27559 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
2025-11-06 21:25:50 +08:00
