|
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 |
|
|
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 |
|
|
|
e70e4fa41d
|
chore(api): migrate file factory builders and account commands to use Session(db.engine) (#35236)
Co-authored-by: Asuka Minato <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-17 08:12:31 +00:00 |
|
|
FFXN
|
9a77590216
|
Merge remote-tracking branch 'origin/main' into feat/evaluation
|
2026-04-17 16:03:12 +08:00 |
|
|
|
881a9a1a08
|
refactor(api): move trace providers (#35144)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-17 07:53:35 +00:00 |
|
|
|
a74e12809b
|
fix: move remote credential validation outside DB session to prevent … (#35350)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-17 07:42:29 +00:00 |
|
|
|
90e281c8da
|
test: migrate dataset service document mock tests to testcontainers (#35191)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-17 07:03:30 +00:00 |
|
|
JunghwanandGitHub
|
de15e5b449
|
fix: scope plugin inner API end-user lookup by tenant (#35325)
|
2026-04-17 06:12:07 +00:00 |
|
|
|
af8ffa0654
|
refactor: use sessionmaker in api_tools_manage_service.py (#34892)
Co-authored-by: Copilot <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-17 05:07:12 +00:00 |
|
|
|
af21dc7df8
|
refactor(api): migrate dataset document response schemas to BaseModel (#35298)
Co-authored-by: ai-hpc <[email protected]>
Co-authored-by: Asuka Minato <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-17 05:02:04 +00:00 |
|
|
|
13a9359191
|
refactor(api): migrate console mcp-server responses to BaseModel (#35219)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-17 04:16:14 +00:00 |
|
|
CodingOnStar
|
90384b26b3
|
merge
|
2026-04-16 16:58:52 +08:00 |
|
|
CodingOnStar
|
14e1fe46a5
|
Merge branch 'feat/dropdown-migaration' into deploy/dev
|
2026-04-16 16:58:08 +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 |
|
|
|
e8af6a6b3b
|
test: migrate conversation service mock tests to testcontainers (#35198)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-16 07:55:21 +00:00 |
|
|
jimcody1995andGitHub
|
7f4fe4d064
|
test: migrate clean notion task tests to SQLAlchemy 2.0 APIs (#35159)
|
2026-04-16 07:52:11 +00:00 |
|
|
|
b665eaa015
|
refactor(api): migrate console conversation responses to BaseModel (#35294)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-16 05:11:21 +00:00 |
|
|
JzoNg
|
ac2104581b
|
fix merge confilcts of evaluation-fe
|
2026-04-16 12:47:16 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e6b5923ff1
|
test(types): replace Account/Tenant status string literals with enum values (#35267)
Co-authored-by: xr843 <[email protected]>
|
2026-04-15 15:52:38 +00:00 |
|
|
|
dbceb3067e
|
refactor(api): migrate console tag responses from marshal_with to BaseModel (#35208)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-15 09:57:27 +00:00 |
|
|
JamesandGitHub
|
425457cb16
|
test: remove legacy workflow draft variable api test (#35226)
|
2026-04-15 09:53:53 +00:00 |
|
|
JamesandGitHub
|
e5bd18132c
|
test: remove legacy jinja2 code executor integration test (#35222)
|
2026-04-15 09:53:46 +00:00 |
|
|
JamesandGitHub
|
2f33867d07
|
test: remove legacy trigger provider permissions test (#35227)
|
2026-04-15 09:53:42 +00:00 |
|
|
JamesandGitHub
|
fd71c56f16
|
test: remove legacy storage key loader integration test (#35225)
|
2026-04-15 09:52:31 +00:00 |
|
|
|
e3c2116501
|
fix: remove enable for get (#35245)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Joel <[email protected]>
|
2026-04-15 09:18:29 +00:00 |
|
|
|
98897a5379
|
test: migrate webhook service additional mock tests to testcontainers (#35199)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-15 08:14:36 +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 |
|
|
|
3bccdd6c9a
|
test: migrate Service API site controller tests to Testcontainers (#32454) (#35183)
Co-authored-by: Copilot <[email protected]>
|
2026-04-15 05:51:34 +00:00 |
|
|
非法操作andGitHub
|
76af80e332
|
fix: open restore version panel raise 500 (#35240)
|
2026-04-15 04:43:38 +00:00 |
|
|
|
7a880ae60c
|
fix: import DSL and copy app not work (#35239)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-15 04:43:22 +00:00 |
|
|
JamesandGitHub
|
5bc0f9513b
|
test: remove legacy python3 code executor integration test (#35223)
|
2026-04-15 02:20:06 +00:00 |
|
|
JamesandGitHub
|
b77801ece9
|
test: remove legacy code executor integration test (#35224)
|
2026-04-15 02:19:42 +00:00 |
|
|
|
7de92c598f
|
test: migrate schedule service mock tests to testcontainers (#35196)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-14 20:34:53 +00:00 |
|
|
|
693080aa12
|
test: migrate dataset service dataset mock tests to testcontainers (#35194)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-04-14 19:52:31 +00:00 |
|
|
|
25c388d0db
|
refactor(api): migrate console workflow-trigger responses to BaseModel (#35200)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-14 19:52:17 +00:00 |
|
|
|
b1722c8af9
|
refactor(api): migrate console conversation variables response model to BaseModel (#35193)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-14 19:51:33 +00:00 |
|
|
|
b65a5fcd97
|
refactor(api): migrate service api workflow responses from marshal_with to BaseModel (#35195)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-14 19:50:59 +00:00 |
|
|
|
1c3cba281a
|
refactor(api): migrate console message responses from marshal_with to BaseModel (#35204)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-14 19:49:33 +00:00 |
|
|
|
800954f8ce
|
refactor(api): migrate service conversation-variable responses to BaseModel (#35205)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-14 19:49:21 +00:00 |
|
|
|
f66a3c49c4
|
refactor(api): migrate console recommended-app response to BaseModel (#35206)
Co-authored-by: ai-hpc <[email protected]>
Co-authored-by: Asuka Minato <[email protected]>
|
2026-04-14 19:48:43 +00:00 |
|
|
|
ef396ac84e
|
refactor(api): migrate workspace current response from marshal_with to BaseModel (#35207)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-14 19:48:09 +00:00 |
|
|
|
b1df52b8ff
|
refactor(api): migrate console workflow app-log responses to BaseModel (#35201)
Co-authored-by: ai-hpc <[email protected]>
|
2026-04-14 18:43:09 +00:00 |
|
|
wdeveloper16andGitHub
|
149b9d4c0f
|
refactor: replace bare dict with dict[str, Any] in services unit test helpers (#35182)
|
2026-04-14 18:37:59 +00:00 |
|