|
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 <[email protected]>
|
2026-04-20 07:03:29 +00:00 |
|
|
FFXN
|
70bcbbb8c5
|
Merge remote-tracking branch 'origin/feat/evaluation' into feat/evaluation
# Conflicts:
# api/controllers/console/app/app.py
# api/services/workflow_service.py
|
2026-04-20 14:08:45 +08:00 |
|
|
FFXN
|
2b5dbbc7ff
|
use workflow_kind as business type (snippet/evaluation), not workflow_type.
|
2026-04-20 13:55:26 +08:00 |
|
|
Joel
|
3bb3670cb5
|
merge
|
2026-04-20 13:41:51 +08:00 |
|
|
|
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 |
|
|
JzoNg
|
cdd57c4b7d
|
fix merge error
|
2026-04-17 17:34:15 +08:00 |
|
|
+21
|
0e320290e1
|
feat: evaluation (#35353)
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: jyong <[email protected]>
Co-authored-by: Yansong Zhang <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: hj24 <[email protected]>
Co-authored-by: hj24 <[email protected]>
Co-authored-by: Joel <[email protected]>
Co-authored-by: Stephen Zhou <[email protected]>
Co-authored-by: CodingOnStar <[email protected]>
Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: 非法操作 <[email protected]>
Co-authored-by: Ayush Baluni <[email protected]>
Co-authored-by: yyh <[email protected]>
Co-authored-by: jimcody1995 <[email protected]>
Co-authored-by: James <[email protected]>
Co-authored-by: Yunlu Wen <[email protected]>
Co-authored-by: Stephen Zhou <[email protected]>
Co-authored-by: Coding On Star <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jerryzai <[email protected]>
Co-authored-by: NVIDIAN <[email protected]>
Co-authored-by: ai-hpc <[email protected]>
Co-authored-by: Asuka Minato <[email protected]>
Co-authored-by: Junghwan <[email protected]>
Co-authored-by: HeYinKazune <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: yyh <[email protected]>
Co-authored-by: Jingyi <[email protected]>
Co-authored-by: Claude Sonnet 4.6 <[email protected]>
Co-authored-by: sxxtony <[email protected]>
|
2026-04-17 16:37:21 +08:00 |
|
|
|
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 <[email protected]>
|
2026-04-17 08:29:13 +00:00 |
|
|
FFXN
|
9a77590216
|
Merge remote-tracking branch 'origin/main' into feat/evaluation
|
2026-04-17 16:03:12 +08:00 |
|
|
|
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 |
|
|
+1
|
f9b76f0f52
|
feat: evaluation (#35251)
Co-authored-by: jyong <[email protected]>
Co-authored-by: Yansong Zhang <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: hj24 <[email protected]>
Co-authored-by: hj24 <[email protected]>
Co-authored-by: Joel <[email protected]>
Co-authored-by: Stephen Zhou <[email protected]>
Co-authored-by: CodingOnStar <[email protected]>
Co-authored-by: copilot-swe-agent[bot] <[email protected]>
|
2026-04-15 16:09:40 +08:00 |
|
|
FFXNandGitHub
|
13f0b141ac
|
Merge branch 'deploy/dev' into feat/evaluation
|
2026-04-15 16:07:50 +08:00 |
|
|
|
7e7b27fdec
|
refactor: replace bare dict with dict[str, Any] in response converter… (#35212)
Co-authored-by: Claude Sonnet 4.6 <[email protected]>
|
2026-04-14 19:45:04 +00:00 |
|
|
aetherandGitHub
|
62bb830338
|
refactor: convert InvokeFrom if/elif to match/case (#35143)
|
2026-04-14 07:46:58 +00:00 |
|
|
FFXN
|
7f98d693da
|
Merge remote-tracking branch 'origin/main' into feat/evaluation
# Conflicts:
# api/controllers/console/app/workflow.py
# api/graphon/enums.py
# api/pyproject.toml
# api/services/workflow_service.py
# api/uv.lock
|
2026-04-14 14:40:57 +08:00 |
|
|
wdeveloper16andGitHub
|
3c279edcf2
|
refactor: replace bare dict with dict[str, Any] in app task_entities … (#35084)
|
2026-04-13 17:14:23 +00:00 |
|
|
-LAN-andGitHub
|
d1e33ba9ea
|
refactor(api): reduce Dify GraphInitParams usage (#34825)
|
2026-04-09 07:59:15 +00:00 |
|
|
carlos4sandGitHub
|
02a9f0abca
|
refactor(api): use sessionmaker in core app generators & pipelines (#34771)
|
2026-04-08 23:15:58 +00:00 |
|
|
corevibe555andGitHub
|
c825d5dcf6
|
refactor(api): tighten types for Tenant.custom_config_dict and MCPToolProvider.headers (#34698)
|
2026-04-08 01:36:42 +00:00 |
|
|
StatxcandGitHub
|
19c80f0f0e
|
refactor(api): type error stream response with TypedDict (#34641)
|
2026-04-07 05:57:42 +00:00 |
|
|
|
8f9dbf269e
|
chore(api): align Python support with 3.12 (#34419)
Co-authored-by: Asuka Minato <[email protected]>
|
2026-04-02 05:07:32 +00:00 |
|
|
|
4bd388669a
|
refactor: core/app pipeline, core/datasource, and core/indexing_runner (#34359)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-01 02:20:56 +00:00 |
|
|
|
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 |
|
|
99andGitHub
|
fcfc96ca05
|
chore: remove stale mypy suppressions and align dataset service tests (#34130)
|
2026-03-26 12:34:44 +00:00 |
|
|
FFXN
|
ef3973f188
|
Merge branch 'origin/main' into feat/evaluation
|
2026-03-26 16:46:10 +08:00 |
|
|
|
5341cd015b
|
fix: dataset query created_by empty UUID in iteration subgraph (#34004) (#34044)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-26 14:57:19 +08:00 |
|
|
99andGitHub
|
52e7492cbc
|
refactor(api): rename dify_graph to graphon (#34095)
|
2026-03-25 21:58:56 +08:00 |
|
|
|
56593f20b0
|
refactor(api): continue decoupling dify_graph from API concerns (#33580)
Signed-off-by: -LAN- <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WH-2099 <[email protected]>
|
2026-03-25 20:32:24 +08:00 |
|
|
FFXN
|
b6bce7c7fa
|
fix: run snippet.
|
2026-03-25 18:18:32 +08:00 |
|
|
tmimmanuelandGitHub
|
20fc69ae7f
|
refactor: use EnumText for WorkflowAppLog.created_from and WorkflowArchiveLog columns (#33954)
|
2026-03-24 02:44:46 +09:00 |
|
|
|
f41d1d0822
|
refactor: use EnumText for Conversation/Message invoke_from and from_source (#33832)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Asuka Minato <[email protected]>
|
2026-03-21 11:47:48 +09:00 |
|
|
|
8c9831177a
|
fix(api): preserve citation metadata in web responses (#33778)
Co-authored-by: AI Assistant <[email protected]>
|
2026-03-20 10:49:12 +08:00 |
|
|
tmimmanuelandGitHub
|
5b9cb55c45
|
refactor: use EnumText for MessageFeedback and MessageFile columns (#33738)
|
2026-03-20 01:13:26 +09:00 |
|
|
盐粒 YanliandGitHub
|
df0ded210f
|
fix: preserve timing metrics in parallel iteration (#33216)
|
2026-03-19 18:05:52 +08:00 |
|
|
statxcandGitHub
|
236ae372be
|
refactor(api): replace dict/Mapping with TypedDict in core/app (#33601)
|
2026-03-18 00:38:39 +09:00 |
|
|
|
98e72521f4
|
chore: change draft var to user scoped (#33066)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: QuantumGhost <[email protected]>
|
2026-03-16 14:04:41 +08:00 |
|
|
-LAN-andGitHub
|
fb41b215c8
|
refactor(api): move workflow knowledge nodes and trigger nodes (#33445)
|
2026-03-15 15:24:59 +08:00 |
|
|
99andGitHub
|
1b6e695520
|
refactor(workflow): move agent node back to core workflow (#33431)
|
2026-03-14 22:33:13 +08:00 |
|
|
Rajat AgarwalandGitHub
|
0045e387f5
|
test: unit test cases for core.app.apps module (#32482)
|
2026-03-12 11:23:25 +08:00 |
|
|
|
989db0e584
|
refactor: Unify NodeConfigDict.data and BaseNodeData (#32780)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot <[email protected]>
|
2026-03-11 23:43:58 +08:00 |
|
|
|
d6721a1dd3
|
fix: use moderation modified inputs and query (#33180)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Crazywoola <[email protected]>
|
2026-03-11 13:37:23 +08:00 |
|
|
|
ad81513b6a
|
fix: show citations in advanced chat apps (#32985)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-06 09:56:14 +08:00 |
|
|
|
741d48560d
|
refactor(api): add TypedDict definitions to models/model.py (#32925)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-06 08:42:54 +09:00 |
|
|
99andGitHub
|
7432b58f82
|
refactor(dify_graph): introduce run_context and delegate child engine creation (#32964)
|
2026-03-05 14:31:28 +08:00 |
|
|
wangxiaoleiandGitHub
|
e14b09d4db
|
refactor: human input node decouple db (#32900)
|
2026-03-04 13:18:32 +08:00 |
|
|
99andGitHub
|
c8688ec371
|
refactor(dify_graph): unify invoke and user enums source in workflow (#32873)
|
2026-03-03 15:05:20 +08:00 |
|
|
-LAN-andGitHub
|
4fd6b52808
|
refactor(api): move model_runtime into dify_graph (#32858)
|
2026-03-02 20:15:32 +08:00 |
|
|
-LAN-andGitHub
|
c917838f9c
|
refactor: move workflow package to dify_graph (#32844)
|
2026-03-02 18:42:30 +08:00 |
|
|
99andGitHub
|
a01de98721
|
refactor(workflow): decouple start node external dependencies (#32793)
|
2026-03-02 02:01:41 +08:00 |
|
|
-LAN-andGitHub
|
1f0fca89a8
|
refactor(workflow): move variables package into core.workflow (#32750)
|
2026-03-01 03:15:09 +08:00 |
|