|
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 |
|
|
|
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 |
|
|
JzoNg
|
ac2104581b
|
fix merge confilcts of evaluation-fe
|
2026-04-16 12:47:16 +08:00 |
|
|
|
53a22aa41b
|
feat: collaboration (#30781)
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: yyh <[email protected]>
Co-authored-by: yyh <[email protected]>
|
2026-04-16 02:21:04 +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 |
|
|
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 |
|
|
|
c34f67495c
|
refactor(api): type WorkflowRun.to_dict with WorkflowRunDict TypedDict (#35047)
Co-authored-by: Ke Wang <[email protected]>
|
2026-04-13 08:30:28 +00:00 |
|
|
StatxcandGitHub
|
b0079e55b4
|
refactor(api): type WorkflowAppLog.to_dict with WorkflowAppLogDict TypedDict (#34682)
|
2026-04-13 05:47:44 +00:00 |
|
|
|
d9f54f8bd7
|
refactor: migrate WorkflowPause and WorkflowPauseReason to TypeBase (#34688)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-13 05:46:52 +00:00 |
|
|
corevibe555andGitHub
|
07c573e52f
|
refactor(api): replace Optional/Union with | syntax, remove dead AnyFunction (#34894)
|
2026-04-10 05:46:05 +00:00 |
|
|
dataCenter430andGitHub
|
3325392cc5
|
refactor: convert segmentType workflow if/elif to match/case (#34785)
|
2026-04-09 00:51:43 +00:00 |
|
|
99andGitHub
|
f27d669f87
|
chore: normalize frozenset literals and myscale typing (#34327)
|
2026-03-31 08:21:22 +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 |
|
|
FFXN
|
c14e57ac44
|
feat: implement publish workflow as evaluation.
|
2026-03-27 17:34:40 +08:00 |
|
|
|
2ea85d3ba2
|
refactor: use EnumText for model_type and WorkflowNodeExecution.status (#34093)
Co-authored-by: Krishna Chaitanya <[email protected]>
|
2026-03-26 20:34:44 +00:00 |
|
|
FFXN
|
ef3973f188
|
Merge branch 'origin/main' into feat/evaluation
|
2026-03-26 16:46:10 +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 |
|
|
tmimmanuelandGitHub
|
20fc69ae7f
|
refactor: use EnumText for WorkflowAppLog.created_from and WorkflowArchiveLog columns (#33954)
|
2026-03-24 02:44:46 +09:00 |
|
|
FFXN
|
2ef7d8a798
|
Merge remote-tracking branch 'refs/remotes/origin/main' into feat/evaluation
|
2026-03-23 17:39:20 +08:00 |
|
|
|
c8ed584c0e
|
fix: adding a restore API for version control on workflow draft (#33582)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <[email protected]>
|
2026-03-20 14:54:23 +08:00 |
|
|
|
c93289e93c
|
fix(api): add trigger_info to WorkflowNodeExecutionMetadataKey (#33753)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-19 17:56:49 +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 |
|
|
盐粒 YanliandGitHub
|
a717519822
|
refactor(api): tighten phase 1 shared type contracts (#33453)
|
2026-03-17 17:50:51 +08:00 |
|
|
statxcandGitHub
|
7e34faaf51
|
refactor(api): replace dict/Mapping with TypedDict in trigger.py and workflow.py (#33562)
|
2026-03-17 13:14:42 +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 |
|
|
|
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 <[email protected]>
|
2026-03-14 13:38:27 +09: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 |
|
|
-LAN-andGitHub
|
c917838f9c
|
refactor: move workflow package to dify_graph (#32844)
|
2026-03-02 18:42:30 +08:00 |
|
|
FFXN
|
eebd7763a5
|
Merge remote-tracking branch 'origin/main' into feat/evaluation
|
2026-03-02 14:46:31 +08:00 |
|
|
|
00dbaef04f
|
fix: use declared_attr.directive for WorkflowNodeExecutionModel.__table_args__ (#32656)
Signed-off-by: edvatar <[email protected]>
Co-authored-by: Asuka Minato <[email protected]>
|
2026-03-02 10:15:06 +08:00 |
|
|
-LAN-andGitHub
|
1f0fca89a8
|
refactor(workflow): move variables package into core.workflow (#32750)
|
2026-03-01 03:15:09 +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 |
|
|
jyongandFFXN
|
bad6fb3470
|
evaluations
|
2026-02-14 09:50:34 +08:00 |
|
|
|
a1fc280102
|
feat: Human Input Node (#32060)
The frontend and backend implementation for the human input node.
Co-authored-by: twwu <[email protected]>
Co-authored-by: JzoNg <[email protected]>
Co-authored-by: yyh <[email protected]>
Co-authored-by: zhsama <[email protected]>
|
2026-02-09 14:57:23 +08:00 |
|
|
|
b8cb5f5ea2
|
refactor(typing): Fixup typing A2 - workflow engine & nodes (#31723)
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Asuka Minato <[email protected]>
|
2026-01-31 18:00:56 +09:00 |
|
|
|
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 |
|
|
|
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 <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <[email protected]>
Co-authored-by: 盐粒 Yanli <[email protected]>
Co-authored-by: CrabSAMA <[email protected]>
Co-authored-by: Stephen Zhou <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: yihong <[email protected]>
Co-authored-by: Joel <[email protected]>
|
2026-01-30 10:18:49 +08:00 |
|
|
-LAN-andGitHub
|
67eb8c052d
|
refactor: single-node workflow runner helpers (#31472)
|
2026-01-24 10:27:44 +08:00 |
|
|
|
fa92548cf6
|
feat: archive workflow run logs backend (#31310)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-01-23 13:11:56 +08:00 |
|
|
|
b0545635b8
|
chore: improve clear workflow_run task (#31124)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <[email protected]>
Co-authored-by: hj24 <[email protected]>
|
2026-01-19 10:58:57 +08:00 |
|
|
|
206706987d
|
refactor(variables): clarify base vs union type naming (#30634)
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
|
2026-01-13 23:39:34 +09:00 |
|